Merge branch 'main' into blanch/keyedservice-fix

Timothy Mothra · web-flow · commit fe639e4ea6b6 · 2025-02-03T16:19:44.000-08:00
diff --git a/.github/workflows/build-and-test-BASE.yml b/.github/workflows/build-and-test-BASE.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0, net9.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
@@ -33,13 +33,14 @@ jobs:
     - uses: actions/checkout@v4
     
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.0.0
+      uses: actions/setup-dotnet@v4.3.0
       with:
         dotnet-version: |
             3.1.x
             6.0.x
             7.0.x
             8.0.x
+            9.0.x
 
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
diff --git a/.github/workflows/build-and-test-LOGGING.yml b/.github/workflows/build-and-test-LOGGING.yml
@@ -24,19 +24,20 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0, net9.0]
 
     steps:
     - uses: actions/checkout@v4
     
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.0.0
+      uses: actions/setup-dotnet@v4.3.0
       with:
         dotnet-version: |
             3.1.x
             6.0.x
             7.0.x
             8.0.x
+            9.0.x
 
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }} 
diff --git a/.github/workflows/build-and-test-NETCORE.yml b/.github/workflows/build-and-test-NETCORE.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0, net9.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
@@ -33,13 +33,14 @@ jobs:
     - uses: actions/checkout@v4
     
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.0.0
+      uses: actions/setup-dotnet@v4.3.0
       with:
         dotnet-version: |
             3.1.x
             6.0.x
             7.0.x
             8.0.x
+            9.0.x
 
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
diff --git a/.github/workflows/build-and-test-WEB.yml b/.github/workflows/build-and-test-WEB.yml
@@ -24,19 +24,20 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0, net9.0]
 
     steps:
     - uses: actions/checkout@v4
     
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.0.0
+      uses: actions/setup-dotnet@v4.3.0
       with:
         dotnet-version: |
             3.1.x
             6.0.x
             7.0.x
             8.0.x
+            9.0.x
 
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
diff --git a/.github/workflows/codeql-csharp.yml b/.github/workflows/codeql-csharp.yml
@@ -69,13 +69,14 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.0.0
+      uses: actions/setup-dotnet@v4.3.0
       with:
         dotnet-version: |
             3.1.x
             6.0.x
             7.0.x
             8.0.x
+            9.0.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -27,7 +27,7 @@ jobs:
         ref: ${{ matrix.branch }}
     
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.0.0
+      uses: actions/setup-dotnet@v4.3.0
       with:
         dotnet-version: |
             3.1.x
diff --git a/.github/workflows/redfield-sanity-check.yml b/.github/workflows/redfield-sanity-check.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        framework: [netcoreapp3.1,net6.0,net7.0,net8.0]
+        framework: [netcoreapp3.1,net6.0,net7.0,net8.0,net9.0]
         include: 
             - os: ubuntu-latest
               args: "--filter TestCategory!=WindowsOnly"
@@ -33,13 +33,14 @@ jobs:
     - uses: actions/checkout@v4
     
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.0.0
+      uses: actions/setup-dotnet@v4.3.0
       with:
         dotnet-version: |
             3.1.x
             6.0.x
             7.0.x
             8.0.x
+            9.0.x
 
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
@@ -32,13 +32,14 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup dotnet
-      uses: actions/setup-dotnet@v4.0.0
+      uses: actions/setup-dotnet@v4.3.0
       with:
         dotnet-version: |
             3.1.x
             6.0.x
             7.0.x
             8.0.x
+            9.0.x
 
     - name: Restore
       run: dotnet restore ${{ matrix.solution }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9.0.0
+      - uses: actions/stale@v9.1.0
         id: stale
         with:
           stale-issue-message: 'This issue is stale because it has been open 300 days with no activity. Remove stale label or this will be closed in 7 days. Commenting will instruct the bot to automatically remove the label.'
diff --git a/.props/Test.props b/.props/Test.props
@@ -20,7 +20,7 @@
           - net7.0 (GA Nov 2022)
     -->
 
-    <SupportedFrameworks_NetCore>net8.0;net7.0;net6.0;netcoreapp3.1;</SupportedFrameworks_NetCore>
+    <SupportedFrameworks_NetCore>net9.0;net8.0;net7.0;net6.0;netcoreapp3.1;</SupportedFrameworks_NetCore>
     <SupportedFrameworks_NetFx Condition="$(OS) == 'Windows_NT'">net481;net480;net472;net462;</SupportedFrameworks_NetFx>
     <LegacyFrameworks_NetFx Condition="$(OS) == 'Windows_NT'">net46;net452;</LegacyFrameworks_NetFx>
     
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -82,8 +82,8 @@
     <LangVersion>preview</LangVersion>
 
     <IsNetFramework Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'net481' ">True</IsNetFramework>
-    <IsNetCore Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'">True</IsNetCore>
-    <IsNetStandard20 Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'net481' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'">True</IsNetStandard20>
+    <IsNetCore Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">True</IsNetCore>
+    <IsNetStandard20 Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'net481' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">True</IsNetStandard20>
 
     <!-- .NET 6 introduces implicit global usings.
     This causes build errors in our multi-target projects.
diff --git a/NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj b/NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj
@@ -31,6 +31,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[9.*-*,10.0)" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.*-*,9.0)" />
   </ItemGroup>
diff --git a/WEB/Src/WindowsServer/WindowsServer.Tests/AppServicesHeartbeatTelemetryModuleTests.cs b/WEB/Src/WindowsServer/WindowsServer.Tests/AppServicesHeartbeatTelemetryModuleTests.cs
@@ -143,7 +143,7 @@ private void RemoveTestEnvVarsAssociatedToModule(AppServicesHeartbeatTelemetryMo
         {
             foreach (var kvp in appServicesHbeatModule.WebHeartbeatPropertyNameEnvVarMap)
             {
-                Environment.SetEnvironmentVariable(kvp.Value, string.Empty);
+                Environment.SetEnvironmentVariable(kvp.Value, null);
             }
         }
     }
