From 246acd9126fab1cf0ce36d4f95439a1b8c66035b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 1 Sep 2023 10:54:47 -0700
Subject: [PATCH] Remove manual Windows SDK KnownFrameworkReference items

These items are always removed by the SDK targets and the correct KnownFrameworkReference items for the target TFM are added in the AddWindowsSdkKnownFrameworkReferences target.
---
 .../targets/GenerateBundledVersions.targets   | 156 ------------------
 1 file changed, 156 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 299a76d5eb71..33802dabcc74 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -559,45 +559,6 @@ Copyright (c) .NET Foundation. All rights reserved.
                               RuntimePackExcludedRuntimeIdentifiers="android%3Blinux-bionic"
                               />
 
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net8.0-windows10.0.17763.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net8.0-windows10.0.18362.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net8.0-windows10.0.19041.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
     <!-- .NET 7.0 -->
     <KnownFrameworkReference Include="Microsoft.NETCore.App"
                               TargetFramework="net7.0"
@@ -699,45 +660,6 @@ Copyright (c) .NET Foundation. All rights reserved.
                               RuntimePackExcludedRuntimeIdentifiers="android"
                               />
 
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net7.0-windows10.0.17763.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net7.0-windows10.0.18362.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net7.0-windows10.0.19041.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
     <!-- .NET 6.0 -->
     <KnownFrameworkReference Include="Microsoft.NETCore.App"
                               TargetFramework="net6.0"
@@ -831,45 +753,6 @@ Copyright (c) .NET Foundation. All rights reserved.
                               RuntimePackRuntimeIdentifiers="@(AspNetCore60RuntimePackRids, '%3B')"
                               />
 
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net6.0-windows10.0.17763.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net6.0-windows10.0.18362.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net6.0-windows10.0.19041.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
     <!-- .NET 5.0 -->
     <KnownFrameworkReference Include="Microsoft.NETCore.App"
                               TargetFramework="net5.0"
@@ -950,45 +833,6 @@ Copyright (c) .NET Foundation. All rights reserved.
                               RuntimePackRuntimeIdentifiers="@(AspNetCore50RuntimePackRids, '%3B')"
                               />
 
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net5.0-windows10.0.17763.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net5.0-windows10.0.18362.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
-    <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
-                              TargetFramework="net5.0-windows10.0.19041.0"
-                              RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
-                              TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
-                              RuntimePackAlwaysCopyLocal="true"
-                              RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
-                              RuntimePackRuntimeIdentifiers="any"
-                              IsWindowsOnly="true"
-                              />
-
     <!-- .NET Core 3.1  -->
     <KnownFrameworkReference Include="Microsoft.NETCore.App"
                               TargetFramework="netcoreapp3.1"