From da4d70e8202232d55534b97db044f08915b3896f Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Fri, 13 Jan 2023 03:45:23 +0000 Subject: [PATCH 01/11] Updated Microsoft.Diasymreader.Native to 16.11.23-beta.1 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dbc54d843a696a..25d3914a5d5040 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,7 +125,7 @@ 1.0.0-prerelease.21416.5 1.0.0-prerelease.21416.5 - 16.9.0-beta1.21055.5 + 16.11.23-beta1.PLACEHOLDER 2.0.0-beta1.20253.1 2.0.65 2.2.0 From d0aa44596dac23df0a4a0f0625f1b6e94bccc496 Mon Sep 17 00:00:00 2001 From: Tom McDonald Date: Fri, 13 Jan 2023 14:14:34 -0500 Subject: [PATCH 02/11] Update Microsoft.DiaSymReader.Native to 16.11.23-beta1.23063.1 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 25d3914a5d5040..3a239245be17b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -125,7 +125,7 @@ 1.0.0-prerelease.21416.5 1.0.0-prerelease.21416.5 - 16.11.23-beta1.PLACEHOLDER + 16.11.23-beta1.23063.1 2.0.0-beta1.20253.1 2.0.65 2.2.0 From d2d13505c61a4c810c2cb5b55b1a8e8b999c3ecd Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 13 Jan 2023 12:15:50 -0800 Subject: [PATCH 03/11] Add SetupNuGetSources calls --- eng/pipelines/coreclr/templates/build-job.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 7298a926120df9..43e4c1a27fba2d 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -175,6 +175,24 @@ jobs: continueOnError: false condition: and(succeeded(), in(variables['SignType'], 'real', 'test')) + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.osGroup, 'windows') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* From ab061966dbc23522bf2262ae536ea5dc51dc29f3 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 13 Jan 2023 13:00:38 -0800 Subject: [PATCH 04/11] Add more SetupNuGetSources --- eng/pipelines/libraries/build-job.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index 4faaff1ac7036a..a086318caa51b4 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -95,6 +95,24 @@ jobs: df -h displayName: Disk Usage before Build + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.osGroup, 'windows') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: $(_buildScript) -subset $(_subset) $(_buildAction) From 49849705455f3f82f5053900fa0841f26b9be936 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 13 Jan 2023 12:36:30 -0800 Subject: [PATCH 05/11] Add SetupNuGetSources calls --- eng/pipelines/common/global-build-job.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 1dcd4aa5a92527..48d39f35b80c9f 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -116,6 +116,24 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.osGroup, 'windows') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ each monoCrossAOTTargetOS in parameters.monoCrossAOTTargetOS }}: - task: DownloadPipelineArtifact@2 displayName: Download ${{monoCrossAOTTargetOS}} AOT offset files From ecb220c70c70f8733b53f06adfc449733fd8b953 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 16 Jan 2023 08:30:13 -0800 Subject: [PATCH 06/11] Add more SetupNuGetSources --- eng/pipelines/installer/jobs/base-job.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 84dec3be206cf9..d732604d449359 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -388,6 +388,24 @@ jobs: df -h displayName: Disk Usage before Build + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.osGroup, 'windows') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + # Build the default subset non-MacOS platforms - ${{ if ne(parameters.osGroup, 'OSX') }}: - script: $(BaseJobBuildCommand) From 131b1fd74f1f742a1e8a56a10d9189928a8d60a8 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 17 Jan 2023 09:00:14 -0800 Subject: [PATCH 07/11] Add PAT reference --- eng/pipelines/common/global-build-job.yml | 1 + eng/pipelines/coreclr/templates/build-job.yml | 2 ++ eng/pipelines/installer/jobs/base-job.yml | 3 +++ 3 files changed, 6 insertions(+) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 48d39f35b80c9f..f2c1747d4ce8d9 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -62,6 +62,7 @@ jobs: variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-HelixApi-Access + - group: AzureDevOps-Artifact-Feeds-Pats - name: _osParameter value: -os ${{ parameters.osGroup }} diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 43e4c1a27fba2d..3d9342fdd1c8c1 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -108,6 +108,8 @@ jobs: # Variables used by arcade to gather asset manifests - name: _DotNetPublishToBlobFeed value: true + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: AzureDevOps-Artifact-Feeds-Pats - name: officialBuildIdArg value: '' - ${{ if eq(parameters.isOfficialBuild, true) }}: diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index d732604d449359..06f0ab27382569 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -98,6 +98,9 @@ jobs: ${{ if in(parameters.osGroup, 'Linux', 'FreeBSD') }}: value: '/root/runtime/' + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: AzureDevOps-Artifact-Feeds-Pats + ### ### Platform-specific variable setup ### From 3315bf593a7b43d6a795d7599f81176805aa9c0f Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 17 Jan 2023 09:31:55 -0800 Subject: [PATCH 08/11] Add PAT reference and move sources setup --- eng/pipelines/libraries/base-job.yml | 19 +++++++++++++++++++ eng/pipelines/libraries/build-job.yml | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 63ef5c4e9ac4f8..ae4870f422d612 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -43,6 +43,7 @@ jobs: variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-HelixApi-Access + - group: AzureDevOps-Artifact-Feeds-Pats - _buildScriptFileName: build @@ -143,4 +144,22 @@ jobs: artifactName: '$(_runtimeArtifactName)' displayName: '$(runtimeFlavorName) build drop' + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if ne(parameters.osGroup, 'windows') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.osGroup, 'windows') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ parameters.steps }} diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index a086318caa51b4..4faaff1ac7036a 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -95,24 +95,6 @@ jobs: df -h displayName: Disk Usage before Build - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - ${{ if ne(parameters.osGroup, 'windows') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) - - ${{ if eq(parameters.osGroup, 'windows') }}: - - task: PowerShell@2 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) - - script: $(_buildScript) -subset $(_subset) $(_buildAction) From a0d4a0e4cf75051839d5a9387ed68ca76611072c Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 19 Jan 2023 17:35:14 +0000 Subject: [PATCH 09/11] Merged PR 29000: Do not set up nuget sources for source build Do not set up nuget sources for source build The source build scripts already do this. This will cause the working tree to be dirty, which breaks the stash command when shallow clones are used, like in CI or official builds. --- eng/pipelines/common/global-build-job.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index f2c1747d4ce8d9..424c5825511b3f 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -117,7 +117,9 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml - - ${{ if ne(variables['System.TeamProject'], 'public') }}: + # Do not set up nuget sources for source build because the source build scripts already do this. + # This will cause the working tree to be dirty, which breaks the stash command when shallow clones are used, like in CI or official builds. + - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(parameters.buildingOnSourceBuildImage, true)) }}: - ${{ if ne(parameters.osGroup, 'windows') }}: - task: Bash@3 displayName: Setup Private Feeds Credentials From e6b0b09cbfbbd668a58517d8e9e1a81eef1248c2 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Jan 2023 18:41:10 +0000 Subject: [PATCH 10/11] Merged PR 29007: Disable source-build leg for 6.0 Disable source-build for now. --- eng/pipelines/global-build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index 420ba301ad12ee..a023f96bd86f95 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -125,12 +125,12 @@ jobs: # # SourceBuild Build # -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: release - platforms: - - SourceBuild_Linux_x64 - jobParameters: - nameSuffix: SourceBuild - timeoutInMinutes: 90 +#- template: /eng/pipelines/common/platform-matrix.yml +# parameters: +# jobTemplate: /eng/pipelines/common/global-build-job.yml +# buildConfig: release +# platforms: +# - SourceBuild_Linux_x64 +# jobParameters: +# nameSuffix: SourceBuild +# timeoutInMinutes: 90 From 702e563b7b8d2354b490b7daee3fde16a6af9315 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 19 Jan 2023 23:23:03 +0000 Subject: [PATCH 11/11] Merged PR 29013: Disable official source-build leg. Disable official source-build leg. --- eng/pipelines/global-build.yml | 18 +++++++++--------- eng/pipelines/runtime-official.yml | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index a023f96bd86f95..420ba301ad12ee 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -125,12 +125,12 @@ jobs: # # SourceBuild Build # -#- template: /eng/pipelines/common/platform-matrix.yml -# parameters: -# jobTemplate: /eng/pipelines/common/global-build-job.yml -# buildConfig: release -# platforms: -# - SourceBuild_Linux_x64 -# jobParameters: -# nameSuffix: SourceBuild -# timeoutInMinutes: 90 +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/common/global-build-job.yml + buildConfig: release + platforms: + - SourceBuild_Linux_x64 + jobParameters: + nameSuffix: SourceBuild + timeoutInMinutes: 90 diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index c353dfa095666d..445d91f0c79ef9 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -326,19 +326,19 @@ stages: # # Build Sourcebuild leg # - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - buildConfig: Release - helixQueueGroup: ci - platforms: - - SourceBuild_Linux_x64 - jobParameters: - nameSuffix: SourceBuild - extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml - extraStepsParameters: - name: SourceBuildPackages - timeoutInMinutes: 95 +# - template: /eng/pipelines/common/platform-matrix.yml +# parameters: +# jobTemplate: /eng/pipelines/common/global-build-job.yml +# buildConfig: Release +# helixQueueGroup: ci +# platforms: +# - SourceBuild_Linux_x64 +# jobParameters: +# nameSuffix: SourceBuild +# extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml +# extraStepsParameters: +# name: SourceBuildPackages +# timeoutInMinutes: 95 #