Update SDK

Relates to dotnet/sdk#19521
Relates to dotnet/sdk#19599

Author: RussKie

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>

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",

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>

packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.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'"/>