From 1d2008bc545a0db7625704492f9aaa6e7e4d5c36 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Mon, 21 Jun 2021 18:53:00 -0700
Subject: [PATCH] Remove references now included in the
Microsoft.NETCore.App.Ref targeting pack + update SDK (#4706)
* Remove references now included in the runtime + update SDK
* Revert SDK version to Preview 4
---
eng/Version.Details.xml | 12 ----------
eng/Versions.props | 3 ---
.../PresentationCore/PresentationCore.csproj | 20 ++++++++--------
.../ref/PresentationCore-ref.csproj | 20 ++++++++--------
.../PresentationFramework.csproj | 2 +-
.../ref/PresentationFramework-ref.csproj | 2 +-
.../src/PresentationUI/PresentationUI.csproj | 3 ++-
.../System.Printing/System.Printing.vcxproj | 1 -
.../src/WindowsBase/WindowsBase.csproj | 24 +++++++++----------
.../WindowsBase/ref/WindowsBase-ref.csproj | 24 +++++++++----------
.../DRT/TestServices/TestServices.csproj | 4 ----
11 files changed, 48 insertions(+), 67 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8dea949d237..d929d95e56a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,10 +9,6 @@
https://github.com/dotnet/winforms
2e42461f881f3e821a7290d6dafa0d5e32a93728
-
- https://github.com/dotnet/runtime
- bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2
-
https://github.com/dotnet/runtime
01188c75f06412dc86508e7b653deaeace9623ba
@@ -37,10 +33,6 @@
https://github.com/dotnet/runtime
01188c75f06412dc86508e7b653deaeace9623ba
-
- https://github.com/dotnet/runtime
- bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2
-
https://github.com/dotnet/runtime
01188c75f06412dc86508e7b653deaeace9623ba
@@ -49,10 +41,6 @@
https://github.com/dotnet/runtime
01188c75f06412dc86508e7b653deaeace9623ba
-
- https://github.com/dotnet/runtime
- bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2
-
https://github.com/dotnet/runtime
01188c75f06412dc86508e7b653deaeace9623ba
diff --git a/eng/Versions.props b/eng/Versions.props
index 4c8d343b17c..7993c5c2519 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -29,15 +29,12 @@
- 6.0.0-preview.6.21314.2
6.0.0-preview.6.21317.4
6.0.0-preview.6.21317.4
6.0.0-preview.6.21317.4
4.6.0-preview4.19176.11
- 6.0.0-preview.6.21314.2
6.0.0-preview.6.21317.4
6.0.0-preview.6.21317.4
- 6.0.0-preview.6.21314.2
6.0.0-preview.6.21317.4
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
index f26ab3689d2..51b9c1708ae 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
@@ -1364,7 +1364,7 @@
-
+
@@ -1375,38 +1375,38 @@
-
-
-
-
-
+
+
+
+
+
-
+
+
+
-
-
+
-
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
index c6822e3b5db..e43cf804f12 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj
@@ -22,7 +22,7 @@
-
+
@@ -33,37 +33,37 @@
-
-
-
-
-
+
+
+
+
+
-
+
+
+
-
-
+
-
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
index ce28b7dd917..e85201d6165 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
@@ -1374,6 +1374,7 @@
+
@@ -1449,7 +1450,6 @@
-
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj
index 563962f8bee..ff6742944ec 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj
@@ -26,6 +26,7 @@
+
@@ -89,7 +90,6 @@
-
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
index a5fdb337aef..7516c9a4926 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj
@@ -218,7 +218,6 @@
-
@@ -230,6 +229,7 @@
-->
+
@@ -249,6 +249,7 @@
+
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
index 4fa15a2842f..e7ef43e64b2 100644
--- a/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/System.Printing.vcxproj
@@ -154,7 +154,6 @@
PackageReferences to pass to CppCliHelper target
-->
-