From 6c112ccb2bdf03cb2bb7f32b1239fd326ccf1b8c Mon Sep 17 00:00:00 2001 From: tmat Date: Tue, 2 May 2023 08:58:25 -0700 Subject: [PATCH] Update infra: disable PDB conversion, clean up yaml --- azure-pipelines-microbuild.yml | 62 ---------------------------------- azure-pipelines.yml | 29 +++++----------- eng/Versions.props | 5 +-- 3 files changed, 11 insertions(+), 85 deletions(-) delete mode 100644 azure-pipelines-microbuild.yml diff --git a/azure-pipelines-microbuild.yml b/azure-pipelines-microbuild.yml deleted file mode 100644 index 8053cb32..00000000 --- a/azure-pipelines-microbuild.yml +++ /dev/null @@ -1,62 +0,0 @@ -resources: -- repo: self - clean: true -queue: - name: VSEng-MicroBuildVS2017 - demands: Cmd -variables: - BuildConfiguration: Release - TeamName: Roslyn - -steps: -- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1 - displayName: Install Signing Plugin - inputs: - signType: $(SignType) - esrpSigning: true - condition: and(succeeded(), ne(variables['SignType'], '')) - -- script: eng\common\CIBuild.cmd - -configuration $(BuildConfiguration) - /p:OfficialBuildId=$(BUILD.BUILDNUMBER) - /p:DotNetSignType=$(SignType) - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - displayName: Build - -- task: NuGetPublisher@0 - displayName: Publish NuGet Packages to MyGet - inputs: - searchPattern: 'artifacts\packages\$(BuildConfiguration)\Shipping\*.nupkg' - connectedServiceName: 'SymReaderConverter NuGet feed' - nuGetVersion: 4.0.0.2283 - condition: succeeded() - -- task: PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\$(_configuration)' - ArtifactName: 'Logs' - continueOnError: true - condition: not(succeeded()) - -- task: PublishTestResults@1 - displayName: Publish Test Results - inputs: - testRunner: XUnit - testResultsFiles: 'artifacts/TestResults/$(BuildConfiguration)/*.xml' - mergeTestResults: true - testRunTitle: 'Unit Tests' - condition: always() - -# Archive NuGet packages to DevOps. -- task: PublishBuildArtifacts@1 - displayName: Publish Artifact Packages - inputs: - PathtoPublish: 'artifacts\packages\$(BuildConfiguration)' - ArtifactName: 'Packages' - condition: succeeded() - -- task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1 - displayName: Cleanup - condition: always() diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 707b7a01..1483a2a4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,9 +10,8 @@ pr: - docs/* # Run official build every day at midnight, if code has changed since the last run. -schedules: -- cron: "0 0 * * *" - displayName: Daily Official Build +trigger: + batch: true branches: include: - main @@ -21,10 +20,6 @@ variables: - template: /eng/common/templates/variables/pool-providers.yml - name: _TeamName value: Roslyn - - name: _PublishUsingPipelines - value: true - - name: _DotNetArtifactsCategory - value: .NETCore stages: - stage: build @@ -42,9 +37,10 @@ stages: enablePublishBuildArtifacts: true enablePublishTestResults: true enablePublishBuildAssets: true - enablePublishUsingPipelines: $(_PublishUsingPipelines) + enablePublishUsingPipelines: true enableTelemetry: true - helixRepo: dotnet/symreader + enableSourceBuild: false + helixRepo: dotnet/symreader-converter jobs: - job: Windows pool: @@ -56,19 +52,13 @@ stages: variables: # Only enable publishing in official builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1 # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT - - group: DotNet-Blob-Feed - group: Publish-Build-Assets - name: _OfficialBuildArgs value: /p:DotNetSignType=$(_SignType) - /p:TeamName=$(_TeamName) - /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1) - /p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) - /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) - /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory) - /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=true + /p:OfficialBuildId=$(BUILD.BUILDNUMBER) # else - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - name: _OfficialBuildArgs @@ -79,18 +69,15 @@ stages: Debug: _BuildConfig: Debug _SignType: test - _DotNetPublishToBlobFeed: false _BuildArgs: '' Release: _BuildConfig: Release # PRs or external builds are not signed. ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: _SignType: test - _DotNetPublishToBlobFeed: false _BuildArgs: '' ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: _SignType: real - _DotNetPublishToBlobFeed: true _BuildArgs: $(_OfficialBuildArgs) steps: - checkout: self diff --git a/eng/Versions.props b/eng/Versions.props index 84c7df36..f72412d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,12 +5,13 @@ 1.1.0 beta2 true + + false true - true 4.1.0-1.21523.2 4.1.0-1.21523.2 - 1.4.0-beta2-21528-01 + 2.0.0 17.0.0-beta1.21524.1 1.7.0-beta-21525-03 1.0.0-beta3.21151.2