Skip to content

[release/7.0-rc1] Roll forward to the latest 6.0.x builds #74288

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

Merged
merged 7 commits into from
Aug 22, 2022
Merged

[release/7.0-rc1] Roll forward to the latest 6.0.x builds #74288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7de0d4
Roll forward to the latest 6.0.x builds
lewing Aug 20, 2022
cfbb7e6
Remove workaround for version emsdk import
lewing Aug 21, 2022
82eebc9
Fix incorrect pack names
lewing Aug 22, 2022
7e04f33
Fix unaliased packs
lewing Aug 22, 2022
7c52084
Alias the experimental packs in WorkloadManifest.targets too
lewing Aug 22, 2022
63dfb3b
fix quoting
lewing Aug 22, 2022
3b6c778
Download manifests for workloads leg
hoyosjs Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/mono/templates/workloads-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions eng/testing/tests.wasm.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
64 changes: 32 additions & 32 deletions src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"abstract": true,
"description": "Android Mono AOT Workload",
"packs": [
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86",
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64",
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm",
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64"
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x86",
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x64",
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm",
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm64"
],
"extends": [ "microsoft-net-runtime-android-net6" ],
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
Expand Down Expand Up @@ -90,8 +90,8 @@
"packs": [
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-arm64",
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-x64",
"Microsoft.NETCore.App.Runtime.osx-arm64",
"Microsoft.NETCore.App.Runtime.osx-x64"
"Microsoft.NETCore.App.Runtime.net6.osx-arm64",
"Microsoft.NETCore.App.Runtime.net6.osx-x64"
],
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
"platforms": [ "osx-arm64", "osx-x64" ]
Expand Down Expand Up @@ -141,49 +141,49 @@
"kind": "Sdk",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NET.Runtime.MonoAOTCompiler.Task"
"any": "Microsoft.NET.Runtime.MonoAOTCompiler.Task"
}
},
"Microsoft.NET.Runtime.MonoTargets.Sdk.net6": {
"kind": "Sdk",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NET.Runtime.MonoTargets.Sdk"
"any": "Microsoft.NET.Runtime.MonoTargets.Sdk"
}
},
"Microsoft.NET.Runtime.WebAssembly.Sdk.net6": {
"kind": "Sdk",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NET.Runtime.WebAssembly.Sdk"
"any": "Microsoft.NET.Runtime.WebAssembly.Sdk"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.android-arm": {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.android-arm64": {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x64": {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x64"
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x86": {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x86"
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x86"
}
},
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x86": {
Expand Down Expand Up @@ -230,77 +230,77 @@
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.maccatalyst-x64": {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-arm64": {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-x64": {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-x64"
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-x64"
}
},
"Microsoft.NETCore.App.Runtime.net6.osx-arm64": {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
}
},
"Microsoft.NETCore.App.Runtime.net6.osx-x64": {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.osx-x64"
"any": "Microsoft.NETCore.App.Runtime.osx-x64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.ios-arm" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm"
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.ios-arm64" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-arm64" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x64" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x86" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
}
},
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvos-arm64": {
Expand All @@ -315,21 +315,21 @@
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-arm64" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64"
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-x64" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
}
},
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-arm64": {
Expand Down Expand Up @@ -418,35 +418,35 @@
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
"any": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
}
},
"Microsoft.NETCore.App.Runtime.net6.win-x64" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.win-x64"
"any": "Microsoft.NETCore.App.Runtime.win-x64"
}
},
"Microsoft.NETCore.App.Runtime.net6.win-x86" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.win-x86"
"any": "Microsoft.NETCore.App.Runtime.win-x86"
}
},
"Microsoft.NETCore.App.Runtime.net6.win-arm" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.win-arm"
"any": "Microsoft.NETCore.App.Runtime.win-arm"
}
},
"Microsoft.NETCore.App.Runtime.net6.win-arm64" : {
"kind": "framework",
"version": "${PackageVersionNet6}",
"alias-to": {
"any": "Microsoft.NETCore.App.Runtime.win-arm64"
"any": "Microsoft.NETCore.App.Runtime.win-arm64"
}
}
}
Expand Down
7 changes: 0 additions & 7 deletions ...ono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.targets.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,6 @@
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
</ImportGroup>

<!-- HACK: -->
<ImportGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '6.0'))">
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python.net6" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node.net6" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk.net6" />
</ImportGroup>

<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'))">
<_MonoWorkloadTargetsMobile>true</_MonoWorkloadTargetsMobile>
<_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion6)</_MonoWorkloadRuntimePackPackageVersion>
Expand Down
Loading