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
2 changes: 1 addition & 1 deletion .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: ./.github/workflows/log-disk-space

- name: Install Android workload
run: dotnet workload install android
run: dotnet workload install android --configfile NuGet.config

- name: Log disk space (after Android workload)
uses: ./.github/workflows/log-disk-space
Expand Down
2 changes: 1 addition & 1 deletion build/ci/setup-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ steps:
ignoreLASTEXITCODE: true

- pwsh: |
dotnet workload install maui-android android --verbosity diag --source $(dotnetWorkloadSource)
dotnet workload install maui-android android --verbosity diag --configfile NuGet.config
if ($LASTEXITCODE -ne 0) {
Write-Host "##vso[task.logissue type=error]Failed to install workloads."
Write-Host "##vso[task.complete result=Failed;]"
Expand Down
1 change: 0 additions & 1 deletion build/ci/variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ variables:
# Tool variables
dotnetVersion: '10.x' # .NET version to install on agent
dotnetFrameworkVersion: 9 # The number to use for TF (eg: netX.0-android)
dotnetWorkloadSource: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json' # NuGet source for workloads

# Standard test variables
standardTestProject: tests/allpackages/AllPackagesTests.csproj # Standard tests project file
Expand Down
8 changes: 8 additions & 0 deletions nuget-diff.cake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ var ROOT_DIR = MakeAbsolute((DirectoryPath)Argument("root", "."));
var ARTIFACTS_DIR = MakeAbsolute((DirectoryPath)Argument("artifacts", ROOT_DIR.Combine("output").FullPath));
var CACHE_DIR = MakeAbsolute((DirectoryPath)Argument("cache", ROOT_DIR.Combine("externals/api-diff").FullPath));
var OUTPUT_DIR = MakeAbsolute((DirectoryPath)Argument("output", ROOT_DIR.Combine("output/api-diff").FullPath));
var NUGET_SOURCE = XmlPeek(
ROOT_DIR.CombineWithFilePath("NuGet.config"),
"/configuration/packageSources/add[@key='dotnet-public']/@value");

if (string.IsNullOrWhiteSpace(NUGET_SOURCE)) {
throw new Exception("The dotnet-public package source was not found in NuGet.config.");
}


// SECTION: Main Script
Expand Down Expand Up @@ -44,6 +51,7 @@ if (!nupkgs.Any()) {
.Append("--group-ids")
.Append("--ignore-unchanged")
.Append("--compare-nuget-structure")
.AppendSwitch("--source", "=", NUGET_SOURCE)
.AppendSwitchQuoted("--output", OUTPUT_DIR.FullPath)
.AppendSwitchQuoted("--cache", CACHE_DIR.Combine("package-cache").FullPath)
});
Expand Down
Loading