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

Jump to bottom

Merges unpkg-submodule branch into main, make the repo submodule ready #1325

Merged
merged 14 commits into from
Aug 7, 2023
Merged

Merges unpkg-submodule branch into main, make the repo submodule ready #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
75b8074
Move Unpkg to feature branch (#1140)
bpulliam Dec 15, 2022
d9b5047
initial build support as submodule
Scottj1s Dec 29, 2022
ab75c85
remove obsolete prop
Scottj1s Dec 30, 2022
db4a165
fixes to build with dotnet
Scottj1s Apr 6, 2023
76be675
chain up directory.build.props
Scottj1s Apr 6, 2023
04a21bd
TargetPlatformMinVersion = 10.0.17763.0
Scottj1s Apr 27, 2023
3e61c9a
do not clear config (e.g., globalPackagesFolder) from parent
Scottj1s May 5, 2023
817daf6
changed readme
Scottj1s Jun 1, 2023
6e236c6
Revert "changed readme"
Scottj1s Jun 2, 2023
28074d2
Merge branch 'main' into unpkg-main
Aug 3, 2023
09c7e82
updated winappsdk version and added version info
Aug 3, 2023
21149bb
updated project references to use different source of truths when bui…
Aug 4, 2023
e29f229
removed duplicate references
Aug 4, 2023
9c69e08
vcrtforwarder added to package reference, matching the older csproj
Aug 7, 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
3 changes: 3 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
</Project>
7 changes: 2 additions & 5 deletions WinUIGallery/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@

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

<!-- When building standalone, WinUI Gallery needs to do some extra things that are done implicitly in the WinUI repo.
Determine if building standalone by conditioning on the MuxCustomBuildTasksPackageVersion property, which only exists in the WinUI repo -->
<PropertyGroup Condition="'$(MuxCustomBuildTasksPackageVersion)' != ''">
<IsInWinUIRepo>true</IsInWinUIRepo>

<!-- When building standalone, WinUI Gallery needs to do some extra things that are done implicitly in the WinUI repo.-->
<PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
<!-- We want to binplace the WinUI Gallery pdb to a subdirectory of Symbols\Test so that the UWP and Desktop versions don't
overwrite each other. -->
<BinplaceSymbolsToSubdir>true</BinplaceSymbolsToSubdir>
Expand Down
51 changes: 51 additions & 0 deletions WinUIGallery/Package.MSIX.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
IgnorableNamespaces="uap mp uap3">
<Identity Name="Microsoft.WinUI3ControlsGallery.Desktop" Publisher="CN=WinUITest" Version="1.3.6.0" />
<mp:PhoneIdentity PhoneProductId="863667e0-667a-4bb4-ac52-c59656c7333a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>WinUI 3 Gallery</DisplayName>
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
<Logo>Assets\Tiles\StoreLogo-sdk.png</Logo>
<uap:SupportedUsers>multiple</uap:SupportedUsers>
</Properties>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
<uap:VisualElements DisplayName="WinUI 3 Gallery" Square150x150Logo="Assets\Tiles\squaretile-sdk.png" Square44x44Logo="Assets\Tiles\SmallTile-sdk.png" Description="WinUI 3 Gallery" BackgroundColor="transparent">
<uap:DefaultTile Square310x310Logo="Assets\Tiles\LargeTile.png" Wide310x150Logo="Assets\Tiles\WideTile.png" Square71x71Logo="Assets\Tiles\SmallTile.png">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="square150x150Logo" />
<uap:ShowOn Tile="wide310x150Logo" />
<uap:ShowOn Tile="square310x310Logo" />
</uap:ShowNameOnTiles>
</uap:DefaultTile>
<uap:SplashScreen Image="Assets\Tiles\splash-sdk.png" BackgroundColor="#00b2f0" />
</uap:VisualElements>
<Extensions>
<uap3:Extension Category="windows.appUriHandler">
<uap3:AppUriHandler>
<uap3:Host Name="winuigallery.com" />
<uap3:Host Name="xamlcontrolsgallery.com" />
</uap3:AppUriHandler>
</uap3:Extension>
<uap:Extension Category="windows.protocol">
<uap:Protocol Name="winui3gallery">
<uap:DisplayName>WinUI 3 Gallery</uap:DisplayName>
</uap:Protocol>
</uap:Extension>
</Extensions>
</Application>
</Applications>
<Capabilities>
<rescap:Capability Name="runFullTrust" />
<Capability Name="internetClient" />
</Capabilities>
</Package>
107 changes: 0 additions & 107 deletions WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions WinUIGallery/WinUIGallery.DesktopWap.sln
View file
Open in desktop

This file was deleted.

Loading