Skip to content

Commit cbfc1fb

Browse files
authored
Fixes for WinUI submodule compatibility (microsoft#1362)
1 parent 398af50 commit cbfc1fb

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

WinUIGallery/Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<PropertyGroup>
44
<!-- We have two projects in the same directory here, so we'll add a differentiator folder to output directories. -->
55
<GenerateProjectSpecificOutputFolder>true</GenerateProjectSpecificOutputFolder>
6+
<!-- Work around DefaultElementAnimator.cs compiler error from missing experimental types -->
7+
<MUXFinalRelease>true</MUXFinalRelease>
68
</PropertyGroup>
79

810
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />

WinUIGallery/WinUIGallery.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
<Optimized Condition="'$(Configuration)' == 'Debug-Unpackaged' Or '$(Configuration)' == 'Debug'">false</Optimized>
2929
<SingleProject>true</SingleProject>
3030
<SingleProject Condition="'$(SolutionName)' == 'WinUIGallery.DesktopWap'">false</SingleProject>
31-
<!--<WindowsAppSdkSelfContained>true</WindowsAppSdkSelfContained>-->
31+
<!-- Enable ExplicitlyIncludeVersionInfo workaround by setting WindowsAppSdkSelfContained earlier than the mock package would -->
32+
<WindowsAppSdkSelfContained Condition="'$(IsInWinUIRepo)' == 'true' and '$(WindowsAppSdkSelfContained)'==''">true</WindowsAppSdkSelfContained>
3233
</PropertyGroup>
3334

3435
<PropertyGroup Condition="'$(Packaged)' != 'true' and '$(SingleProject)'=='true'">

nuget.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
1212

1313
<!-- a local directory to allow testing nupkg files without pushing to a remote feed -->
14-
<add key="packagestore" value="packagestore" />
14+
<add key="gallerystore" value="packagestore" />
1515
</packageSources>
1616
<activePackageSource>
1717
<add key="All" value="(Aggregate source)" />

0 commit comments

Comments
 (0)