Skip to content

Commit db5e98d

Browse files
authored
[wasm] Remove runtimeconfig.template.json from templates and provide it by default (#102818)
1 parent c1d6262 commit db5e98d

File tree

6 files changed

+15
-1
lines changed

6 files changed

+15
-1
lines changed

src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk/Microsoft.NET.Runtime.WebAssembly.Wasi.Sdk.pkgproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<PackageFile Include="$(WasmProjectRoot)build\WasmApp.Common.targets" TargetPath="Sdk" />
2020

2121
<PackageFile Include="$(WasiProjectRoot)build\WasiSdk.Defaults.props" TargetPath="Sdk" />
22+
23+
<PackageFile Include="$(WasiProjectRoot)build\wasiconsole.runtimeconfig.template.json" TargetPath="Sdk" />
2224
</ItemGroup>
2325

2426
<Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles">

src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/Microsoft.NET.Sdk.WebAssembly.Pack.pkgproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ItemGroup>
99
<ProjectReference Include="$(RepoTasksDir)Microsoft.NET.Sdk.WebAssembly.Pack.Tasks\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj" />
1010
<ProjectReference Include="$(WasmProjectRoot)host\WasmAppHost.csproj" />
11-
<PackageFile Include="build\*.props;build\*.targets;build\*.web.config" TargetPath="build" />
11+
<PackageFile Include="build\*.props;build\*.targets;build\*.web.config;build\*.json" TargetPath="build" />
1212
</ItemGroup>
1313

1414
<Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles">

src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,12 @@ Copyright (c) .NET Foundation. All rights reserved.
410410

411411
</Target>
412412

413+
<Target Name="ProvideDefaultUserRuntimeConfig" BeforeTargets="_GenerateRuntimeConfigurationFilesInputCache" Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true'">
414+
<PropertyGroup Condition="!Exists('$(UserRuntimeConfig)')">
415+
<UserRuntimeConfig>$(MSBuildThisFileDirectory)browser.runtimeconfig.template.json</UserRuntimeConfig>
416+
</PropertyGroup>
417+
</Target>
418+
413419
<!-- Publish starts here -->
414420

415421
<!-- Make sure that ResolveAssemblyReferences runs early enough to ensure satellite assemblies are populated in the ResolvedFilesToPublish -->

src/mono/wasi/build/WasiApp.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,5 +455,11 @@ wasi.start(instance);
455455
<Exec Condition="'$(OS)' != 'Windows_NT'" Command="chmod a+x &quot;$(_WasmNodeScriptPath)&quot;" />
456456
</Target>
457457

458+
<Target Name="ProvideDefaultUserRuntimeConfig" BeforeTargets="_GenerateRuntimeConfigurationFilesInputCache" Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true'">
459+
<PropertyGroup Condition="!Exists('$(UserRuntimeConfig)')">
460+
<UserRuntimeConfig>$(MSBuildThisFileDirectory)wasiconsole.runtimeconfig.template.json</UserRuntimeConfig>
461+
</PropertyGroup>
462+
</Target>
463+
458464
<!--<Target Name="_WasmCalculateInitialHeapSize" />-->
459465
</Project>

0 commit comments

Comments
 (0)