From a886564280d5f6a3f79f4f26768ca83a9346ab81 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Thu, 15 Jun 2023 13:51:20 +0200 Subject: [PATCH 01/13] Add localization setup for main and release branches --- .vsts-dotnet.yml | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index 29f6d2e126a..d9a347830de 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -36,20 +36,39 @@ variables: value: .NETCore - name: _DotNetValidationArtifactsCategory value: .NETCoreValidation + - name: EnableReleaseOneLocBuild + value: false stages: - stage: build displayName: Build jobs: - - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/vs17.2') }}: # should track next-release's active dev branch - - template: /eng/common/templates/job/onelocbuild.yml - parameters: - LclSource: lclFilesfromPackage - LclPackageId: 'LCL-JUNO-PROD-MSBUILD' - MirrorRepo: 'msbuild' - MirrorBranch: 'main' # should match condition above - + - ${{ if and( ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + # The localization setup for release/ branches. Note difference in LclPackageId. main branch is handled separately below. + # Used for vs17.2, vs17.4, vs17.6 etc. branches only. + # When the branch is setup for localization (the localization ticket needs to be created - https://aka.ms/ceChangeLocConfig, requesting change from one release branch to another), + # set 'EnableReleaseOneLocBuild' to true. + - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/vs') }}: + - template: /eng/common/templates/job/onelocbuild.yml + parameters: + MirrorRepo: 'msbuild' + LclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-MSBUILDREL' + MirrorBranch: replace(variables['Build.SourceBranch'], 'refs/heads/', '') + JobNameSuffix: '_release' + condition: $(EnableReleaseOneLocBuild) + # The localization setup for main branch. Note difference in package ID. Should not be used with release/ branches. + - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: + - template: /eng/common/templates/job/onelocbuild.yml + parameters: + MirrorRepo: 'msbuild' + LclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-MSBUILD' + MirrorBranch: 'main' + JobNameSuffix: '_main' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') + - job: Windows_NT pool: name: VSEngSS-MicroBuild2022-1ES From 19c0cf6193597f733b2a551d22383d4d151f373d Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Thu, 15 Jun 2023 16:26:14 +0200 Subject: [PATCH 02/13] Bump version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9af4ecf5573..e0a3006a471 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.2.11 + 17.2.12 release 15.1.0.0 preview From a54bbdd25130b22f386153c4b013b02a4d2aa629 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Thu, 15 Jun 2023 17:09:05 +0200 Subject: [PATCH 03/13] Bump version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2628110ea7c..317ac21718e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.4.6 + 17.4.7 release 15.1.0.0 preview From eac3fbf6a9e601e4e27714e26a7cb0e9b72b3459 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Thu, 15 Jun 2023 18:09:12 +0200 Subject: [PATCH 04/13] Fix expressions for OneLocBuild --- .vsts-dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index d9a347830de..77449ca0597 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -55,9 +55,9 @@ stages: MirrorRepo: 'msbuild' LclSource: lclFilesfromPackage LclPackageId: 'LCL-JUNO-PROD-MSBUILDREL' - MirrorBranch: replace(variables['Build.SourceBranch'], 'refs/heads/', '') + MirrorBranch: ${{ replace(variables['Build.SourceBranch'], 'refs/heads/', '') }} JobNameSuffix: '_release' - condition: $(EnableReleaseOneLocBuild) + condition: ${{ variables.EnableReleaseOneLocBuild }} # The localization setup for main branch. Note difference in package ID. Should not be used with release/ branches. - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: - template: /eng/common/templates/job/onelocbuild.yml From f136f1d9b32855ffb8d909690501060f59d83055 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Thu, 15 Jun 2023 18:12:05 +0200 Subject: [PATCH 05/13] Bump version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e0a3006a471..caced6fbc76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.2.12 + 17.2.13 release 15.1.0.0 preview From df9585461664f848c36620fe8cfaa0cbaf72dd80 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Thu, 15 Jun 2023 18:58:47 +0200 Subject: [PATCH 06/13] Bump version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 317ac21718e..bb84d2f3bfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.4.7 + 17.4.8 release 15.1.0.0 preview From e65f73130bb5019f7aa079847fa5e02928df5e80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 21:10:46 +0000 Subject: [PATCH 07/13] Update dependencies from https://github.com/dotnet/arcade build 20230613.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.23221.7 -> To Version 6.0.0-beta.23313.5 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 16 +++++++++++----- global.json | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0bf169124e..58e62b8e804 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 @@ -14,9 +14,9 @@ https://github.com/dotnet/roslyn eaf9823eb18af4972cb5b8e299a350d1985be33d - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 diff --git a/eng/Versions.props b/eng/Versions.props index caced6fbc76..3f63134eebc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) - 6.0.0-beta.23221.7 + 6.0.0-beta.23313.5 6.0.0-preview.2.21154.6 4.2.0-2.22167.6 6.2.0-preview.2.109 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e5784440d0b..0e10e7db69c 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 28ab997cd2a..3d882dd7954 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23221.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5" } } From b0d6785f3817988e7455bd5b38eb9c0883f3e8df Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Fri, 16 Jun 2023 11:00:31 +0200 Subject: [PATCH 08/13] Update sdk version to bump pulled runtime --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 28ab997cd2a..158f7dc0498 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "6.0.311", + "dotnet": "6.0.313", "vs": { "version": "17.2.1" }, From 44c2f3ac1223747b27066e6a171d9cd2ba05a557 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Fri, 16 Jun 2023 11:50:35 +0200 Subject: [PATCH 09/13] Bump Version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index caced6fbc76..6727d0cd6d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.2.13 + 17.2.14 release 15.1.0.0 preview From 17dbef7002d862d404b4df956b9678137a938c20 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Fri, 16 Jun 2023 12:07:47 +0200 Subject: [PATCH 10/13] Update vulnerable System.Security.Cryptography.Pkcs --- eng/dependabot/Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props index ba6ffbf90be..724cce83a5d 100644 --- a/eng/dependabot/Packages.props +++ b/eng/dependabot/Packages.props @@ -46,7 +46,7 @@ - + From 2e08259d50c778ef961dc777e9e86b436cd0830a Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Fri, 16 Jun 2023 17:58:11 +0200 Subject: [PATCH 11/13] Bump version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3f63134eebc..afaae0ca434 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.2.13 + 17.2.14 release 15.1.0.0 preview From 689ca02b34a7aeb0ff2899cd72e4a19c322085fc Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Sat, 17 Jun 2023 00:19:05 +0200 Subject: [PATCH 12/13] Bump version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8de5b9dafe7..da594622975 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.6.6 + 17.6.7 release 17.5.0 15.1.0.0 From 7fd8e63db9c5fa96da72077f7e82f83060bbbced Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Sat, 17 Jun 2023 00:30:54 +0200 Subject: [PATCH 13/13] Bum version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 317ac21718e..bb84d2f3bfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.4.7 + 17.4.8 release 15.1.0.0 preview