From 19fc478d67c2fc55e62b50676935f903a77f5a4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 21:58:17 -0600 Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#80547) * Update dependencies from https://github.com/dotnet/arcade build 20230111.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23053.5 -> To Version 8.0.0-beta.23061.1 * Update dependencies from https://github.com/dotnet/arcade build 20230112.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23059.1 -> To Version 8.0.0-beta.23062.3 * Update dependencies from https://github.com/dotnet/arcade build 20230113.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23059.1 -> To Version 8.0.0-beta.23063.7 * Update dependencies from https://github.com/dotnet/arcade build 20230116.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23059.1 -> To Version 8.0.0-beta.23066.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Larry Ewing --- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 30 ++++---- eng/common/cross/build-rootfs.sh | 18 +++-- eng/common/generate-locproject.ps1 | 45 +++++++++++- eng/common/native/common-library.sh | 4 +- eng/common/templates/job/job.yml | 10 +++ .../templates/variables/pool-providers.yml | 4 +- global.json | 6 +- 8 files changed, 122 insertions(+), 67 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c260c2bd3038..9fafc73c6fdf8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,73 +94,73 @@ - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b https://github.com/dotnet/runtime-assets @@ -286,9 +286,9 @@ https://github.com/dotnet/xharness 172d0715b3dbee3cbc440ccb44bf782b10ce090f - + https://github.com/dotnet/arcade - d360f5e4d22cdc673601d6cc60284ced948706ae + e52b885a6ec2fc87c9e94b80d9ff7a862786390b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2ea33f922df70..218e16b45b12e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,21 +81,21 @@ 8.0.100-alpha.1.22571.3 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 2.5.1-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 - 8.0.0-beta.23059.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 2.5.1-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 + 8.0.0-beta.23066.1 6.0.0-preview.1.102 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index b04d3b3806575..1ebf454f3cf28 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -48,12 +48,14 @@ __UbuntuPackages+=" symlinks" __UbuntuPackages+=" libicu-dev" __UbuntuPackages+=" liblttng-ust-dev" __UbuntuPackages+=" libunwind8-dev" +__UbuntuPackages+=" libnuma-dev" __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" __AlpinePackages+=" compiler-rt-static" +__AlpinePackages+=" numactl-dev" # runtime libraries' dependencies __UbuntuPackages+=" libcurl4-openssl-dev" @@ -147,9 +149,9 @@ while :; do __BuildArch=ppc64le __UbuntuArch=ppc64el __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" - __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//') - __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//') - __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//') + __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" + __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" + __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package ;; riscv64) @@ -157,7 +159,7 @@ while :; do __UbuntuArch=riscv64 __UbuntuRepo="http://deb.debian.org/debian-ports" __CodeName=sid - __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//') + __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" unset __LLDB_Package if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then @@ -168,9 +170,9 @@ while :; do __BuildArch=s390x __UbuntuArch=s390x __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" - __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//') - __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//') - __UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//') + __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" + __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" + __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package ;; x64) @@ -310,6 +312,8 @@ done if [[ "$__BuildArch" == "armel" ]]; then __LLDB_Package="lldb-3.5-dev" +elif [[ "$__BuildArch" == "arm" && "$__AlpineVersion" == "3.13" ]]; then + __AlpinePackages="${__AlpinePackages//numactl-dev/}" fi __UbuntuPackages+=" ${__LLDB_Package:-}" diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index dbf2ab4ee7d17..69e65eeae7de0 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -34,6 +34,25 @@ $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 +if (-not $wxlFiles) { + $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files + if ($wxlEnFiles) { + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } + } +} + +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files +$macosHtmlFiles = @() +if ($macosHtmlEnFiles) { + $macosHtmlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } +} $xlfFiles = @() @@ -99,8 +118,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) - { + if ($_.FullName.Contains($exclusion)) { $continue = $false } } @@ -115,6 +133,29 @@ $locJson = @{ } } ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "VS_macOS_CloneLanguages" + LocItems = @( + $macosHtmlFiles | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + } + } + } + ) } ) } diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh index 75740d4a65c91..080c2c283ae46 100755 --- a/eng/common/native/common-library.sh +++ b/eng/common/native/common-library.sh @@ -55,8 +55,8 @@ function ExpandZip { function GetCurrentOS { local unameOut="$(uname -s)" case $unameOut in - Linux*) echo "linux";; - Darwin*) echo "macos";; + Linux*) echo "Linux";; + Darwin*) echo "MacOS";; esac return 0 } diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0549e4c71ce3e..f0af425d9f68a 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -88,6 +88,16 @@ jobs: - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} + # handle template variable syntax + # example: + # - template: path/to/template.yml + # parameters: + # [key]: [value] + - ${{ if ne(variable.template, '') }}: + - template: ${{ variable.template }} + ${{ if ne(variable.parameters, '') }}: + parameters: ${{ variable.parameters }} + # handle key-value variable syntax. # example: # - [key]: [value] diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index a7b943c2fa4c1..1b820b4160577 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -16,7 +16,7 @@ # First, import the template in an arcade-ified repo to pick up the variables, e.g.: # # variables: -# - template: eng/common/templates/variables/pool-providers.yml +# - template: /eng/common/templates/variables/pool-providers.yml # # ... then anywhere specifying the pool provider use the runtime variables, # $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.: @@ -45,4 +45,4 @@ variables: - name: DncEngPublicBuildPool value: NetCore-Svc-Public - name: DncEngInternalBuildPool - value: NetCore1ESPool-Svc-Internal \ No newline at end of file + value: NetCore1ESPool-Svc-Internal diff --git a/global.json b/global.json index d92f1ee811605..9df3f9a9d7187 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-alpha.1.23061.8" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23059.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23059.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23059.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23066.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23066.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23066.1", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.23058.2"