Update to 1.8.0 version with dotnet 6 support

deinsoftware · Mar 20, 2022 · 1b1f083 · 1b1f083
1 parent 8dad177
commit 1b1f083
Show file tree

Hide file tree

Showing 14 changed files with 212 additions and 182 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,8 +7,8 @@ on:
     branches: [master]
 
 env:
-  dotnet: 5.0.100
-  version: 1.7.1
+  dotnet: 6.0.201
+  version: 1.8.0
   key: dein:toolbox
   organization: dein
   name: ToolBox

diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
@@ -6,8 +6,8 @@ on:
       - "v*"
 
 env:
-  dotnet: 5.0.100
-  version: 1.7.1
+  dotnet: 6.0.201
+  version: 1.8.0
 
 jobs:
   pack:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,28 +1,28 @@
 {
-   // Use IntelliSense to find out which attributes exist for C# debugging
-   // Use hover for the description of the existing attributes
-   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
-   "version": "0.2.0",
-   "configurations": [
-        {
-            "name": ".NET Launch (console)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/ToolBox.Tests/bin/Debug/net5.0/ToolBox.Tests.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/ToolBox.Tests",
-            // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
-            "console": "internalConsole",
-            "stopAtEntry": false,
-            "internalConsoleOptions": "openOnSessionStart"
-        },
-        {
-            "name": ".NET Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
-        }
-    ]
-}
+  // Use IntelliSense to find out which attributes exist for C# debugging
+  // Use hover for the description of the existing attributes
+  // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": ".NET Launch (console)",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/ToolBox.Tests/bin/Debug/net6.0/ToolBox.Tests.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/ToolBox.Tests",
+      // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
+      "console": "internalConsole",
+      "stopAtEntry": false,
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": ".NET Attach",
+      "type": "coreclr",
+      "request": "attach",
+      "processId": "${command:pickProcess}"
+    }
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -36,16 +36,12 @@
   ],
   "dotnet-test-explorer.testArguments": "/p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../lcov",
   "editor.tabSize": 4,
-  "grammarly.userWords": [
-    "NotificationSystem"
-  ],
+  "grammarly.userWords": ["NotificationSystem"],
   "grammarly.diagnostics": {
     "[markdown]": {
-      "ignore": [
-        "inlineCode",
-        "code"
-      ]
+      "ignore": ["inlineCode", "code"]
     }
   },
-  "omnisharp.useEditorFormattingSettings": true
-}
+  "omnisharp.useEditorFormattingSettings": true,
+  "cSpell.words": ["dotnet", "netstandard"]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,118 +1,116 @@
 {
-    "version": "2.0.0",
-    "tasks": [{
-            "label": "build",
-            "command": "dotnet",
-            "type": "process",
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "args": [
-                "build",
-                "${workspaceFolder}/ToolBox/ToolBox.csproj"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "build tests",
-            "command": "dotnet",
-            "type": "process",
-            "group": "build",
-            "args": [
-                "build",
-                "${workspaceFolder}/ToolBox.Tests/ToolBox.Tests.csproj"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "test",
-            "command": "dotnet",
-            "type": "process",
-            "group": {
-                "kind": "test",
-                "isDefault": true
-            },
-            "args": [
-                "test",
-                "${workspaceFolder}/ToolBox.Tests/ToolBox.Tests.csproj",
-                "/p:CollectCoverage=true",
-                "/p:CoverletOutputFormat=\"opencover,lcov\"",
-                "/p:CoverletOutput=../lcov"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish win",
-            "command": "dotnet",
-            "group": "none",
-            "args": [
-                "publish",
-                "${workspaceRoot}/ToolBox/ToolBox.csproj",
-                "-o",
-                "${workspaceRoot}/Library/win/",
-                "-c",
-                "release",
-                "-r",
-                "win10-x64"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish mac",
-            "command": "dotnet",
-            "args": [
-                "publish",
-                "${workspaceRoot}/ToolBox/ToolBox.csproj",
-                "-o",
-                "${workspaceRoot}/Library/mac/",
-                "-c",
-                "release",
-                "-r",
-                "osx.10.12-x64"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "pack",
-            "command": "dotnet",
-            "args": [
-                "pack",
-                "${workspaceRoot}/ToolBox/ToolBox.csproj",
-                "/p:NuspecFile=${workspaceRoot}/ToolBox/ToolBox.nuspec",
-                "-o",
-                "${workspaceRoot}/Package/",
-                "-c",
-                "release"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "permissions",
-            "type": "shell",
-            "osx": {
-                "command": "chmod +x ${workspaceRoot}/sonar.sh"
-            },
-            "presentation": {
-                "reveal": "always",
-                "panel": "new"
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "sonar",
-            "type": "shell",
-            "windows": {
-                "command": "${workspaceRoot}\\sonar.bat"
-            },
-            "osx": {
-                "command": "${workspaceRoot}/sonar.sh"
-            },
-            "presentation": {
-                "reveal": "always",
-                "panel": "new"
-            },
-            "problemMatcher": []
-        }
-    ]
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build",
+      "command": "dotnet",
+      "type": "process",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "args": ["build", "${workspaceFolder}/ToolBox/ToolBox.csproj"],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "build tests",
+      "command": "dotnet",
+      "type": "process",
+      "group": "build",
+      "args": [
+        "build",
+        "${workspaceFolder}/ToolBox.Tests/ToolBox.Tests.csproj"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "test",
+      "command": "dotnet",
+      "type": "process",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "args": [
+        "test",
+        "${workspaceFolder}/ToolBox.Tests/ToolBox.Tests.csproj",
+        "/p:CollectCoverage=true",
+        "/p:CoverletOutputFormat=\"opencover,lcov\"",
+        "/p:CoverletOutput=../lcov"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish win",
+      "command": "dotnet",
+      "group": "none",
+      "args": [
+        "publish",
+        "${workspaceRoot}/ToolBox/ToolBox.csproj",
+        "-o",
+        "${workspaceRoot}/Library/win/",
+        "-c",
+        "release",
+        "-r",
+        "win10-x64"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish mac",
+      "command": "dotnet",
+      "args": [
+        "publish",
+        "${workspaceRoot}/ToolBox/ToolBox.csproj",
+        "-o",
+        "${workspaceRoot}/Library/mac/",
+        "-c",
+        "release",
+        "-r",
+        "osx.10.12-x64"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "pack",
+      "command": "dotnet",
+      "args": [
+        "pack",
+        "${workspaceRoot}/ToolBox/ToolBox.csproj",
+        "/p:NuspecFile=${workspaceRoot}/ToolBox/ToolBox.nuspec",
+        "-o",
+        "${workspaceRoot}/Package/",
+        "-c",
+        "release"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "permissions",
+      "type": "shell",
+      "osx": {
+        "command": "chmod +x ${workspaceRoot}/sonar.sh"
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "sonar",
+      "type": "shell",
+      "windows": {
+        "command": "${workspaceRoot}\\sonar.bat"
+      },
+      "osx": {
+        "command": "${workspaceRoot}/sonar.sh"
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    }
+  ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,13 @@ Fixed       for any bug fixes.
 Security    to invite users to upgrade in case of vulnerabilities.
 -->
 
+## [1.8.0] - 2022-03-20
+
+**Added:**
+
+- Support for .Net version 6.0
+- Support for netstandard version 2.1
+
 ## [1.7.1] - 2020-12-01
 
 **Fixed:**

diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ What things you need to install?
 
 - [.Net SDK](https://www.microsoft.com/net/download)
 
-**ToolBox** supports `netcoreapp3.1` and `net5.0` target frameworks.
+**ToolBox** supports `netstandard2.1`, `netcoreapp3.1`, `net5.0` and `net6.0` target frameworks.
 
 ### Installing
 
@@ -102,12 +102,12 @@ Inside your .csproj add Command Bridge files on build:
 
 ```xml
 <Project Sdk="Microsoft.NET.Sdk">
-    <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
         <!-- Command Bridge -->
         <None Update="cmd.sh" CopyToOutputDirectory="PreserveNewest" />
         <None Update="cmd.bat" CopyToOutputDirectory="PreserveNewest" />
         <!-- Packages -->
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <!-- Projects -->
         <ProjectReference Include="..\..\_devTB\ToolBox\ToolBox.csproj" />
     </ItemGroup>

diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="dein.Colorify" Version="2.6.0" />
-    <PackageReference Include="dein.ToolBox" Version="1.7.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="dein.Colorify" Version="2.7.0" />
+    <PackageReference Include="dein.ToolBox" Version="1.8.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 </Project>