Adjusted RichPresence build configurations

WindowsAppCommunity · Apr 21, 2022 · 6cf649b · 6cf649b
1 parent 08528d1
commit 6cf649b
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 187 deletions.
diff --git a/Quarrel.sln b/Quarrel.sln
@@ -364,8 +364,8 @@ Global
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Alpha|ARM.Build.0 = Debug|ARM
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Alpha|ARM64.ActiveCfg = Debug|ARM64
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Alpha|ARM64.Build.0 = Debug|ARM64
-		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Alpha|x64.ActiveCfg = Debug|x64
-		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Alpha|x64.Build.0 = Debug|x64
+		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Alpha|x64.ActiveCfg = Alpha|x64
+		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Alpha|x64.Build.0 = Alpha|x64
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Alpha|x86.ActiveCfg = Debug|x86
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Alpha|x86.Build.0 = Debug|x86
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -384,8 +384,8 @@ Global
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Insider|ARM.Build.0 = Debug|ARM
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Insider|ARM64.ActiveCfg = Debug|ARM64
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Insider|ARM64.Build.0 = Debug|ARM64
-		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Insider|x64.ActiveCfg = Debug|x64
-		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Insider|x64.Build.0 = Debug|x64
+		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Insider|x64.ActiveCfg = Insider|x64
+		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Insider|x64.Build.0 = Insider|x64
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Insider|x86.ActiveCfg = Debug|x86
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Insider|x86.Build.0 = Debug|x86
 		{BA8BE893-2B4D-4213-A4AF-53AA28BF2E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -408,8 +408,6 @@ Global
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Alpha|ARM64.Build.0 = Debug|ARM64
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Alpha|ARM64.Deploy.0 = Debug|ARM64
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Alpha|x64.ActiveCfg = Debug|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Alpha|x64.Build.0 = Debug|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Alpha|x64.Deploy.0 = Debug|x64
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Alpha|x86.ActiveCfg = Debug|x86
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Alpha|x86.Build.0 = Debug|x86
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Alpha|x86.Deploy.0 = Debug|x86
@@ -438,26 +436,14 @@ Global
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Insider|ARM64.Build.0 = Debug|ARM64
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Insider|ARM64.Deploy.0 = Debug|ARM64
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Insider|x64.ActiveCfg = Debug|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Insider|x64.Build.0 = Debug|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Insider|x64.Deploy.0 = Debug|x64
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Insider|x86.ActiveCfg = Debug|x86
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Insider|x86.Build.0 = Debug|x86
 		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Insider|x86.Deploy.0 = Debug|x86
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|Any CPU.ActiveCfg = Release|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|Any CPU.Build.0 = Release|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|Any CPU.Deploy.0 = Release|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|ARM.ActiveCfg = Release|ARM
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|ARM.Build.0 = Release|ARM
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|ARM.Deploy.0 = Release|ARM
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|ARM64.ActiveCfg = Release|ARM64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|ARM64.Build.0 = Release|ARM64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|ARM64.Deploy.0 = Release|ARM64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|x64.ActiveCfg = Release|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|x64.Build.0 = Release|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|x64.Deploy.0 = Release|x64
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|x86.ActiveCfg = Release|x86
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|x86.Build.0 = Release|x86
-		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|x86.Deploy.0 = Release|x86
+		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|Any CPU.ActiveCfg = Debug|x86
+		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|ARM.ActiveCfg = Debug|ARM
+		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|ARM64.ActiveCfg = Debug|ARM64
+		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|x64.ActiveCfg = Debug|x64
+		{4304E7AB-92E3-4313-AD8B-EFDCB033C0CE}.Release|x86.ActiveCfg = Debug|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/samples/Quarrel.Samples.RichPresence/Quarrel.Samples.RichPresence.csproj b/samples/Quarrel.Samples.RichPresence/Quarrel.Samples.RichPresence.csproj
@@ -19,98 +19,30 @@
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+  <PropertyGroup>
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
+    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEV</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  <PropertyGroup Condition="'$(Platform)' == 'x86'">
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
+  <PropertyGroup Condition="'$(Platform)' == 'x64'">
     <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  <PropertyGroup Condition="'$(Platform)' == 'ARM'">
+    <PlatformTarget>ARM</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)' == 'ARM64'">
+    <PlatformTarget>ARM64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>

diff --git a/src/Libs/RichPresence/Quarrel.RichPresence.Connection/Quarrel.RichPresence.csproj b/src/Libs/RichPresence/Quarrel.RichPresence.Connection/Quarrel.RichPresence.csproj
@@ -10,111 +10,62 @@
     <RootNamespace>Quarrel.RichPresence</RootNamespace>
     <AssemblyName>Quarrel.RichPresence</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
+    <LangVersion>10.0</LangVersion>
+    <Nullable>enable</Nullable>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22000.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+  <PropertyGroup>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
+    <Prefer32Bit>true</Prefer32Bit>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
+    <DefineConstants>DEBUG</DefineConstants>
+    <DefineConstants>DEV</DefineConstants>
     <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+  <PropertyGroup Condition="'$(Configuration)' == 'Alpha'">
     <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
+    <DefineConstants>ALPHA</DefineConstants>
     <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
+  <PropertyGroup Condition="'$(Configuration)' == 'Insider'">
+    <Optimize>true</Optimize>
+    <DefineConstants>INSIDER</DefineConstants>
+    <DebugType>pdbonly</DebugType>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
+    <DefineConstants>RELEASE</DefineConstants>
     <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
+
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)' == 'x86'">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)' == 'ARM'">
+    <PlatformTarget>ARM</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+  <PropertyGroup Condition="'$$(Platform)' == 'ARM64'">
+    <PlatformTarget>ARM64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)' == 'x64'">
     <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>

diff --git a/src/Quarrel/Quarrel.csproj b/src/Quarrel/Quarrel.csproj
@@ -10,6 +10,8 @@
     <RootNamespace>Quarrel</RootNamespace>
     <AssemblyName>Quarrel</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
+    <LangVersion>10.0</LangVersion>
+    <Nullable>enable</Nullable>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22000.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
@@ -18,8 +20,6 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
-    <LangVersion>10.0</LangVersion>
-    <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GenerateAppInstallerFile>true</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>false</AppxAutoIncrementPackageRevision>
@@ -34,7 +34,6 @@
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>