Skip to content

Commit 912f97f

Browse files
Merge branch 'master' into deferred-move
2 parents 2e2c4c3 + 1e67de7 commit 912f97f

File tree

107 files changed

+1163
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1163
-249
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ assignees: ''
77

88
---
99

10-
<!-- 🚨 Please Do Not skip any instructions and information mentioned below as they are all required and essential to investigate the issue. Issues with missing information may be closed without investigation 🚨 -->
10+
<!-- 🚨 PLEASE DO NOT SKIP ANY INSTRUCTIONS AND INFORMATION MENTIONED BELOW AS THEY ARE ALL REQUIRED AND ESSENTIAL TO INVESTIGATE THE ISSUE. ISSUES WITH MISSING INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION
11+
...
12+
IF NOT CERTAIN ABOUT THE ISSUE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "QUESTIONS & HELP" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/windows-toolkit/WindowsCommunityToolkit/discussions/categories/questions-help] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE ISSUE 🚨 -->
1113

1214
## Describe the bug
1315
A clear and concise description of what the bug is.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ assignees: ''
77

88
---
99

10-
<!-- 🚨 Please provide detailed information and Do Not skip any instructions as they are all required and essential to help us understand the feature 🚨 -->
10+
<!-- 🚨 PLEASE PROVIDE DETAILED INFORMATION AND DO NOT SKIP ANY INSTRUCTIONS AND INFORMATION MENTIONED BELOW AS THEY ARE ALL REQUIRED AND ESSENTIAL TO HELP US UNDERSTAND THE FEATURE.
11+
...
12+
IF NOT CERTAIN ABOUT THE FEATURE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "IDEAS" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/windows-toolkit/WindowsCommunityToolkit/discussions/categories/ideas] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE FEATURE 🚨 -->
1113

1214
## Describe the problem this feature would solve
1315
<!-- Please describe or link to any existing issues or discussions.

.github/ISSUE_TEMPLATE/question.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ Hi!
1212
1313
We try and keep our GitHub issue list for bugs and features.
1414
15-
Ideally, it'd be great to post your question on Stack Overflow using the 'windows-community-toolkit' tag here: https://stackoverflow.com/questions/tagged/windows-community-toolkit
16-
🚨 Please provide detailed information that includes examples, screenshots, and relevant issues if possible 🚨
15+
Ideally, it'd be great to post your question on Stack Overflow using the 'windows-community-toolkit' tag here: https://stackoverflow.com/questions/tagged/windows-community-toolkit OR you may ask the question on "Questions & Help" category of the Discussions platform [https://github.com/windows-toolkit/WindowsCommunityToolkit/discussions/categories/questions-help]
16+
17+
🚨 PLEASE PROVIDE DETAILED INFORMATION THAT INCLUDE EXAMPLES, SCREENSHOTS, AND RELEVANT ISSUES IF POSSIBLE 🚨
1718
1819
If this is more about a scenario that you think is missing documentation, please file an issue instead at https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/issues/new
1920

GazeInputTest/GazeInputTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
</ItemGroup>
151151
<ItemGroup>
152152
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
153-
<Version>6.2.10</Version>
153+
<Version>6.2.12</Version>
154154
</PackageReference>
155155
<PackageReference Include="StyleCop.Analyzers">
156156
<Version>1.0.2</Version>

Microsoft.Toolkit.Parsers/Microsoft.Toolkit.Parsers.csproj

Lines changed: 0 additions & 19 deletions
This file was deleted.

Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.Controls
2525
/// </summary>
2626
internal class SampleAppMarkdownRenderer : MarkdownRenderer
2727
{
28+
#pragma warning disable CS0618 // Type or member is obsolete
2829
public SampleAppMarkdownRenderer(MarkdownDocument document, ILinkRegister linkRegister, IImageResolver imageResolver, ICodeBlockResolver codeBlockResolver)
2930
: base(document, linkRegister, imageResolver, codeBlockResolver)
3031
{
@@ -514,5 +515,6 @@ private class CustomCodeBlock
514515

515516
public string CurrentLanguage { get; set; }
516517
}
518+
#pragma warning restore CS0618 // Type or member is obsolete
517519
}
518520
}

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
</PropertyGroup>
108108
<ItemGroup>
109109
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
110-
<Version>6.2.10</Version>
110+
<Version>6.2.12</Version>
111111
</PackageReference>
112112
<PackageReference Include="Microsoft.Services.Store.Engagement">
113113
<Version>10.1901.28001</Version>
@@ -118,7 +118,7 @@
118118
</PackageReference>
119119
-->
120120
<PackageReference Include="Microsoft.UI.Xaml">
121-
<Version>2.4.2</Version>
121+
<Version>2.5.0</Version>
122122
</PackageReference>
123123
<PackageReference Include="Monaco.Editor">
124124
<Version>0.7.0-alpha</Version>
@@ -745,9 +745,6 @@
745745
<Compile Include="SamplePages\ListViewExtensions\ListViewExtensionsPage.xaml.cs">
746746
<DependentUpon>ListViewExtensionsPage.xaml</DependentUpon>
747747
</Compile>
748-
<Compile Include="SamplePages\MarkdownParser\MarkdownParserPage.xaml.cs">
749-
<DependentUpon>MarkdownParserPage.xaml</DependentUpon>
750-
</Compile>
751748
<Compile Include="SamplePages\Menu\Commands\VsCommands.cs" />
752749
<Compile Include="SamplePages\Menu\MenuPage.xaml.cs">
753750
<DependentUpon>MenuPage.xaml</DependentUpon>
@@ -1175,10 +1172,6 @@
11751172
<SubType>Designer</SubType>
11761173
<Generator>MSBuild:Compile</Generator>
11771174
</Page>
1178-
<Page Include="SamplePages\MarkdownParser\MarkdownParserPage.xaml">
1179-
<SubType>Designer</SubType>
1180-
<Generator>MSBuild:Compile</Generator>
1181-
</Page>
11821175
<Page Include="SamplePages\Mouse\MouseCursorPage.xaml">
11831176
<Generator>MSBuild:Compile</Generator>
11841177
<SubType>Designer</SubType>
@@ -1401,10 +1394,6 @@
14011394
</Page>
14021395
</ItemGroup>
14031396
<ItemGroup>
1404-
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">
1405-
<Project>{42CA4935-54BE-42EA-AC19-992378C08DE6}</Project>
1406-
<Name>Microsoft.Toolkit.Parsers</Name>
1407-
</ProjectReference>
14081397
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj">
14091398
<Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
14101399
<Name>Microsoft.Toolkit.Uwp.Connectivity</Name>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownParser/MarkdownParserPage.xaml.cs

Lines changed: 0 additions & 48 deletions
This file was deleted.

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -857,14 +857,6 @@
857857
"Icon": "/Assets/Helpers.png",
858858
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/behaviors/FocusBehavior.md"
859859
},
860-
{
861-
"Name": "Markdown Parser",
862-
"Type": "MarkdownParserPage",
863-
"Subcategory": "Parser",
864-
"About": "The Markdown Parser allows you to parse a Markdown String into a Markdown Document, and then Render it with a Markdown Renderer.",
865-
"Icon": "/Assets/Helpers.png",
866-
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/parsers/MarkdownParser.md"
867-
},
868860
{
869861
"Name": "Win2d Path Mini Language Parser",
870862
"Type": "CanvasPathGeometryPage",

0 commit comments

Comments
 (0)