From 159eefdd99a0c853e366eca80eca6cba62c80b95 Mon Sep 17 00:00:00 2001
From: Andrii Chebukin <xperiandri@live.ru>
Date: Sun, 20 Jun 2021 02:58:38 +0300
Subject: [PATCH] Fixed issue with UseDotNetNativeToolchain for all platforms
 except x86, however crashes on runtime

---
 .../Properties/Default.rd.xml                 | 22 ++++++++++++--
 .../SolutionTemplate.UWP.csproj               | 30 ++++++++++---------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.UWP/Properties/Default.rd.xml b/src/Templates/SolutionTemplate/SolutionTemplate.UWP/Properties/Default.rd.xml
index fcaf3e10..9f664f2e 100644
--- a/src/Templates/SolutionTemplate/SolutionTemplate.UWP/Properties/Default.rd.xml
+++ b/src/Templates/SolutionTemplate/SolutionTemplate.UWP/Properties/Default.rd.xml
@@ -17,14 +17,30 @@
 
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
   <Application>
+    <!--
+      According to https://stackoverflow.com/a/62265908/1149328
+    -->
+    <Namespace Name="SolutionTemplate" Dynamic="Excluded" Serialize="Excluded" />
     <!--
       An Assembly element with Name="*Application*" applies to all assemblies in
       the application package. The asterisks are not wildcards.
     -->
-    <Assembly Dynamic="Required All" Name="Microsoft.Extensions.Options"/>
-    <Assembly Dynamic="Required All" Name="Microsoft.Extensions.Logging"/>
-    <Assembly Name="*Application*" Dynamic="Required All" />
+    <!--<Assembly Dynamic="Required All" Name="*Application*" />-->
     <!-- Add your application specific runtime directives here. -->
+    <Assembly Dynamic="Required All" Name="Microsoft.Extensions.Hosting" />
+    <Assembly Dynamic="Required All" Name="Microsoft.Extensions.Logging" />
+    <Assembly Dynamic="Required All" Name="Microsoft.Extensions.Options" />
 
+    <!--<Assembly Dynamic="Required All" Name="FSharp.Core" />
+    <Assembly Dynamic="Required All" Name="Elmish" />
+    <Assembly Dynamic="Required All" Name="Elmish.Uno" />
+    <Assembly Dynamic="Required All" Name="Elmish.Uno.Mobile" />
+    <Assembly Dynamic="Required All" Name="FSharp.Collections.Immutable" />
+    <Assembly Dynamic="Required All" Name="FSharp.Control.FusionTasks" />
+    <Assembly Dynamic="Required All" Name="FSharp.Control.Reactive" />
+    <Assembly Dynamic="Required All" Name="FSharpPlus" />
+    <Assembly Dynamic="Required All" Name="System.Collections.Immutable" />
+    <Assembly Dynamic="Required All" Name="Uno.Core" />
+    <Assembly Dynamic="Required All" Name="Xamarin.Essentials" />-->
   </Application>
 </Directives>
diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj
index dc17f199..54f0cbb5 100644
--- a/src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj
+++ b/src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj
@@ -27,6 +27,7 @@
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProjectGuid>{7727D8AD-8883-427D-A77A-7C8639ACE4AF}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SolutionTemplate</RootNamespace>
     <AssemblyName>$(AssemblyBaseName).UWP</AssemblyName>
@@ -42,7 +43,6 @@
   </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>
@@ -50,9 +50,9 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </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>
@@ -61,11 +61,11 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <!-- does not work for x86 platform -->
     <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
@@ -73,9 +73,9 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
@@ -84,22 +84,21 @@
     <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>
+    <Prefer32Bit>false</Prefer32Bit>
     <Use64Bitcompiler>true</Use64Bitcompiler>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <UseDotNetNativeToolchain>false</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>
@@ -107,21 +106,23 @@
     <PlatformTarget>ARM64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit>false</Prefer32Bit>
+    <Use64Bitcompiler>true</Use64Bitcompiler>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </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>
     <PlatformTarget>x64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
+    <Prefer32Bit>false</Prefer32Bit>
+    <Use64Bitcompiler>true</Use64Bitcompiler>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </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>
@@ -129,8 +130,9 @@
     <PlatformTarget>x64</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+    <Prefer32Bit>false</Prefer32Bit>
+    <Use64Bitcompiler>true</Use64Bitcompiler>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->