<InstallWorkloadForTesting>true</InstallWorkloadForTesting>
<!-- don't run any wasm build steps -->
- <IsBrowserWasmProject>false</IsBrowserWasmProject>
+ <IsWasiProject>false</IsWasiProject>
<UseDefaultTestHost>true</UseDefaultTestHost>
<EnableRunSettingsSupport>false</EnableRunSettingsSupport>
</PropertyGroup>
</Target>
- <Target Name="_WasiBuildNativeCore" DependsOnTargets="$(_WasiBuildNativeCoreDependsOn)" Condition="'$(WasmBuildNative)' == 'true'" />
+ <Target Name="_WasiBuildNativeCore" BeforeTargets="_WasiGenerateAppBundle" DependsOnTargets="$(_WasiBuildNativeCoreDependsOn)" Condition="'$(WasmBuildNative)' == 'true'" />
<Target Name="_PrepareForWasiBuildNative">
<Error Condition="'$(_IsToolchainMissing)' == 'true'"
<_WasiFilePathForFixup Include="@(_WasmNativeFileForLinking)" />
<_WasiFilePathForFixup Include="@(_WasmRuntimePackSrcFile)" />
- <_WasiSdkClangArgs Condition="'$(OS)' == 'Windows_NT'" Include="$([System.String]::new(%(_WasiFilePathForFixup.Identity)).Replace('\', '/'))" />
- <_WasiSdkClangArgs Condition="'$(OS)' != 'Windows_NT'" Include="@(_WasiFilePathForFixup)" />
+ <_WasiSdkClangArgs Condition="'$(OS)' == 'Windows_NT'" Include=""$([System.String]::new(%(_WasiFilePathForFixup.Identity)).Replace('\', '/'))"" />
+ <_WasiSdkClangArgs Condition="'$(OS)' != 'Windows_NT'" Include="@(_WasiFilePathForFixup -> '"%(Identity)"')" />
<_WasiSdkClangArgs Include="@(_WasmCommonCFlags)" />
<WriteLinesToFile Lines="@(_WasiSdkClangArgs)" File="$(_WasmIntermediateOutputPath)clang-compile.rsp" Overwrite="true" />
<!--<Message Importance="High" Text="Performing WASI SDK build: "$(WasiClang)" @(_WasiSdkClangArgs, ' ')" />-->
- <Message Importance="High" Text="Performing WASI SDK build: "$(WasiClang)" @$(_WasmIntermediateOutputPath)clang-compile.rsp" />
+ <Message Importance="High" Text="Performing WASI SDK build: "$(WasiClang)" "@$(_WasmIntermediateOutputPath)clang-compile.rsp"" />
<!--<Exec Command=""$(WasiClang)" @(_WasiSdkClangArgs, ' ')" />-->
- <Exec Command=""$(WasiClang)" @$(_WasmIntermediateOutputPath)clang-compile.rsp" />
+ <Exec Command=""$(WasiClang)" "@$(_WasmIntermediateOutputPath)clang-compile.rsp"" />
<!-- FIXME: this will be done by the bundler -->
<Copy SourceFiles="$(_WasmOutputFileName)" DestinationFolder="$(WasmAppDir)" />
<RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
<UseMonoRuntime>true</UseMonoRuntime>
<TrimMode Condition="'$(TrimMode)' == ''">partial</TrimMode>
- <WasmBuildNativeTarget>_WasiBuildNativeCore</WasmBuildNativeTarget>
<_WasmBuildCoreDependsOn>
_InitializeCommonProperties;
_PrepareForAfterBuild;
_BeforeWasmBuildApp;
- $(WasmBuildNativeTarget);
_WasiGenerateAppBundle;
</_WasmBuildCoreDependsOn>
<WasmBuildAppDependsOn>
<Target Name="WasmTriggerPublishApp"
AfterTargets="$(WasmTriggerPublishAppAfterThisTarget)"
- Condition="'$(IsWasmProject)' == 'true' and '$(WasmBuildingForNestedPublish)' != 'true' and '$(IsCrossTargetingBuild)' != 'true'">
+ Condition="'$(IsWasiProject)' == 'true' and '$(WasmBuildingForNestedPublish)' != 'true' and '$(IsCrossTargetingBuild)' != 'true'">
<!-- Use a unique property, so the already run wasm targets can also run -->
<MSBuild Projects="$(MSBuildProjectFile)"
<Target Name="WasmBuildApp"
AfterTargets="$(WasmBuildAppAfterThisTarget)"
DependsOnTargets="$(WasmBuildAppDependsOn)"
- Condition="'$(IsWasmProject)' == 'true' and '$(WasmBuildingForNestedPublish)' == '' and '$(WasmBuildOnlyAfterPublish)' != 'true' and '$(IsCrossTargetingBuild)' != 'true'" />
+ Condition="'$(IsWasiProject)' == 'true' and '$(WasmBuildingForNestedPublish)' == '' and '$(WasmBuildOnlyAfterPublish)' != 'true' and '$(IsCrossTargetingBuild)' != 'true'" />
<Target Name="_InitializeCommonProperties">
<Error Condition="'$(MicrosoftNetCoreAppRuntimePackDir)' == '' and ('%(ResolvedRuntimePack.PackageDirectory)' == '' or !Exists(%(ResolvedRuntimePack.PackageDirectory)))"
<FileWrites Include="$(WasmRunWasmtimeScriptPath)" />
</ItemGroup>
- <Exec Condition="'$(OS)' != 'Windows_NT'" Command="chmod a+x $(WasmRunWasmtimeScriptPath)" />
+ <Exec Condition="'$(OS)' != 'Windows_NT'" Command="chmod a+x "$(WasmRunWasmtimeScriptPath)"" />
</Target>
<Target Name="_WasmResolveReferences" Condition="'$(WasmResolveAssembliesBeforeBuild)' == 'true'">