Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
7 changes: 5 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@
<add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
<!-- Added manually for .NET 8 MAUI -->-
<add key="darc-pub-dotnet-maui-a33a875e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-a33a875e/nuget/v3/index.json" /></packageSources>
<!-- Added manually for .NET 8 MAUI -->
<add key="darc-pub-dotnet-maui-a33a875e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-maui-a33a875e/nuget/v3/index.json" />
<!-- Added manually for .NET 8.0.12 -->
<add key="darc-pub-dotnet-runtime-c1ae9626" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c1ae9626/nuget/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
Expand Down
16 changes: 10 additions & 6 deletions eng/pipelines/azure-pipelines-internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ variables:

parameters:
- name: pushMauiPackagesToMaestro
type: boolean
default: true

- name: provisionatorChannel
displayName: 'Provisionator channel'
type: string
default: 'latest' # Support for launching a build against a Provisionator PR (e.g., pr/[github-account-name]/[pr-number]) as a means to test in-progress Provisionator changes
- name: enableSourceIndex
type: boolean
default: true

- name: VM_IMAGE_HOST
type: object
Expand All @@ -107,6 +107,7 @@ parameters:
artifactsPath: '$(Build.ArtifactStagingDirectory)'

- name: Skip1ESComplianceTasks
type: boolean
default: false

resources:
Expand Down Expand Up @@ -151,9 +152,12 @@ extends:
enablePublishBuildAssets: true
enableTelemetry: true
enableSourceBuild: false
enableSourceIndex: false
enableSourceIndex: ${{ parameters.enableSourceIndex }}
sourceIndexParams:
sourceIndexBuildCommand: build.cmd -restore -build -ci -warnAsError 0 /bl:$(Build.Arcade.LogsPath)sourceIndexBuild.binlog /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This mixes - and /, do you want to pick one to be consistent?

binlogPath: $(Build.Arcade.LogsPath)sourceIndexBuild.binlog
publishAssetsImmediately: true
# Publish build logs
# Publish build logs
enablePublishBuildArtifacts: true
# Publish test logs
enablePublishTestResults: true
Expand Down
9 changes: 3 additions & 6 deletions eng/pipelines/azure-pipelines-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,8 @@ variables:

parameters:
- name: pushMauiPackagesToMaestro
default: true

- name: provisionatorChannel
displayName: 'Provisionator channel'
type: string
default: 'latest'
type: boolean
default: true

- name: VM_IMAGE_HOST
type: object
Expand All @@ -106,6 +102,7 @@ parameters:
artifactsPath: '$(Build.ArtifactStagingDirectory)'

- name: Skip1ESComplianceTasks
type: boolean
default: true

stages:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/build-test-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ steps:
- ${{ if and(eq(parameters.isWindows, 'true'), ne(parameters.runAsPublic, 'true') ) }}:

- script: ${{ parameters.buildScript }}
-pack
-restore -pack
-sign $(_SignArgs)
-publish $(_PublishArgs)
-configuration $(_BuildConfig)
/bl:${{ parameters.repoLogPath }}/pack.binlog
/bl:${{ parameters.repoLogPath }}pack.binlog
$(_OfficialBuildIdArgs)
displayName: Pack, Sign & Publish

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "9.0.100"
"dotnet": "9.0.102-servicing.24577.25"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44",
Expand Down
Loading