Move up to WinUI 3 Preview 3, remove workarounds in sample, centraliz…

…e SDK version (#625) * move build up to WinUI 3 Preview 3, remove workarounds in sample, centralize SDK version * PR feedback
microsoft · Dec 8, 2020 · fa3b39e · fa3b39e
1 parent bd1fd97
commit fa3b39e
Show file tree

Hide file tree

Showing 9 changed files with 1,225 additions and 2,302 deletions.
diff --git a/src/Authoring/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj b/src/Authoring/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
@@ -23,7 +23,6 @@
     <ProjectGuid>{0212a7c5-8d3f-443c-9ebc-1f28091fdf88}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>AuthoringConsumptionTest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.19592.0</WindowsTargetPlatformVersion>
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>

diff --git a/src/Authoring/WinRT.Host/WinRT.Host.vcxproj b/src/Authoring/WinRT.Host/WinRT.Host.vcxproj
@@ -24,7 +24,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{7e33bcb7-19c5-4061-981d-ba695322708a}</ProjectGuid>
     <RootNamespace>WinRTHost</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -8,7 +8,7 @@
     <CppWinRTVerbosity>high</CppWinRTVerbosity>
     <CsWinRTVerbosity>high</CsWinRTVerbosity>
     <!--Note: unlisted at https://www.nuget.org/packages/Microsoft.WinUI/-->
-    <MicrosoftWinUIVersion>3.0.0-preview2.200713.0</MicrosoftWinUIVersion>
+    <MicrosoftWinUIVersion>3.0.0-preview3.201113.0</MicrosoftWinUIVersion>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <LangVersion>preview</LangVersion>

diff --git a/src/Samples/WinUIDesktopSample/Net5_WinUI_Fixup.Targets b/src/Samples/WinUIDesktopSample/Net5_WinUI_Fixup.Targets
diff --git a/src/Samples/WinUIDesktopSample/WinUIDesktopSample.csproj b/src/Samples/WinUIDesktopSample/WinUIDesktopSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
     <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
     <ApplicationManifest>WinUIDesktopSample.exe.manifest</ApplicationManifest>
     <!--
@@ -11,7 +11,6 @@
     -->
     <XamlCodeGenerationControlFlags>DoNotGenerateOtherProviders</XamlCodeGenerationControlFlags>
     <Platforms>x86;x64</Platforms>
-    <MsAppxPackageTargets>$(MSBuildThisFileDirectory)Net5_WinUI_Fixup.Targets</MsAppxPackageTargets>
   </PropertyGroup>
 
   <ItemGroup>