Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/6.0] Add windows runtime packs as a workload #69393

Merged
merged 1 commit into from
May 16, 2022
Merged

[release/6.0] Add windows runtime packs as a workload #69393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions eng/pipelines/mono/templates/workloads-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ jobs:
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.MonoTargets.Sdk*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.MonoAOTCompiler.Task*.nupkg
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.WebAssembly.Sdk*.nupkg
IntermediateArtifacts/windows_arm/Shipping/Microsoft.NETCore.App.Runtime.win-arm*.nupkg
IntermediateArtifacts/windows_arm64/Shipping/Microsoft.NETCore.App.Runtime.win-arm64*.nupkg
IntermediateArtifacts/windows_x64/Shipping/Microsoft.NETCore.App.Runtime.win-x64*.nupkg
IntermediateArtifacts/windows_x86/Shipping/Microsoft.NETCore.App.Runtime.win-x86*.nupkg

- task: CopyFiles@2
displayName: Flatten packages
Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/runtime-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,10 @@ stages:
- Build_tvOSSimulator_arm64_release_AllSubsets_Mono
- Build_tvOSSimulator_x64_release_AllSubsets_Mono
- Build_Windows_x64_release_CrossAOT_Mono
- installer__coreclr__windows_x64_Release_
- installer__coreclr__windows_x86_Release_
- installer__coreclr__windows_arm_Release_
- installer__coreclr__windows_arm64_Release_

- ${{ if eq(variables.isOfficialBuild, true) }}:
- template: /eng/pipelines/official/stages/publish.yml
Expand Down
25 changes: 25 additions & 0 deletions src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,15 @@
"extends": [ "microsoft-net-runtime-mono-tooling" ],
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
},
"runtimes-windows": {
"description": "Windows Runtime Packs",
"packs": [
"Microsoft.NETCore.App.Runtime.win-x64",
"Microsoft.NETCore.App.Runtime.win-x86",
"Microsoft.NETCore.App.Runtime.win-arm",
"Microsoft.NETCore.App.Runtime.win-arm64"
]
},
"microsoft-net-runtime-mono-tooling": {
"abstract": true,
"description": "Shared native build tooling for Mono runtime",
Expand Down Expand Up @@ -346,5 +355,21 @@
"kind": "framework",
"version": "${PackageVersion}"
},
"Microsoft.NETCore.App.Runtime.win-x64" : {
"kind": "framework",
"version": "${PackageVersion}"
},
"Microsoft.NETCore.App.Runtime.win-x86" : {
"kind": "framework",
"version": "${PackageVersion}"
},
"Microsoft.NETCore.App.Runtime.win-arm" : {
"kind": "framework",
"version": "${PackageVersion}"
},
"Microsoft.NETCore.App.Runtime.win-arm64" : {
"kind": "framework",
"version": "${PackageVersion}"
}
}
}
3 changes: 3 additions & 0 deletions src/workloads/workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@
Description=".NET runtime components for tvOS execution."/>
<ComponentResources Include="runtimes-maccatalyst" Title=".NET Mac Catalyst Build Tools"
Description=".NET runtime components for Mac Catalyst execution."/>
<ComponentResources Include="runtimes-windows" Title=".NET Windows Runtimes"
Description=".NET runtime components for Windows execution."/>

<!-- Visual Studio components must be versioned. Build tasks will fall back to cobbling a version number from
the manifest information unless it's overridden. -->
Expand All @@ -85,6 +87,7 @@
<ComponentVersions Include="runtimes-ios" Version="$(FileVersion)" />
<ComponentVersions Include="runtimes-tvos" Version="$(FileVersion)" />
<ComponentVersions Include="runtimes-maccatalyst" Version="$(FileVersion)" />
<ComponentVersions Include="runtimes-windows" Version="$(FileVersion)" />
</ItemGroup>

<!-- BAR requires having version information in blobs -->
Expand Down