From 3aed40cc5d9910e6132abded768a07f1407ab2b8 Mon Sep 17 00:00:00 2001
From: Timothy Mothra Lee <tilee@microsoft.com>
Date: Fri, 6 Oct 2023 14:53:54 -0700
Subject: [PATCH 1/5] add net8 to test framework

---
 .github/workflows/build-and-test-BASE.yml    | 3 ++-
 .github/workflows/build-and-test-LOGGING.yml | 3 ++-
 .github/workflows/build-and-test-NETCORE.yml | 3 ++-
 .github/workflows/build-and-test-WEB.yml     | 3 ++-
 .github/workflows/redfield-sanity-check.yml  | 3 ++-
 .props/Test.props                            | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-test-BASE.yml b/.github/workflows/build-and-test-BASE.yml
index 08368bca07..15e5bea002 100644
--- 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]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
@@ -39,6 +39,7 @@ jobs:
             3.1.x
             6.0.x
             7.0.x
+            8.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
index 270c25a213..56a8b2ce78 100644
--- a/.github/workflows/build-and-test-LOGGING.yml
+++ b/.github/workflows/build-and-test-LOGGING.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
 
     steps:
     - uses: actions/checkout@v3
@@ -36,6 +36,7 @@ jobs:
             3.1.x
             6.0.x
             7.0.x
+            8.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
index ffc2b69cf6..6287ac0535 100644
--- 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]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
@@ -39,6 +39,7 @@ jobs:
             3.1.x
             6.0.x
             7.0.x
+            8.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
index 57cca6e32c..3b9a18469a 100644
--- a/.github/workflows/build-and-test-WEB.yml
+++ b/.github/workflows/build-and-test-WEB.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
+        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
 
     steps:
     - uses: actions/checkout@v3
@@ -36,6 +36,7 @@ jobs:
             3.1.x
             6.0.x
             7.0.x
+            8.0.x
 
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
diff --git a/.github/workflows/redfield-sanity-check.yml b/.github/workflows/redfield-sanity-check.yml
index 98c1945139..a2fef9dc91 100644
--- 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]
+        framework: [netcoreapp3.1,net6.0,net7.0,net8.0]
         include: 
             - os: ubuntu-latest
               args: "--filter TestCategory!=WindowsOnly"
@@ -39,6 +39,7 @@ jobs:
             3.1.x
             6.0.x
             7.0.x
+            8.0.x
 
     - name: Restore
       run: dotnet restore ${{ env.SOLUTION }}
diff --git a/.props/Test.props b/.props/Test.props
index e396eba6e0..260679e8d4 100644
--- a/.props/Test.props
+++ b/.props/Test.props
@@ -20,7 +20,7 @@
           - net7.0 (GA Nov 2022)
     -->
 
-    <SupportedFrameworks_NetCore>net7.0;net6.0;netcoreapp3.1;</SupportedFrameworks_NetCore>
+    <SupportedFrameworks_NetCore>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>
     

From 4661d2f4bd9b74dda80b0524308a5158e7fcdd2c Mon Sep 17 00:00:00 2001
From: Timothy Mothra Lee <tilee@microsoft.com>
Date: Fri, 17 Nov 2023 14:27:30 -0800
Subject: [PATCH 2/5] fix typo

---
 .props/Test.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.props/Test.props b/.props/Test.props
index 260679e8d4..f80c0e89e3 100644
--- 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>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>
     

From 9ae6f7d835562c6490b073764205aaff2e75ee3e Mon Sep 17 00:00:00 2001
From: Timothy Mothra Lee <tilee@microsoft.com>
Date: Fri, 17 Nov 2023 14:48:44 -0800
Subject: [PATCH 3/5] fix properties

---
 Directory.Build.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 58e3e9f31c..da3949143b 100644
--- 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'">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'">True</IsNetStandard20>
+    <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>
 
     <!-- .NET 6 introduces implicit global usings.
     This causes build errors in our multi-target projects.

From e2c49327943784809e505fdd47a988d8c6a6b71b Mon Sep 17 00:00:00 2001
From: Timothy Mothra Lee <tilee@microsoft.com>
Date: Fri, 17 Nov 2023 14:57:36 -0800
Subject: [PATCH 4/5] update project

---
 .../test/IntegrationTests.Tests/IntegrationTests.Tests.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj b/NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj
index 720b3a5b2d..dc66981a3e 100644
--- 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)' == 'net8.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.*-*,9.0)" />
+  </ItemGroup>
+  
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.*-*,8.0)" />
   </ItemGroup>

From 87273286d2850556758552fa64367e6fa02ea645 Mon Sep 17 00:00:00 2001
From: Timothy Mothra Lee <tilee@microsoft.com>
Date: Fri, 17 Nov 2023 15:09:12 -0800
Subject: [PATCH 5/5] update sanity.yml

---
 .github/workflows/sanity.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index c5faf70d28..a51ac60e01 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -38,6 +38,7 @@ jobs:
             3.1.x
             6.0.x
             7.0.x
+            8.0.x
 
     - name: Restore
       run: dotnet restore ${{ matrix.solution }}