diff --git a/.github/social/preview.png b/.github/social/preview.png index 8f6ee15..f3a14fa 100644 Binary files a/.github/social/preview.png and b/.github/social/preview.png differ diff --git a/.github/social/preview.xcf b/.github/social/preview.xcf index f843184..e7c9bcc 100644 Binary files a/.github/social/preview.xcf and b/.github/social/preview.xcf differ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d56168..6ef5ee5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,8 @@ on: branches: [master] env: - dotnet: 3.1.201 - version: 1.6.4 + dotnet: 5.0.100 + version: 1.7.0 key: dein:toolbox organization: dein name: ToolBox @@ -22,7 +22,7 @@ jobs: name: build on ${{ matrix.platform }} steps: - uses: actions/checkout@v2 - - name: setup .Net Core + - name: setup .Net uses: actions/setup-dotnet@v1 with: dotnet-version: ${{ env.dotnet }} @@ -35,7 +35,7 @@ jobs: name: test steps: - uses: actions/checkout@v2 - - name: setup .Net Core + - name: setup .Net uses: actions/setup-dotnet@v1 with: dotnet-version: ${{ env.dotnet }} diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index 5e5cb2f..fa644b3 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -6,8 +6,8 @@ on: - "v*" env: - dotnet: 3.1.201 - version: 1.6.4 + dotnet: 5.0.100 + version: 1.7.0 jobs: pack: @@ -15,7 +15,7 @@ jobs: name: packing steps: - uses: actions/checkout@v2 - - name: setup .Net Core + - name: setup .Net uses: actions/setup-dotnet@v1 with: dotnet-version: ${{ env.dotnet }} @@ -38,7 +38,7 @@ jobs: - name: setup Twitter uses: ethomson/send-tweet-action@v1 with: - status: "ToolBox - C# .Net Core Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ]\n + status: "ToolBox - C# .Net Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ]\n ${{ env.version }} 🐛🛠 version available as NuGet package\n $ dotnet add package dein.toolbox\n \n diff --git a/.vscode/launch.json b/.vscode/launch.json index b70b545..b904a7c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,12 +5,12 @@ "version": "0.2.0", "configurations": [ { - "name": ".NET Core Launch (console)", + "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/netcoreapp3.1/ToolBox.Tests.dll", + "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 @@ -19,7 +19,7 @@ "internalConsoleOptions": "openOnSessionStart" }, { - "name": ".NET Core Attach", + "name": ".NET Attach", "type": "coreclr", "request": "attach", "processId": "${command:pickProcess}" diff --git a/.vscode/settings.json b/.vscode/settings.json index 0587c40..013e611 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -26,7 +26,6 @@ "unversioned", "xclip", "xcopy", - "netcoreapp", "Namesapace", "ethomson", "lcov", diff --git a/CHANGELOG.md b/CHANGELOG.md index 65640d4..ad2a318 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,16 @@ Fixed for any bug fixes. Security to invite users to upgrade in case of vulnerabilities. --> +## [1.7.0] - 2020-11-11 + +**Removed:** + +- Drop support for .Net Core version 2.2, because is out of support and will not receive security updates in the future. + +**Added:** + +- Support for .Net version 5.0 + ## [1.6.4] - 2020-04-27 **Fixed:** diff --git a/Package/README.md b/Package/README.md index eb50a84..a2c579a 100644 --- a/Package/README.md +++ b/Package/README.md @@ -1,6 +1,6 @@ # dein ToolBox [ Win+Mac+Linux ] -**ToolBox** was created to simplify and automate tasks related to the .Net Core console. Was born in [HardHat](https://github.com/deinsoftware/hardhat/) project as a Class. Now grown up as a library and can be used by other console applications. +**ToolBox** was created to simplify and automate tasks related to the .Net console. Was born in [HardHat](https://github.com/deinsoftware/hardhat/) project as a Class. Now grown up as a library and can be used by other console applications. Contributions or Beer will be appreciated @@ -15,7 +15,7 @@ These instructions will get you a copy of the project up and running on your loc What things do you need to install? -- [NET Core SDK](https://www.microsoft.com/net/download) +- [.Net SDK](https://www.microsoft.com/net/download) ### Installing diff --git a/README.md b/README.md index cf98117..7690463 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ ![ToolBox](.github/social/preview.png "ToolBox") -**ToolBox** was created to simplify and automate tasks related to the .Net Core console. Was born in [HardHat](https://github.com/deinsoftware/hardhat/) project as a Class. Now grown up as a library and can be used by other console applications. +**ToolBox** was created to simplify and automate tasks related to the .Net console. Was born in [HardHat](https://github.com/deinsoftware/hardhat/) project as a Class. Now grown up as a library and can be used by other console applications. > The Code is Dark and Full of Errors! > Console is your friend ... don't be afraid! @@ -52,7 +52,7 @@ These instructions will get you a copy of the project up and running on your loc What things you need to install? -- [NET Core SDK](https://www.microsoft.com/net/download) +- [.Net SDK](https://www.microsoft.com/net/download) ### Installing @@ -100,7 +100,7 @@ Inside your .csproj add Command Bridge files on build: ```xml - + @@ -485,7 +485,7 @@ Web.IsUrl(value); //Return true if value is an http or https valid address ### Built With -- [.Net Core](https://dotnet.github.io/) - ASP.NET Core is a free and open-source web framework, and the next generation of ASP.NET, developed by Microsoft and the community. +- [.Net](https://dotnet.github.io/) - .Net is a free and open-source web framework, developed by Microsoft and the community. - [VS Code](https://code.visualstudio.com/) - Code editing redefined. - [SonarQube](https://sonarcloud.io/dashboard/index/dein:toolbox) - Continuous code quality. diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj index 5a0bab5..e48f3ae 100644 --- a/Sample/Sample.csproj +++ b/Sample/Sample.csproj @@ -1,11 +1,11 @@ - - + + Exe - netcoreapp3.1 + net5.0 \ No newline at end of file diff --git a/Sample/sonar.bat b/Sample/sonar.bat index ed92ed0..ee6c887 100644 --- a/Sample/sonar.bat +++ b/Sample/sonar.bat @@ -1,7 +1,7 @@ @echo off set /p token= - netcoreapp3.1 + net5.0 false {8fb9feb0-766c-4602-bd1a-79026d9f1266} - - - - + + + + - + diff --git a/ToolBox/ToolBox.csproj b/ToolBox/ToolBox.csproj index 0022ef0..ce00bcd 100644 --- a/ToolBox/ToolBox.csproj +++ b/ToolBox/ToolBox.csproj @@ -2,14 +2,14 @@ ToolBox ToolBox - 1.6.4 + 1.7.0 {cc239282-2799-4be9-a88f-aa8b744b533d} Camilo Martinez dein Software en-US ToolBox - C# NETCore ToolBox Library + C# .Net ToolBox Library dein Software © since 2017 dotnet;core;win-x64;osx-x64 @@ -21,13 +21,13 @@ https://github.com/deinsoftware/toolbox git - netcoreapp2.2;netcoreapp3.1; + netcoreapp3.1;net5.0; win-x64;osx-x64;linux-x64; full True - + @@ -36,7 +36,7 @@ - + diff --git a/ToolBox/ToolBox.nuspec b/ToolBox/ToolBox.nuspec index 858f3e7..1e58cac 100644 --- a/ToolBox/ToolBox.nuspec +++ b/ToolBox/ToolBox.nuspec @@ -2,7 +2,7 @@ dein.ToolBox - 1.6.4 + 1.7.0 dein ToolBox Camilo Martinez dein,equiman @@ -12,19 +12,19 @@ https://github.com/deinsoftware/toolbox icon.png - C# .Net Core Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ] - C# .Net Core Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ] + C# .Net Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ] + C# .Net Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ] Refer to https://github.com/deinsoftware/colorify/blob/master/CHANGELOG.md on GitHub. dein Software © since 2017 - toolboxes dotnet-core macos windows linux library csharp toolbox validation-library osdetection command-line + toolboxes dotnet macos windows linux library csharp toolbox validation-library osdetection command-line en-US false - + - + @@ -36,10 +36,10 @@ - - + + \ No newline at end of file diff --git a/global.json b/global.json new file mode 100644 index 0000000..caf3be7 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "5.0.100", + "rollForward": "latestMajor" + } +} \ No newline at end of file diff --git a/sonar.bat b/sonar.bat index ed92ed0..ee6c887 100644 --- a/sonar.bat +++ b/sonar.bat @@ -1,7 +1,7 @@ @echo off set /p token=