From 9ba5d4d18698b26bbd323dcb900d5d8faffd456b Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Mon, 21 Mar 2022 18:01:26 -0500
Subject: [PATCH 1/3] Fixed MacOS and iOS projects not building properly

---
 Common/Labs.Head.props                        | 17 ++++++---
 .../CommunityToolkit.Labs.iOS.csproj          |  5 +++
 .../CommunityToolkit.Labs.macOS.csproj        | 35 +++++++------------
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/Common/Labs.Head.props b/Common/Labs.Head.props
index 1ddca7b43..478951dbc 100644
--- a/Common/Labs.Head.props
+++ b/Common/Labs.Head.props
@@ -1,6 +1,12 @@
 <!-- Common props for any deployable sample project head. -->
-<Project>
-  
+<Project InitialTargets="iPhoneSimulatorPlatformOverrideValidation">
+
+  <Target Name="iPhoneSimulatorPlatformOverrideValidation" Condition="'$(Platform)' == 'iPhoneSimulator'">
+    <!-- Prevent macOS / iOS from using "iPhoneSimulator" as the platform in libraries which don't support it. -->
+    <Error Condition="'$(PlatformTarget)' == ''" Text="PlatformTarget property was not defined, and is required when using the Platform iPhoneSimulator" />
+    <Error Condition="'$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86' AND '$(PlatformTarget)' != 'ARM' AND '$(PlatformTarget)' != 'ARM64'" Text="Invalid PlatformTarget was defined: $(PlatformTarget). Expected x86, x64, ARM or ARM64" />
+  </Target>
+
   <!-- Shared project -->
   <Import Project="$(RepositoryDirectory)\Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.projitems" Label="Shared" />
 
@@ -16,9 +22,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepositoryDirectory)Common\CommunityToolkit.Labs.Core.SourceGenerators\CommunityToolkit.Labs.Core.SourceGenerators.csproj"
-                      SetTargetFramework="TargetFramework=netstandard2.0"
-                      OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
+    <ProjectReference Include="$(RepositoryDirectory)Common\CommunityToolkit.Labs.Core.SourceGenerators\CommunityToolkit.Labs.Core.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true">
+      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+      <SetPlatform Condition="'$(Platform)' == 'iPhoneSimulator'">Platform=$(PlatformTarget)</SetPlatform>
+    </ProjectReference>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj b/Platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj
index e70bcaaf1..fdfa6a43c 100644
--- a/Platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj
+++ b/Platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj
@@ -27,6 +27,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <MtouchArch>x86_64</MtouchArch>
+    <PlatformTarget>x64</PlatformTarget>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
     <MtouchExtraArgs>--setenv=MONO_LOG_LEVEL=debug --setenv=MONO_LOG_MASK=gc --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -39,6 +40,7 @@
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
+    <PlatformTarget>x64</PlatformTarget>
     <ConsolePause>false</ConsolePause>
     <MtouchExtraArgs>--setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
   </PropertyGroup>
@@ -52,6 +54,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <MtouchArch>ARM64</MtouchArch>
+    <PlatformTarget>ARM64</PlatformTarget>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
@@ -65,6 +68,7 @@
     <WarningLevel>4</WarningLevel>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchArch>ARM64</MtouchArch>
+    <PlatformTarget>ARM64</PlatformTarget>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <MtouchUseLlvm>true</MtouchUseLlvm>
@@ -80,6 +84,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <MtouchArch>ARM64</MtouchArch>
+    <PlatformTarget>ARM64</PlatformTarget>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <BuildIpa>True</BuildIpa>
     <CodesignProvision>Automatic:AdHoc</CodesignProvision>
diff --git a/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj b/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
index 0cab23d25..94503e738 100644
--- a/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
+++ b/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
-  
   <Import Project="$(RepositoryDirectory)\Common\Labs.SampleRefs.props" />
   <Import Project="$(RepositoryDirectory)Common\Labs.Head.props" />
-
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProjectGuid>34617141-25C4-4FEC-8A15-5B46934F1A99</ProjectGuid>
+    <ProjectGuid>{34617141-25C4-4FEC-8A15-5B46934F1A99}</ProjectGuid>
     <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>CommunityToolkit.Labs.macOS</RootNamespace>
@@ -33,14 +31,11 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <Profiling>true</Profiling>
-    <HttpClientHandler>
-    </HttpClientHandler>
-    <LinkMode>
-    </LinkMode>
-    <XamMacArch>
-    </XamMacArch>
-    <NoWarn>
-    </NoWarn>
+    <HttpClientHandler />
+    <LinkMode />
+    <XamMacArch />
+    <NoWarn />
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugSymbols>false</DebugSymbols>
@@ -58,12 +53,10 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <LinkMode>SdkOnly</LinkMode>
-    <HttpClientHandler>
-    </HttpClientHandler>
-    <XamMacArch>
-    </XamMacArch>
-    <NoWarn>
-    </NoWarn>
+    <HttpClientHandler />
+    <XamMacArch />
+    <NoWarn />
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -96,11 +89,7 @@
     <ImageAsset Include="Assets.xcassets\unologo.imageset\Contents.json" />
     <ImageAsset Include="Assets.xcassets\unologo.imageset\unoplatform.jpg" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-    <Folder Include="Resources\Fonts\" />
-    <Folder Include="Assets.xcassets\unologo.imageset\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />

From d64c1a217271c3171410f2b970e76a69d4490d19 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 24 Mar 2022 17:34:30 -0500
Subject: [PATCH 2/3] Revert "Fixed MacOS and iOS projects not building
 properly"

This reverts commit 9ba5d4d18698b26bbd323dcb900d5d8faffd456b.
---
 Common/Labs.Head.props                        | 17 +++------
 .../CommunityToolkit.Labs.iOS.csproj          |  5 ---
 .../CommunityToolkit.Labs.macOS.csproj        | 35 ++++++++++++-------
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/Common/Labs.Head.props b/Common/Labs.Head.props
index 478951dbc..1ddca7b43 100644
--- a/Common/Labs.Head.props
+++ b/Common/Labs.Head.props
@@ -1,12 +1,6 @@
 <!-- Common props for any deployable sample project head. -->
-<Project InitialTargets="iPhoneSimulatorPlatformOverrideValidation">
-
-  <Target Name="iPhoneSimulatorPlatformOverrideValidation" Condition="'$(Platform)' == 'iPhoneSimulator'">
-    <!-- Prevent macOS / iOS from using "iPhoneSimulator" as the platform in libraries which don't support it. -->
-    <Error Condition="'$(PlatformTarget)' == ''" Text="PlatformTarget property was not defined, and is required when using the Platform iPhoneSimulator" />
-    <Error Condition="'$(PlatformTarget)' != 'x64' AND '$(PlatformTarget)' != 'x86' AND '$(PlatformTarget)' != 'ARM' AND '$(PlatformTarget)' != 'ARM64'" Text="Invalid PlatformTarget was defined: $(PlatformTarget). Expected x86, x64, ARM or ARM64" />
-  </Target>
-
+<Project>
+  
   <!-- Shared project -->
   <Import Project="$(RepositoryDirectory)\Common\CommunityToolkit.Labs.Shared\CommunityToolkit.Labs.Shared.projitems" Label="Shared" />
 
@@ -22,10 +16,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepositoryDirectory)Common\CommunityToolkit.Labs.Core.SourceGenerators\CommunityToolkit.Labs.Core.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true">
-      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
-      <SetPlatform Condition="'$(Platform)' == 'iPhoneSimulator'">Platform=$(PlatformTarget)</SetPlatform>
-    </ProjectReference>
+    <ProjectReference Include="$(RepositoryDirectory)Common\CommunityToolkit.Labs.Core.SourceGenerators\CommunityToolkit.Labs.Core.SourceGenerators.csproj"
+                      SetTargetFramework="TargetFramework=netstandard2.0"
+                      OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj b/Platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj
index fdfa6a43c..e70bcaaf1 100644
--- a/Platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj
+++ b/Platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj
@@ -27,7 +27,6 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <MtouchArch>x86_64</MtouchArch>
-    <PlatformTarget>x64</PlatformTarget>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
     <MtouchExtraArgs>--setenv=MONO_LOG_LEVEL=debug --setenv=MONO_LOG_MASK=gc --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -40,7 +39,6 @@
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
-    <PlatformTarget>x64</PlatformTarget>
     <ConsolePause>false</ConsolePause>
     <MtouchExtraArgs>--setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
   </PropertyGroup>
@@ -54,7 +52,6 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <MtouchArch>ARM64</MtouchArch>
-    <PlatformTarget>ARM64</PlatformTarget>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
@@ -68,7 +65,6 @@
     <WarningLevel>4</WarningLevel>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchArch>ARM64</MtouchArch>
-    <PlatformTarget>ARM64</PlatformTarget>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <MtouchUseLlvm>true</MtouchUseLlvm>
@@ -84,7 +80,6 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <MtouchArch>ARM64</MtouchArch>
-    <PlatformTarget>ARM64</PlatformTarget>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <BuildIpa>True</BuildIpa>
     <CodesignProvision>Automatic:AdHoc</CodesignProvision>
diff --git a/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj b/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
index 94503e738..0cab23d25 100644
--- a/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
+++ b/Platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
+  
   <Import Project="$(RepositoryDirectory)\Common\Labs.SampleRefs.props" />
   <Import Project="$(RepositoryDirectory)Common\Labs.Head.props" />
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProjectGuid>{34617141-25C4-4FEC-8A15-5B46934F1A99}</ProjectGuid>
+    <ProjectGuid>34617141-25C4-4FEC-8A15-5B46934F1A99</ProjectGuid>
     <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>CommunityToolkit.Labs.macOS</RootNamespace>
@@ -31,11 +33,14 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <Profiling>true</Profiling>
-    <HttpClientHandler />
-    <LinkMode />
-    <XamMacArch />
-    <NoWarn />
-    <PlatformTarget>x64</PlatformTarget>
+    <HttpClientHandler>
+    </HttpClientHandler>
+    <LinkMode>
+    </LinkMode>
+    <XamMacArch>
+    </XamMacArch>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugSymbols>false</DebugSymbols>
@@ -53,10 +58,12 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <LinkMode>SdkOnly</LinkMode>
-    <HttpClientHandler />
-    <XamMacArch />
-    <NoWarn />
-    <PlatformTarget>x64</PlatformTarget>
+    <HttpClientHandler>
+    </HttpClientHandler>
+    <XamMacArch>
+    </XamMacArch>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -89,7 +96,11 @@
     <ImageAsset Include="Assets.xcassets\unologo.imageset\Contents.json" />
     <ImageAsset Include="Assets.xcassets\unologo.imageset\unoplatform.jpg" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Resources\" />
+    <Folder Include="Resources\Fonts\" />
+    <Folder Include="Assets.xcassets\unologo.imageset\" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />

From 07cfca0540492ea4159ef08b9e4a79829ab1ac2d Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 24 Mar 2022 19:59:05 -0500
Subject: [PATCH 3/3] Implement source generator workaround for ios/wasm

---
 Common/Labs.Head.props | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Common/Labs.Head.props b/Common/Labs.Head.props
index 1ddca7b43..50ab9f316 100644
--- a/Common/Labs.Head.props
+++ b/Common/Labs.Head.props
@@ -17,8 +17,9 @@
 
   <ItemGroup>
     <ProjectReference Include="$(RepositoryDirectory)Common\CommunityToolkit.Labs.Core.SourceGenerators\CommunityToolkit.Labs.Core.SourceGenerators.csproj"
-                      SetTargetFramework="TargetFramework=netstandard2.0"
-                      OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
+                      OutputItemType="None" ReferenceOutputAssembly="true" />
+                      
+    <Analyzer Include="$(RepositoryDirectory)Common\CommunityToolkit.Labs.Core.SourceGenerators\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Labs.Core.SourceGenerators.dll" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file