chore: Updating for windows and wasm

unoplatform · Nov 13, 2023 · df46af5 · df46af5
1 parent 3a00dfe
commit df46af5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-arm64.pubxml b/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-arm64.pubxml
@@ -12,9 +12,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<PublishSingleFile>False</PublishSingleFile>
 		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
 		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-		<!-- Note: This may still be an issue with PublishTrimmed support https://github.com/microsoft/CsWinRT/issues/373 -->
+		<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
+		<!-- 
 		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
 		<TrimMode>partial</TrimMode>
-		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
+		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> 
+		-->
 	</PropertyGroup>
 </Project>
diff --git a/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-x64.pubxml b/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-x64.pubxml
@@ -12,9 +12,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<PublishSingleFile>False</PublishSingleFile>
 		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
 		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-		<!-- Note: This may still be an issue with PublishTrimmed support https://github.com/microsoft/CsWinRT/issues/373 -->
+		<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
+		<!-- 
 		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
 		<TrimMode>partial</TrimMode>
-		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
+		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> 
+		-->
 	</PropertyGroup>
 </Project>
diff --git a/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-x86.pubxml b/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-x86.pubxml
@@ -12,9 +12,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<PublishSingleFile>False</PublishSingleFile>
 		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
 		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-		<!-- Note: This may still be an issue with PublishTrimmed support https://github.com/microsoft/CsWinRT/issues/373 -->
+		<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
+		<!-- 
 		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
 		<TrimMode>partial</TrimMode>
-		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
+		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> 
+		-->
 	</PropertyGroup>
 </Project>
diff --git a/samples/Playground/Playground.sln b/samples/Playground/Playground.sln
@@ -121,6 +121,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension Items", "Extensio
 		..\..\src\Directory.Build.targets = ..\..\src\Directory.Build.targets
 		..\..\src\Directory.Packages.props = ..\..\src\Directory.Packages.props
 		..\..\src\global.json = ..\..\src\global.json
+		..\..\src\winappsdk-workaround.targets = ..\..\src\winappsdk-workaround.targets
+		..\..\src\xamarinmac-workaround.targets = ..\..\src\xamarinmac-workaround.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Validation", "Validation", "{235663AE-4E7D-4FA4-964E-012C2F143FE5}"

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -21,7 +21,8 @@
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
 		<PackageVersion Include="Microsoft.UI.Xaml" Version="2.7.1" />
 		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
+		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.1.5" Condition="$(UseMaui) != 'true'" />
+	    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" Condition="$(UseMaui) == 'true'" />
 		<PackageVersion Include="Moq" Version="4.17.2" />
 		<PackageVersion Include="Refit" Version="6.3.2" />
 		<PackageVersion Include="Refit.HttpClientFactory" Version="6.3.2" />