Initial workload split #29
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <Project> | ||
| <Import Project="$(RepoRoot)\Directory.Build.props" /> | ||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" /> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove(Microsoft.NET.Runtime.Emscripten.Common.props))" /> | ||
| <Import Project="Microsoft.NET.Runtime.Emscripten.Node.props" /> | ||
|
|
||
| <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)"> | ||
| <!-- Override the id to include the Emscripten version --> | ||
| <PropertyGroup> | ||
| <Id>Microsoft.NET.Runtime.Emscripten.$(EmscriptenVersion).Node.$(PackageRID)</Id> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageDescription>Contains Emscripten Node binaries for $(PackageRID).</PackageDescription> | ||
| <Description>Contains Emscripten Node binaries for $(PackageRID).</Description> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" /> | ||
| <Import Project="$(RepoRoot)\Directory.Build.targets" /> | ||
| </Project> | ||
File renamed without changes.
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,21 @@ | ||
| <Project> | ||
| <Import Project="$(RepoRoot)\Directory.Build.props" /> | ||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" /> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove(Microsoft.NET.Runtime.Emscripten.Common.props))" /> | ||
| <Import Project="Microsoft.NET.Runtime.Emscripten.Python.props" /> | ||
|
|
||
| <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)"> | ||
| <!-- Override the id to include the Emscripten version --> | ||
| <PropertyGroup> | ||
| <Id>Microsoft.NET.Runtime.Emscripten.$(EmscriptenVersion).Python.$(PackageRID)</Id> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageDescription>Contains Emscripten Python binaries for $(PackageRID).</PackageDescription> | ||
| <Description>Contains Emscripten Python binaries for $(PackageRID).</Description> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" /> | ||
| <Import Project="$(RepoRoot)\Directory.Build.targets" /> | ||
| </Project> |
File renamed without changes.
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,21 @@ | ||
| <Project> | ||
| <Import Project="$(RepoRoot)\Directory.Build.props" /> | ||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" /> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove(Microsoft.NET.Runtime.Emscripten.Common.props))" /> | ||
| <Import Project="Microsoft.NET.Runtime.Emscripten.Sdk.props" /> | ||
|
|
||
| <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)"> | ||
| <!-- Override the id to include the Emscripten version --> | ||
| <PropertyGroup> | ||
| <Id>Microsoft.NET.Runtime.Emscripten.$(EmscriptenVersion).Sdk.$(PackageRID)</Id> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageDescription>Contains Emscripten SDK binaries for $(PackageRID).</PackageDescription> | ||
| <Description>Contains Emscripten SDK binaries for $(PackageRID).</Description> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" /> | ||
| <Import Project="$(RepoRoot)\Directory.Build.targets" /> | ||
| </Project> |
File renamed without changes.
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,49 @@ | ||
| <Project DefaultTargets="Build"> | ||
| <Import Project="$(RepoRoot)\Directory.Build.props" /> | ||
|
|
||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.props" /> | ||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.templating\$(MicrosoftDotNetBuildTasksTemplatingVersion)\build\Microsoft.DotNet.Build.Tasks.Templating.props" /> | ||
| <Import Project="$([MSBuild]::GetPathOfFileAbove(Microsoft.NET.Runtime.Emscripten.Common.props))" /> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageDescription>Internal toolchain package not meant for direct consumption. Please do not reference directly.</PackageDescription> | ||
| <Description>Internal toolchain package not meant for direct consumption. Please do not reference directly.</Description> | ||
| </PropertyGroup> | ||
lewing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
lewing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)"> | ||
| <!-- Override the id to include the sdk band as per the workload installer spec --> | ||
| <PropertyGroup> | ||
| <Id>Microsoft.NET.Workload.Emscripten.Manifest-$(WorkloadSdkBandVersion)</Id> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <WorkloadManifestPath>$(IntermediateOutputPath)WorkloadManifest.json</WorkloadManifestPath> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageFile Include="$(WorkloadManifestPath)" TargetPath="data" /> | ||
| <PackageFile Include="WorkloadManifest.targets" TargetPath="data" /> | ||
| </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="PackageVersion" Value="$(PackageVersion)" /> | ||
| <_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <GenerateFileFromTemplate | ||
| TemplateFile="WorkloadManifest.json.in" | ||
| Properties="@(_WorkloadManifestValues->'%(Identity)=%(Value)')" | ||
| OutputPath="$(WorkloadManifestPath)" /> | ||
| </Target> | ||
|
|
||
| <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" /> | ||
| <Import Project="$(RepoRoot)\Directory.Build.targets" /> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| { | ||
| "version": "${WorkloadVersion}", | ||
| "workloads": { | ||
| "microsoft-net-sdk-emscripten": { | ||
| "abstract": true, | ||
| "description": "Emscripten SDK compiler tooling", | ||
| "packs": [ | ||
| "Microsoft.NET.Runtime.Emscripten.Node", | ||
| "Microsoft.NET.Runtime.Emscripten.Python", | ||
| "Microsoft.NET.Runtime.Emscripten.Sdk" | ||
| ], | ||
| "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ] | ||
| } | ||
| }, | ||
| "packs": { | ||
| "Microsoft.NET.Runtime.Emscripten.Node" : { | ||
| "kind": "Sdk", | ||
| "version": "${PackageVersion}", | ||
| "alias-to": { | ||
| "win-x64": "Microsoft.NET.Runtime.${EmscriptenVersion}.Node.win-x64", | ||
| "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.linux-x64", | ||
| "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64", | ||
| "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64" | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. This is to tell the sdk that it should use the osx-x64 packs when targeting osx-arm64 (they work using rosetta) |
||
| } | ||
| }, | ||
| "Microsoft.NET.Runtime.Emscripten.Python" : { | ||
| "kind": "Sdk", | ||
| "version": "${PackageVersion}", | ||
| "alias-to": { | ||
| "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.win-x64", | ||
| "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64", | ||
| "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64" | ||
| } | ||
| }, | ||
| "Microsoft.NET.Runtime.Emscripten.Sdk" : { | ||
| "kind": "Sdk", | ||
| "version": "${PackageVersion}", | ||
| "alias-to": { | ||
| "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.win-x64", | ||
| "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.linux-x64", | ||
| "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.osx-x64", | ||
| "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.osx-x64" | ||
| } | ||
| } | ||
| } | ||
| } | ||
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,12 @@ | ||
| <Project> | ||
lewing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'"> | ||
| <UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)' != 'true'" >true</UsingBrowserRuntimeWorkload> | ||
| <UsingBrowserRuntimeWorkload Condition="'$(UsingBrowserRuntimeWorkload)' == ''" >$(WasmNativeWorkload)</UsingBrowserRuntimeWorkload> | ||
| </PropertyGroup> | ||
|
|
||
| <ImportGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true'"> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node" /> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk" /> | ||
| </ImportGroup> | ||
| </Project> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! I like that the files don't need to be renamed anymore.