From fa96282e48a38e5e3c24a4570acdf39de2e236be Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Tue, 22 Aug 2023 15:47:10 -0700
Subject: [PATCH 1/5] [release/8.0] Update SDK

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index a40910d4a71d..f4afdd8af56b 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "8.0.100-rc.1.23381.2"
+    "version": "8.0.100-rc.2.23422.11"
   },
   "tools": {
-    "dotnet": "8.0.100-rc.1.23381.2",
+    "dotnet": "8.0.100-rc.2.23422.11",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

From 56451c3edcf92f8be926d02591abf0599603ca98 Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Tue, 22 Aug 2023 16:38:59 -0700
Subject: [PATCH 2/5] Fix IsAotCompatible warnings

---
 Directory.Build.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6d564cde7912..077353216668 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,7 @@
 <Project>
   <PropertyGroup>
+    <!-- Disable IsTrimmable on non-DefaultNetCoreTargetFrameworks even if explicitly enabled or else we'll get NETSDK1195 and NETSDK1210 errors -->
+    <IsTrimmable Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'"></IsTrimmable>
     <EnableAOTAnalyzer Condition=" '$(EnableAOTAnalyzer)' == '' ">$([MSBuild]::ValueOrDefault($(IsTrimmable),'false'))</EnableAOTAnalyzer>
     <!-- TODO: Remove when analyzer is enabled by default with AOT in SDK. See https://github.com/dotnet/sdk/issues/31284 -->
     <EnableSingleFileAnalyzer Condition=" '$(EnableSingleFileAnalyzer)' == '' ">$(EnableAOTAnalyzer)</EnableSingleFileAnalyzer>

From c4e29b4097985ea7647ac671e67c5e242d943cd3 Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Tue, 22 Aug 2023 16:54:10 -0700
Subject: [PATCH 3/5] Update nullability annotation for TemplatePart.Text

---
 src/Http/Routing/src/Template/TemplatePart.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Http/Routing/src/Template/TemplatePart.cs b/src/Http/Routing/src/Template/TemplatePart.cs
index b0f1ef02b1ab..a58b43e3e9ce 100644
--- a/src/Http/Routing/src/Template/TemplatePart.cs
+++ b/src/Http/Routing/src/Template/TemplatePart.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.AspNetCore.Routing.Patterns;
 
@@ -104,6 +105,7 @@ public static TemplatePart CreateParameter(
     /// <summary>
     /// <see langword="true"/> if the route part is represents a literal value.
     /// </summary>
+    [MemberNotNullWhen(true, nameof(Text))]
     public bool IsLiteral { get; private set; }
     /// <summary>
     /// <see langword="true"/> if the route part represents a parameterized value.

From 15129bac1c6c9913066da457d4f4a6449143bf06 Mon Sep 17 00:00:00 2001
From: Stephen Halter <halter73@gmail.com>
Date: Tue, 8 Aug 2023 17:23:54 -0700
Subject: [PATCH 4/5] Update CodeGen.proj to account for conditional
 IsTrimmable metadata

---
 eng/CodeGen.proj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/CodeGen.proj b/eng/CodeGen.proj
index 1de7e09de4db..d5d8f0a5f6b6 100644
--- a/eng/CodeGen.proj
+++ b/eng/CodeGen.proj
@@ -24,10 +24,12 @@
       <_RequiresDelayedBuild Include="@(_ProvidesReferenceOrRequiresDelay->WithMetadataValue('RequiresDelayedBuild','true')->Distinct())" />
       <_SharedFrameworkAndPackageRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'true'))" />
       <_SharedFrameworkRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'false'))" />
-      <_TrimmableProject Include="@(_ProjectReferenceProvider->WithMetadataValue('IsTrimmable', 'true'))" />
       <_ShippingAssemblyWithDupes Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp', 'true'))" />
       <_ShippingAssemblyWithDupes Include="@(_ProjectReferenceProvider->WithMetadataValue('IsShippingPackage', 'true'))" />
       <_ShippingAssembly Include="@(_ShippingAssemblyWithDupes->Distinct())" />
+      <!-- _ProjectReferenceProvider is already Distinct() and does not include metadata for each target framework. -->
+      <!-- If a project is trimmable for even just one of multiple target frameworks, include it in TrimmableProjects.props. -->
+      <_TrimmableProject Include="@(_ProvidesReferenceOrRequiresDelay->WithMetadataValue('IsTrimmable', 'true')->WithMetadataValue('IsProjectReferenceProvider','true')->Distinct())" />
     </ItemGroup>
 
     <PropertyGroup>

From c05dd28a357df4834acf31270a501ffdc5ba65c0 Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@microsoft.com>
Date: Wed, 23 Aug 2023 11:35:57 -0700
Subject: [PATCH 5/5] Update Directory.Build.props.in

---
 eng/tools/GenerateFiles/Directory.Build.props.in | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/eng/tools/GenerateFiles/Directory.Build.props.in b/eng/tools/GenerateFiles/Directory.Build.props.in
index dd4ea40b86b6..619ec1ded3d9 100644
--- a/eng/tools/GenerateFiles/Directory.Build.props.in
+++ b/eng/tools/GenerateFiles/Directory.Build.props.in
@@ -8,11 +8,4 @@
     <!-- Temporarily hardcoded to true -->
     <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
   </PropertyGroup>
-
-  <!-- Ignore warning about RID resolution rules changing in .NET 8 Preview 6 -->
-  <!-- Needed until https://github.com/ericsink/SQLitePCL.raw/issues/543 is fixed -->
-  <!-- See https://github.com/dotnet/aspnetcore/pull/48908#issuecomment-1601894643 -->
-  <ItemGroup>
-    <RuntimeHostConfigurationOption Include="System.Runtime.Loader.UseRidGraph" Value="true" />
-  </ItemGroup>
 </Project>