Skip to content

Commit 0df231c

Browse files
lewinghoyosjs
lewing
and
hoyosjs
authored
[release/7.0-rc1] Roll forward to the latest 6.0.x builds (#74288)
* Roll forward to the latest 6.0.x builds * Remove workaround for version emsdk import * Fix incorrect pack names * Fix unaliased packs * Alias the experimental packs in WorkloadManifest.targets too * Fix quoting * Download manifests for workloads leg Co-authored-by: Juan Sebastian Hoyos Ayala <juan.hoyos@microsoft.com>
1 parent d42d9fe commit 0df231c

File tree

8 files changed

+88
-89
lines changed

8 files changed

+88
-89
lines changed

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
<Uri>https://github.com/dotnet/command-line-api</Uri>
4949
<Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
5050
</Dependency>
51-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6">
51+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22418.9">
5252
<Uri>https://github.com/dotnet/emsdk</Uri>
53-
<Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha>
53+
<Sha>745113281de08619474a5e1c704290a4ed30a65d</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6">
55+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22418.9">
5656
<Uri>https://github.com/dotnet/emsdk</Uri>
57-
<Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha>
57+
<Sha>745113281de08619474a5e1c704290a4ed30a65d</Sha>
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<MinorVersion>0</MinorVersion>
88
<PatchVersion>0</PatchVersion>
99
<SdkBandVersion>7.0.100</SdkBandVersion>
10-
<PackageVersionNet6>6.0.8</PackageVersionNet6>
10+
<PackageVersionNet6>6.0.9</PackageVersionNet6>
1111
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
1212
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
1313
<!-- Set assembly version to align with major and minor version,
@@ -22,8 +22,8 @@
2222
<UsingToolXliff>false</UsingToolXliff>
2323
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
2424
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
25-
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26-
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
25+
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0-rc.1.22418.9</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
26+
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.1.22418.9</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
2727
</PropertyGroup>
2828
<!--
2929
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ jobs:
6363
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg
6464
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.tvos-*.nupkg
6565
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.tvossimulator-*.nupkg
66-
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.Manifest*.nupkg
66+
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest*.nupkg
67+
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest*.nupkg
6768
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.MonoTargets.Sdk*.nupkg
6869
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.MonoAOTCompiler.Task*.nupkg
6970
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Runtime.WebAssembly.Sdk*.nupkg

‎eng/testing/tests.wasm.targets‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,11 @@
155155
/>
156156

157157
<WorkloadCombinationsToInstall Include="net7" Variants="net7" />
158+
<!-- Latest net6 6.0.x versions are not available in feed currently so don't install them -->
159+
<!--
158160
<WorkloadCombinationsToInstall Include="net6" Variants="net6" />
159161
<WorkloadCombinationsToInstall Include="net6+7" Variants="net6;net7" />
162+
-->
160163
<!--<WorkloadCombinationsToInstall Include="none" />-->
161164

162165
<WasmExtraFilesToDeploy Condition="'$(_UseWasmSymbolicator)' == 'true'" Include="$(MonoProjectRoot)wasm\data\wasm-symbol-patterns.txt" />

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
"abstract": true,
3131
"description": "Android Mono AOT Workload",
3232
"packs": [
33-
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86",
34-
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64",
35-
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm",
36-
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64"
33+
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x86",
34+
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x64",
35+
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm",
36+
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm64"
3737
],
3838
"extends": [ "microsoft-net-runtime-android-net6" ],
3939
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
@@ -90,8 +90,8 @@
9090
"packs": [
9191
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-arm64",
9292
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-x64",
93-
"Microsoft.NETCore.App.Runtime.osx-arm64",
94-
"Microsoft.NETCore.App.Runtime.osx-x64"
93+
"Microsoft.NETCore.App.Runtime.net6.osx-arm64",
94+
"Microsoft.NETCore.App.Runtime.net6.osx-x64"
9595
],
9696
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
9797
"platforms": [ "osx-arm64", "osx-x64" ]
@@ -141,49 +141,49 @@
141141
"kind": "Sdk",
142142
"version": "${PackageVersionNet6}",
143143
"alias-to": {
144-
"any": "Microsoft.NET.Runtime.MonoAOTCompiler.Task"
144+
"any": "Microsoft.NET.Runtime.MonoAOTCompiler.Task"
145145
}
146146
},
147147
"Microsoft.NET.Runtime.MonoTargets.Sdk.net6": {
148148
"kind": "Sdk",
149149
"version": "${PackageVersionNet6}",
150150
"alias-to": {
151-
"any": "Microsoft.NET.Runtime.MonoTargets.Sdk"
151+
"any": "Microsoft.NET.Runtime.MonoTargets.Sdk"
152152
}
153153
},
154154
"Microsoft.NET.Runtime.WebAssembly.Sdk.net6": {
155155
"kind": "Sdk",
156156
"version": "${PackageVersionNet6}",
157157
"alias-to": {
158-
"any": "Microsoft.NET.Runtime.WebAssembly.Sdk"
158+
"any": "Microsoft.NET.Runtime.WebAssembly.Sdk"
159159
}
160160
},
161161
"Microsoft.NETCore.App.Runtime.Mono.net6.android-arm": {
162162
"kind": "framework",
163163
"version": "${PackageVersionNet6}",
164164
"alias-to": {
165-
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
165+
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
166166
}
167167
},
168168
"Microsoft.NETCore.App.Runtime.Mono.net6.android-arm64": {
169169
"kind": "framework",
170170
"version": "${PackageVersionNet6}",
171171
"alias-to": {
172-
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
172+
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
173173
}
174174
},
175175
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x64": {
176176
"kind": "framework",
177177
"version": "${PackageVersionNet6}",
178178
"alias-to": {
179-
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x64"
179+
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x64"
180180
}
181181
},
182182
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x86": {
183183
"kind": "framework",
184184
"version": "${PackageVersionNet6}",
185185
"alias-to": {
186-
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x86"
186+
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x86"
187187
}
188188
},
189189
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x86": {
@@ -230,77 +230,77 @@
230230
"kind": "framework",
231231
"version": "${PackageVersionNet6}",
232232
"alias-to": {
233-
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64"
233+
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64"
234234
}
235235
},
236236
"Microsoft.NETCore.App.Runtime.Mono.net6.maccatalyst-x64": {
237237
"kind": "framework",
238238
"version": "${PackageVersionNet6}",
239239
"alias-to": {
240-
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
240+
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
241241
}
242242
},
243243
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-arm64": {
244244
"kind": "framework",
245245
"version": "${PackageVersionNet6}",
246246
"alias-to": {
247-
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
247+
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
248248
}
249249
},
250250
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-x64": {
251251
"kind": "framework",
252252
"version": "${PackageVersionNet6}",
253253
"alias-to": {
254-
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-x64"
254+
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-x64"
255255
}
256256
},
257257
"Microsoft.NETCore.App.Runtime.net6.osx-arm64": {
258258
"kind": "framework",
259259
"version": "${PackageVersionNet6}",
260260
"alias-to": {
261-
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
261+
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
262262
}
263263
},
264264
"Microsoft.NETCore.App.Runtime.net6.osx-x64": {
265265
"kind": "framework",
266266
"version": "${PackageVersionNet6}",
267267
"alias-to": {
268-
"any": "Microsoft.NETCore.App.Runtime.osx-x64"
268+
"any": "Microsoft.NETCore.App.Runtime.osx-x64"
269269
}
270270
},
271271
"Microsoft.NETCore.App.Runtime.Mono.net6.ios-arm" : {
272272
"kind": "framework",
273273
"version": "${PackageVersionNet6}",
274274
"alias-to": {
275-
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm"
275+
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm"
276276
}
277277
},
278278
"Microsoft.NETCore.App.Runtime.Mono.net6.ios-arm64" : {
279279
"kind": "framework",
280280
"version": "${PackageVersionNet6}",
281281
"alias-to": {
282-
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm64"
282+
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm64"
283283
}
284284
},
285285
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-arm64" : {
286286
"kind": "framework",
287287
"version": "${PackageVersionNet6}",
288288
"alias-to": {
289-
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64"
289+
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64"
290290
}
291291
},
292292
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x64" : {
293293
"kind": "framework",
294294
"version": "${PackageVersionNet6}",
295295
"alias-to": {
296-
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
296+
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
297297
}
298298
},
299299
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x86" : {
300300
"kind": "framework",
301301
"version": "${PackageVersionNet6}",
302302
"alias-to": {
303-
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
303+
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
304304
}
305305
},
306306
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvos-arm64": {
@@ -315,21 +315,21 @@
315315
"kind": "framework",
316316
"version": "${PackageVersionNet6}",
317317
"alias-to": {
318-
"any": "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64"
318+
"any": "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64"
319319
}
320320
},
321321
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-arm64" : {
322322
"kind": "framework",
323323
"version": "${PackageVersionNet6}",
324324
"alias-to": {
325-
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64"
325+
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64"
326326
}
327327
},
328328
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-x64" : {
329329
"kind": "framework",
330330
"version": "${PackageVersionNet6}",
331331
"alias-to": {
332-
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
332+
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
333333
}
334334
},
335335
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-arm64": {
@@ -418,35 +418,35 @@
418418
"kind": "framework",
419419
"version": "${PackageVersionNet6}",
420420
"alias-to": {
421-
"any": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
421+
"any": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
422422
}
423423
},
424424
"Microsoft.NETCore.App.Runtime.net6.win-x64" : {
425425
"kind": "framework",
426426
"version": "${PackageVersionNet6}",
427427
"alias-to": {
428-
"any": "Microsoft.NETCore.App.Runtime.win-x64"
428+
"any": "Microsoft.NETCore.App.Runtime.win-x64"
429429
}
430430
},
431431
"Microsoft.NETCore.App.Runtime.net6.win-x86" : {
432432
"kind": "framework",
433433
"version": "${PackageVersionNet6}",
434434
"alias-to": {
435-
"any": "Microsoft.NETCore.App.Runtime.win-x86"
435+
"any": "Microsoft.NETCore.App.Runtime.win-x86"
436436
}
437437
},
438438
"Microsoft.NETCore.App.Runtime.net6.win-arm" : {
439439
"kind": "framework",
440440
"version": "${PackageVersionNet6}",
441441
"alias-to": {
442-
"any": "Microsoft.NETCore.App.Runtime.win-arm"
442+
"any": "Microsoft.NETCore.App.Runtime.win-arm"
443443
}
444444
},
445445
"Microsoft.NETCore.App.Runtime.net6.win-arm64" : {
446446
"kind": "framework",
447447
"version": "${PackageVersionNet6}",
448448
"alias-to": {
449-
"any": "Microsoft.NETCore.App.Runtime.win-arm64"
449+
"any": "Microsoft.NETCore.App.Runtime.win-arm64"
450450
}
451451
}
452452
}

‎src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.targets.in‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,6 @@
9797
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
9898
</ImportGroup>
9999

100-
<!-- HACK: -->
101-
<ImportGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '6.0'))">
102-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python.net6" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
103-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node.net6" />
104-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk.net6" />
105-
</ImportGroup>
106-
107100
<PropertyGroup Condition="'$(TargetsNet6)' == 'true' and ('$(TargetPlatformIdentifier)' == 'android' or '$(TargetPlatformIdentifier)' == 'macOS' or '$(TargetPlatformIdentifier)' == 'ios' or '$(TargetPlatformIdentifier)' == 'maccatalyst' or '$(TargetPlatformIdentifier)' == 'tvos' or ('$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true'))">
108101
<_MonoWorkloadTargetsMobile>true</_MonoWorkloadTargetsMobile>
109102
<_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion6)</_MonoWorkloadRuntimePackPackageVersion>

0 commit comments

Comments
 (0)