Skip to content

Commit 02789c3

Browse files
github-actions[bot]hoyosjsjoeloffradical
authored
[release/7.0-rc1] Workload changes - account for SDK bands and use archives (#74054)
* Update arcade to 7.0.0-beta.22416.1 * Port workload changes from release/6.0 * workloads: Add multithread, and perftrace runtime packs for wasm workload * Mono.ToolChain.Manifest short name * Change order of shortnames Co-authored-by: Juan Sebastian Hoyos Ayala <juan.hoyos@microsoft.com> Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com> Co-authored-by: Ankit Jain <radical@gmail.com>
1 parent ceef11f commit 02789c3

File tree

10 files changed

+142
-131
lines changed

10 files changed

+142
-131
lines changed

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -54,77 +54,77 @@
5454
</Dependency>
5555
</ProductDependencies>
5656
<ToolsetDependencies>
57-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22411.2">
57+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
59+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22411.2">
61+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
63+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22411.2">
65+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
67+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22411.2">
69+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
71+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22411.2">
73+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
75+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22411.2">
77+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
79+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22411.2">
81+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
83+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22411.2">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
87+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22411.2">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
91+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22411.2">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
95+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22411.2">
97+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
99+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22411.2">
101+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
103+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22411.2">
105+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
107+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22411.2">
109+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
111+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22411.2">
113+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
115+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22411.2">
117+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
119+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22411.2">
121+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
123+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22411.2">
125+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
127+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
128128
</Dependency>
129129
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
130130
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -250,9 +250,9 @@
250250
<Uri>https://github.com/dotnet/xharness</Uri>
251251
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
252252
</Dependency>
253-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22411.2">
253+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
254254
<Uri>https://github.com/dotnet/arcade</Uri>
255-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
255+
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
256256
</Dependency>
257257
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22375.7">
258258
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,22 @@
5454
<!-- SDK dependencies -->
5555
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
5656
<!-- Arcade dependencies -->
57-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22411.2</MicrosoftDotNetApiCompatVersion>
58-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksFeedVersion>
59-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22411.2</MicrosoftDotNetCodeAnalysisVersion>
60-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22411.2</MicrosoftDotNetGenAPIVersion>
61-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22411.2</MicrosoftDotNetGenFacadesVersion>
62-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22411.2</MicrosoftDotNetXUnitExtensionsVersion>
63-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22411.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
64-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksArchivesVersion>
65-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksInstallersVersion>
66-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksPackagingVersion>
67-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
68-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksTemplatingVersion>
69-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
70-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22411.2</MicrosoftDotNetRemoteExecutorVersion>
71-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22411.2</MicrosoftDotNetVersionToolsTasksVersion>
72-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22411.2</MicrosoftDotNetPackageTestingVersion>
57+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
58+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
59+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
60+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
61+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
62+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
63+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
64+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
65+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
66+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
67+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
68+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
69+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
70+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
71+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
72+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
7373
<!-- NuGet dependencies -->
7474
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7575
<!-- Installer dependencies -->

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ __FreeBSDPackages+=" openssl"
7676
__FreeBSDPackages+=" krb5"
7777
__FreeBSDPackages+=" terminfo-db"
7878

79-
__IllumosPackages="icu-64.2nb2"
80-
__IllumosPackages+=" mit-krb5-1.16.2nb4"
81-
__IllumosPackages+=" openssl-1.1.1e"
82-
__IllumosPackages+=" zlib-1.2.11"
79+
__IllumosPackages="icu"
80+
__IllumosPackages+=" mit-krb5"
81+
__IllumosPackages+=" openssl"
82+
__IllumosPackages+=" zlib"
8383

8484
__HaikuPackages="gmp"
8585
__HaikuPackages+=" gmp_devel"
@@ -390,14 +390,18 @@ elif [[ "$__CodeName" == "illumos" ]]; then
390390
if [[ "$__UseMirror" == 1 ]]; then
391391
BaseUrl=http://pkgsrc.smartos.skylime.net
392392
fi
393-
BaseUrl="$BaseUrl/packages/SmartOS/2020Q1/${__illumosArch}/All"
393+
BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
394+
echo "Downloading manifest"
395+
wget "$BaseUrl"
394396
echo "Downloading dependencies."
395397
read -ra array <<<"$__IllumosPackages"
396398
for package in "${array[@]}"; do
397-
echo "Installing $package..."
399+
echo "Installing '$package'"
400+
package="$(grep ">$package-[0-9]" All | sed -En 's/.*href="(.*)\.tgz".*/\1/p')"
401+
echo "Resolved name '$package'"
398402
wget "$BaseUrl"/"$package".tgz
399403
ar -x "$package".tgz
400-
tar --skip-old-files -xzf "$package".tmp.tgz -C "$__RootfsDir" 2>/dev/null
404+
tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null
401405
done
402406
echo "Cleaning up temporary files."
403407
popd

‎eng/common/generate-locproject.ps1‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ $jsonTemplateFiles | ForEach-Object {
3333

3434
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
3535

36+
$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
37+
3638
$xlfFiles = @()
3739

3840
$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
@@ -77,8 +79,7 @@ $locJson = @{
7779
CopyOption = "LangIDOnPath"
7880
OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
7981
}
80-
}
81-
else {
82+
} else {
8283
return @{
8384
SourceFile = $sourceFile
8485
CopyOption = "LangIDOnName"
@@ -88,6 +89,32 @@ $locJson = @{
8889
}
8990
}
9091
)
92+
},
93+
@{
94+
CloneLanguageSet = "WiX_CloneLanguages"
95+
LssFiles = @( "wxl_loc.lss" )
96+
LocItems = @(
97+
$wxlFiles | ForEach-Object {
98+
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
99+
$continue = $true
100+
foreach ($exclusion in $exclusions.Exclusions) {
101+
if ($outputPath.Contains($exclusion))
102+
{
103+
$continue = $false
104+
}
105+
}
106+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
107+
if ($continue)
108+
{
109+
return @{
110+
SourceFile = $sourceFile
111+
CopyOption = "LangIDOnPath"
112+
OutputPath = $outputPath
113+
Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
114+
}
115+
}
116+
}
117+
)
91118
}
92119
)
93120
}

‎eng/common/sdk-task.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.1.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
365365

366366
# If the version of msbuild is going to be xcopied,
367367
# use this version. Version matches a package here:
368-
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview
369-
$defaultXCopyMSBuildVersion = '17.1.0'
368+
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview
369+
$defaultXCopyMSBuildVersion = '17.2.1'
370370

371371
if (!$vsRequirements) {
372372
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ jobs:
5656
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm*.nupkg
5757
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.android-*.nupkg
5858
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.browser-wasm*.nupkg
59+
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm*.nupkg
60+
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.perftrace.browser-wasm*.nupkg
5961
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.ios-*.nupkg
6062
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.iossimulator-*.nupkg
6163
IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "7.0.100-preview.7.22377.5"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22411.2",
12-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22411.2",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22411.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
12+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
1414
"Microsoft.Build.NoTargets": "3.5.0",
1515
"Microsoft.Build.Traversal": "3.1.6",
1616
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"

‎src/installer/prepare-artifacts.proj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
</ItemsToPush>
134134

135135
<ItemsToPush Include="@(WorkloadsVSInsertionFile)">
136-
<RelativeBlobPath>$(InstallersRelativePath)workloads/$(SdkBandVersion)/%(Filename)%(Extension)</RelativeBlobPath>
136+
<RelativeBlobPath>$(InstallersRelativePath)workloads/%(Filename)%(Extension)</RelativeBlobPath>
137137
<PublishFlatContainer>true</PublishFlatContainer>
138138
</ItemsToPush>
139139

@@ -222,11 +222,13 @@
222222
Include="$(DownloadDirectory)**\VS.Redist.Common.*.nupkg"
223223
Exclude="@(DownloadedSymbolNupkgFile)" />
224224

225-
<!-- Workloads VS insertion artifacts produced by src/workloads/workloads.csproj -->
225+
<!--
226+
Workloads VS insertion artifacts produced by src/workloads/workloads.csproj. Only grab
227+
the zip artifacts as they're grouped by SDK feature band which correlates with specific VS versions.
228+
-->
226229
<WorkloadsVSInsertionFile
227230
Include="
228-
$(DownloadDirectory)*\workloads-vs\**\*.json;
229-
$(DownloadDirectory)*\workloads-vs\**\*.msi" />
231+
$(DownloadDirectory)*\workloads-vs\**\*.zip"/>
230232

231233
<!--
232234
Runtime packages associated with some identity packages. Need to exclude "runtime.native.*"

0 commit comments

Comments
 (0)