Skip to content

[ci] Enable source index #26557

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

Merged
merged 4 commits into from
Dec 17, 2024
Merged

[ci] Enable source index #26557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6656876
Can we bump this sdk
rmarinho Nov 28, 2024
9dba3fb
Enable source index
rmarinho Nov 28, 2024
23ba119
Update global.json
rmarinho Dec 16, 2024
4ab0609
Update NuGet.config
rmarinho Dec 16, 2024
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
5 changes: 3 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
<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" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
Expand Down
16 changes: 10 additions & 6 deletions eng/pipelines/azure-pipelines-internal.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "9.0.100"
"dotnet": "9.0.101"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.44",
Expand Down
Loading