From eebb035c509bb41a8d58197ba75ca8c82e107b0e Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <igor.velikorossov@microsoft.com>
Date: Tue, 17 Aug 2021 15:50:24 +1000
Subject: [PATCH] Update SDK

Relates to https://github.com/dotnet/sdk/issues/19521
Relates to https://github.com/dotnet/sdk/pull/19599
---
 Directory.Build.props                                    | 5 -----
 global.json                                              | 4 ++--
 .../targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props   | 9 +++------
 .../targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets | 7 -------
 .../targets/Microsoft.NET.Sdk.WindowsDesktop.targets     | 3 ---
 5 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets

diff --git a/Directory.Build.props b/Directory.Build.props
index 2e9a80d4d2c..e011dfe2e94 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,11 +4,6 @@
     <WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
   </PropertyGroup>
 
-  <!-- Disable global usings, as those require 'preview' language version -->
-  <PropertyGroup>
-    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
-  </PropertyGroup>
-
   <!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
   <PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">
     <WpfArcadeSdkPath>$(TestWpfArcadeSdkPath)</WpfArcadeSdkPath>
diff --git a/global.json b/global.json
index eb74449f1f0..5b0ba2cadd5 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.100-rc.1.21379.2",
+    "dotnet": "6.0.100-rc.1.21416.15",
     "runtimes": {
       "dotnet": [
         "2.1.7",
@@ -16,7 +16,7 @@
     "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21412.1"
   },
   "sdk": {
-    "version": "6.0.100-rc.1.21379.2"
+    "version": "6.0.100-rc.1.21416.15"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1",
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props
index 295097fa7c9..7906641e0e2 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props
@@ -2,12 +2,9 @@
   <!--
     Generates implicit global namespace imports file <projectname>.ImplicitGlobalNamespaceImports.cs.
   -->
-  <ItemGroup Condition="'$(DisableImplicitNamespaceImports_WPF)' != 'true'
-                        and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
-                        and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '6.0'))
-                        and '$(UseWPF)' == 'true'">
-    <Import Remove="System.IO" />
-    <Import Remove="System.Net.Http" />
+  <ItemGroup Condition="'$(UseWPF)' == 'true' and ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable')">
+    <Using Remove="System.IO" />
+    <Using Remove="System.Net.Http" />
   </ItemGroup>
 
 </Project>
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets
deleted file mode 100644
index ac904aa438c..00000000000
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <DisableImplicitNamespaceImports_WPF Condition="'$(DisableImplicitNamespaceImports_WPF)' == ''
-                   and '$(DisableImplicitNamespaceImports)' != 'true'">false</DisableImplicitNamespaceImports_WPF>
-  </PropertyGroup>
-
-</Project>
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
index a77eb09ad94..0802bb76bcb 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets
@@ -159,9 +159,6 @@
   -->
   <Import Project="Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets" Condition="'$(UseWindowsForms)' == 'true'"/>
 
-  <!-- Import WPF-specific targets -->
-  <Import Project="Microsoft.NET.Sdk.WindowsDesktop.WPF.targets" Condition="'$(UseWPF)' == 'true'"/>
-
   <!-- Import WPF Build logic only when we don't import NETFX's WinFX targets -->
   <Import Project="Microsoft.WinFX.targets" Condition="'$(ImportFrameworkWinFXTargets)' != 'true'"/>