Skip to content

Commit 4b7cc43

Browse files
steveisokSteve Pfister
andauthored
[release/6.0] Add windows runtime packs as a workload (#69393)
Backport of #68981 At certain points in time internally, the sdk will rev its version and insert into VS. It's at this point the sdk version will be ahead of the runtime version as we have not published anything into nuget. In MAUI and WinUI scenarios, this creates a bit of a pickle as the sdk will try to download a new version of the windows runtime pack, but it will not be available. To get around this limitation, we are introducing a workload that will be inserted into VS where you can optionally install Windows runtime packs. Co-authored-by: Steve Pfister <[email protected]>
1 parent c213c5b commit 4b7cc43

File tree

4 files changed

+36
-0
lines changed

4 files changed

+36
-0
lines changed

eng/pipelines/mono/templates/workloads-build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ jobs:
6565
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.MonoTargets.Sdk*.nupkg
6666
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.MonoAOTCompiler.Task*.nupkg
6767
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.WebAssembly.Sdk*.nupkg
68+
IntermediateArtifacts/windows_arm/Shipping/Microsoft.NETCore.App.Runtime.win-arm*.nupkg
69+
IntermediateArtifacts/windows_arm64/Shipping/Microsoft.NETCore.App.Runtime.win-arm64*.nupkg
70+
IntermediateArtifacts/windows_x64/Shipping/Microsoft.NETCore.App.Runtime.win-x64*.nupkg
71+
IntermediateArtifacts/windows_x86/Shipping/Microsoft.NETCore.App.Runtime.win-x86*.nupkg
6872
6973
- task: CopyFiles@2
7074
displayName: Flatten packages

eng/pipelines/runtime-official.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,10 @@ stages:
426426
- Build_tvOSSimulator_arm64_release_AllSubsets_Mono
427427
- Build_tvOSSimulator_x64_release_AllSubsets_Mono
428428
- Build_Windows_x64_release_CrossAOT_Mono
429+
- installer__coreclr__windows_x64_Release_
430+
- installer__coreclr__windows_x86_Release_
431+
- installer__coreclr__windows_arm_Release_
432+
- installer__coreclr__windows_arm64_Release_
429433

430434
- ${{ if eq(variables.isOfficialBuild, true) }}:
431435
- template: /eng/pipelines/official/stages/publish.yml

src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@
118118
"extends": [ "microsoft-net-runtime-mono-tooling" ],
119119
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
120120
},
121+
"runtimes-windows": {
122+
"description": "Windows Runtime Packs",
123+
"packs": [
124+
"Microsoft.NETCore.App.Runtime.win-x64",
125+
"Microsoft.NETCore.App.Runtime.win-x86",
126+
"Microsoft.NETCore.App.Runtime.win-arm",
127+
"Microsoft.NETCore.App.Runtime.win-arm64"
128+
]
129+
},
121130
"microsoft-net-runtime-mono-tooling": {
122131
"abstract": true,
123132
"description": "Shared native build tooling for Mono runtime",
@@ -346,5 +355,21 @@
346355
"kind": "framework",
347356
"version": "${PackageVersion}"
348357
},
358+
"Microsoft.NETCore.App.Runtime.win-x64" : {
359+
"kind": "framework",
360+
"version": "${PackageVersion}"
361+
},
362+
"Microsoft.NETCore.App.Runtime.win-x86" : {
363+
"kind": "framework",
364+
"version": "${PackageVersion}"
365+
},
366+
"Microsoft.NETCore.App.Runtime.win-arm" : {
367+
"kind": "framework",
368+
"version": "${PackageVersion}"
369+
},
370+
"Microsoft.NETCore.App.Runtime.win-arm64" : {
371+
"kind": "framework",
372+
"version": "${PackageVersion}"
373+
}
349374
}
350375
}

src/workloads/workloads.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
Description=".NET runtime components for tvOS execution."/>
7373
<ComponentResources Include="runtimes-maccatalyst" Title=".NET Mac Catalyst Build Tools"
7474
Description=".NET runtime components for Mac Catalyst execution."/>
75+
<ComponentResources Include="runtimes-windows" Title=".NET Windows Runtimes"
76+
Description=".NET runtime components for Windows execution."/>
7577

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

9093
<!-- BAR requires having version information in blobs -->

0 commit comments

Comments
 (0)