Skip to content

Commit 9ee95a3

Browse files
committed
Merge branch 'main' into winui
# Conflicts: # CommunityToolkit.WinUI.SampleApp/SamplePages/KeyDownTriggerBehavior/KeyDownTriggerBehaviorXaml.bind # CommunityToolkit.WinUI.SampleApp/SamplePages/samples.json # CommunityToolkit.WinUI.UI.Animations/CommunityToolkit.WinUI.UI.Animations.csproj # CommunityToolkit.WinUI.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs # CommunityToolkit.WinUI.UI.Animations/Properties/SkipLocalsInitAttribute.cs # CommunityToolkit.WinUI.UI.Behaviors/Keyboard/KeyDownTriggerBehavior.cs # CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs # CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxAutomationPeer.cs # CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs # CommunityToolkit.WinUI.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.cs # Microsoft.Toolkit.Uwp.DeveloperTools/VisualStudioToolsManifest.xml # Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj # Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml # Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/VisualStudioToolsManifest.xml # Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml # Microsoft.Toolkit.Uwp.UI.Controls.Layout/VisualStudioToolsManifest.xml # Microsoft.Toolkit.Uwp.UI.Controls.Markdown/VisualStudioToolsManifest.xml # Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml # Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml # UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj # Windows Community Toolkit.sln
2 parents 4e4e628 + 5171b99 commit 9ee95a3

File tree

51 files changed

+1625
-206
lines changed

Some content is hidden

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

51 files changed

+1625
-206
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,26 @@ about: Create a report to help us fix something that isn't working as expected
44
title: ''
55
labels: "bug :bug:"
66
assignees: ''
7-
87
---
98

109
<!-- 🚨 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
1110
...
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/CommunityToolkit/WindowsCommunityToolkit/discussions/categories/questions-help] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE ISSUE 🚨 -->
11+
IF NOT CERTAIN ABOUT THE ISSUE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "QUESTIONS & HELP" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions/categories/questions-help] WHERE YOU CAN DISCUSS AND ENGAGE WITH THE COMMUNITY TO GAIN FURTHER CLARITY REGARDING THE ISSUE 🚨 -->
1312

1413
## Describe the bug
14+
1515
A clear and concise description of what the bug is.
1616

1717
- [ ] Is this bug a regression in the toolkit? If so, what toolkit version did you last see it work:
1818

1919
## Steps to Reproduce
2020

21-
- [ ] Can this be reproduced in the Sample App? (Either in a sample as-is or with new XAML pasted in the editor.) If so, please provide custom XAML or steps to reproduce. If not, let us know why it can't be reproduced (e.g. more complex setup, environment, dependencies, etc...) <!-- Being able to reproduce the problem in the sample app, really stream-lines the whole process in being able to discover, resolve, and validate bug fixes. -->
21+
- [ ] Can this be reproduced in the Sample App? (Either in a sample as-is or with new XAML pasted in the editor.) If so, please provide custom XAML or steps to reproduce. If not, let us know why it can't be reproduced (e.g. more complex setup, environment, dependencies, etc...)
22+
23+
<!-- Being able to reproduce the problem in the sample app, really stream-lines the whole process in being able to discover, resolve, and validate bug fixes. -->
2224

2325
Steps to reproduce the behavior:
26+
2427
1. Given the following environment (Sample App w/ XAML, Project with Isolated setup, etc...)
2528
2. Go to '...'
2629
3. Click on '....'
@@ -30,46 +33,52 @@ Steps to reproduce the behavior:
3033
<!-- Provide as many code-snippets or XAML snippets where appropriate. -->
3134

3235
## Expected behavior
33-
A clear and concise description of what you expected to happen.
36+
37+
<!-- A clear and concise description of what you expected to happen. -->
3438

3539
## Screenshots
36-
If applicable, add screenshots to help explain your problem.
40+
41+
<!-- If applicable, add screenshots to help explain your problem. -->
3742

3843
## Environment
39-
<!-- Check one or more of the following options with "x" -->
40-
```
41-
NuGet Package(s):
44+
45+
<!-- Check one or more of the following options with "x" and replace the {build_number} and {minor_version} with the actual values -->
46+
47+
NuGet Package(s): <!-- Which NuGet Packages have you used -->
4248

4349
Package Version(s):
4450

4551
Windows 10 Build Number:
52+
4653
- [ ] Fall Creators Update (16299)
4754
- [ ] April 2018 Update (17134)
4855
- [ ] October 2018 Update (17763)
4956
- [ ] May 2019 Update (18362)
5057
- [ ] May 2020 Update (19041)
51-
- [ ] Insider Build (build number: )
58+
- [ ] Insider Build ({build_number})
5259

5360
App min and target version:
61+
5462
- [ ] Fall Creators Update (16299)
5563
- [ ] April 2018 Update (17134)
5664
- [ ] October 2018 Update (17763)
5765
- [ ] May 2019 Update (18362)
5866
- [ ] May 2020 Update (19041)
59-
- [ ] Insider Build (xxxxx)
67+
- [ ] Insider Build ({build_number})
6068

6169
Device form factor:
70+
6271
- [ ] Desktop
6372
- [ ] Xbox
6473
- [ ] Surface Hub
6574
- [ ] IoT
6675

67-
Visual Studio
68-
- [ ] 2017 (version: )
69-
- [ ] 2019 (version: )
70-
- [ ] 2019 Preview (version: )
76+
Visual Studio version:
7177

72-
```
78+
- [ ] 2017 (15.{minor_version})
79+
- [ ] 2019 (16.{minor_version})
80+
- [ ] 2022 (17.{minor_version})
7381

7482
## Additional context
75-
Add any other context about the problem here.
83+
84+
<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: I have a documentation suggestion or question
44
title: "[Docs]"
55
labels: documentation
66
assignees: ''
7-
87
---
98

109
<!--

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ about: I have a new idea or improvement for the toolkit
44
title: "[Feature]"
55
labels: "feature request :mailbox_with_mail:"
66
assignees: ''
7-
87
---
98

109
<!-- 🚨 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.
1110
...
12-
IF NOT CERTAIN ABOUT THE FEATURE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "IDEAS" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions/categories/ideas] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE FEATURE 🚨 -->
11+
IF NOT CERTAIN ABOUT THE FEATURE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "IDEAS" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions/categories/ideas] WHERE YOU CAN DISCUSS AND ENGAGE WITH THE COMMUNITY TO GAIN FURTHER CLARITY REGARDING THE FEATURE 🚨 -->
1312

1413
## Describe the problem this feature would solve
14+
1515
<!-- Please describe or link to any existing issues or discussions.
1616
A clear and concise description of what the problem is, starting with the user story.
1717
Provide examples of the restrictions in the current environment that hinders the work your users or you want to perform. What are the ways this new feature will help transform and deliver those results?
1818
For example, I am currently using the InfiniteCanvas control which lacks the TabbedCommandBar control feature. I am looking to improve user experience therefore i would like to use that in my project to provide ease of accessibility and a user-friendly interface. This new feature will provide quick access to the toolbar, enhance space utilization, etc [...] -->
1919

20-
2120
## Describe the solution
22-
<!-- A clear and concise description of what you want to happen. Define how do you think it will help the community and adds value to the toolkit? -->
2321

22+
<!-- A clear and concise description of what you want to happen. Define how do you think it will help the community and adds value to the toolkit? -->
2423

2524
## Describe alternatives you've considered
26-
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
2725

26+
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
2827

2928
## Additional context & Screenshots
29+
3030
<!-- Add any other context or screenshots about the feature request here.-->

.github/ISSUE_TEMPLATE/question.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: I have a question about how to use something in the toolkit.
44
title: "[Question]"
55
labels: "question :grey_question:"
66
assignees: ''
7-
87
---
98

109
<!--

.github/ISSUE_TEMPLATE/win32_controls.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: I have an issue with a Toolkit WPF or WinForms control
44
title: "[Win32]"
55
labels:
66
assignees: ''
7-
87
---
98

109
<!--

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
<!-- 🚨 Please Do Not skip any instructions and information mentioned below as they are all required and essential to evaluate and test the PR. By fulfilling all the required information you will be able to reduce the volume of questions and most likely help merge the PR faster 🚨 -->
22

3-
<!-- 👉 It is imperative to resolve ONE ISSUE PER PR and avoid making multiple changes unless the changes interrelate with each other -->
3+
<!-- 👉 It is imperative to resolve ONE ISSUE PER PR and avoid making multiple changes unless the changes interrelate with each other -->
44

55
<!-- 📝 Please always keep the "☑️ Allow edits by maintainers" button checked in the Pull Request Template as it increases collaboration with the Toolkit maintainers by permitting commits to your PR branch (only) created from your fork. This can let us quickly make fixes for minor typos or forgotten StyleCop issues during review without needing to wait on you doing extra work. Let us help you help us! 🎉 -->
66

7+
## Fixes
78

8-
## Fixes #
9-
<!-- Add the relevant issue number after the "#" mentioned above (for ex: "## Fixes #1234") which will automatically close the issue once the PR is merged. -->
9+
<!-- Add the relevant issue number after the word "Fixes" mentioned above (for ex: "## Fixes #1234") which will automatically close the issue once the PR is merged. -->
1010

1111
<!-- Add a brief overview here of the feature/bug & fix. -->
1212

1313
## PR Type
14+
1415
What kind of change does this PR introduce?
16+
1517
<!-- Please uncomment one or more options below that apply to this PR. -->
1618

1719
<!-- - Bugfix -->
@@ -23,30 +25,30 @@ What kind of change does this PR introduce?
2325
<!-- - Sample app changes -->
2426
<!-- - Other... Please describe: -->
2527

26-
2728
## What is the current behavior?
28-
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
2929

30+
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
3031

3132
## What is the new behavior?
32-
<!-- Describe how was this issue resolved or changed? -->
3333

34+
<!-- Describe how was this issue resolved or changed? -->
3435

3536
## PR Checklist
3637

37-
Please check if your PR fulfills the following requirements:
38+
Please check if your PR fulfills the following requirements: <!-- and remove the ones that are not applicable to the current PR -->
3839

39-
- [ ] Tested code with current [supported SDKs](../readme.md#supported)
40-
- [ ] Pull Request has been submitted to the documentation repository [instructions](..\contributing.md#docs). Link: <!-- docs PR link -->
40+
- [ ] Tested code with current [supported SDKs](../#supported)
41+
- [ ] Pull Request has been submitted to the documentation repository [instructions](../blob/main/Contributing.md#docs). Link: <!-- docs PR link -->
4142
- [ ] Sample in sample app has been added / updated (for bug fixes / features)
42-
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets)
43+
- [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets)
4344
- [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc...
4445
- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
45-
- [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*)
46+
- [ ] Header has been added to all new source files (run _build/UpdateHeaders.bat_)
4647
- [ ] Contains **NO** breaking changes
4748

4849
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
49-
Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. -->
50-
50+
Please note that breaking changes are likely to be rejected within minor release cycles or held until major versions. -->
5151

5252
## Other information
53+
54+
<!-- Please add any other information that might be helpful to reviewers. -->

CODE_OF_CONDUCT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ members of the project's leadership.
6868
## Attribution
6969

7070
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
71+
available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
7272

7373
[homepage]: https://www.contributor-covenant.org
7474

7575
For answers to common questions about this code of conduct, see
76-
https://www.contributor-covenant.org/faq
76+
<https://www.contributor-covenant.org/faq>

CommunityToolkit.Mvvm.SourceGenerators/Attributes/NullabilityAttributesGenerator.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using Microsoft.CodeAnalysis;
1010
using Microsoft.CodeAnalysis.Text;
1111

12-
namespace Microsoft.Toolkit.Mvvm.SourceGenerators
12+
namespace CommunityToolkit.Mvvm.SourceGenerators
1313
{
1414
/// <summary>
1515
/// A source generator for necessary nullability attributes.
@@ -34,14 +34,18 @@ public void Execute(GeneratorExecutionContext context)
3434
/// </summary>
3535
private void AddSourceCodeIfTypeIsNotPresent(GeneratorExecutionContext context, string typeFullName)
3636
{
37-
if (context.Compilation.GetTypeByMetadataName(typeFullName) is not null)
37+
// Check that the target attributes are not available in the consuming project. To ensure that
38+
// this works fine both in .NET (Core) and .NET Standard implementations, we also need to check
39+
// that the target types are declared as public (we assume that in this case those types are from the BCL).
40+
// This avoids issues on .NET Standard with Roslyn also seeing internal types from referenced assemblies.
41+
if (context.Compilation.GetTypeByMetadataName(typeFullName) is { DeclaredAccessibility: Accessibility.Public })
3842
{
3943
return;
4044
}
4145

4246
string
4347
typeName = typeFullName.Split('.').Last(),
44-
filename = $"Microsoft.Toolkit.Mvvm.SourceGenerators.EmbeddedResources.{typeName}.cs";
48+
filename = $"CommunityToolkit.Mvvm.SourceGenerators.EmbeddedResources.{typeName}.cs";
4549

4650
Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(filename);
4751
StreamReader reader = new(stream);

CommunityToolkit.Win32/ReadMe.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Windows Community Toolkit - WPF and Windows Forms
1+
# Windows Community Toolkit WPF and Windows Forms
22

3-
The source has moved to a new repository: https://github.com/CommunityToolkit/Microsoft.Toolkit.Win32
3+
The source has moved to a new repository: <https://github.com/CommunityToolkit/Microsoft.Toolkit.Win32>

CommunityToolkit.WinUI.Connectivity/Network/ConnectionInformation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ public bool IsInternetOnMeteredConnection
135135
public byte? SignalStrength { get; private set; }
136136

137137
/// <summary>
138-
/// Gets signal strength for the current Internet Connection Profile.
138+
/// Gets the network names associated with the current Internet Connection Profile.
139139
/// </summary>
140-
/// <returns>value of <see cref="NetworkConnectivityLevel"/></returns>
140+
/// <returns>value of <see cref="IReadOnlyList{String}"/></returns>
141141
public IReadOnlyList<string> NetworkNames
142142
{
143143
get
@@ -146,4 +146,4 @@ public IReadOnlyList<string> NetworkNames
146146
}
147147
}
148148
}
149-
}
149+
}

0 commit comments

Comments
 (0)