From dee53f6a67cb8b2cf1c40ce707eb04f2a30beef7 Mon Sep 17 00:00:00 2001
From: Stephen Halter <halter73@gmail.com>
Date: Fri, 7 Jun 2024 11:48:39 -0700
Subject: [PATCH 1/2] Don't require latest runtime patch for Blazor DevServer

---
 ...Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj | 2 +-
 .../DevServer/src/blazor-devserver.runtimeconfig.json.in        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
index 8267a699183b..2030028ff87f 100644
--- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
+++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
@@ -37,7 +37,7 @@
   <Target Name="_CreateRuntimeConfig" BeforeTargets="CoreBuild">
     <PropertyGroup>
       <_RuntimeConfigProperties>
-        SharedFxVersion=$(SharedFxVersion);
+        AspNetCoreMajorMinorVersion=$(AspNetCoreMajorMinorVersion);
       </_RuntimeConfigProperties>
 
       <_RuntimeConfigPath>$(OutputPath)blazor-devserver.runtimeconfig.json</_RuntimeConfigPath>
diff --git a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
index f8e3bd9f0df2..352baf2b524a 100644
--- a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
+++ b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
@@ -3,7 +3,7 @@
     "tfm": "net9.0",
     "framework": {
       "name": "Microsoft.AspNetCore.App",
-      "version": "${SharedFxVersion}"
+      "version": "${AspNetCoreMajorMinorVersion}.0"
     },
     "rollForwardOnNoCandidateFx": 2
   }

From 29bbd9edfe3f44727ebc01bbcac3c691ca2e20c3 Mon Sep 17 00:00:00 2001
From: Stephen Halter <halter73@gmail.com>
Date: Fri, 7 Jun 2024 11:57:45 -0700
Subject: [PATCH 2/2] Delete outdated MicrosoftAspNetCoreAppVersion

---
 eng/Versions.props                                         | 1 -
 .../sample/ConcurrencyLimiterSample.csproj                 | 5 -----
 src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj        | 7 -------
 src/ProjectTemplates/GenerateContent.targets               | 6 ------
 src/SiteExtensions/Sdk/SiteExtension.targets               | 2 --
 5 files changed, 21 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index e8626a43d25a..6583f49f4873 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -334,7 +334,6 @@
     <XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
     <XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
     <MicrosoftDataSqlClientVersion>4.0.5</MicrosoftDataSqlClientVersion>
-    <MicrosoftAspNetCoreAppVersion>6.0.0-preview.3.21167.1</MicrosoftAspNetCoreAppVersion>
     <MicrosoftOpenApiVersion>1.6.13</MicrosoftOpenApiVersion>
     <MicrosoftOpenApiReadersVersion>1.6.13</MicrosoftOpenApiReadersVersion>
     <!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
diff --git a/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj b/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj
index 94dfd9b47f31..a7f5b4921686 100644
--- a/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj
+++ b/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj
@@ -9,9 +9,4 @@
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
   </ItemGroup>
-
-  <!-- Benchmarks server uses shared Fx but needs refs to OOB packages. -->
-  <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
-    <PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="$(MicrosoftAspNetCoreAppVersion)" />
-  </ItemGroup>
 </Project>
diff --git a/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj
index b61abeb404b4..bc66454704e8 100644
--- a/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj
+++ b/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj
@@ -30,11 +30,4 @@
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
   </ItemGroup>
-
-  <!-- These references are used when building on the Benchmarks Server. -->
-  <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
-    <!-- Special-case the JwtBearer package because assembly no longer ships in Microsoft.AspNetCore.App. -->
-    <!-- Cannot use <Reference> because it's unsupported when building an isolated project. -->
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAppVersion)" />
-  </ItemGroup>
 </Project>
diff --git a/src/ProjectTemplates/GenerateContent.targets b/src/ProjectTemplates/GenerateContent.targets
index e7e822235e53..3c216eedf91f 100644
--- a/src/ProjectTemplates/GenerateContent.targets
+++ b/src/ProjectTemplates/GenerateContent.targets
@@ -4,12 +4,6 @@
 
     <!-- Use for incremental builds. When versions or dependencies of templates change, this file is updated and causes a re-build. -->
     <_GenerateContentPropertiesHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).content.g.cache</_GenerateContentPropertiesHashFile>
-
-    <!-- The version of the shared framework. This is used in tests to ensure they run against the shared framework version we just built. -->
-    <GeneratedContentProperties>
-      $(GeneratedContentProperties);
-      MicrosoftAspNetCoreAppVersion=$(SharedFxVersion);
-    </GeneratedContentProperties>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets
index 2fa12f51e2a5..8c10d2e7ca08 100644
--- a/src/SiteExtensions/Sdk/SiteExtension.targets
+++ b/src/SiteExtensions/Sdk/SiteExtension.targets
@@ -85,7 +85,6 @@
               HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);
               HostingStartupVersion=%(_HostingStartupPackageReference.Version);
               RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);
-              MicrosoftAspNetCoreAppVersion=$(SharedFxVersion);
               UseAppHost=false;
               NoBuild=false;
               RestoreAdditionalProjectSources=$(_RsRestoreSources)" />
@@ -97,7 +96,6 @@
               HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);
               HostingStartupVersion=%(_HostingStartupPackageReference.Version);
               RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);
-              MicrosoftAspNetCoreAppVersion=$(SharedFxVersion);
               UseAppHost=false;
               NoBuild=false;
               IncludeMainProjectInDepsFile=false" />