Added dotnet 5.0 support

equiman · equiman · commit b575cfa7d1e3 · 2020-11-11T13:00:32.000-05:00
diff --git a/.github/social/preview.png b/.github/social/preview.png
diff --git a/.github/social/preview.xcf b/.github/social/preview.xcf
diff --git 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
@@ -6,16 +6,16 @@ on:
       - "v*"
 
 env:
-  dotnet: 3.1.201
-  version: 1.6.4
+  dotnet: 5.0.100
+  version: 1.7.0
 
 jobs:
   pack:
     runs-on: ubuntu-latest
     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
@@ -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
@@ -26,7 +26,6 @@
     "unversioned",
     "xclip",
     "xcopy",
-    "netcoreapp",
     "Namesapace",
     "ethomson",
     "lcov",
diff --git 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
@@ -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
@@ -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
 <Project Sdk="Microsoft.NET.Sdk">
-    <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
         <!-- Command Bridge -->
         <None Update="cmd.sh" CopyToOutputDirectory="PreserveNewest" />
         <None Update="cmd.bat" CopyToOutputDirectory="PreserveNewest" />
@@ -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
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="dein.Colorify" Version="2.5.0" />
-    <PackageReference Include="dein.ToolBox" Version="1.6.4" />
+    <PackageReference Include="dein.Colorify" Version="2.6.0" />
+    <PackageReference Include="dein.ToolBox" Version="1.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/Sample/sonar.bat b/Sample/sonar.bat
@@ -1,7 +1,7 @@
 @echo off
 set /p token=<sonar.txt
 :: https://docs.sonarqube.org/display/SONAR/Analysis+Parameters
-dotnet sonarscanner begin /k:"dein:toolbox" /n:"ToolBox" /v:"1.6.4" /o:"dein" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="%token%" /d:sonar.language="cs" /d:sonar.exclusions="**/bin/**/*,**/obj/**/*" /d:sonar.coverage.exclusions="ToolBox.Tests/**,**/*Tests.cs" /d:sonar.cs.opencover.reportsPaths="%cd%\lcov.opencover.xml"
+dotnet sonarscanner begin /k:"dein:toolbox" /n:"ToolBox" /v:"1.7.0" /o:"dein" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="%token%" /d:sonar.language="cs" /d:sonar.exclusions="**/bin/**/*,**/obj/**/*" /d:sonar.coverage.exclusions="ToolBox.Tests/**,**/*Tests.cs" /d:sonar.cs.opencover.reportsPaths="%cd%\lcov.opencover.xml"
 dotnet restore
 dotnet build
 dotnet test ToolBox.Tests/ToolBox.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=\"opencover,lcov\" /p:CoverletOutput=../lcov
diff --git a/Sample/sonar.sh b/Sample/sonar.sh
@@ -2,7 +2,7 @@
 token="$(cat sonar.txt)"
 dir="$(pwd)"
 # https://docs.sonarqube.org/display/SONAR/Analysis+Parameters
-dotnet sonarscanner begin /k:"dein:toolbox" /n:"ToolBox" /v:"1.6.4" /o:"dein" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="${token}" /d:sonar.language="cs" /d:sonar.exclusions="**/bin/**/*,**/obj/**/*" /d:sonar.cs.opencover.reportsPaths="${dir}/lcov.opencover.xml"
+dotnet sonarscanner begin /k:"dein:toolbox" /n:"ToolBox" /v:"1.7.0" /o:"dein" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="${token}" /d:sonar.language="cs" /d:sonar.exclusions="**/bin/**/*,**/obj/**/*" /d:sonar.cs.opencover.reportsPaths="${dir}/lcov.opencover.xml"
 dotnet restore
 dotnet build
 dotnet test ToolBox.Tests/ToolBox.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=\"opencover,lcov\" /p:CoverletOutput=../lcov
diff --git a/ToolBox.Tests/ToolBox.Tests.csproj b/ToolBox.Tests/ToolBox.Tests.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ProjectGuid>{8fb9feb0-766c-4602-bd1a-79026d9f1266}</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.8.1" />
-    <PackageReference Include="Microsoft.CodeCoverage" Version="16.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
+    <PackageReference Include="Microsoft.CodeCoverage" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Moq" Version="4.15.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ToolBox\ToolBox.csproj" />
diff --git a/ToolBox/ToolBox.csproj b/ToolBox/ToolBox.csproj
@@ -2,14 +2,14 @@
   <PropertyGroup>
     <AssemblyName>ToolBox</AssemblyName>
     <PackageId>ToolBox</PackageId>
-    <VersionPrefix>1.6.4</VersionPrefix>
+    <VersionPrefix>1.7.0</VersionPrefix>
     <ProjectGuid>{cc239282-2799-4be9-a88f-aa8b744b533d}</ProjectGuid>
 
     <Authors>Camilo Martinez</Authors>
     <Company>dein Software</Company>
     <NeutralLanguage>en-US</NeutralLanguage>
     <AssemblyTitle>ToolBox</AssemblyTitle>
-    <Description>C# NETCore ToolBox Library</Description>
+    <Description>C# .Net ToolBox Library</Description>
     <Copyright>dein Software © since 2017</Copyright>
 
     <PackageTags>dotnet;core;win-x64;osx-x64</PackageTags>
@@ -21,13 +21,13 @@
     <RepositoryUrl>https://github.com/deinsoftware/toolbox</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
 
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.1;</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;</TargetFrameworks>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;</RuntimeIdentifiers>
 
     <DebugType>full</DebugType>
     <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <!-- Resources -->
     <None Update="cmd.bat" CopyToOutputDirectory="PreserveNewest" />
     <None Update="cmd.sh" CopyToOutputDirectory="PreserveNewest" />
@@ -36,7 +36,7 @@
     <!-- License -->
     <None Include="..\LICENSE.md" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <!-- Resources -->
     <None Update="cmd.bat" CopyToOutputDirectory="PreserveNewest" />
     <None Update="cmd.sh" CopyToOutputDirectory="PreserveNewest" />
diff --git a/ToolBox/ToolBox.nuspec b/ToolBox/ToolBox.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>dein.ToolBox</id>
-    <version>1.6.4</version>
+    <version>1.7.0</version>
     <title>dein ToolBox</title>
     <authors>Camilo Martinez</authors>
     <owners>dein,equiman</owners>
@@ -12,19 +12,19 @@
     <projectUrl>https://github.com/deinsoftware/toolbox</projectUrl>
     <repository type="git" url="https://github.com/deinsoftware/toolbox" />
     <icon>icon.png</icon>
-    <description>C# .Net Core Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ]</description>
-    <summary>C# .Net Core Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ]</summary>
+    <description>C# .Net Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ]</description>
+    <summary>C# .Net Library with utilities like: command line, files, log, platform, shell, system, transform and validation [ Win+Mac+Linux ]</summary>
     <documentation src="README.md" />
     <releaseNotes>Refer to https://github.com/deinsoftware/colorify/blob/master/CHANGELOG.md on GitHub.</releaseNotes>
     <copyright>dein Software © since 2017</copyright>
-    <tags>toolboxes dotnet-core macos windows linux library csharp toolbox validation-library osdetection command-line</tags>
+    <tags>toolboxes dotnet macos windows linux library csharp toolbox validation-library osdetection command-line</tags>
     <language>en-US</language>
     <developmentDependency>false</developmentDependency>
     <dependencies>
-      <group targetFramework="netcoreapp2.2">
+      <group targetFramework="netcoreapp3.1">
         <dependency id="Newtonsoft.Json" version="12.0.3" />
       </group>
-      <group targetFramework="netcoreapp3.1">
+      <group targetFramework="net5.0">
         <dependency id="Newtonsoft.Json" version="12.0.3" />
       </group>
     </dependencies>
@@ -36,10 +36,10 @@
     <file src="..\icon.png" target="\" />
     <file src="..\LICENSE.md" target="LICENSE.md" />
     <file src="..\Package\README.md" target="README.md" />
-    <file src="bin\release\netcoreapp2.2\T*.dll" target="lib\netcoreapp2.2" />
-    <file src="bin\release\netcoreapp2.2\T*.pdb" target="lib\netcoreapp2.2" />
     <file src="bin\release\netcoreapp3.1\T*.dll" target="lib\netcoreapp3.1" />
     <file src="bin\release\netcoreapp3.1\T*.pdb" target="lib\netcoreapp3.1" />
+    <file src="bin\release\net5.0\T*.dll" target="lib\net5.0" />
+    <file src="bin\release\net5.0\T*.pdb" target="lib\net5.0" />
     <file src="cmd.*" target="contentFiles\any\any\" />
   </files>
 </package>
diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+    "sdk": {
+        "version": "5.0.100",
+        "rollForward": "latestMajor"
+    }
+}
diff --git a/sonar.bat b/sonar.bat
@@ -1,7 +1,7 @@
 @echo off
 set /p token=<sonar.txt
 :: https://docs.sonarqube.org/display/SONAR/Analysis+Parameters
-dotnet sonarscanner begin /k:"dein:toolbox" /n:"ToolBox" /v:"1.6.4" /o:"dein" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="%token%" /d:sonar.language="cs" /d:sonar.exclusions="**/bin/**/*,**/obj/**/*" /d:sonar.coverage.exclusions="ToolBox.Tests/**,**/*Tests.cs" /d:sonar.cs.opencover.reportsPaths="%cd%\lcov.opencover.xml"
+dotnet sonarscanner begin /k:"dein:toolbox" /n:"ToolBox" /v:"1.7.0" /o:"dein" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="%token%" /d:sonar.language="cs" /d:sonar.exclusions="**/bin/**/*,**/obj/**/*" /d:sonar.coverage.exclusions="ToolBox.Tests/**,**/*Tests.cs" /d:sonar.cs.opencover.reportsPaths="%cd%\lcov.opencover.xml"
 dotnet restore
 dotnet build
 dotnet test ToolBox.Tests/ToolBox.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=\"opencover,lcov\" /p:CoverletOutput=../lcov
diff --git a/sonar.sh b/sonar.sh
@@ -2,7 +2,7 @@
 token="$(cat sonar.txt)"
 dir="$(pwd)"
 # https://docs.sonarqube.org/display/SONAR/Analysis+Parameters
-dotnet sonarscanner begin /k:"dein:toolbox" /n:"ToolBox" /v:"1.6.4" /o:"dein" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="${token}" /d:sonar.language="cs" /d:sonar.exclusions="**/bin/**/*,**/obj/**/*" /d:sonar.cs.opencover.reportsPaths="${dir}/lcov.opencover.xml"
+dotnet sonarscanner begin /k:"dein:toolbox" /n:"ToolBox" /v:"1.7.0" /o:"dein" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="${token}" /d:sonar.language="cs" /d:sonar.exclusions="**/bin/**/*,**/obj/**/*" /d:sonar.cs.opencover.reportsPaths="${dir}/lcov.opencover.xml"
 dotnet restore
 dotnet build
 dotnet test ToolBox.Tests/ToolBox.Tests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=\"opencover,lcov\" /p:CoverletOutput=../lcov
