From 5cece2ea25009a746cdda6f73dc2931969b0c54d Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Thu, 30 Jan 2025 08:04:16 -0800
Subject: [PATCH] Remove unneeded additional sources and ForceAzureDevCom
 sources switch (#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
---
 azure-pipelines-official.yml |  1 -
 eng/InternalTools.props      | 22 ----------------------
 2 files changed, 23 deletions(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index 058212a9a2268..d2a8322ffaa92 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -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
diff --git a/eng/InternalTools.props b/eng/InternalTools.props
index 110ac628fd153..525bd5f56f751 100644
--- a/eng/InternalTools.props
+++ b/eng/InternalTools.props
@@ -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)"/>
@@ -29,5 +8,4 @@
         <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)"/>
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtVersion)"/>
     </ItemGroup>
-
 </Project>