diff --git a/eng/Versions.props b/eng/Versions.props index d024bd89252a..41664d482b31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -261,6 +261,7 @@ $(XunitVersion) 2.4.3 1.0.19249.1 + 6.0.0-preview.3.21167.1 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 6ee44e50573f..5737771dc8fb 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 @@ -11,6 +11,9 @@ true false + + false @@ -19,6 +22,21 @@ + + + <_RuntimeConfigProperties> + SharedFxVersion=$(SharedFxVersion); + + + <_RuntimeConfigPath>$(IntermediateOutputPath)blazor-devserver.runtimeconfig.json + + + + + $(GenerateNuspecDependsOn);publish @@ -28,6 +46,7 @@ + diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec index 77df4b791b98..7421979853e7 100644 --- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec +++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.nuspec @@ -8,5 +8,6 @@ + diff --git a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in new file mode 100644 index 000000000000..e5bc81165938 --- /dev/null +++ b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in @@ -0,0 +1,10 @@ +{ + "runtimeOptions": { + "tfm": "net6.0", + "framework": { + "name": "Microsoft.AspNetCore.App", + "version": "${SharedFxVersion}" + }, + "rollForwardOnNoCandidateFx": 2 + } +} diff --git a/src/Components/WebAssembly/DevServer/src/runtimeconfig.template.json b/src/Components/WebAssembly/DevServer/src/runtimeconfig.template.json deleted file mode 100644 index a148d76b8b0e..000000000000 --- a/src/Components/WebAssembly/DevServer/src/runtimeconfig.template.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "framework": { - "name": "Microsoft.AspNetCore.App", - "version": "6.0.0-preview.3.21167.1" - }, - "rollForwardOnNoCandidateFx": 2 -} \ No newline at end of file