Skip to content

Commit

Permalink
Remove unneeded additional sources and ForceAzureDevCom sources switch (
Browse files Browse the repository at this point in the history
#76964)

* Remove unneeded additional sources and ForceAzureDevCom sources switch
The forced azure-dev-com appears no longer necessary, and dotnet-core-internal tooling is already added from internal tools nuget.config

* Remove all extra supporting feeds
  • Loading branch information
mmitche authored Jan 30, 2025
1 parent 250065a commit 5cece2e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
1 change: 0 additions & 1 deletion azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,6 @@ 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
22 changes: 0 additions & 22 deletions eng/InternalTools.props
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project>
<PropertyGroup>
<RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
$(RestoreSources);
https://devdiv.pkgs.visualstudio.com/_packaging/Engineering/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
</RestoreSources>
<RestoreSources>
$(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'">
<!-- Add explicit top-level dependencies to override the implicit versions brought in by Microsoft.DevDiv.Optimization.Data.PowerShell -->
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)"/>
Expand All @@ -29,5 +8,4 @@
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)"/>
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtVersion)"/>
</ItemGroup>

</Project>

0 comments on commit 5cece2e

Please sign in to comment.