Update Visual Studio 2022 and .NET 6 (#184)

* Update Visual Studio 2022 and .NET 6 * Update target framework for test projects * Fixed dotnet-format error * Remove obsolete method and update package * Remove `include-prerelease` option
shibayan · Nov 8, 2021 · bb45238 · bb45238
1 parent 8d42ddb
commit bb45238
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 env:
-  DOTNET_VERSION: 5.0.x
+  DOTNET_VERSION: 6.0.x
 
 jobs:
   build:
@@ -30,4 +30,4 @@ jobs:
       run: dotnet test -c Release --no-build
 
     - name: Lint C# code
-      run: dotnet format --check --verbosity detailed --no-restore
+      run: dotnet format --verify-no-changes --verbosity detailed --no-restore
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,7 +5,7 @@ on:
     tags: [ v* ]
 
 env:
-  DOTNET_VERSION: 5.0.x
+  DOTNET_VERSION: 6.0.x
 
 jobs:
   publish:

diff --git a/Sharprompt.Example/Sharprompt.Example.csproj b/Sharprompt.Example/Sharprompt.Example.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Sharprompt.Tests/Sharprompt.Tests.csproj b/Sharprompt.Tests/Sharprompt.Tests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Sharprompt.sln b/Sharprompt.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29123.88
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31815.197
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sharprompt", "Sharprompt\Sharprompt.csproj", "{32B1CF1F-4683-4B04-B435-424EC5EE0E40}"
 EndProject

diff --git a/Sharprompt/Prompt.Basic.cs b/Sharprompt/Prompt.Basic.cs
@@ -55,19 +55,6 @@ public static string Password(Action<PasswordOptions> configure)
             return Password(options);
         }
 
-        [Obsolete("This is obsolete and will be removed in a future version. Use Password(message, passwordChar, validators) instead.")]
-        public static string Password(string message, IList<Func<object, ValidationResult>> validators = default)
-        {
-            var options = new PasswordOptions
-            {
-                Message = message
-            };
-
-            options.Validators.Merge(validators);
-
-            return Password(options);
-        }
-
         public static string Password(string message, string passwordChar = "*", IList<Func<object, ValidationResult>> validators = default)
         {
             var options = new PasswordOptions