diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f77637..27d0a98 100644 --- 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 index 3ec1cb7..7fc09a6 100644 --- 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 index b904a7c..af2178b 100644 --- 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}" - } - ] -} \ No newline at end of file + // 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 index 0bd126e..8119bc3 100644 --- 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 -} \ No newline at end of file + "omnisharp.useEditorFormattingSettings": true, + "cSpell.words": ["dotnet", "netstandard"] +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6d76d4b..db84f10 100644 --- 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 index 922feec..684701b 100644 --- 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 index 6e09a9f..04f6d25 100644 --- 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 - + - + diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj index 03ab754..bc13c48 100644 --- a/Sample/Sample.csproj +++ b/Sample/Sample.csproj @@ -1,11 +1,11 @@ - - - + + + Exe - net5.0 + net6.0 \ No newline at end of file diff --git a/ToolBox.Tests/ToolBox.Tests.csproj b/ToolBox.Tests/ToolBox.Tests.csproj index 522b483..6f0c1c1 100644 --- a/ToolBox.Tests/ToolBox.Tests.csproj +++ b/ToolBox.Tests/ToolBox.Tests.csproj @@ -1,14 +1,14 @@ - net5.0 + net6.0 false {8fb9feb0-766c-4602-bd1a-79026d9f1266} - - - - + + + + diff --git a/ToolBox/ToolBox.csproj b/ToolBox/ToolBox.csproj index 54bdbb3..c245ce3 100644 --- a/ToolBox/ToolBox.csproj +++ b/ToolBox/ToolBox.csproj @@ -2,7 +2,7 @@ ToolBox ToolBox - 1.7.1 + 1.8.0 {cc239282-2799-4be9-a88f-aa8b744b533d} Camilo Martinez @@ -21,18 +21,28 @@ https://github.com/deinsoftware/toolbox git - netcoreapp3.1;net5.0; + netstandard2.1;netcoreapp3.1;net5.0;net6.0; win-x64;osx-x64;linux-x64; full True + + + + + + + + + + - + @@ -41,7 +51,16 @@ - + + + + + + + + + + diff --git a/ToolBox/ToolBox.nuspec b/ToolBox/ToolBox.nuspec index 767dfc1..0f44c91 100644 --- a/ToolBox/ToolBox.nuspec +++ b/ToolBox/ToolBox.nuspec @@ -2,7 +2,7 @@ dein.ToolBox - 1.7.1 + 1.8.0 dein ToolBox Camilo Martinez dein,equiman @@ -21,11 +21,17 @@ en-US false + + + - + - + + + + @@ -36,10 +42,14 @@ + + + + \ No newline at end of file diff --git a/global.json b/global.json index caf3be7..6532e59 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { - "sdk": { - "version": "5.0.100", - "rollForward": "latestMajor" - } -} \ No newline at end of file + "sdk": { + "version": "6.0.201", + "rollForward": "latestMajor" + } +} diff --git a/sonar.bat b/sonar.bat index 1b54efb..e19aa01 100644 --- a/sonar.bat +++ b/sonar.bat @@ -1,7 +1,7 @@ @echo off set /p token=