Skip to content

Backport pipeline configuration fixes from PRs #32781 and #32803 #32806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 3 commits into from
Closed

Backport pipeline configuration fixes from PRs #32781 and #32803 #32806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9540ef9
Initial plan
Copilot Nov 21, 2025
1876bb0
Backport PRs #32781 and #32803 - pipeline configuration fixes
Copilot Nov 21, 2025
50d2ba4
Restore DotNetBuilds storage account read tokens in common/variables.yml
Copilot Nov 21, 2025
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
6 changes: 3 additions & 3 deletions eng/pipelines/arcade/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ variables:
- name: TreatWarningsAsErrors
value: false
- name: _OfficialBuildIdArgs
value: /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true
value: ''
- name: ApiScanAppId
value: cbde2fca-1ca1-47f7-8212-fcdf1a556eb2
- name: ApiScanTenantId
value: 72f988bf-86f1-41af-91ab-2d7cd011db47
- name: ApiScanServiceConnectionId
value: 334a6802-ebad-4fb1-bc3b-105bcc70bda2
# Produce test-signed build for PR and Public builds
- ${{ if or(eq(variables['_RunAsPublic'], 'true'), eq(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(variables['_RunAsPublic'], 'true') }}:
# needed for darc (dependency flow) publishing
- name: _PublishArgs
value: ''
Expand All @@ -45,7 +45,7 @@ variables:
- name: _SignArgs
value: '/p:DotNetSignType=$(_SignType) /p:TeamName=$(TeamName)'
# Set up non-PR build from internal project
- ${{ if and(ne(variables['_RunAsPublic'], 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if or(eq(variables['Build.DefinitionName'], 'dotnet-maui'), eq(variables['Build.DefinitionName'], 'dotnet-maui-build')) }}:
# needed for darc (dependency flow) publishing
- name: _PublishArgs
value: >-
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/ci-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ variables:
- template: /eng/common/templates/variables/pool-providers.yml@self
- template: /eng/pipelines/common/variables.yml@self
- template: /eng/pipelines/arcade/variables.yml@self
- group: DotNetBuilds storage account read tokens
- group: AzureDevOps-Artifact-Feeds-Pats

parameters:
Expand Down
7 changes: 2 additions & 5 deletions eng/pipelines/common/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,16 @@ variables:
value: true
- name: _RunAsInternal
value: false
- name: _InternalBuildArgs
value: ''
- name: cfsNugetWarnLevel
value: warn
- name: nugetMultiFeedWarnLevel
value: none

- group: MAUI # This is the main MAUI variable group that contains secrets for the apple certificate

# Variable groups required for all builds
- ${{ if and(ne(variables['Build.DefinitionName'], 'maui-pr'), ne(variables['Build.DefinitionName'], 'dotnet-maui'), ne(variables['Build.DefinitionName'], 'maui-pr-devicetests')) }}:
- group: maui-provisionator # This is just needed for the provisionator
- group: MAUI # This is the main MAUI variable group that contains secret for the apple certificate

- ${{ if or(eq(variables['System.TeamProject'], 'DevDiv'), eq(variables['Build.DefinitionName'], 'dotnet-maui'), eq(variables['Build.DefinitionName'], 'dotnet-maui-build')) }}:
- name: internalProvisioning
Expand All @@ -76,8 +75,6 @@ variables:

- group: DotNetBuilds storage account read tokens
- group: AzureDevOps-Artifact-Feeds-Pats
- name: _InternalBuildArgs
value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) /p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)

- ${{ if eq(variables['Build.DefinitionName'], 'dotnet-maui') }}:
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/maui-release-internal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ parameters:
variables:
- template: /eng/common/templates/variables/pool-providers.yml@self

- group: DotNetBuilds storage account read tokens
- group: AzureDevOps-Artifact-Feeds-Pats
- group: maui-nuget-release # maui-nuget-release provides: pat--nuget--xamarinc--push--wildcard

Expand Down
4 changes: 2 additions & 2 deletions src/DotNet/DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<InstallWorkloadPacks Condition=" '$(InstallWorkloadPacks)' == '' ">true</InstallWorkloadPacks>
<InstallDotNet Condition=" '$(InstallDotNet)' == '' ">true</InstallDotNet>
<InternalAzureFeed>https://ci.dot.net/internal</InternalAzureFeed>
<DotNetFeedUrl>https://dotnetbuilds.blob.core.windows.net/public</DotNetFeedUrl>
<DotNetFeedUrl>https://ci.dot.net/public</DotNetFeedUrl>
<NugetArtifactsPath>$(MauiRootDirectory)/artifacts</NugetArtifactsPath>
<PrivateSdk>$(PRIVATE_BUILD)</PrivateSdk>
<PrivateSdk Condition=" '$(PrivateSdk)' == ''">false</PrivateSdk>
<PrivateSdk Condition=" '$(PrivateSdk)' == ''">false</PrivateSdk>
<_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
<_SkipUpdateBuildNumber>true</_SkipUpdateBuildNumber>
</PropertyGroup>
Expand Down