diff options
author | Larry Ewing <lewing@microsoft.com> | 2022-08-23 01:26:07 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-23 01:26:07 +0300 |
commit | 0df231c6d50bd59e72c9dc9b1d3b5983f0042584 (patch) | |
tree | ef1afaa5ffce265f61222b6fa484cdde1582ce54 /eng | |
parent | d42d9fe1ef041fd7103a09dae248fe46fbb501dc (diff) |
[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>
Diffstat (limited to 'eng')
-rw-r--r-- | eng/Version.Details.xml | 8 | ||||
-rw-r--r-- | eng/Versions.props | 6 | ||||
-rw-r--r-- | eng/pipelines/mono/templates/workloads-build.yml | 3 | ||||
-rw-r--r-- | eng/testing/tests.wasm.targets | 3 |
4 files changed, 12 insertions, 8 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63a0603175e..e13b807313b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,13 +48,13 @@ <Uri>https://github.com/dotnet/command-line-api</Uri> <Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22418.9"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha> + <Sha>745113281de08619474a5e1c704290a4ed30a65d</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6"> + <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22418.9"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha> + <Sha>745113281de08619474a5e1c704290a4ed30a65d</Sha> </Dependency> </ProductDependencies> <ToolsetDependencies> diff --git a/eng/Versions.props b/eng/Versions.props index acd5e604649..d6deb8b7c43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ <MinorVersion>0</MinorVersion> <PatchVersion>0</PatchVersion> <SdkBandVersion>7.0.100</SdkBandVersion> - <PackageVersionNet6>6.0.8</PackageVersionNet6> + <PackageVersionNet6>6.0.9</PackageVersionNet6> <PreReleaseVersionLabel>rc</PreReleaseVersionLabel> <PreReleaseVersionIteration>1</PreReleaseVersionIteration> <!-- Set assembly version to align with major and minor version, @@ -22,8 +22,8 @@ <UsingToolXliff>false</UsingToolXliff> <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion> <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers> - <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> - <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> + <MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0-rc.1.22418.9</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version> + <MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.1.22418.9</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version> </PropertyGroup> <!-- For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn. diff --git a/eng/pipelines/mono/templates/workloads-build.yml b/eng/pipelines/mono/templates/workloads-build.yml index 19a56febb53..2dc0cc8a3ae 100644 --- a/eng/pipelines/mono/templates/workloads-build.yml +++ b/eng/pipelines/mono/templates/workloads-build.yml @@ -63,7 +63,8 @@ jobs: IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.tvos-*.nupkg IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.tvossimulator-*.nupkg - IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.Manifest*.nupkg + IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest*.nupkg + IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest*.nupkg 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 diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 7df09a51810..b4187faf8f6 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -155,8 +155,11 @@ /> <WorkloadCombinationsToInstall Include="net7" Variants="net7" /> + <!-- Latest net6 6.0.x versions are not available in feed currently so don't install them --> + <!-- <WorkloadCombinationsToInstall Include="net6" Variants="net6" /> <WorkloadCombinationsToInstall Include="net6+7" Variants="net6;net7" /> + --> <!--<WorkloadCombinationsToInstall Include="none" />--> <WasmExtraFilesToDeploy Condition="'$(_UseWasmSymbolicator)' == 'true'" Include="$(MonoProjectRoot)wasm\data\wasm-symbol-patterns.txt" /> |