From dc75f4208a33f018ae2f17b1aa984fa6d06bc31a Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Mon, 19 Jun 2023 23:56:42 -0700 Subject: [PATCH 1/4] Update branding to 6.0.20 (#87775) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d8ed30224f6967..478a5adaa1aa5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.19 + 6.0.20 6 0 - 19 + 20 6.0.400 servicing From c7448eac88bb2621c1f5467cbadb46b185365e7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 12:19:02 -0600 Subject: [PATCH 2/4] [release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk (#87649) * Update dependencies from https://github.com/dotnet/arcade build 20230613.5 Microsoft.DotNet.ApiCompat , 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.Sdk , 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 6.0.0-beta.23221.7 -> To Version 6.0.0-beta.23313.5 * Update dependencies from https://github.com/dotnet/emsdk build 20230616.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.19 -> To Version 6.0.19 * Update dependencies from https://github.com/dotnet/emsdk build 20230620.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.19 -> To Version 6.0.20 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 88 ++++++++++++++++---------------- eng/Versions.props | 36 ++++++------- eng/common/templates/job/job.yml | 16 ++++-- global.json | 12 ++--- 5 files changed, 80 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d4f22f6ccf379..90e21e18c5bffd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2319972b1fa256..31ea6ca2042d1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/msquic 7312355e44fd230b7aa26c7190f3870391751476 - + https://github.com/dotnet/emsdk - 0e3ff3ea9054b5ab771db20d5a87923d97287bdb + 6c7f38c614304c93cd392907df7d5e770d5cf7f1 - + https://github.com/dotnet/emsdk - 0e3ff3ea9054b5ab771db20d5a87923d97287bdb + 6c7f38c614304c93cd392907df7d5e770d5cf7f1 - + https://github.com/dotnet/emsdk - 0e3ff3ea9054b5ab771db20d5a87923d97287bdb + 6c7f38c614304c93cd392907df7d5e770d5cf7f1 https://github.com/dotnet/wcf @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 https://github.com/microsoft/vstest @@ -222,9 +222,9 @@ https://github.com/dotnet/xharness bc2e9e39a7b424f6e96af8d677d12ac58606753a - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 478a5adaa1aa5c..4abc581de68efa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 2.5.1-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 2.5.1-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 6.0.0-preview.1.102 @@ -175,9 +175,9 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.19 - 6.0.19 - 6.0.19 + 6.0.20 + 6.0.20 + 6.0.20 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e5784440d0bb29..0e10e7db69c77a 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -144,15 +148,17 @@ jobs: - template: /eng/common/templates/steps/component-governance.yml parameters: ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: disableComponentGovernance: false ${{ else }}: disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -220,7 +226,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -231,7 +237,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/global.json b/global.json index 49180d70c9d093..51640c121ac78b 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.116", + "version": "6.0.118", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.116" + "dotnet": "6.0.118" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23221.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23221.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23221.7", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23221.7", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23313.5", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From 3ba73ac3678d9f53730a6c23d9a20219ca0673ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 12:23:09 -0600 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/xharness build 20230609.2 (#87654) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 6.0.0-prerelease.23253.6 -> To Version 6.0.0-prerelease.23309.2 Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ef2073ccd06da7..2496faeb421ec2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "6.0.0-prerelease.23253.6", + "version": "6.0.0-prerelease.23309.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31ea6ca2042d1e..b64486cec2ab43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,13 +214,13 @@ https://github.com/mono/linker c8499798a2a09639174e2f5c694d6652794cc73d - + https://github.com/dotnet/xharness - bc2e9e39a7b424f6e96af8d677d12ac58606753a + 233cbdd69acedc940fc3342f66b649ac0fb44333 - + https://github.com/dotnet/xharness - bc2e9e39a7b424f6e96af8d677d12ac58606753a + 233cbdd69acedc940fc3342f66b649ac0fb44333 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 4abc581de68efa..fa8981e630360b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 1.0.1-prerelease-00006 17.4.0-preview-20220707-01 - 6.0.0-prerelease.23253.6 - 6.0.0-prerelease.23253.6 + 6.0.0-prerelease.23309.2 + 6.0.0-prerelease.23309.2 6.0.0-alpha.0.23226.4 2.4.2-pre.9 2.4.2 From 491271fb005dc57add44212af72923d1291f324b Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 5 Jul 2023 20:52:54 -0700 Subject: [PATCH 4/4] Update branding to 6.0.21 (#88444) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fa8981e630360b..851a89e62004da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.20 + 6.0.21 6 0 - 20 + 21 6.0.400 servicing