set env vars in ps scripts and readd net10 if statements

.github/workflows/dotnetcore.yml

@@ -49,7 +49,7 @@ jobs:
           regedit /s .\build\strongNameBypass.reg
 
     - name: Run the tests
-      run: dotnet test Wilson.sln --collect:"XPlat Code Coverage" --settings:./build/CodeCoverage.runsettings --property:TargetNetNext=True
+      run: dotnet test Wilson.sln --collect:"XPlat Code Coverage" --settings:./build/CodeCoverage.runsettings
 
     - name: Create code coverage report
       run: |

build.ps1

@@ -55,8 +55,8 @@ if ($env:VSINSTALLDIR)
         $msbuildDir = $env:VSINSTALLDIR+"\MSBuild\Current\Bin";
     }
 }
-env:
-    TargetNetNext: True
+
+$env:TargetNetNext = "True"
 
 WriteSectionHeader("build.ps1 - parameters");
 Write-Host "buildType:                  " $buildType;

runTests.ps1

@@ -30,8 +30,7 @@ function WriteSectionFooter($sectionName)
 
 ################################################# Functions ############################################################
 
-env:
-    TargetNetNext: True
+$env:TargetNetNext = "True"
 
 WriteSectionHeader("runTests.ps1");
 Write-Host "buildType:       " $buildType;

src/Microsoft.IdentityModel.Logging/IdentityModelTelemetryUtil.cs

@@ -39,9 +39,7 @@ public static class IdentityModelTelemetryUtil
             "ID_NET8_0";
 #elif NET9_0
             "ID_NET9_0";
-#else
-            // We can't use NET10_0 here until after NET 10's release or Visual Studio will crash if NET 10 is not installed.
-            // In the tests we check to make sure the version running is actually NET 10.
+#elif NET10_0
             "ID_NET10_0";
 #endif
 

src/Microsoft.IdentityModel.LoggingExtensions/Microsoft.IdentityModel.LoggingExtensions.csproj

@@ -9,7 +9,7 @@
     <PackageId>Microsoft.IdentityModel.LoggingExtensions</PackageId>
     <PackageTags>.NET;Windows;Authentication;Identity;Extensions;Logging</PackageTags>
     <TargetFrameworks>netstandard2.0;net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks);</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetNetNext)'== 'True'">$(TargetFrameworks);net10.0</TargetFrameworks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

test.ps1

@@ -24,8 +24,7 @@ function WriteSectionFooter($sectionName)
 
 ################################################# Functions ############################################################
 
-env:
-    TargetNetNext: True
+$env:TargetNetNext = "True"
 
 WriteSectionHeader("runTests.ps1");
 Write-Host "buildType:       " $buildType;

test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectMessageTests.cs

@@ -288,19 +288,7 @@ public void OidcCreateAuthenticationRequestUrl(string testId, OpenIdConnectMessa
 #elif NET9_0
             if (!message.SkuTelemetryValue.Equals("ID_NET9_0"))
                 context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET9_0");
-#else // we can't use elif NET10_0 or Visual Studio will crash if NET 10 is not installed
-            //TODO: Use elif NET10_0 after NET 10's release
-            System.Diagnostics.Process process = new System.Diagnostics.Process();
-            process.StartInfo.FileName = "dotnet.exe";
-            process.StartInfo.Arguments = "--version";
-            process.StartInfo.UseShellExecute = false;
-            process.StartInfo.RedirectStandardOutput = true;
-            process.Start();
-
-            string version = process.StandardOutput.ReadToEnd()?.TrimEnd();
-
-            process.WaitForExit();
-            Assert.StartsWith("10.", version, StringComparison.OrdinalIgnoreCase);
+#elif NET10_0
             if (!message.SkuTelemetryValue.Equals("ID_NET10_0"))
                 context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET10_0");
 #endif
@@ -560,10 +548,7 @@ public void OidcCreateLogoutRequestUrl(string testId, OpenIdConnectMessage messa
             TestUtilities.WriteHeader("OidcCreateLogoutRequestUrl - " + testId, true);
 
             var context = new CompareContext();
-#if NET462
-            if (!message.SkuTelemetryValue.Equals("ID_NET462"))
-                context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET462");
-#elif NET472
+#if NET472
             if (!message.SkuTelemetryValue.Equals("ID_NET472"))
                 context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET472");
 #elif NET6_0
@@ -575,19 +560,7 @@ public void OidcCreateLogoutRequestUrl(string testId, OpenIdConnectMessage messa
 #elif NET9_0
             if (!message.SkuTelemetryValue.Equals("ID_NET9_0"))
                 context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET9_0");
-#else // we can't use elif NET10_0 or Visual Studio will crash if NET 10 is not installed
-            //TODO: Use elif NET10_0 after NET 10's release
-            System.Diagnostics.Process process = new System.Diagnostics.Process();
-            process.StartInfo.FileName = "dotnet.exe";
-            process.StartInfo.Arguments = "--version";
-            process.StartInfo.UseShellExecute = false;
-            process.StartInfo.RedirectStandardOutput = true;
-            process.Start();
-
-            string version = process.StandardOutput.ReadToEnd()?.TrimEnd();
-
-            process.WaitForExit();
-            Assert.StartsWith("10.", version, StringComparison.OrdinalIgnoreCase);
+#elif NET10_0
             if (!message.SkuTelemetryValue.Equals("ID_NET10_0"))
                 context.Diffs.Add($"{message.SkuTelemetryValue} != ID_NET10_0");
 #endif