Merge branch '6.0.0' into winSDKContracts

Directory.Build.props

@@ -18,7 +18,7 @@
     <IsWpfProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Wpf'))</IsWpfProject>
     <IsFormsProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Forms'))</IsFormsProject>
     <IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
-    <DefaultTargetPlatformVersion>18298</DefaultTargetPlatformVersion>
+    <DefaultTargetPlatformVersion>18327</DefaultTargetPlatformVersion>
     <DefaultTargetPlatformMinVersion>18226</DefaultTargetPlatformMinVersion>
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
   </PropertyGroup>
@@ -43,9 +43,9 @@
           - /azure-pipelines.yml
 
         This also needs to be installed on your local machine. Can do this with PowerShell:
-          ./build/Install-WindowsSDKISO.ps1 18298
+          ./build/Install-WindowsSDKISO.ps1 18327
         -->
-        <TargetPlatformVersion>10.0.18298.0</TargetPlatformVersion>
+        <TargetPlatformVersion>10.0.18327.0</TargetPlatformVersion>
 		<!-- XAML Islands require SDK 18226 -->
         <TargetPlatformMinVersion>10.0.18226.0</TargetPlatformMinVersion>
 

Directory.Build.targets

@@ -7,7 +7,7 @@
       </PropertyGroup>
       <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" PrivateAssets="all"/>
-        <PackageReference Include="winsdk.metadata.apt7.en" Version="10.0.18312.1000" />
+		<PackageReference Include="winsdk.metadata.apt7.en" Version="10.0.18312.1000" />
       </ItemGroup>
     </When>
   </Choose>

Microsoft.Toolkit.Sample.Forms.App/app.manifest

@@ -40,7 +40,7 @@
       <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
 
       <!-- Windows 10 -->
-      <maxversiontested Id="10.0.18298.0"/>
+      <maxversiontested Id="10.0.18327.0"/>
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
 
     </application>

Microsoft.Toolkit.Sample.Wpf.App/app.manifest

@@ -40,7 +40,7 @@
       <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
 
       <!-- Windows 10 -->
-      <maxversiontested Id="10.0.18298.0"/>
+      <maxversiontested Id="10.0.18327.0"/>
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
 
     </application>

Microsoft.Toolkit.Win32.sln

@@ -39,6 +39,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Wpf.UI.Co
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Sample.Forms.App", "Microsoft.Toolkit.Sample.Forms.App\Microsoft.Toolkit.Sample.Forms.App.csproj", "{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2B59D500-7A53-452F-B0AF-774E0ED98C16}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

Tests/UnitTests.WebView.Shared/UnitTests.WebView.Shared.csproj

@@ -49,7 +49,7 @@
     <Reference Include="System.Management" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="System.Management" Version="4.6.0-preview.18571.3" />
+    <PackageReference Include="System.Management" Version="4.6.0-preview.19073.11" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Microsoft.Toolkit.Win32.UI.Controls\Interop\Win32\ExternDll.cs" Link="ExternDll.cs" />

azure-pipelines.yml

@@ -28,7 +28,7 @@ steps:
 - task: DotNetCoreInstaller@0
   inputs:
     packageType: 'sdk'
-    version: '3.0.100-preview-010185'
+    version: '3.0.100-preview-010184'
   displayName: Install Dot Net Core SDK 3.0
     
 - task: DotNetCoreCLI@2  
@@ -40,8 +40,8 @@ steps:
 
 - script: nbgv cloud
   displayName: Set Version
-      
-- powershell: .\build\Install-WindowsSdkISO.ps1 18298
+
+- powershell: .\build\Install-WindowsSdkISO.ps1 18327
   displayName: Insider SDK
 
 - powershell: .\build\build.ps1 -target=Package

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0.100-preview-010185"
+    "version": "3.0.100-preview-010184"
   }
 }