Skip to content

Commit

Permalink
Merge pull request #100 from WildernessLabs/develop
Browse files Browse the repository at this point in the history
Bump to 1.9.2
  • Loading branch information
CartBlanche authored Mar 15, 2024
2 parents 9aa5279 + 4773a77 commit 279286c
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: VSCode Extension
env:
IDE_TOOLS_RELEASE_VERSION: 1.9.0
IDE_TOOLS_RELEASE_VERSION: 1.9.2

on:
push:
Expand Down Expand Up @@ -39,11 +39,11 @@ jobs:
path: Meadow.CLI
ref: develop

- name: Setup .NET 7.0.x
- name: Setup .NET 8.0.x
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
7.0.x
8.0.x
- name: Setup Nuget
uses: Nuget/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"request": "launch",
"preLaunchTask": "Debug Build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/csharp/bin/Debug/net7.0/vscode-meadow.dll",
"program": "${workspaceFolder}/src/csharp/bin/Debug/net8.0/vscode-meadow.dll",
"args": [ "--server", "--trace=response" ],
"cwd": "${workspaceFolder}",
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
Expand Down Expand Up @@ -50,7 +50,7 @@
"request": "launch",
"preLaunchTask": "Release Build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/csharp/bin/Release/net7.0/vscode-meadow.dll",
"program": "${workspaceFolder}/src/csharp/bin/Release/net8.0/vscode-meadow.dll",
"args": [ "--server", "--trace=response" ],
"cwd": "${workspaceFolder}",
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.300",
"version": "8.0.100",
"allowPrerelease": false,
"rollForward": "latestMinor"
}
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "meadow",
"displayName": "VSCode Tools For Meadow",
"version": "1.9.0",
"version": "1.9.2",
"publisher": "WildernessLabs",
"description": "Build, Debug and Deploy Meadow applications",
"icon": "meadow.png",
Expand Down Expand Up @@ -152,7 +152,7 @@
{
"type": "meadow",
"label": "Meadow (Debug)",
"program": "./src/csharp/bin/Debug/net7.0/vscode-meadow.dll",
"program": "./src/csharp/bin/Debug/net8.0/vscode-meadow.dll",
"runtime": "dotnet",
"initialConfigurations": [
{
Expand Down Expand Up @@ -181,7 +181,7 @@
{
"type": "meadow",
"label": "Meadow (Release)",
"program": "./src/csharp/bin/Release/net7.0/vscode-meadow.dll",
"program": "./src/csharp/bin/Release/net8.0/vscode-meadow.dll",
"runtime": "dotnet",
"initialConfigurations": [
{
Expand Down
4 changes: 2 additions & 2 deletions src/csharp/Meadow/MeadowDeployer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ public async Task<DebuggingServer> Deploy(string folder, int debugPort = -1)

await new DownloadManager(Logger).DownloadOsBinaries(osVersion);
}
catch
catch (Exception e)
{
Logger.LogInformation("OS download failed, make sure you have an active internet connection");
Logger.LogInformation($"OS download failed, make sure you have an active internet connection.{Environment.NewLine}{e.Message}");
}

var isDebugging = debugPort > 1000;
Expand Down
3 changes: 1 addition & 2 deletions src/csharp/VSCodeMeadow.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>8.0</LangVersion>
<OutputType>Exe</OutputType>
<AssemblyName>vscode-meadow</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/typescript/meadow-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class MeadowUtil
const isProduction = process.env.NODE_ENV === "production";
const debugOrRelease = isProduction ? "Release" : "Debug";

this.UtilPath = path.join(extPath, 'src', 'csharp', 'bin', debugOrRelease, 'net7.0', 'vscode-meadow.dll');
this.UtilPath = path.join(extPath, 'src', 'csharp', 'bin', debugOrRelease, 'net8.0', 'vscode-meadow.dll');
}

async RunCommand<TResult>(cmd: string, args: string[] = null)
Expand Down

0 comments on commit 279286c

Please sign in to comment.