-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move TargetsCurrent to net9 and add net8 workload (#91480)
* Move TargetsCurrent to net9 and add net8 workload * Fix version references * Update src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in * [wasm] build net8 workload * Update emsdk * Update current template to reference net9 * Bump 8.0 version used for workloads * Fix version for latest emscripten packages * fix typo in 8.0 version used for the workload * disamiguate templates * WBT: explicitly use net8.0 projects for template projects * Update emsdk dependency to get the workload fix * fix * Add some addtional workarounds for net8 * Remove extra character * Fix test * More wasi fixes * Add net8 wasi-wasm runtime pack reference * Add wasi-experimental-net8 workload * [wasi] Fix use of workload * [wasm] WBT: Fix test * wasi: Allow wasi-wasm runtimepacks even when targeting net8 * fix test --------- Co-authored-by: Ankit Jain <radical@gmail.com>
- Loading branch information
Showing
32 changed files
with
751 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/AutoImport.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. --> | ||
| <Project> | ||
| <PropertyGroup> | ||
| <WasmNativeWorkload Condition="'$(WasmNativeWorkload)' == ''">net8.0</WasmNativeWorkload> | ||
| <WasmNativeWorkload8>true</WasmNativeWorkload8> | ||
| <WasmNativeWorkload Condition="'$(WasmNativeWorkload)' == ''">net9.0</WasmNativeWorkload> | ||
| <WasmNativeWorkload9>true</WasmNativeWorkload9> | ||
| <!--<WasmNativeWorkloadAvailableList>$(WasmNativeWorkloadAvailableList)+net8.0+</WasmNativeWorkloadAvailableList>--> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 4 additions & 3 deletions
7
...t/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.Wasi.targets.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,11 @@ | ||
| <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. --> | ||
| <Project> | ||
| <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'wasi-wasm'"> | ||
| <WasiNativeWorkloadAvailable Condition="'$(TargetsCurrent)' == 'true' and '$(WasiNativeWorkload)' == 'net8.0'">true</WasiNativeWorkloadAvailable> | ||
| <PropertyGroup> | ||
| <WasiNativeWorkloadAvailable Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '8.0')) and '$(WasiNativeWorkload)' == 'net8.0'">true</WasiNativeWorkloadAvailable> | ||
| <TargetsCurrent Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '8.0'))">true</TargetsCurrent> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'wasi-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> | ||
| <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> | ||
| <UsingWasiRuntimeWorkload Condition="'$(UsingWasiRuntimeWorkload)' == ''">$(WasiNativeWorkloadAvailable)</UsingWasiRuntimeWorkload> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
....Mono.Toolchain.net8.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest.pkgproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <Project DefaultTargets="Build"> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" /> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageDescription>Internal toolchain package not meant for direct consumption. Please do not reference directly.</PackageDescription> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)"> | ||
| <Error Condition="'$(SdkBandVersionForWorkload_FromRuntimeVersions)' == ''" | ||
| Text="%24(SdkBandVersionForWorkload_FromRuntimeVersions) is not set" /> | ||
|
|
||
| <!-- Override the id to include the sdk band as per the workload installer spec --> | ||
| <PropertyGroup> | ||
| <Id>Microsoft.NET.Workload.Mono.ToolChain.net8.Manifest-$(SdkBandVersionForWorkload_FromRuntimeVersions)</Id> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <WorkloadManifestPath>$(IntermediateOutputPath)WorkloadManifest.json</WorkloadManifestPath> | ||
| <WorkloadManifestTargetsPath>$(IntermediateOutputPath)WorkloadManifest.targets</WorkloadManifestTargetsPath> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageFile Include="$(WorkloadManifestPath)" TargetPath="data" /> | ||
| <PackageFile Include="$(WorkloadManifestTargetsPath)" TargetPath="data" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <File Include="localize/**/*"> | ||
| <TargetPath>data/localize</TargetPath> | ||
| </File> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <!-- Running this target ensures we have the fully evaluated PackageVersion --> | ||
| <Target Name="_WriteManifestValues" AfterTargets="CalculatePackageVersion"> | ||
| <PropertyGroup> | ||
| <PackagePathVersion>PackageVersion=$(PackageVersion);</PackagePathVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" /> | ||
| <_WorkloadManifestValues Include="PackageVersionNet8" Value="$(PackageVersionNet8)" Condition="'$(PackageVersionNet8)' != ''" /> | ||
| <_WorkloadManifestValues Include="PackageVersionNet8" Value="$(PackageVersion)" Condition="'$(PackageVersionNet8)' == ''" /> | ||
| <_WorkloadManifestValues Include="EmscriptenVersion" Value="$(MicrosoftNETRuntimeEmscriptenVersion)" /> | ||
| <_WorkloadManifestValues Include="NetCoreAppCurrent" Value="$(NetCoreAppCurrent)" /> | ||
| </ItemGroup> | ||
|
|
||
| <Error Condition="'%(_WorkloadManifestValues.Value)' == ''" | ||
| Text="No version specified for template variable '%(_WorkloadManifestValues.Identity)'" /> | ||
|
|
||
| <GenerateFileFromTemplate | ||
| TemplateFile="WorkloadManifest.json.in" | ||
| Properties="@(_WorkloadManifestValues)" | ||
| OutputPath="$(WorkloadManifestPath)" /> | ||
|
|
||
| <GenerateFileFromTemplate | ||
| TemplateFile="WorkloadManifest.targets.in" | ||
| Properties="@(_WorkloadManifestValues)" | ||
| OutputPath="$(WorkloadManifestTargetsPath)" /> | ||
| </Target> | ||
|
|
||
| <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" /> | ||
| </Project> |
Oops, something went wrong.