[wasm] Remove runtimeconfig.template.json from templates and provide …

…it by default (dotnet#102818)
pavelsavara · Jun 4, 2024 · db5e98d · db5e98d
1 parent c1d6262
commit db5e98d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/...osoft.NET.Runtime.WebAssembly.Wasi.Sdk/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj b/...osoft.NET.Runtime.WebAssembly.Wasi.Sdk/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj
@@ -19,6 +19,8 @@
  <PackageFile Include="$(WasmProjectRoot)build\WasmApp.Common.targets" TargetPath="Sdk" />
 
  <PackageFile Include="$(WasiProjectRoot)build\WasiSdk.Defaults.props" TargetPath="Sdk" />
+
+ <PackageFile Include="$(WasiProjectRoot)build\wasiconsole.runtimeconfig.template.json" TargetPath="Sdk" />
  </ItemGroup>
 
  <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles">

diff --git a/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/Microsoft.NET.Sdk.WebAssembly.Pack.pkgproj b/src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/Microsoft.NET.Sdk.WebAssembly.Pack.pkgproj
@@ -8,7 +8,7 @@
  <ItemGroup>
  <ProjectReference Include="$(RepoTasksDir)Microsoft.NET.Sdk.WebAssembly.Pack.Tasks\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj" />
  <ProjectReference Include="$(WasmProjectRoot)host\WasmAppHost.csproj" />
- <PackageFile Include="build\*.props;build\*.targets;build\*.web.config" TargetPath="build" />
+ <PackageFile Include="build\*.props;build\*.targets;build\*.web.config;build\*.json" TargetPath="build" />
  </ItemGroup>
 
  <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles">

diff --git a/...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets b/...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
@@ -410,6 +410,12 @@ Copyright (c) .NET Foundation. All rights reserved.
 
  </Target>
 
+ <Target Name="ProvideDefaultUserRuntimeConfig" BeforeTargets="_GenerateRuntimeConfigurationFilesInputCache" Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true'">
+ <PropertyGroup Condition="!Exists('$(UserRuntimeConfig)')">
+ <UserRuntimeConfig>$(MSBuildThisFileDirectory)browser.runtimeconfig.template.json</UserRuntimeConfig>
+ </PropertyGroup>
+ </Target>
+
  <!-- Publish starts here -->
 
  <!-- Make sure that ResolveAssemblyReferences runs early enough to ensure satellite assemblies are populated in the ResolvedFilesToPublish -->

diff --git a/...lates/browser/runtimeconfig.template.json → ...build/browser.runtimeconfig.template.json b/...lates/browser/runtimeconfig.template.json → ...build/browser.runtimeconfig.template.json
diff --git a/src/mono/wasi/build/WasiApp.targets b/src/mono/wasi/build/WasiApp.targets
@@ -455,5 +455,11 @@ wasi.start(instance);
  <Exec Condition="'$(OS)' != 'Windows_NT'" Command="chmod a+x &quot;$(_WasmNodeScriptPath)&quot;" />
  </Target>
 
+ <Target Name="ProvideDefaultUserRuntimeConfig" BeforeTargets="_GenerateRuntimeConfigurationFilesInputCache" Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true'">
+ <PropertyGroup Condition="!Exists('$(UserRuntimeConfig)')">
+ <UserRuntimeConfig>$(MSBuildThisFileDirectory)wasiconsole.runtimeconfig.template.json</UserRuntimeConfig>
+ </PropertyGroup>
+ </Target>
+
  <!--<Target Name="_WasmCalculateInitialHeapSize" />-->
 </Project>
diff --git a/.../wasi-console/runtimeconfig.template.json → ...d/wasiconsole.runtimeconfig.template.json b/.../wasi-console/runtimeconfig.template.json → ...d/wasiconsole.runtimeconfig.template.json