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

Store Update #952

Merged
merged 2 commits into from
May 19, 2022
Merged

Store Update #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66fe96a
Store update
gregwoo-microsoft May 18, 2022
b256d69
Update protocol launcher to work with doc pages
gregwoo-microsoft May 18, 2022
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
4 changes: 2 additions & 2 deletions WinUIGallery/Debug.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6" IgnorableNamespaces="uap mp uap3 uap6">
<Identity Name="Microsoft.WinUI2Gallery.Debug" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.2.22.0" />
<Identity Name="Microsoft.XAMLControlsGallery.Debug" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.2.24.0" />
<mp:PhoneIdentity PhoneProductId="1DE51B2F-78B7-4c23-9045-66DD91CDFE62" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>WinUI 2 Gallery (Debug)</DisplayName>
Expand All @@ -27,7 +27,7 @@
</uap:VisualElements>
<Extensions>
<uap:Extension Category="windows.protocol">
<uap:Protocol Name="winuigallery">
<uap:Protocol Name="winui2gallery">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why adding the version?

<uap:DisplayName>WinUI 2 Gallery (Debug)</uap:DisplayName>
</uap:Protocol>
</uap:Extension>
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/Helper/ProtocolActivationClipboardHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ public static bool ShowCopyLinkTeachingTip

public static void Copy(ControlInfoDataItem item)
{
var uri = new Uri($"winuigallery://item/{item.UniqueId}", UriKind.Absolute);
var uri = new Uri($"winui2gallery://item/{item.UniqueId}", UriKind.Absolute);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the version?

ProtocolActivationClipboardHelper.Copy(uri, $"{Package.Current.DisplayName} - {item.Title} Sample");
}

public static void Copy(ControlInfoDataGroup group)
{
var uri = new Uri($"winuigallery://category/{group.UniqueId}", UriKind.Absolute);
var uri = new Uri($"winui2gallery://category/{group.UniqueId}", UriKind.Absolute);
ProtocolActivationClipboardHelper.Copy(uri, $"{Package.Current.DisplayName} - {group.Title} Samples");
}

Expand Down
2 changes: 0 additions & 2 deletions WinUIGallery/ItemTemplates.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@
CornerRadius="{StaticResource ControlCornerRadius}"
Visibility="{x:Bind BadgeString, Converter={StaticResource nullToVisibilityConverter}}" >
<muxc:InfoBadge Style="{StaticResource AttentionIconInfoBadgeStyle}" HorizontalAlignment="Right"/>

<Ellipse Fill="{ThemeResource SystemAccentColorDark1}" Width="12" Height="12"/>
</Grid>
</Grid>
</UserControl>
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6" IgnorableNamespaces="uap mp uap3 uap6">
<Identity Name="Microsoft.WinUI2Gallery" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.2.22.0" />
<Identity Name="Microsoft.XAMLControlsGallery" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.2.24.0" />
<mp:PhoneIdentity PhoneProductId="5103861a-e76c-42b7-aea1-03093f3cf4bb" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>WinUI 2 Gallery</DisplayName>
Expand All @@ -27,7 +27,7 @@
</uap:VisualElements>
<Extensions>
<uap:Extension Category="windows.protocol">
<uap:Protocol Name="winuigallery">
<uap:Protocol Name="winui2gallery">
<uap:DisplayName>WinUI 2 Gallery</uap:DisplayName>
</uap:Protocol>
</uap:Extension>
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/WinUIGallery.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
<AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<PackageCertificateThumbprint>
</PackageCertificateThumbprint>
Expand Down