Skip to content

Commit

Permalink
Workaround failing official builds (dotnet#75898)
Browse files Browse the repository at this point in the history
  • Loading branch information
jjonescz committed Nov 25, 2024
1 parent bc1c301 commit 8094ac0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ extends:
/p:DotnetPublishUsingPipelines=true
/p:IgnoreIbcMergeErrors=true
/p:GenerateSbom=true
/p:ForceAzureComSources=true
condition: succeeded()

- template: /eng/common/templates-official/steps/generate-sbom.yml@self
Expand Down
9 changes: 9 additions & 0 deletions eng/InternalTools.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
$(RestoreSources);
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
</RestoreSources>

<!-- Workaround for https://github.com/dotnet/dnceng/issues/4441. -->
<RestoreSources Condition="'$(ForceAzureComSources)' == 'true'">
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
https://pkgs.dev.azure.com/devdiv/_packaging/VS/nuget/v3/index.json;
https://pkgs.dev.azure.com/devdiv/_packaging/Engineering/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json
</RestoreSources>
</PropertyGroup>

<ItemGroup Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
Expand Down

0 comments on commit 8094ac0

Please sign in to comment.