From aa3f4ca82894d92940ef188433b45fd65ac7f023 Mon Sep 17 00:00:00 2001
From: Oscar Calvo <ocalvo@microsoft.com>
Date: Thu, 25 Apr 2019 16:49:44 -0700
Subject: [PATCH] Fix settings for WinForms

---
 .../Microsoft.Toolkit.Sample.Forms.App.csproj |  4 ++-
 Microsoft.Toolkit.Win32.sln                   | 34 ++++++++-----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Microsoft.Toolkit.Sample.Forms.App/Microsoft.Toolkit.Sample.Forms.App.csproj b/Microsoft.Toolkit.Sample.Forms.App/Microsoft.Toolkit.Sample.Forms.App.csproj
index 6271e6f..24cce41 100644
--- a/Microsoft.Toolkit.Sample.Forms.App/Microsoft.Toolkit.Sample.Forms.App.csproj
+++ b/Microsoft.Toolkit.Sample.Forms.App/Microsoft.Toolkit.Sample.Forms.App.csproj
@@ -2,7 +2,9 @@
   <PropertyGroup>
     <ProjectGuid>{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net462;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <AssetTargetFallback>uap10.0.17763</AssetTargetFallback>
+    <Platforms>x86;x64</Platforms>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AssemblyTitle>Windows Community Toolkit Controls (Sample Xaml Island Wrapper Controls for .NET Windows Forms)</AssemblyTitle>
diff --git a/Microsoft.Toolkit.Win32.sln b/Microsoft.Toolkit.Win32.sln
index 495d8de..d5ad282 100644
--- a/Microsoft.Toolkit.Win32.sln
+++ b/Microsoft.Toolkit.Win32.sln
@@ -297,26 +297,20 @@ Global
 		{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|x64.Build.0 = Release|Any CPU
 		{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|x86.ActiveCfg = Release|Any CPU
 		{F8393C4E-4501-4CC2-8767-ABFE3AD1C0FB}.Release|x86.Build.0 = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|ARM.Build.0 = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x64.Build.0 = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x86.Build.0 = Debug|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|ARM.ActiveCfg = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|ARM.Build.0 = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|ARM64.Build.0 = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x64.ActiveCfg = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x64.Build.0 = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x86.ActiveCfg = Release|Any CPU
-		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x86.Build.0 = Release|Any CPU
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|ARM.ActiveCfg = Debug|x86
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|ARM64.ActiveCfg = Debug|x86
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x64.ActiveCfg = Debug|x64
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x64.Build.0 = Debug|x64
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x86.ActiveCfg = Debug|x86
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Debug|x86.Build.0 = Debug|x86
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|Any CPU.ActiveCfg = Release|x86
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|ARM.ActiveCfg = Release|x86
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|ARM64.ActiveCfg = Release|x86
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x64.ActiveCfg = Release|x64
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x64.Build.0 = Release|x64
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x86.ActiveCfg = Release|x86
+		{9C49A885-D39B-4CA0-9DEB-204A6EA7D453}.Release|x86.Build.0 = Release|x86
 		{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F87EDD34-AF48-45C7-9342-49023B882DA1}.Debug|ARM.ActiveCfg = Debug|Any CPU