mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Readded public vs internal statements since removing them doesn't matter. Trying 1es-ubuntu-2204 since the other is not 1ES PT compatible.

Browse source
This commit is contained in:
Michael Yanni 2024-03-14 09:46:32 -07:00
parent e5bba6c92a
commit dab13ec5ec
2 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.vsts-ci.yml
View file

@ -25,11 +25,14 @@ variables:
- group: DotNet-Installer-SDLValidation-Params - group: DotNet-Installer-SDLValidation-Params
- name: _PublishUsingPipelines - name: _PublishUsingPipelines
value: true value: true
- group: DotNetBuilds storage account read tokens
- name: _InternalRuntimeDownloadArgs - name: _InternalRuntimeDownloadArgs
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal value: ''
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) - group: DotNetBuilds storage account read tokens
- name: _InternalRuntimeDownloadArgs
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
- template: /eng/common/templates-official/variables/pool-providers.yml - template: /eng/common/templates-official/variables/pool-providers.yml
resources: resources:
@ -91,9 +94,14 @@ extends:
# Build Retry Configuration # Build Retry Configuration
- job: Publish_Build_Configuration - job: Publish_Build_Configuration
pool: pool:
name: $(DncEngInternalBuildPool) ${{ if eq(variables['System.TeamProject'], 'public') }}:
image: windows.vs2022preview.amd64 name: $(DncEngPublicBuildPool)
os: windows image: windows.vs2022preview.amd64.open
os: windows
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool)
image: windows.vs2022preview.amd64
os: windows
steps: steps:
- task: 1ES.PublishPipelineArtifact@1 - task: 1ES.PublishPipelineArtifact@1
displayName: Publish Build Config displayName: Publish Build Config

22
eng/build.yml
View file

@ -81,14 +81,24 @@ jobs:
${{ if eq(parameters.agentOs, 'Windows_NT') }}: ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
enableMicrobuild: true enableMicrobuild: true
pool: pool:
name: $(DncEngInternalBuildPool) ${{ if eq(variables['System.TeamProject'], 'public') }}:
image: windows.vs2022preview.amd64 name: $(DncEngPublicBuildPool)
os: windows image: windows.vs2022.amd64.open
os: windows
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool)
image: windows.vs2022preview.amd64
os: windows
${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.agentOs, 'Linux') }}:
pool: pool:
name: $(DncEngInternalBuildPool) ${{ if eq(variables['System.TeamProject'], 'public') }}:
image: build.ubuntu.2204.amd64 name: $(DncEngPublicBuildPool)
os: linux image: build.ubuntu.2204.amd64.open
os: linux
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool)
image: 1es-ubuntu-2204
os: linux
container: ${{ parameters.container }} container: ${{ parameters.container }}
${{ if eq(parameters.agentOs, 'Darwin') }}: ${{ if eq(parameters.agentOs, 'Darwin') }}:
pool: pool: