From b02088806851b78b27840fb99ebce19c6aa4fb9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Jan 2023 19:07:10 +0000 Subject: [PATCH 01/12] Update dependencies from https://github.com/dotnet/arcade build 20230105.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22630.1 -> To Version 8.0.0-beta.23055.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/source-index-stage1.yml | 6 +++--- eng/common/tools.ps1 | 4 +++- eng/common/tools.sh | 4 +++- global.json | 8 ++++---- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c1f38cf704..30c35963d29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - e82404fca08383513e0b0b3c5308d4a9b18b7c7a + 7502a87ca569989008d3acef120b614604b6805f - + https://github.com/dotnet/arcade - e82404fca08383513e0b0b3c5308d4a9b18b7c7a + 7502a87ca569989008d3acef120b614604b6805f - + https://github.com/dotnet/arcade - e82404fca08383513e0b0b3c5308d4a9b18b7c7a + 7502a87ca569989008d3acef120b614604b6805f diff --git a/eng/Versions.props b/eng/Versions.props index 669b0e15c10..5c3d825297d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 8.0.0-alpha.1.22631.1 - 8.0.0-beta.22630.1 + 8.0.0-beta.23055.3 4.2.0 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 09c506d1185..71b66aeb8a5 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20220804.1 + sourceIndexPackageVersion: 1.0.1-20221220.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -40,10 +40,10 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core sdk 3.1 + displayName: Use .NET Core SDK 6 inputs: packageType: sdk - version: 3.1.x + version: 6.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 1a8c16c56e5..7caacc6de2e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -581,7 +581,7 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' } + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore @@ -743,6 +743,8 @@ function MSBuild() { (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll')) (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')), (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll')) + (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')), + (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')) ) $selectedPath = $null foreach ($path in $possiblePaths) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 2f27d7453cd..cf9fb1ea2d3 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -312,7 +312,7 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net7.0" + _InitializeBuildToolFramework="net8.0" } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 @@ -428,6 +428,8 @@ function MSBuild { possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) + possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" ) for path in "${possiblePaths[@]}"; do if [[ -f $path ]]; then selectedPath=$path diff --git a/global.json b/global.json index eca3cc64f90..71aa2626395 100644 --- a/global.json +++ b/global.json @@ -1,14 +1,14 @@ { "tools": { - "dotnet": "7.0.100" + "dotnet": "8.0.100-alpha.1.23055.1" }, "sdk": { - "version": "7.0.100", + "version": "8.0.100-alpha.1.23055.1", "allowPrerelease": true, "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22630.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22630.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23055.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23055.3" } } From 3a7abc84348adc3322253291d0ab407c9a83caa5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Jan 2023 13:03:18 +0000 Subject: [PATCH 02/12] Update dependencies from https://github.com/dotnet/arcade build 20230108.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22630.1 -> To Version 8.0.0-beta.23058.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30c35963d29..2e16d39a0f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - 7502a87ca569989008d3acef120b614604b6805f + 53026f034f7b8abfb9362ed018519423d81c9abb - + https://github.com/dotnet/arcade - 7502a87ca569989008d3acef120b614604b6805f + 53026f034f7b8abfb9362ed018519423d81c9abb - + https://github.com/dotnet/arcade - 7502a87ca569989008d3acef120b614604b6805f + 53026f034f7b8abfb9362ed018519423d81c9abb diff --git a/eng/Versions.props b/eng/Versions.props index 5c3d825297d..bd48b2e2f84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 8.0.0-alpha.1.22631.1 - 8.0.0-beta.23055.3 + 8.0.0-beta.23058.1 4.2.0 diff --git a/global.json b/global.json index 71aa2626395..feac8947f53 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23055.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23055.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23058.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23058.1" } } From 5e2c477efc976664abfaf15d5bb29b110e9f1b4a Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 10 Jan 2023 19:16:14 -0800 Subject: [PATCH 03/12] Workaround CS0165 error - despite calling `SetupAsync()`, compiler thought `adding` was uninitialized --- src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs b/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs index 5b6bce5375d..22465244956 100644 --- a/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs +++ b/src/EFCore/ChangeTracking/Internal/InternalEntityEntry.cs @@ -186,7 +186,7 @@ public async Task SetEntityStateAsync( CancellationToken cancellationToken = default) { var oldState = _stateData.EntityState; - bool adding; + bool adding = PrepareForAdd(entityState); await SetupAsync().ConfigureAwait(false); if ((adding || oldState is EntityState.Detached) @@ -202,7 +202,6 @@ public async Task SetEntityStateAsync( async Task SetupAsync() { - adding = PrepareForAdd(entityState); entityState = await PropagateToUnknownKeyAsync( oldState, entityState, adding, forceStateWhenUnknownKey, cancellationToken).ConfigureAwait(false); } From 774db441d718efad18ec44b0e1c0ea5e4eeb1e3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Jan 2023 13:03:22 +0000 Subject: [PATCH 04/12] Update dependencies from https://github.com/dotnet/arcade build 20230113.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22630.1 -> To Version 8.0.0-beta.23063.7 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- eng/common/cross/build-rootfs.sh | 18 +++++--- eng/common/generate-locproject.ps1 | 45 ++++++++++++++++++- eng/common/templates/job/job.yml | 10 +++++ .../templates/variables/pool-providers.yml | 4 +- global.json | 8 ++-- 7 files changed, 77 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e16d39a0f4..0a54770fc41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - 53026f034f7b8abfb9362ed018519423d81c9abb + 1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b - + https://github.com/dotnet/arcade - 53026f034f7b8abfb9362ed018519423d81c9abb + 1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b - + https://github.com/dotnet/arcade - 53026f034f7b8abfb9362ed018519423d81c9abb + 1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b diff --git a/eng/Versions.props b/eng/Versions.props index bd48b2e2f84..199cbd20b02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 8.0.0-alpha.1.22631.1 - 8.0.0-beta.23058.1 + 8.0.0-beta.23063.7 4.2.0 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index b04d3b38065..1ebf454f3cf 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 dbf2ab4ee7d..69e65eeae7d 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/templates/job/job.yml b/eng/common/templates/job/job.yml index 0549e4c71ce..f0af425d9f6 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 a7b943c2fa4..1b820b41605 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 feac8947f53..fcf5e9e2db4 100644 --- a/global.json +++ b/global.json @@ -1,14 +1,14 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23055.1" + "dotnet": "8.0.100-alpha.1.23061.8" }, "sdk": { - "version": "8.0.100-alpha.1.23055.1", + "version": "8.0.100-alpha.1.23061.8", "allowPrerelease": true, "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23058.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23058.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23063.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23063.7" } } From 1c1db735f1742dac5c950e6ce8b452c383ad675a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Jan 2023 13:03:22 +0000 Subject: [PATCH 05/12] Update dependencies from https://github.com/dotnet/arcade build 20230117.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22630.1 -> To Version 8.0.0-beta.23067.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a54770fc41..f47bb276d94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - 1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b + 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 - + https://github.com/dotnet/arcade - 1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b + 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 - + https://github.com/dotnet/arcade - 1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b + 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 diff --git a/eng/Versions.props b/eng/Versions.props index 199cbd20b02..b4b08dd33ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 8.0.0-alpha.1.22631.1 - 8.0.0-beta.23063.7 + 8.0.0-beta.23067.5 4.2.0 diff --git a/global.json b/global.json index fcf5e9e2db4..9c08a046a0b 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23063.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23063.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23067.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23067.5" } } From a6eb90b1daf8bd9d9acd5f92a7fbf4199761aef5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Jan 2023 13:03:28 +0000 Subject: [PATCH 06/12] Update dependencies from https://github.com/dotnet/arcade build 20230127.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22630.1 -> To Version 8.0.0-beta.23077.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64d3b10115c..0901e05b702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 + 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 - + https://github.com/dotnet/arcade - 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 + 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 - + https://github.com/dotnet/arcade - 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 + 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 diff --git a/eng/Versions.props b/eng/Versions.props index b91d7aa780a..5256ac86106 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 8.0.0-alpha.1.23072.5 - 8.0.0-beta.23067.5 + 8.0.0-beta.23077.1 4.2.0 diff --git a/global.json b/global.json index 9c08a046a0b..aa2acbded6a 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23067.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23067.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23077.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23077.1" } } From f1aeeca5fd14177825047547dd379ca6bc08fce2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Feb 2023 13:03:41 +0000 Subject: [PATCH 07/12] Update dependencies from https://github.com/dotnet/arcade build 20230203.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22630.1 -> To Version 8.0.0-beta.23103.1 --- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- eng/common/generate-locproject.ps1 | 1 + eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 0 -> 3810 bytes eng/common/native/init-compiler.sh | 2 +- eng/common/templates/job/source-build.yml | 16 ++----- .../templates/variables/pool-providers.yml | 41 +++++++++++------- global.json | 4 +- 8 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 eng/common/loc/P22DotNetHtmlLocalization.lss diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0901e05b702..0faa8cf988e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 + c453dfef2f41533de5cb03b2115aab9d0dfc74c6 - + https://github.com/dotnet/arcade - 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 + c453dfef2f41533de5cb03b2115aab9d0dfc74c6 - + https://github.com/dotnet/arcade - 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 + c453dfef2f41533de5cb03b2115aab9d0dfc74c6 diff --git a/eng/Versions.props b/eng/Versions.props index 5256ac86106..85bb011a150 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 8.0.0-alpha.1.23072.5 - 8.0.0-beta.23077.1 + 8.0.0-beta.23103.1 4.2.0 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 69e65eeae7d..bcb579e37a9 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -137,6 +137,7 @@ $locJson = @{ @{ LanguageSet = $LanguageSet CloneLanguageSet = "VS_macOS_CloneLanguages" + LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) LocItems = @( $macosHtmlFiles | ForEach-Object { $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss new file mode 100644 index 0000000000000000000000000000000000000000..6661fed566e49b0c206665bc21f135e06c9b89c4 GIT binary patch literal 3810 zcmd^CT~8BH5S?ce|HG9Bo&v?0;P_m6l= znU-wb=}VLT7UH{>{5H;0M4iLmRE8QeBRr|>&k=uV*L;heKY+dq>B$0^=0I}|x`)s{ zht4t9zaiEh5Fe>E-;zVT;c4G?v;9N0G=rWwo~*(Cs`OS6ZL`HL;vsL0J@I%$+0YvE zx{9ukK|FtFx1PlPD5M;6ZM>f;1BhCf?`8y6QH*?RT9T>XwF z#~m_N+i^UKE^j{e;KdNW`kH9Rbj{G8tDY}mafCgG+m3H`I@_PhrDmcIzxD&IX@s083kV|lLUE^0(h6wWRPN0QN1n^PU5eX8r6OZ*s^g)tt77#SZCB}znxye#U$Dtinr6lnVu z!LzA{A}0~no7p$thFGJAnI}oSW||9H=Bz}I7kD#2MLg7WfrlE5o9sQjePc>qmv+6iQCmdp(y}(Vr literal 0 HcmV?d00001 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index c670cb79689..7aee4213e1b 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then # Set default versions if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [ "$compiler" = "clang" ]; then versions="15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" + if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" elif [ "$compiler" = "gcc" ]; then versions="12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index e40bf35203b..8a3deef2b72 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,20 +46,12 @@ jobs: # source-build builds run in Docker, including the default managed platform. # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic pool: - # Main environments - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}: - name: NetCore-Public + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - # Servicing build environments - ${{ if and(eq(variables['System.TeamProject'], 'public'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if and(eq(variables['System.TeamProject'], 'internal'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}: - name: NetCore1ESPool-Svc-Internal + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 1b820b41605..9cc5c550d3b 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -26,23 +26,32 @@ # demands: ImageOverride -equals windows.vs2019.amd64 variables: -# Coalesce the target and source branches so we know when a PR targets a release branch -# If these variables are somehow missing, fall back to main (tends to have more capacity) -- name: BranchNameForPoolSelection - value: ${{ coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main') }} + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) -# Any new -Svc alternative pools should have variables added here to allow for splitting work - -# Main branch pools -- ${{ if ne(contains(variables['BranchNameForPoolSelection'], 'release'), true) }}: + # Any new -Svc alternative pools should have variables added here to allow for splitting work - name: DncEngPublicBuildPool - value: NetCore-Public - - name: DncEngInternalBuildPool - value: NetCore1ESPool-Internal + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore-Svc-Public' + ), + False, + 'NetCore-Public' + ) + ] -# Release branch pools -- ${{ if contains(variables['BranchNameForPoolSelection'], 'release') }}: - - name: DncEngPublicBuildPool - value: NetCore-Svc-Public - name: DncEngInternalBuildPool - value: NetCore1ESPool-Svc-Internal + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/global.json b/global.json index aa2acbded6a..217991084ff 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23077.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23077.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23103.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23103.1" } } From 8b5ab1d190f9765070d6e781d0a9bbec943b7f65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Feb 2023 13:03:53 +0000 Subject: [PATCH 08/12] Update dependencies from https://github.com/dotnet/arcade build 20230210.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22630.1 -> To Version 8.0.0-beta.23110.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/init-tools-native.ps1 | 9 +++------ eng/common/templates/job/job.yml | 6 +++--- global.json | 4 ++-- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0faa8cf988e..66e4ed55d9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - c453dfef2f41533de5cb03b2115aab9d0dfc74c6 + 96d8be74c39a4765ec919ff9bebf9e0c875fc195 - + https://github.com/dotnet/arcade - c453dfef2f41533de5cb03b2115aab9d0dfc74c6 + 96d8be74c39a4765ec919ff9bebf9e0c875fc195 - + https://github.com/dotnet/arcade - c453dfef2f41533de5cb03b2115aab9d0dfc74c6 + 96d8be74c39a4765ec919ff9bebf9e0c875fc195 diff --git a/eng/Versions.props b/eng/Versions.props index 85bb011a150..4fda33edf17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 8.0.0-alpha.1.23072.5 - 8.0.0-beta.23103.1 + 8.0.0-beta.23110.3 4.2.0 diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index fbc67effc36..27ccdb9ecc9 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -83,7 +83,8 @@ try { Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { if ($PathPromotion -eq $True) { - if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools" + if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name $ToolVersion = $_.Value @@ -93,11 +94,6 @@ try { if ($ToolVersion -eq "latest") { $ToolVersion = "" } - $ArcadeToolsDirectory = "C:\arcade-tools" - if (-not (Test-Path $ArcadeToolsDirectory)) { - Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." - exit 1 - } $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) if ($ToolDirectories -eq $null) { Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." @@ -125,6 +121,7 @@ try { if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image." } } exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index f0af425d9f6..61914a1fbcd 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -134,7 +134,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@0 - - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 inputs: buildType: current @@ -171,7 +171,7 @@ jobs: TeamName: $(_TeamName) - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - task: CopyFiles@2 displayName: Gather binaries for publish to artifacts inputs: @@ -192,7 +192,7 @@ jobs: ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true condition: always() - - ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - publish: artifacts/log artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} displayName: Publish logs diff --git a/global.json b/global.json index 217991084ff..cee8206e7f8 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23103.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23103.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23110.3" } } From 92fd32e1ac3b62f616f3fc5215da66135345bf67 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 16 Feb 2023 14:58:34 -0800 Subject: [PATCH 09/12] Download the 7.0.3 runtime - not carried in 8.0.x .NET SDKs --- global.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/global.json b/global.json index cee8206e7f8..a8779e42a24 100644 --- a/global.json +++ b/global.json @@ -7,6 +7,11 @@ "allowPrerelease": true, "rollForward": "latestMajor" }, + "runtimes": { + "dotnet": [ + "7.0.3" + ] + }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23110.3" From d94976233116087e99b4bd09c36a7d66425bc922 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 16 Feb 2023 15:23:49 -0800 Subject: [PATCH 10/12] !fixup! Correct nesting in global.json - nit: put the "sdk" section at the top of the file --- global.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/global.json b/global.json index a8779e42a24..62673bf75ad 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { - "tools": { - "dotnet": "8.0.100-alpha.1.23061.8" - }, "sdk": { "version": "8.0.100-alpha.1.23061.8", "allowPrerelease": true, "rollForward": "latestMajor" }, - "runtimes": { - "dotnet": [ - "7.0.3" - ] + "tools": { + "dotnet": "8.0.100-alpha.1.23061.8", + "runtimes": { + "dotnet": [ + "7.0.3" + ] + } }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23110.3", From cd046605d8bbb28ca1b270db3fd2b1c37b94042a Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 16 Feb 2023 16:34:24 -0800 Subject: [PATCH 11/12] !fixup! Some tests need an ASP.NET runtime - add the v7.0.3 runtime to global.json - nit: clean up console logging about a missing variable --- azure-pipelines.yml | 2 ++ global.json | 3 +++ 2 files changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d551c47ed7..ed3f616c23b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -120,6 +120,8 @@ stages: - Codeql.TSAEnabled: ${{ eq(variables['Build.Reason'], 'Schedule') }} # Default expects tsaoptions.json under SourceRoot. - Codeql.TSAOptionsPath: '$(Build.SourcesDirectory)/.config/tsaoptions.json' + - ${{ else }}: + _AdditionalBuildArgs: '' steps: - task: NuGetCommand@2 displayName: 'Clear NuGet caches' diff --git a/global.json b/global.json index 62673bf75ad..76f2baa9946 100644 --- a/global.json +++ b/global.json @@ -7,6 +7,9 @@ "tools": { "dotnet": "8.0.100-alpha.1.23061.8", "runtimes": { + "aspnetcore": [ + "7.0.3" + ], "dotnet": [ "7.0.3" ] From 375498c440ecd3714c6ba5dbd98ad084790ddda2 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 16 Feb 2023 16:38:58 -0800 Subject: [PATCH 12/12] !fixup! Correct typo in my nit fix --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ed3f616c23b..996ba48a44c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -121,7 +121,7 @@ stages: # Default expects tsaoptions.json under SourceRoot. - Codeql.TSAOptionsPath: '$(Build.SourcesDirectory)/.config/tsaoptions.json' - ${{ else }}: - _AdditionalBuildArgs: '' + - _AdditionalBuildArgs: '' steps: - task: NuGetCommand@2 displayName: 'Clear NuGet caches'