Fix single-feed error with Release Studio nuget.config (#1549)

(cherry picked from commit 376cd32)
microsoft · Feb 11, 2025 · b6579b2 · b6579b2
1 parent 19645c5
commit b6579b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/eng/release-studio/NuGet.config b/eng/release-studio/NuGet.config
@@ -6,13 +6,8 @@
 <configuration>
   <packageSources>
     <clear />
+    <!-- Only one feed is allowed. https://aka.ms/cfs/nuget -->
     <add key="MicroBuildToolset" value="https://pkgs.dev.azure.com/dnceng/_packaging/MicroBuildToolset/nuget/v3/index.json" />
-    <!--
-      When the .NET SDK version doesn't match the TargetFramework, get targeting
-      packs (Microsoft.NETCore.App.Ref, Microsoft.WindowsDesktop.App.Ref, and
-      Microsoft.AspNetCore.App.Ref) from here.
-    -->
-    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

diff --git a/eng/release-studio/ReleaseStudio.csproj b/eng/release-studio/ReleaseStudio.csproj
@@ -3,7 +3,17 @@
 
   <!-- Minimal info for '.csproj' to work. -->
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <!--
+      We only have a single NuGet feed, and that feed doesn't have any targeting
+      packs (Microsoft.NETCore.App.Ref, Microsoft.WindowsDesktop.App.Ref, and
+      Microsoft.AspNetCore.App.Ref). To avoid downloading any targeting packs,
+      we need the Target Framework to match the .NET SDK exactly. The SDK may be
+      upgraded without our knowledge, so a hard-coded version is fragile. Use
+      BundledNETCoreAppTargetFrameworkVersion to be flexible.
+
+      We aren't actually building an app anyway, we just need the RM package.
+    -->
+    <TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/eng/signing/NuGet.config b/eng/signing/NuGet.config
@@ -6,6 +6,7 @@
 <configuration>
   <packageSources>
     <clear />
+    <!-- Multiple feeds are allowed, but only because they are both in dnceng/public. -->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
   </packageSources>