Skip to content

Commit

Permalink
Fixes for WinUI submodule compatibility (microsoft#1362)
Browse files Browse the repository at this point in the history
  • Loading branch information
Scottj1s authored Sep 24, 2023
1 parent 398af50 commit cbfc1fb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions WinUIGallery/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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)../')))" />
Expand Down
3 changes: 2 additions & 1 deletion WinUIGallery/WinUIGallery.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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'">
Expand Down
2 changes: 1 addition & 1 deletion nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down

0 comments on commit cbfc1fb

Please sign in to comment.