Skip to content

[release/7.0-rc1] Workload changes - account for SDK bands and use archives #74054

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
hoyosjs merged 6 commits into from
Aug 17, 2022
Merged

[release/7.0-rc1] Workload changes - account for SDK bands and use archives #74054

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
861b6f6
Update dependencies from dotnet/arcade to 7.0.0-beta.22415.5
hoyosjs Aug 16, 2022
6c805fd
Port workload changes from release/6.0
joeloff Aug 16, 2022
750b723
Update arcade to 7.0.0-beta.22416.1
hoyosjs Aug 16, 2022
66c1107
workloads: Add multithread, and perftrace runtime packs for wasm work…
radical Aug 16, 2022
a82ed00
Mono.ToolChain.Manifest short name
hoyosjs Aug 17, 2022
2f539e6
Change order of shortnames
hoyosjs Aug 17, 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
Next Next commit
Update dependencies from dotnet/arcade to 7.0.0-beta.22415.5
  • Loading branch information
@hoyosjs
hoyosjs authored and github-actions committed Aug 17, 2022
commit 861b6f60848eff298ee0b21a643d3ad0d61977e0
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,77 +54,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22411.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -250,9 +250,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22411.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22415.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
<Sha>bb38157cef03490ae7046792e44020d9d7a54391</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22375.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22411.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22411.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22411.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22411.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22411.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22411.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22411.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22411.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22411.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22415.5</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22415.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22415.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22415.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22415.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22415.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22415.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22415.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22415.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22415.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22415.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22415.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22415.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22415.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22415.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22415.5</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
18 changes: 11 additions & 7 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ __FreeBSDPackages+=" openssl"
__FreeBSDPackages+=" krb5"
__FreeBSDPackages+=" terminfo-db"

__IllumosPackages="icu-64.2nb2"
__IllumosPackages+=" mit-krb5-1.16.2nb4"
__IllumosPackages+=" openssl-1.1.1e"
__IllumosPackages+=" zlib-1.2.11"
__IllumosPackages="icu"
__IllumosPackages+=" mit-krb5"
__IllumosPackages+=" openssl"
__IllumosPackages+=" zlib"

__HaikuPackages="gmp"
__HaikuPackages+=" gmp_devel"
Expand Down Expand Up @@ -390,14 +390,18 @@ elif [[ "$__CodeName" == "illumos" ]]; then
if [[ "$__UseMirror" == 1 ]]; then
BaseUrl=http://pkgsrc.smartos.skylime.net
fi
BaseUrl="$BaseUrl/packages/SmartOS/2020Q1/${__illumosArch}/All"
BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
echo "Downloading manifest"
wget "$BaseUrl"
echo "Downloading dependencies."
read -ra array <<<"$__IllumosPackages"
for package in "${array[@]}"; do
echo "Installing $package..."
echo "Installing '$package'"
package="$(grep ">$package-[0-9]" All | sed -En 's/.*href="(.*)\.tgz".*/\1/p')"
echo "Resolved name '$package'"
wget "$BaseUrl"/"$package".tgz
ar -x "$package".tgz
tar --skip-old-files -xzf "$package".tmp.tgz -C "$__RootfsDir" 2>/dev/null
tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null
done
echo "Cleaning up temporary files."
popd
Expand Down
31 changes: 29 additions & 2 deletions eng/common/generate-locproject.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ $jsonTemplateFiles | ForEach-Object {

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

$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

$xlfFiles = @()

$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
Expand Down Expand Up @@ -77,8 +79,7 @@ $locJson = @{
CopyOption = "LangIDOnPath"
OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
}
}
else {
} else {
return @{
SourceFile = $sourceFile
CopyOption = "LangIDOnName"
Expand All @@ -88,6 +89,32 @@ $locJson = @{
}
}
)
},
@{
CloneLanguageSet = "WiX_CloneLanguages"
LssFiles = @( "wxl_loc.lss" )
LocItems = @(
$wxlFiles | ForEach-Object {
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($outputPath.Contains($exclusion))
{
$continue = $false
}
}
$sourceFile = ($_.FullName | Resolve-Path -Relative)
if ($continue)
{
return @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
OutputPath = $outputPath
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"
}
}
}
)
}
)
}
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "7.0.100-preview.7.22377.5"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22411.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22411.2",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22411.2",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22415.5",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22415.5",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22415.5",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down