From cbfc1fbee1aa4450e3e1fc5294f1d2a6717570b4 Mon Sep 17 00:00:00 2001
From: Scott Jones <scottj1s@gmail.com>
Date: Sun, 24 Sep 2023 04:55:17 -0700
Subject: [PATCH] Fixes for WinUI submodule compatibility (#1362)

---
 WinUIGallery/Directory.Build.props | 2 ++
 WinUIGallery/WinUIGallery.csproj   | 3 ++-
 nuget.config                       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WinUIGallery/Directory.Build.props b/WinUIGallery/Directory.Build.props
index 39faf6040..73bd14dbf 100644
--- a/WinUIGallery/Directory.Build.props
+++ b/WinUIGallery/Directory.Build.props
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <!-- We have two projects in the same directory here, so we'll add a differentiator folder to output directories. -->
     <GenerateProjectSpecificOutputFolder>true</GenerateProjectSpecificOutputFolder>
+    <!-- Work around DefaultElementAnimator.cs compiler error from missing experimental types -->
+    <MUXFinalRelease>true</MUXFinalRelease>
   </PropertyGroup>
     
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
diff --git a/WinUIGallery/WinUIGallery.csproj b/WinUIGallery/WinUIGallery.csproj
index 0ab4b6832..edae7d77a 100644
--- a/WinUIGallery/WinUIGallery.csproj
+++ b/WinUIGallery/WinUIGallery.csproj
@@ -28,7 +28,8 @@
         <Optimized Condition="'$(Configuration)' == 'Debug-Unpackaged' Or '$(Configuration)' == 'Debug'">false</Optimized>
         <SingleProject>true</SingleProject>
         <SingleProject Condition="'$(SolutionName)' == 'WinUIGallery.DesktopWap'">false</SingleProject>
-        <!--<WindowsAppSdkSelfContained>true</WindowsAppSdkSelfContained>-->
+        <!-- Enable ExplicitlyIncludeVersionInfo workaround by setting WindowsAppSdkSelfContained earlier than the mock package would -->
+        <WindowsAppSdkSelfContained Condition="'$(IsInWinUIRepo)' == 'true' and '$(WindowsAppSdkSelfContained)'==''">true</WindowsAppSdkSelfContained>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Packaged)' != 'true' and '$(SingleProject)'=='true'">
diff --git a/nuget.config b/nuget.config
index d1cfd30da..e793689e0 100644
--- a/nuget.config
+++ b/nuget.config
@@ -11,7 +11,7 @@
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
 
     <!-- a local directory to allow testing nupkg files without pushing to a remote feed -->
-    <add key="packagestore" value="packagestore" />
+    <add key="gallerystore" value="packagestore" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />