From d9b15a678e71466b9695c5ee0350fa1e1b962fbb Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Thu, 17 Oct 2024 13:58:29 -0700
Subject: [PATCH 1/6] Update Util.csproj to use the same TargetFramework
 assignment logic as other projects in ScenarioMeasurement. Also removed the
 no longer used LibrariesTargetFramework property from the Scenario
 Measurement Directory.Build.props.

---
 src/tools/ScenarioMeasurement/Directory.Build.props | 1 -
 src/tools/ScenarioMeasurement/Util/Util.csproj      | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tools/ScenarioMeasurement/Directory.Build.props b/src/tools/ScenarioMeasurement/Directory.Build.props
index a0c5daa8639..d6708d94c45 100644
--- a/src/tools/ScenarioMeasurement/Directory.Build.props
+++ b/src/tools/ScenarioMeasurement/Directory.Build.props
@@ -3,7 +3,6 @@
     <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
     <PropertyGroup>
         <FallbackTargetFramework>net8.0</FallbackTargetFramework>
-        <LibrariesTargetFramework>net8.0</LibrariesTargetFramework>
         <NoWarn>$(NoWarn);CS8002</NoWarn>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
diff --git a/src/tools/ScenarioMeasurement/Util/Util.csproj b/src/tools/ScenarioMeasurement/Util/Util.csproj
index 0fcc3f4d488..f7b684ee4b5 100644
--- a/src/tools/ScenarioMeasurement/Util/Util.csproj
+++ b/src/tools/ScenarioMeasurement/Util/Util.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>$(LibrariesTargetFramework)</TargetFramework>
+    <TargetFramework>$(PERFLAB_TARGET_FRAMEWORKS)</TargetFramework>
+    <!-- Supported target frameworks -->
+    <TargetFramework Condition="'$(TargetFramework)' == ''">$(FallbackTargetFramework)</TargetFramework>
     <RootNamespace>ScenarioMeasurement</RootNamespace>
   </PropertyGroup>
 

From 7a2f37fe58874d2948cdef2d42aa8d3abafdeba2 Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Thu, 17 Oct 2024 15:44:33 -0700
Subject: [PATCH 2/6] Add 9.0.0 feed to fix build failure for now.

---
 NuGet.config           | 2 ++
 src/tools/NuGet.config | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/NuGet.config b/NuGet.config
index 210b11263c3..f62ed970450 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -22,6 +22,8 @@
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/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="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
+    <!-- Package source to fix https://github.com/dotnet/performance/issues/4524 -->
+    <add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />
     <!-- Package Sources for Maui -->
     <!-- Added manually for dotnet/runtime 8.0.10 -->
     <add key="darc-pub-dotnet-emsdk-d667257" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570/nuget/v3/index.json" />
diff --git a/src/tools/NuGet.config b/src/tools/NuGet.config
index d939aae3006..1ebce10b467 100644
--- a/src/tools/NuGet.config
+++ b/src/tools/NuGet.config
@@ -10,6 +10,9 @@
     <packageSource key="dotnet8">
       <package pattern="*" />
     </packageSource>
+    <packageSource key="darc-pub-dotnet-runtime-d398172"> <!-- This is a temporary fix, remove when corresponding feed is removed from top level nuget.config -->
+      <package pattern="*" />
+    </packageSource>
     <packageSource key="dotnet-eng">
       <package pattern="Microsoft.DotNet.Helix.*" />
       <package pattern="Microsoft.DotNet.Arcade.*" />

From 16f0d59ce2b62b2e50d1f6b64806263450040a20 Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Mon, 21 Oct 2024 13:23:19 -0700
Subject: [PATCH 3/6] Run updates and add windowsdesktop and aspnetcore
 dependencies.

---
 NuGet.config            | 17 +++++++++++++----
 eng/Version.Details.xml | 18 +++++++++++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f62ed970450..c2d82ab9513 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,8 +7,14 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-b678c8a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b678c8a4/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-pub-dotnet-windowsdesktop-5307f2a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-5307f2ab/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-windowsdesktop -->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-pub-dotnet-aspnetcore-ff8e369" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-ff8e3690/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
@@ -22,8 +28,6 @@
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/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="benchmark-dotnet-prerelease" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/benchmark-dotnet-prerelease/nuget/v3/index.json" />
-    <!-- Package source to fix https://github.com/dotnet/performance/issues/4524 -->
-    <add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />
     <!-- Package Sources for Maui -->
     <!-- Added manually for dotnet/runtime 8.0.10 -->
     <add key="darc-pub-dotnet-emsdk-d667257" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570/nuget/v3/index.json" />
@@ -36,5 +40,10 @@
     <!-- Added manually for .NET 8 iOS -->
     <add key="darc-pub-xamarin-xamarin-macios-a8d7eab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-a8d7eab2/nuget/v3/index.json" />
   </packageSources>
-  <disabledPackageSources />
+  <disabledPackageSources>
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <!--  End: Package sources from dotnet-windowsdesktop -->
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
+  </disabledPackageSources>
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8d61d49f30b..cad0dd5065f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,19 +3,27 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
+      <Sha>b678c8a49022eb25e8c9de5ed3496d4a26b56e31</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-rtm.24516.10">
+    <Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-rtm.24517.17">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
+      <Sha>b678c8a49022eb25e8c9de5ed3496d4a26b56e31</Sha>
     </Dependency>
     <Dependency Name="System.Threading.Channels" Version="9.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
+      <Sha>b678c8a49022eb25e8c9de5ed3496d4a26b56e31</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
+      <Sha>b678c8a49022eb25e8c9de5ed3496d4a26b56e31</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0">
+      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
+      <Sha>5307f2abc4387e29964c6f46cb1f63cfdc218602</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>ff8e3690dee1f9278fec6055a91e936300c35c37</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 2cc18f03428..372aced0a52 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,7 @@
   <!--Package versions-->
   <PropertyGroup>
     <MicrosoftNETILLinkTasksVersion>9.0.0</MicrosoftNETILLinkTasksVersion>
-    <MicrosoftNETILLinkPackageVersion>9.0.0-rtm.24516.10</MicrosoftNETILLinkPackageVersion>
+    <MicrosoftNETILLinkPackageVersion>9.0.0-rtm.24517.17</MicrosoftNETILLinkPackageVersion>
     <SystemThreadingChannelsPackageVersion>9.0.0</SystemThreadingChannelsPackageVersion>
     <MicrosoftExtensionsLoggingPackageVersion>9.0.0</MicrosoftExtensionsLoggingPackageVersion>
     <BenchmarkDotNetVersion>0.14.1-nightly.20240924.187</BenchmarkDotNetVersion>

From d9d55ceb2b5fccf585c4686424a3b3f9fdd6155e Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Mon, 21 Oct 2024 13:37:51 -0700
Subject: [PATCH 4/6] Remove NuGet.config because darc does not seem to support
 updating package mappings.

---
 src/tools/NuGet.config | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src/tools/NuGet.config

diff --git a/src/tools/NuGet.config b/src/tools/NuGet.config
deleted file mode 100644
index 1ebce10b467..00000000000
--- a/src/tools/NuGet.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSourceMapping>
-    <packageSource key="dotnet-public">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet9">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet8">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="darc-pub-dotnet-runtime-d398172"> <!-- This is a temporary fix, remove when corresponding feed is removed from top level nuget.config -->
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet-eng">
-      <package pattern="Microsoft.DotNet.Helix.*" />
-      <package pattern="Microsoft.DotNet.Arcade.*" />
-      <package pattern="Microsoft.Arcade.*" />
-      <package pattern="Microsoft.DotNet.XliffTasks" />
-    </packageSource>
-  </packageSourceMapping>
-</configuration>

From 63616086d1b0c307bca09a1da72ec942718b6845 Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Mon, 21 Oct 2024 13:41:35 -0700
Subject: [PATCH 5/6] Revert "Remove NuGet.config because darc does not seem to
 support updating package mappings."

This reverts commit d9d55ceb2b5fccf585c4686424a3b3f9fdd6155e.
---
 src/tools/NuGet.config | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/tools/NuGet.config

diff --git a/src/tools/NuGet.config b/src/tools/NuGet.config
new file mode 100644
index 00000000000..1ebce10b467
--- /dev/null
+++ b/src/tools/NuGet.config
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSourceMapping>
+    <packageSource key="dotnet-public">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet9">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet8">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="darc-pub-dotnet-runtime-d398172"> <!-- This is a temporary fix, remove when corresponding feed is removed from top level nuget.config -->
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet-eng">
+      <package pattern="Microsoft.DotNet.Helix.*" />
+      <package pattern="Microsoft.DotNet.Arcade.*" />
+      <package pattern="Microsoft.Arcade.*" />
+      <package pattern="Microsoft.DotNet.XliffTasks" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>

From 30683166763a714c07d8f858112587fdc960c91a Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Mon, 21 Oct 2024 13:50:36 -0700
Subject: [PATCH 6/6] Remove NuGet.config because darc does not seem to support
 updating package mappings and disable the warning for not having package
 mappings.

---
 src/Directory.Build.props |  1 +
 src/tools/NuGet.config    | 23 -----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 src/tools/NuGet.config

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 745b0bc0787..a9301c58db5 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -13,6 +13,7 @@
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
     
     <!-- every warning is important, we want to enforce best practices here to keep high quality of the code and avoid common mistakes -->
+    <NoWarn>$(NoWarn);NU1507</NoWarn> <!-- Darc does not seem to support auto updating of packageSourceMapping causing tool publishes to fail without manual updating of the NuGet.config with package mappings, disable this check so we don't have to manually update the source mappings. -->
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
     
diff --git a/src/tools/NuGet.config b/src/tools/NuGet.config
deleted file mode 100644
index 1ebce10b467..00000000000
--- a/src/tools/NuGet.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSourceMapping>
-    <packageSource key="dotnet-public">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet9">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet8">
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="darc-pub-dotnet-runtime-d398172"> <!-- This is a temporary fix, remove when corresponding feed is removed from top level nuget.config -->
-      <package pattern="*" />
-    </packageSource>
-    <packageSource key="dotnet-eng">
-      <package pattern="Microsoft.DotNet.Helix.*" />
-      <package pattern="Microsoft.DotNet.Arcade.*" />
-      <package pattern="Microsoft.Arcade.*" />
-      <package pattern="Microsoft.DotNet.XliffTasks" />
-    </packageSource>
-  </packageSourceMapping>
-</configuration>