Fix the build in Visual Studio

Directory.Build.props

@@ -28,7 +28,7 @@
 
   <ItemGroup Condition = "'$(TargetFramework)' == 'net472'">
     <PackageReference Include="System.Text.Json">
-      <Version>7.0.2</Version>
+      <Version>8.0.4</Version>
     </PackageReference>
   </ItemGroup>
 

Directory.Build.targets

@@ -6,7 +6,7 @@
   <Import Project="$(RepoPath)build\GCM.tasks" />
 
   <!-- Use version specified in VERSION file -->
-  <Target Name="GetVersion" BeforeTargets="BeforeBuild">
+  <Target Name="GetVersion" BeforeTargets="BeforeBuild;GenerateWindowsAppManifest">
     <GetVersion VersionFile="$(RepoPath)VERSION">
       <Output TaskParameter="Version" PropertyName="Version" />
       <Output TaskParameter="AssemblyVersion" PropertyName="AssemblyVersion" />
@@ -21,6 +21,7 @@
 
   <!-- Generate the manifest file before we set the win32 manifest properties -->
   <Target Name="GenerateWindowsAppManifest"
+		  AfterTargets="GetVersion"
           BeforeTargets="SetWin32ManifestProperties"
           Condition="'$(GenerateWindowsAppManifest)' != 'false'"
           Inputs="$(FileVersion);$(AssemblyName)"

src/shared/Atlassian.Bitbucket.Tests/Atlassian.Bitbucket.Tests.csproj

@@ -8,13 +8,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="ReportGenerator" Version="5.1.9" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="ReportGenerator" Version="5.3.10" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

src/shared/Core.Tests/ApplicationTests.cs

@@ -244,7 +244,7 @@ public async Task Application_UnconfigureAsync_EmptyAndGcmWithOthersBefore_Remov
 
             Assert.Single(context.Git.Configuration.Global);
             Assert.True(context.Git.Configuration.Global.TryGetValue(key, out var actualValues));
-            Assert.Equal(1, actualValues.Count);
+            Assert.Single(actualValues);
             Assert.Equal(beforeHelper, actualValues[0]);
         }
 

src/shared/Core.Tests/Authentication/BasicAuthenticationTests.cs

@@ -12,12 +12,12 @@ namespace GitCredentialManager.Tests.Authentication
     public class BasicAuthenticationTests
     {
         [Fact]
-        public void BasicAuthentication_GetCredentials_NullResource_ThrowsException()
+        public async Task BasicAuthentication_GetCredentials_NullResource_ThrowsException()
         {
             var context = new TestCommandContext();
             var basicAuth = new BasicAuthentication(context);
 
-            Assert.ThrowsAsync<ArgumentNullException>(() => basicAuth.GetCredentialsAsync(null));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => basicAuth.GetCredentialsAsync(null));
         }
 
         [Fact]
@@ -58,7 +58,7 @@ public async Task BasicAuthentication_GetCredentials_NonDesktopSession_Resource_
         }
 
         [Fact]
-        public void BasicAuthentication_GetCredentials_NonDesktopSession_NoTerminalPrompts_ThrowsException()
+        public async Task BasicAuthentication_GetCredentials_NonDesktopSession_NoTerminalPrompts_ThrowsException()
         {
             const string testResource = "https://example.com";
 
@@ -70,7 +70,7 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_NoTerminalPromp
 
             var basicAuth = new BasicAuthentication(context);
 
-            Assert.ThrowsAsync<InvalidOperationException>(() => basicAuth.GetCredentialsAsync(testResource));
+            await Assert.ThrowsAsync<GitCredentialManager.Trace2InvalidOperationException>(() => basicAuth.GetCredentialsAsync(testResource));
         }
 
         [Fact]

src/shared/Core.Tests/Core.Tests.csproj

@@ -9,13 +9,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="ReportGenerator" Version="5.1.9" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="ReportGenerator" Version="5.3.10" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

src/shared/Core.Tests/CurlCookieTests.cs

@@ -37,7 +37,7 @@ public void CurlCookieParser_Parse_MissingFields_SkipsInvalidLines()
 
         IList<Cookie> actual = parser.Parse(content);
 
-        Assert.Equal(1, actual.Count);
+        Assert.Single(actual);
         AssertCookie(actual[0], ".example.com", "/path/here", true, 0, "cookie1", "value1");
     }
 

src/shared/Core.Tests/EnvironmentTests.cs

@@ -15,7 +15,7 @@ public class EnvironmentTests
         private const string PosixPathVar = "/home/john.doe/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";
         private const string PosixExecName = "foo";
 
-        [PlatformFact(Platforms.Windows)]
+        [WindowsFact]
         public void WindowsEnvironment_TryLocateExecutable_NotExists_ReturnFalse()
         {
             var fs = new TestFileSystem();
@@ -28,7 +28,7 @@ public void WindowsEnvironment_TryLocateExecutable_NotExists_ReturnFalse()
             Assert.Null(actualPath);
         }
 
-        [PlatformFact(Platforms.Windows)]
+        [WindowsFact]
         public void WindowsEnvironment_TryLocateExecutable_Exists_ReturnTrueAndPath()
         {
             string expectedPath = @"C:\Windows\system32\foo.exe";
@@ -48,7 +48,7 @@ public void WindowsEnvironment_TryLocateExecutable_Exists_ReturnTrueAndPath()
             Assert.Equal(expectedPath, actualPath);
         }
 
-        [PlatformFact(Platforms.Windows)]
+        [WindowsFact]
         public void WindowsEnvironment_TryLocateExecutable_ExistsMultiple_ReturnTrueAndFirstPath()
         {
             string expectedPath = @"C:\Users\john.doe\bin\foo.exe";
@@ -70,7 +70,7 @@ public void WindowsEnvironment_TryLocateExecutable_ExistsMultiple_ReturnTrueAndF
             Assert.Equal(expectedPath, actualPath);
         }
 
-        [PlatformFact(Platforms.Posix)]
+        [PosixFact]
         public void PosixEnvironment_TryLocateExecutable_NotExists_ReturnFalse()
         {
             var fs = new TestFileSystem();
@@ -83,7 +83,7 @@ public void PosixEnvironment_TryLocateExecutable_NotExists_ReturnFalse()
             Assert.Null(actualPath);
         }
 
-        [PlatformFact(Platforms.Posix)]
+        [PosixFact]
         public void PosixEnvironment_TryLocateExecutable_Exists_ReturnTrueAndPath()
         {
             string expectedPath = "/usr/local/bin/foo";
@@ -103,7 +103,7 @@ public void PosixEnvironment_TryLocateExecutable_Exists_ReturnTrueAndPath()
             Assert.Equal(expectedPath, actualPath);
         }
 
-        [PlatformFact(Platforms.Posix)]
+        [PosixFact]
         public void PosixEnvironment_TryLocateExecutable_ExistsMultiple_ReturnTrueAndFirstPath()
         {
             string expectedPath = "/home/john.doe/bin/foo";
@@ -125,7 +125,7 @@ public void PosixEnvironment_TryLocateExecutable_ExistsMultiple_ReturnTrueAndFir
             Assert.Equal(expectedPath, actualPath);
         }
 
-        [PlatformFact(Platforms.MacOS)]
+        [MacOSFact]
         public void MacOSEnvironment_TryLocateExecutable_Paths_Are_Ignored()
         {
             List<string> pathsToIgnore = new List<string>()
@@ -150,8 +150,8 @@ public void MacOSEnvironment_TryLocateExecutable_Paths_Are_Ignored()
             Assert.True(actualResult);
             Assert.Equal(expectedPath, actualPath);
         }
-        
-        [PlatformFact(Platforms.Posix)]
+
+        [PosixFact]
         public void PosixEnvironment_SetEnvironmentVariable_Sets_Expected_Value()
         {
             var variable = "FOO_BAR";
@@ -166,8 +166,8 @@ public void PosixEnvironment_SetEnvironmentVariable_Sets_Expected_Value()
             Assert.Contains(env.Variables, item 
                 => item.Key.Equals(variable) && item.Value.Equals(value));
         }
-        
-        [PlatformFact(Platforms.Windows)]
+
+        [WindowsFact]
         public void WindowsEnvironment_SetEnvironmentVariable_Sets_Expected_Value()
         {
             var variable = "FOO_BAR";

src/shared/Core.Tests/GenericHostProviderTests.cs

@@ -169,13 +169,13 @@ public async Task GenericHostProvider_CreateCredentialAsync_NonHttpProtocol_Retu
             basicAuthMock.Verify(x => x.GetCredentialsAsync(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
-        [PlatformFact(Platforms.Posix)]
+        [PosixFact]
         public async Task GenericHostProvider_CreateCredentialAsync_NonWindows_WiaSupported_ReturnsBasicCredential()
         {
             await TestCreateCredentialAsync_ReturnsBasicCredential(wiaSupported: true);
         }
 
-        [PlatformFact(Platforms.Windows)]
+        [WindowsFact]
         public async Task GenericHostProvider_CreateCredentialAsync_Windows_WiaSupported_ReturnsEmptyCredential()
         {
             await TestCreateCredentialAsync_ReturnsEmptyCredential(wiaSupported: true);

src/shared/Core.Tests/HostProviderRegistryTests.cs

@@ -35,13 +35,13 @@ public void HostProviderRegistry_Register_AutoAuthorityId_ThrowException()
         }
 
         [Fact]
-        public void HostProviderRegistry_GetProvider_NoProviders_ThrowException()
+        public async Task HostProviderRegistry_GetProvider_NoProviders_ThrowException()
         {
             var context = new TestCommandContext();
             var registry = new HostProviderRegistry(context);
             var input = new InputArguments(new Dictionary<string, string>());
 
-            Assert.ThrowsAsync<Exception>(() => registry.GetProviderAsync(input));
+            await Assert.ThrowsAsync<GitCredentialManager.Trace2Exception>(() => registry.GetProviderAsync(input));
         }
 
         [Fact]
@@ -119,7 +119,7 @@ public async Task HostProviderRegistry_GetProvider_Auto_HasProviders_DynamicMatc
 
             Assert.Same(providerMock.Object, result);
             Assert.True(context.Git.Configuration.Global.TryGetValue(configKey, out IList<string> config));
-            Assert.Equal(1, config.Count);
+            Assert.Single(config);
             Assert.Equal(providerId, config[0]);
         }
 
@@ -148,7 +148,7 @@ public async Task HostProviderRegistry_GetProvider_Auto_HasProviders_DynamicMatc
 
             Assert.Same(providerMock.Object, result);
             Assert.True(context.Git.Configuration.Global.TryGetValue(configKey, out IList<string> config));
-            Assert.Equal(1, config.Count);
+            Assert.Single(config);
             Assert.Equal(providerId, config[0]);
         }
 

src/shared/Core.Tests/HostProviderTests.cs

@@ -30,7 +30,7 @@ public async Task HostProvider_GetCredentialAsync_CredentialExists_ReturnsExisti
                 IsSupportedFunc = _ => true,
                 GenerateCredentialFunc = _ =>
                 {
-                    Assert.True(false, "Should never be called");
+                    Assert.Fail("Should never be called");
                     return null;
                 },
             };

src/shared/Core.Tests/IniFileTests.cs

@@ -79,7 +79,7 @@ recovery tests]
             Assert.Equal(6, ini.Sections.Count);
 
             AssertSection(ini, "one", out IniSection one);
-            Assert.Equal(1, one.Properties.Count);
+            Assert.Single(one.Properties);
             AssertProperty(one, "foo", "123");
 
             AssertSection(ini, "two", out IniSection twoA);
@@ -88,7 +88,7 @@ recovery tests]
             AssertProperty(twoA, "widget", "Hello, World!");
 
             AssertSection(ini, "two", "subsection name", out IniSection twoB);
-            Assert.Equal(1, twoB.Properties.Count);
+            Assert.Single(twoB.Properties);
             AssertProperty(twoB, "foo", "this is different");
 
             AssertSection(ini, "three", out IniSection three);
@@ -97,7 +97,7 @@ recovery tests]
             AssertProperty(three, "empty", "");
 
             AssertSection(ini, "four", out IniSection four);
-            Assert.Equal(0, four.Properties.Count);
+            Assert.Empty(four.Properties);
 
             AssertSection(ini, "five", out IniSection five);
             Assert.Equal(3, five.Properties.Count);

src/shared/Core.Tests/Interop/Linux/LinuxFileSystemTests.cs

@@ -7,7 +7,7 @@ namespace GitCredentialManager.Tests.Interop.Linux
 {
     public class LinuxFileSystemTests
     {
-        [PlatformFact(Platforms.Linux)]
+        [LinuxFact]
         public static void LinuxFileSystem_IsSamePath_SamePath_ReturnsTrue()
         {
             var fs = new LinuxFileSystem();
@@ -18,7 +18,7 @@ public static void LinuxFileSystem_IsSamePath_SamePath_ReturnsTrue()
             Assert.True(fs.IsSamePath(fileA, fileA));
         }
 
-        [PlatformFact(Platforms.Linux)]
+        [LinuxFact]
         public static void LinuxFileSystem_IsSamePath_DifferentFile_ReturnsFalse()
         {
             var fs = new LinuxFileSystem();
@@ -31,7 +31,7 @@ public static void LinuxFileSystem_IsSamePath_DifferentFile_ReturnsFalse()
             Assert.False(fs.IsSamePath(fileB, fileA));
         }
 
-        [PlatformFact(Platforms.Linux)]
+        [LinuxFact]
         public static void LinuxFileSystem_IsSamePath_SameFileDifferentCase_ReturnsFalse()
         {
             var fs = new LinuxFileSystem();
@@ -44,7 +44,7 @@ public static void LinuxFileSystem_IsSamePath_SameFileDifferentCase_ReturnsFalse
             Assert.False(fs.IsSamePath(fileA2, fileA1));
         }
 
-        [PlatformFact(Platforms.Linux)]
+        [LinuxFact]
         public static void LinuxFileSystem_IsSamePath_SameFileDifferentPathNormalization_ReturnsTrue()
         {
             var fs = new LinuxFileSystem();
@@ -58,7 +58,7 @@ public static void LinuxFileSystem_IsSamePath_SameFileDifferentPathNormalization
             Assert.True(fs.IsSamePath(fileA2, fileA1));
         }
 
-        [PlatformFact(Platforms.Linux)]
+        [LinuxFact]
         public static void LinuxFileSystem_IsSamePath_SameFileViaSymlink_ReturnsTrue()
         {
             var fs = new LinuxFileSystem();
@@ -71,7 +71,7 @@ public static void LinuxFileSystem_IsSamePath_SameFileViaSymlink_ReturnsTrue()
             Assert.True(fs.IsSamePath(fileA2, fileA1));
         }
 
-        [PlatformFact(Platforms.Linux)]
+        [LinuxFact]
         public static void LinuxFileSystem_IsSamePath_SameFileRelativePath_ReturnsTrue()
         {
             var fs = new LinuxFileSystem();

src/shared/Core.Tests/Interop/Linux/SecretServiceCollectionTests.cs

@@ -8,7 +8,7 @@ public class SecretServiceCollectionTests
     {
         private const string TestNamespace = "git-test";
 
-        [PlatformFact(Platforms.Linux, Skip = "Cannot run headless")]
+        [LinuxFact(Skip = "Cannot run headless")]
         public void SecretServiceCollection_ReadWriteDelete()
         {
             var collection = new SecretServiceCollection(TestNamespace);
@@ -37,7 +37,7 @@ public void SecretServiceCollection_ReadWriteDelete()
             }
         }
 
-        [PlatformFact(Platforms.Linux, Skip = "Cannot run headless")]
+        [LinuxFact(Skip = "Cannot run headless")]
         public void SecretServiceCollection_Get_NotFound_ReturnsNull()
         {
             var collection = new SecretServiceCollection(TestNamespace);
@@ -49,7 +49,7 @@ public void SecretServiceCollection_Get_NotFound_ReturnsNull()
             Assert.Null(credential);
         }
 
-        [PlatformFact(Platforms.Linux, Skip = "Cannot run headless")]
+        [LinuxFact(Skip = "Cannot run headless")]
         public void SecretServiceCollection_Remove_NotFound_ReturnsFalse()
         {
             var collection = new SecretServiceCollection(TestNamespace);