Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 4 additions & 35 deletions azure-pipelines-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,8 @@ variables:
value: true
- name: _DotNetArtifactsCategory
value: ASPNETENTITYFRAMEWORK6
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- group: DotNet-MSRC-Storage
- name: _InternalRuntimeDownloadArgs
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: _InternalRuntimeDownloadArgs
value: ''
- name: _InternalRuntimeDownloadArgs
value: ''
- template: /eng/common/templates/variables/pool-providers.yml

trigger:
Expand Down Expand Up @@ -45,23 +39,12 @@ stages:
jobs:
- job: Windows
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals 1es-windows-2022-open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals 1es-windows-2022
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals 1es-windows-2022-open
timeoutInMinutes: 180
variables:
- _AdditionalBuildArgs: ''
- _InternalBuildArgs: ''
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- _SignType: real
- _InternalBuildArgs: /p:DotNetSignType=$(_SignType)
/p:TeamName=$(_TeamName)
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
steps:
- checkout: self
clean: true
Expand All @@ -79,14 +62,6 @@ stages:
inputs:
command: custom
arguments: 'locals all -clear'
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- 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: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_InternalBuildArgs)
$(_InternalRuntimeDownloadArgs) $(_AdditionalBuildArgs)
name: Build
Expand All @@ -108,9 +83,3 @@ stages:
artifactType: Container
parallel: true

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: eng\common\templates\post-build\post-build.yml
parameters:
# Symbol validation isn't being very reliable lately. This should be enabled back
# once this issue is resolved: https://github.com/dotnet/arcade/issues/2871
enableSymbolValidation: false
2 changes: 1 addition & 1 deletion azure-pipelines-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,6 @@ extends:
inputs:
useDotNetTask: false
packageParentPath: '$(Pipeline.Workspace)/PackageArtifactsSbom'
packagesToPush: '$(Pipeline.Workspace)/PackageArtifactsSbom/**/*.nupkg;!$(Pipeline.Workspace)/PackageArtifactsSbom/**/*.symbols.nupkg'
packagesToPush: $(Pipeline.Workspace)/PackageArtifactsSbom/**/*.nupkg
nuGetFeedType: external
publishFeedCredentials: nuget.org (efcore client owner)