From fd4c7f38d8b71783c2537ac49b8eb415f6a7967d Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Thu, 27 May 2021 09:55:53 +0100
Subject: [PATCH] More fixes

---
 .gitignore                                               | 1 +
 Directory.Build.targets                                  | 5 +++++
 build/Build.Microsoft.Maui.Graphics-net6.sln             | 9 +++++++++
 ...crosoft.Maui.Graphics.Win2D.WinUI.Desktop-net6.csproj | 7 ++++++-
 .../Microsoft.Maui.Graphics-net6.csproj                  | 6 ++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index dbd0b65..2d4b49e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -350,3 +350,4 @@ MigrationBackup/
 .ionide/
 .DS_Store
 .idea
+tools
diff --git a/Directory.Build.targets b/Directory.Build.targets
index fbba508..7d1cb4d 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,6 +1,11 @@
 <Project>
   <Import Project="eng\Git.Build.targets" />
   <Import Project="eng\Version.targets" />
+  <!-- Temporarily disable the linker for net6.0-ios and net6.0-maccatalyst until we get machine pools with Big Sur and Xcode 12.5 is stable -->
+  <PropertyGroup>
+    <PublishTrimmed Condition=" '$(TargetFramework)' == 'net6.0-ios' or '$(TargetFramework)' == 'net6.0-maccatalyst' ">false</PublishTrimmed>
+  </PropertyGroup>
+
   <Target Name="Net6WinUIPackagingWorkaround" BeforeTargets="GetPackagingOutputs" Condition="$(TargetFramework.Contains('-windows')) == true AND '$(DisableEmbeddedXbf)' != 'true' ">
     <PropertyGroup>
       <TargetPlatformIdentifierAdjusted>UAP</TargetPlatformIdentifierAdjusted>
diff --git a/build/Build.Microsoft.Maui.Graphics-net6.sln b/build/Build.Microsoft.Maui.Graphics-net6.sln
index 6a415fe..a5a34c8 100644
--- a/build/Build.Microsoft.Maui.Graphics-net6.sln
+++ b/build/Build.Microsoft.Maui.Graphics-net6.sln
@@ -14,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8A2197EB
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics-net6", "..\src\Microsoft.Maui.Graphics\Microsoft.Maui.Graphics-net6.csproj", "{8E78C89F-7AE7-4342-BFFE-227873D89397}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6", "..\src\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6.csproj", "{00145282-A205-4230-8AC8-161E59E5C00A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AppStore|Any CPU = AppStore|Any CPU
@@ -27,12 +29,19 @@ Global
 		{8E78C89F-7AE7-4342-BFFE-227873D89397}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8E78C89F-7AE7-4342-BFFE-227873D89397}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E78C89F-7AE7-4342-BFFE-227873D89397}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00145282-A205-4230-8AC8-161E59E5C00A}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{00145282-A205-4230-8AC8-161E59E5C00A}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{00145282-A205-4230-8AC8-161E59E5C00A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00145282-A205-4230-8AC8-161E59E5C00A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00145282-A205-4230-8AC8-161E59E5C00A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00145282-A205-4230-8AC8-161E59E5C00A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{8E78C89F-7AE7-4342-BFFE-227873D89397} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
+		{00145282-A205-4230-8AC8-161E59E5C00A} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854}
diff --git a/src/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6.csproj b/src/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6.csproj
index 3a0dcf8..1df966b 100644
--- a/src/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6.csproj
+++ b/src/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop/Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6.csproj
@@ -12,7 +12,12 @@
       <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.0" />
       <PackageReference Include="Microsoft.Graphics.Win2D" Version="0.5.0.13" />
   </ItemGroup>
-
+ <Target Name="Net6WinUIWorkaround" BeforeTargets="_GetSdkToolsPathsFromSdk" Condition="$(TargetFramework.Contains('-windows')) == true ">
+    <PropertyGroup>
+      <TargetPlatformIdentifierAdjusted>UAP</TargetPlatformIdentifierAdjusted>
+    </PropertyGroup>
+  </Target>
+  
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Maui.Graphics\Microsoft.Maui.Graphics-net6.csproj" />
   </ItemGroup>
diff --git a/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics-net6.csproj b/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics-net6.csproj
index ed2c962..66895a3 100644
--- a/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics-net6.csproj
+++ b/src/Microsoft.Maui.Graphics/Microsoft.Maui.Graphics-net6.csproj
@@ -35,5 +35,11 @@
     </Compile>
   </ItemGroup>
 
+  <Target Name="Net6WinUIWorkaround" BeforeTargets="_GetSdkToolsPathsFromSdk" Condition="$(TargetFramework.Contains('-windows')) == true ">
+    <PropertyGroup>
+      <TargetPlatformIdentifierAdjusted>UAP</TargetPlatformIdentifierAdjusted>
+    </PropertyGroup>
+  </Target>
+
   <Import Project="..\targets\MultiTargeting.targets" />
 </Project>