From 273bd8ad3f96804d2044e8b028dd5b746981e5a9 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Wed, 29 Jan 2025 11:03:01 -0800
Subject: [PATCH 1/2] 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

---
 azure-pipelines-official.yml |  1 -
 eng/InternalTools.props      | 13 -------------
 2 files changed, 14 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..122374b6b79f2 100644
--- a/eng/InternalTools.props
+++ b/eng/InternalTools.props
@@ -6,19 +6,6 @@
           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'">

From 45bc91dbc2b13a5b50e1505a2c8f94b9fe591866 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Wed, 29 Jan 2025 16:04:39 -0800
Subject: [PATCH 2/2] Remove all extra supporting feeds

---
 eng/InternalTools.props | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/eng/InternalTools.props b/eng/InternalTools.props
index 122374b6b79f2..525bd5f56f751 100644
--- a/eng/InternalTools.props
+++ b/eng/InternalTools.props
@@ -1,13 +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>
-    </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)"/>
@@ -16,5 +8,4 @@
         <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)"/>
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtVersion)"/>
     </ItemGroup>
-
 </Project>