Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for WinUI submodule compatibility #1362

Merged
merged 3 commits into from
Sep 24, 2023
Merged

Fixes for WinUI submodule compatibility #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c89d3e
lost original submodule config change which removed packagestore to p…
Scottj1s Sep 23, 2023
dd70dc4
fixed scenario of gallery as a submodule, where WindowsAppSdkSelfCont…
Scottj1s Sep 23, 2023
305c9fd
disable experimental features that are now breaking compilation with …
Scottj1s Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions WinUIGallery/Directory.Build.props
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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