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

First round of UWP link replacement #1347

Merged
merged 2 commits into from
Sep 28, 2023
Merged

First round of UWP link replacement #1347

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
7912202
First round of UWP link replacement
marcelwgn Aug 30, 2023
6f66f75
Merge branch 'main' into dev/1344-remove-uwp-links
bpulliam Sep 20, 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: 2 additions & 1 deletion WinUIGallery/ControlPages/DesignGuidance/IconsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@
<Paragraph>
If you don't specify a FontFamily,
or you specify a FontFamily that is not available on the system at runtime,
the <Hyperlink NavigateUri="https://learn.microsoft.com/uwp/api/windows.ui.xaml.controls.fonticon">FontIcon</Hyperlink> falls back to the default font family defined by the SymbolThemeFontFamily resource.</Paragraph>
the <Hyperlink NavigateUri="https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.fonticon">FontIcon</Hyperlink> falls back to the default font family defined by the SymbolThemeFontFamily resource.
</Paragraph>
<Paragraph>
An icon with a 16-epx font size is the equivalent of a 16x16-epx icon, to make sizing and positioning more predictable.
For optimal appearance, use these specific sizes: 16, 20, 24, 32, 40, 48, and 64. Deviating from these font sizes could lead to less crisp or blurry outcomes.
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/Controls/ControlExample.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
IsTextSelectionEnabled="True"
Visibility="Collapsed">
<Paragraph>
This sample requires a later version of Windows to be fully functional. Learn more about version adaptive apps:<Hyperlink NavigateUri="https://learn.microsoft.com/windows/uwp/debug-test-perf/version-adaptive-apps">https://learn.microsoft.com/windows/uwp/debug-test-perf/version-adaptive-apps</Hyperlink>
This sample requires a later version of Windows to be fully functional.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do we still need this or can we remove this feature? WinUI 3 isn't really platform agnostic anymore and I don't think we actually need to show a warning for samples that only work on specific OS versions.

Copy link
Contributor

Choose a reason for hiding this comment

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

Your change looks good. We should keep this check, which is based on the ApiContract versions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure let's keep it though I don't think we actually still use this. Do you happen to know what the replacement link would be or do we keep the changes as is and remove the info on how to do such a check?

</Paragraph>
</RichTextBlock>

Expand Down
6 changes: 1 addition & 5 deletions WinUIGallery/DataModel/ControlInfoData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2727,15 +2727,11 @@
},
{
"Title": "Composition Animation - API",
"Uri": "https://learn.microsoft.com/windows/uwp/composition/composition-animation"
"Uri": "https://learn.microsoft.com/windows/apps/windows-app-sdk/composition"
},
{
"Title": "Guidelines - Xaml Property Animations",
"Uri": "https://learn.microsoft.com/windows/apps/design/motion/xaml-property-animations"
},
{
"Title": "Using the Visual Layer with XAML",
"Uri": "https://learn.microsoft.com/windows/uwp/composition/using-the-visual-layer-with-xaml"
}
],
"RelatedControls": [
Expand Down