From 829fe3ac6de308ea9d4252d36e4ec72d1526044e Mon Sep 17 00:00:00 2001
From: Meera Ruxmohan <mruxmohan@microsoft.com>
Date: Tue, 19 Nov 2024 09:02:14 -0800
Subject: [PATCH 1/4] Add upstream sources to slngen nuget feed

---
 NuGet.config | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f8d7227..eae6767 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -12,20 +12,6 @@
   </activePackageSource>
   <packageSources>
     <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
-    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
+    <add key="slngen-aggregate" value="https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/slngen-aggregate/nuget/v3/index.json" />
   </packageSources>
-  <packageSourceMapping>
-    <packageSource key="nuget.org">
-      <package pattern="Microsoft.*" />
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet10">
-      <package pattern="Microsoft.*" />
-    </packageSource>
-    <packageSource key="dotnet-tools">
-      <package pattern="Microsoft.*" />
-    </packageSource>
-  </packageSourceMapping>
 </configuration>
\ No newline at end of file

From 9533637c36b2cba346407cb1f5326d6db695dd67 Mon Sep 17 00:00:00 2001
From: Meera Ruxmohan <mruxmohan@microsoft.com>
Date: Tue, 19 Nov 2024 10:23:42 -0800
Subject: [PATCH 2/4] Keep multiple feeds specified in nuget.config

---
 NuGet.config | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index eae6767..46b4487 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -12,6 +12,11 @@
   </activePackageSource>
   <packageSources>
     <clear />
-    <add key="slngen-aggregate" value="https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/slngen-aggregate/nuget/v3/index.json" />
+    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
   </packageSources>
+  <auditSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </auditSources>
 </configuration>
\ No newline at end of file

From 4f82eaa6c9f636b38f75163e2834113de89c445a Mon Sep 17 00:00:00 2001
From: Meera Ruxmohan <mruxmohan@microsoft.com>
Date: Tue, 19 Nov 2024 10:44:47 -0800
Subject: [PATCH 3/4] Add dotnet-public as a package source and move nuget.org
 to audit source

---
 NuGet.config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index 46b4487..48415f0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -12,8 +12,9 @@
   </activePackageSource>
   <packageSources>
     <clear />
-    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
+    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
   </packageSources>
   <auditSources>
     <clear />

From 655810b38e0a06bd1589c5fe222f8f148f4a77ff Mon Sep 17 00:00:00 2001
From: Meera Ruxmohan <mruxmohan@microsoft.com>
Date: Thu, 21 Nov 2024 13:13:09 -0800
Subject: [PATCH 4/4] Add back package source mapping

---
 NuGet.config | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/NuGet.config b/NuGet.config
index 48415f0..03424ac 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -16,6 +16,18 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
   </packageSources>
+  <packageSourceMapping>
+    <packageSource key="dotnet-public">
+      <package pattern="Microsoft.*" />
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet-tools">
+      <package pattern="Microsoft.*" />
+    </packageSource>
+    <packageSource key="dotnet10">
+      <package pattern="Microsoft.*" />
+    </packageSource>
+  </packageSourceMapping>
   <auditSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />