Use exact runtime for non-servicing builds of Blazor DevServer

halter73 · halter73 · commit 30cca491807b · 2024-06-17T18:00:33.000-07:00
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
@@ -36,8 +36,11 @@
 
   <Target Name="_CreateRuntimeConfig" BeforeTargets="CoreBuild">
     <PropertyGroup>
-      <_RuntimeConfigProperties>
-        AspNetCoreMajorMinorVersion=$(AspNetCoreMajorMinorVersion);
+      <_RuntimeConfigProperties Condition="'$(IsServicingBuild)' == 'true'">
+        FrameworkVersion=$(AspNetCoreMajorMinorVersion).0;
+      </_RuntimeConfigProperties>
+      <_RuntimeConfigProperties Condition="'$(IsServicingBuild)' != 'true'">
+        FrameworkVersion=$(SharedFxVersion);
       </_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
@@ -3,7 +3,7 @@
     "tfm": "net8.0",
     "framework": {
       "name": "Microsoft.AspNetCore.App",
-      "version": "${AspNetCoreMajorMinorVersion}.0"
+      "version": "${FrameworkVersion}"
     },
     "rollForwardOnNoCandidateFx": 2
   }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"tfm": "net8.0",`
`4`	`4`	`"framework": {`
`5`	`5`	`"name": "Microsoft.AspNetCore.App",`
`6`		`- "version": "${AspNetCoreMajorMinorVersion}.0"`
	`6`	`+ "version": "${FrameworkVersion}"`
`7`	`7`	`},`
`8`	`8`	`"rollForwardOnNoCandidateFx": 2`
`9`	`9`	`}`