build: replace netstandard2.0 TFM with net6.0

mjcheetham · mjcheetham · commit 65cead2b5caa · 2022-11-07T11:32:24.000-08:00
Replace netstandard2.0 where possible with net6.0, or dual target net6.0
and net472 for projects that are included on Windows.
diff --git a/build/GCM.MSBuild.csproj b/build/GCM.MSBuild.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
diff --git a/src/shared/Atlassian.Bitbucket.UI/Atlassian.Bitbucket.UI.csproj b/src/shared/Atlassian.Bitbucket.UI/Atlassian.Bitbucket.UI.csproj
@@ -1,7 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
     <RootNamespace>Atlassian.Bitbucket.UI</RootNamespace>
     <AssemblyName>Atlassian.Bitbucket.UI.Shared</AssemblyName>
   </PropertyGroup>
diff --git a/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj b/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
     <AssemblyName>Atlassian.Bitbucket</AssemblyName>
     <RootNamespace>Atlassian.Bitbucket</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/Core.UI/Core.UI.csproj b/src/shared/Core.UI/Core.UI.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
     <AssemblyName>gcmcoreui</AssemblyName>
     <RootNamespace>GitCredentialManager.UI</RootNamespace>
   </PropertyGroup>
diff --git a/src/shared/Core/Core.csproj b/src/shared/Core/Core.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
     <AssemblyName>gcmcore</AssemblyName>
     <RootNamespace>GitCredentialManager</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/Core/PlatformUtils.cs b/src/shared/Core/PlatformUtils.cs
@@ -70,7 +70,7 @@ public static bool IsMacOS()
         {
 #if NETFRAMEWORK
             return Environment.OSVersion.Platform == PlatformID.MacOSX;
-#elif NETSTANDARD
+#else
             return RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
 #endif
         }
@@ -83,7 +83,7 @@ public static bool IsWindows()
         {
 #if NETFRAMEWORK
             return Environment.OSVersion.Platform == PlatformID.Win32NT;
-#elif NETSTANDARD
+#else
             return RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 #endif
         }
@@ -96,7 +96,7 @@ public static bool IsLinux()
         {
 #if NETFRAMEWORK
             return Environment.OSVersion.Platform == PlatformID.Unix;
-#elif NETSTANDARD
+#else
             return RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
 #endif
         }
@@ -309,7 +309,7 @@ private static string GetCpuArchitecture()
         {
 #if NETFRAMEWORK
             return Environment.Is64BitOperatingSystem ? "x86-64" : "x86";
-#elif NETSTANDARD
+#else
             switch (RuntimeInformation.OSArchitecture)
             {
                 case Architecture.Arm:
@@ -330,7 +330,7 @@ private static string GetClrVersion()
         {
 #if NETFRAMEWORK
             return $".NET Framework {Environment.Version}";
-#elif NETSTANDARD
+#else
             return RuntimeInformation.FrameworkDescription;
 #endif
         }
diff --git a/src/shared/GitHub.UI/GitHub.UI.csproj b/src/shared/GitHub.UI/GitHub.UI.csproj
@@ -1,7 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
     <RootNamespace>GitHub.UI</RootNamespace>
     <AssemblyName>GitHub.UI.Shared</AssemblyName>
   </PropertyGroup>
diff --git a/src/shared/GitHub/GitHub.csproj b/src/shared/GitHub/GitHub.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
     <AssemblyName>GitHub</AssemblyName>
     <RootNamespace>GitHub</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/GitLab.UI/GitLab.UI.csproj b/src/shared/GitLab.UI/GitLab.UI.csproj
@@ -1,7 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
     <RootNamespace>GitLab.UI</RootNamespace>
     <AssemblyName>GitLab.UI.Shared</AssemblyName>
   </PropertyGroup>
diff --git a/src/shared/GitLab/GitLab.csproj b/src/shared/GitLab/GitLab.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
     <AssemblyName>GitLab</AssemblyName>
     <RootNamespace>GitLab</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj b/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">netstandard2.0;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net6.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.AzureRepos</AssemblyName>
     <RootNamespace>Microsoft.AzureRepos</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/TestInfrastructure/TestInfrastructure.csproj b/src/shared/TestInfrastructure/TestInfrastructure.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>GitCredentialManager.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
     <IsTestProject>false</IsTestProject>

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static bool IsMacOS()`
`70`	`70`	`{`
`71`	`71`	`#if NETFRAMEWORK`
`72`	`72`	`return Environment.OSVersion.Platform == PlatformID.MacOSX;`
`73`		`-#elif NETSTANDARD`
	`73`	`+#else`
`74`	`74`	`return RuntimeInformation.IsOSPlatform(OSPlatform.OSX);`
`75`	`75`	`#endif`
`76`	`76`	`}`
`@@ -83,7 +83,7 @@ public static bool IsWindows()`
`83`	`83`	`{`
`84`	`84`	`#if NETFRAMEWORK`
`85`	`85`	`return Environment.OSVersion.Platform == PlatformID.Win32NT;`
`86`		`-#elif NETSTANDARD`
	`86`	`+#else`
`87`	`87`	`return RuntimeInformation.IsOSPlatform(OSPlatform.Windows);`
`88`	`88`	`#endif`
`89`	`89`	`}`
`@@ -96,7 +96,7 @@ public static bool IsLinux()`
`96`	`96`	`{`
`97`	`97`	`#if NETFRAMEWORK`
`98`	`98`	`return Environment.OSVersion.Platform == PlatformID.Unix;`
`99`		`-#elif NETSTANDARD`
	`99`	`+#else`
`100`	`100`	`return RuntimeInformation.IsOSPlatform(OSPlatform.Linux);`
`101`	`101`	`#endif`
`102`	`102`	`}`
`@@ -309,7 +309,7 @@ private static string GetCpuArchitecture()`
`309`	`309`	`{`
`310`	`310`	`#if NETFRAMEWORK`
`311`	`311`	`return Environment.Is64BitOperatingSystem ? "x86-64" : "x86";`
`312`		`-#elif NETSTANDARD`
	`312`	`+#else`
`313`	`313`	`switch (RuntimeInformation.OSArchitecture)`
`314`	`314`	`{`
`315`	`315`	`case Architecture.Arm:`
`@@ -330,7 +330,7 @@ private static string GetClrVersion()`
`330`	`330`	`{`
`331`	`331`	`#if NETFRAMEWORK`
`332`	`332`	`return $".NET Framework {Environment.Version}";`
`333`		`-#elif NETSTANDARD`
	`333`	`+#else`
`334`	`334`	`return RuntimeInformation.FrameworkDescription;`
`335`	`335`	`#endif`
`336`	`336`	`}`