Skip to content

Commit eff69f8

Browse files
committed
Merge branch 'master' into gazeCS
1 parent 910de59 commit eff69f8

File tree

129 files changed

+1329
-595
lines changed

Some content is hidden

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

129 files changed

+1329
-595
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,5 +323,5 @@ dotnet_diagnostic.SA1634.severity = none
323323
dotnet_diagnostic.SA1652.severity = none
324324

325325
dotnet_diagnostic.SA1629.severity = none # DocumentationTextMustEndWithAPeriod: Let's enable this rule back when we shift to WinUI3 (v8.x). If we do it now, it would mean more than 400 file changes.
326-
dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline intializers. It's also debatable if we want this or not.
326+
dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline initializers. It's also debatable if we want this or not.
327327
dotnet_diagnostic.SA1314.severity = none # TypeParameterNamesMustBeginWithT: We do have a few templates that don't start with T. We need to double check that changing this is not a breaking change. If not, we can re-enable this.

GazeInputTest/MainPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</ToggleButton>
4444
<ProgressBar Grid.Row="1" x:Name="ProgressShow" Maximum="100" />
4545
</Grid>
46-
<TextBlock Grid.Row="2" Grid.Column="0" x:Name="DeviceAvailable" Text="Device availablility not yet detected"/>
46+
<TextBlock Grid.Row="2" Grid.Column="0" x:Name="DeviceAvailable" Text="Device availability not yet detected"/>
4747
<Grid Grid.Row="2" Grid.Column="1">
4848
<Grid.ColumnDefinitions>
4949
<ColumnDefinition/>

Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Microsoft.Toolkit.HighPerformance.Buffers
1212
{
1313
/// <summary>
14-
/// Represents an utput sink into which <typeparamref name="T"/> data can be written, backed by a <see cref="Memory{T}"/> instance.
14+
/// Represents an output sink into which <typeparamref name="T"/> data can be written, backed by a <see cref="Memory{T}"/> instance.
1515
/// </summary>
1616
/// <typeparam name="T">The type of items to write to the current instance.</typeparam>
1717
/// <remarks>

Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static ref readonly T DangerousGetLookupReferenceAt<T>(this ReadOnlySpan<
9999
// The result is then negated, producing the value 0xFFFFFFFF
100100
// for valid indices, or 0 otherwise. The generated mask
101101
// is then combined with the original index. This leaves
102-
// the index intact if it was valid, otherwise zeroes it.
102+
// the index intact if it was valid, otherwise zeros it.
103103
// The computed offset is finally used to access the
104104
// lookup table, and it is guaranteed to never go out of
105105
// bounds unless the input span was just empty, which for a

Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static bool HasFlag(uint value, int n)
5454
/// decrement the input parameter <paramref name="x"/> to ensure that the range of accepted
5555
/// values fits within the available 32 bits of the lookup table in use.
5656
/// For more info on this optimization technique, see <see href="https://egorbo.com/llvm-range-checks.html"/>.
57-
/// Here is how the code from the lik above would be implemented using this method:
57+
/// Here is how the code from the link above would be implemented using this method:
5858
/// <code>
5959
/// bool IsReservedCharacter(char c)
6060
/// {

Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Hash.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public static unsafe int GetDjb2LikeByteHash(ref byte r0, IntPtr length)
105105
// and the final loop to combine the partial hash values.
106106
// Note that even when we use the vectorized path we don't need to do
107107
// any preprocessing to try to get memory aligned, as that would cause
108-
// the hashcodes to potentially be different for the same data.
108+
// the hash codes to potentially be different for the same data.
109109
if (Vector.IsHardwareAccelerated &&
110110
(byte*)length >= (byte*)(Vector<byte>.Count << 3))
111111
{

Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public bool HasValue
5959
get
6060
{
6161
// We know that the span will always have a length of either
62-
// 1 or 0, se instead of using a cmp instruction and setting the
62+
// 1 or 0, so instead of using a cmp instruction and setting the
6363
// zero flag to produce our boolean value, we can just cast
6464
// the length to byte without overflow checks (doing a cast will
6565
// also account for the byte endianness of the current system),

Microsoft.Toolkit.Parsers/Markdown/Blocks/CodeBlock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public CodeBlock()
2727
public string Text { get; set; }
2828

2929
/// <summary>
30-
/// Gets or sets the Language specified in prefix, e.g. ```c# (Github Style Parsing).<para/>
30+
/// Gets or sets the Language specified in prefix, e.g. ```c# (GitHub Style Parsing).<para/>
3131
/// This does not guarantee that the Code Block has a language, or no language, some valid code might not have been prefixed, and this will still return null. <para/>
3232
/// To ensure all Code is Highlighted (If desired), you might have to determine the language from the provided string, such as looking for key words.
3333
/// </summary>

Microsoft.Toolkit.Parsers/Rss/BaseRssParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Microsoft.Toolkit.Parsers.Rss
1010
{
1111
/// <summary>
12-
/// Base class for Rss Parser(s).
12+
/// Base class for RSS Parser(s).
1313
/// </summary>
1414
internal abstract class BaseRssParser
1515
{

Microsoft.Toolkit.Parsers/Rss/Enums/RssType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Microsoft.Toolkit.Parsers.Rss
66
{
77
/// <summary>
8-
/// Type of Rss.
8+
/// Type of RSS.
99
/// </summary>
1010
internal enum RssType
1111
{

Microsoft.Toolkit.Parsers/Rss/Rss2Parser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Microsoft.Toolkit.Parsers.Rss
1212
{
1313
/// <summary>
14-
/// Rss reader implementation to parse Rss content.
14+
/// RSS reader implementation to parse RSS content.
1515
/// </summary>
1616
internal class Rss2Parser : BaseRssParser
1717
{

Microsoft.Toolkit.Parsers/Rss/RssHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Microsoft.Toolkit.Parsers.Rss
1414
{
1515
/// <summary>
16-
/// Class with utilities for Rss related works.
16+
/// Class with utilities for RSS related works.
1717
/// </summary>
1818
internal static class RssHelper
1919
{

Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpSignatureManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Microsoft.Toolkit.Services.PlatformSpecific.Uwp
1212
{
1313
/// <summary>
14-
/// Uwp specific signature generator using cryptographic library
14+
/// UWP specific signature generator using cryptographic library
1515
/// </summary>
1616
internal class UwpSignatureManager : ISignatureManager
1717
{

Microsoft.Toolkit.Services/PlatformSpecific/Uwp/UwpStorageManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Microsoft.Toolkit.Services.PlatformSpecific.Uwp
1212
{
1313
/// <summary>
14-
/// Uwp specific implementation for IStorageManager using ApplicationData and LocalSettings
14+
/// UWP specific implementation for IStorageManager using ApplicationData and LocalSettings
1515
/// </summary>
1616
internal class UwpStorageManager : IStorageManager
1717
{

Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public Task LogoutAsync()
113113

114114
#if WINRT
115115
/// <summary>
116-
/// Initialize underlying provider with relevant token information for Uwp.
116+
/// Initialize underlying provider with relevant token information for UWP.
117117
/// </summary>
118118
/// <param name="oAuthTokens">Token instance.</param>
119119
/// <param name="requiredPermissions">Scope / permissions app requires user to sign up for.</param>
@@ -138,7 +138,7 @@ public bool Initialize(string clientId, string clientSecret, string callbackUri)
138138

139139
#if NET462
140140
/// <summary>
141-
/// Initialize underlying provider with relevant token information for Uwp.
141+
/// Initialize underlying provider with relevant token information for UWP.
142142
/// </summary>
143143
/// <param name="oAuthTokens">Token instance.</param>
144144
/// <param name="requiredPermissions">Scope / permissions app requires user to sign up for.</param>

Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public bool Initialize(TwitterOAuthTokens oAuthTokens, IAuthenticationBroker aut
151151

152152
#if WINRT
153153
/// <summary>
154-
/// Initialize underlying provider with relevant token information for Uwp.
154+
/// Initialize underlying provider with relevant token information for UWP.
155155
/// </summary>
156156
/// <param name="consumerKey">Consumer key.</param>
157157
/// <param name="consumerSecret">Consumer secret.</param>
@@ -175,7 +175,7 @@ public bool Initialize(TwitterOAuthTokens oAuthTokens)
175175

176176
#if NET462
177177
/// <summary>
178-
/// Initialize underlying provider with relevant token information for Uwp.
178+
/// Initialize underlying provider with relevant token information for UWP.
179179
/// </summary>
180180
/// <param name="consumerKey">Consumer key.</param>
181181
/// <param name="consumerSecret">Consumer secret.</param>

Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public bool Initialize(WeiboOAuthTokens oAuthTokens, IAuthenticationBroker authe
136136

137137
#if WINRT
138138
/// <summary>
139-
/// Initialize underlying provider with relevant token information for Uwp.
139+
/// Initialize underlying provider with relevant token information for UWP.
140140
/// </summary>
141141
/// <param name="appKey">App key.</param>
142142
/// <param name="appSecret">App secret.</param>

Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/GattNativeUuid.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ public enum GattNativeUuid : ushort
633633
PositionQuality = 0x2A69,
634634

635635
/// <summary>
636-
/// The scientific temperature in celsius
636+
/// The scientific temperature in Celsius
637637
/// </summary>
638638
ScientificTemperatureInCelsius = 0x2A3C,
639639

@@ -648,12 +648,12 @@ public enum GattNativeUuid : ushort
648648
String = 0x2A3D,
649649

650650
/// <summary>
651-
/// The temperature in celsius
651+
/// The temperature in Celsius
652652
/// </summary>
653653
TemperatureInCelsius = 0x2A1F,
654654

655655
/// <summary>
656-
/// The temperature in fahrenheit
656+
/// The temperature in Fahrenheit
657657
/// </summary>
658658
TemperatureInFahrenheit = 0x2A20,
659659

Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazeInput.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public static TimeSpan GetFixationDuration(UIElement element)
231231
}
232232

233233
/// <summary>
234-
/// Gets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typicaly achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
234+
/// Gets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typically achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
235235
/// </summary>
236236
/// <returns>The duration for the control to transition from the Fixation state to the Dwell state.</returns>
237237
public static TimeSpan GetDwellDuration(UIElement element)
@@ -325,7 +325,7 @@ public static void SetFixationDuration(UIElement element, TimeSpan span)
325325
}
326326

327327
/// <summary>
328-
/// Sets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typicaly achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
328+
/// Sets the duration for the control to transition from the Fixation state to the Dwell state. At this point, a StateChanged event is fired with PointerState set to Dwell. The Enter and Fixation states are typically achieved too rapidly for the user to have much control over. In contrast Dwell is conscious event. This is the point at which the control is invoked, e.g. a button click. The application can modify this property to control when a gaze enabled UI element gets invoked after a user starts looking at it.
329329
/// </summary>
330330
public static void SetDwellDuration(UIElement element, TimeSpan span)
331331
{

Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,8 +546,8 @@ private GazeTargetItem GetHitTarget(Point gazePoint)
546546

547547
private GazeTargetItem ResolveHitTarget(Point gazePoint, TimeSpan timestamp)
548548
{
549-
// TODO: The existance of a GazeTargetItem should be used to indicate that
550-
// the target item is invokable. The method of invokation should be stored
549+
// TODO: The existence of a GazeTargetItem should be used to indicate that
550+
// the target item is invokable. The method of invocation should be stored
551551
// within the GazeTargetItem when it is created and not recalculated when
552552
// subsequently needed.
553553

Microsoft.Toolkit.Uwp.Input.GazeInteraction/IGazeFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.Toolkit.Uwp.Input.GazeInteraction
88
{
9-
// Every filter must provide an Wpdate method which transforms sample data
9+
// Every filter must provide an Update method which transforms sample data
1010
// and returns filtered output
1111
internal interface IGazeFilter
1212
{

Microsoft.Toolkit.Uwp.Input.GazeInteraction/PointerState.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public enum PointerState
3434
Fixation = 3,
3535

3636
/// <summary>
37-
/// User is conciously dwelling on the control with an intent to invoke, e.g. click a button
37+
/// User is consciously dwelling on the control with an intent to invoke, e.g. click a button
3838
/// </summary>
3939
Dwell = 4,
4040

Microsoft.Toolkit.Uwp.Notifications/Adaptive/BaseTextHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ namespace Microsoft.Toolkit.Uwp.Notifications
88
{
99
internal class BaseTextHelper
1010
{
11-
internal static Element_AdaptiveText CreateBaseElement(IBaseText baseText)
11+
internal static Element_AdaptiveText CreateBaseElement(IBaseText current)
1212
{
1313
return new Element_AdaptiveText()
1414
{
15-
Text = baseText.Text,
16-
Lang = baseText.Language
15+
Text = current.Text,
16+
Lang = current.Language
1717
};
1818
}
1919
}

Microsoft.Toolkit.Uwp.Notifications/Adaptive/BindableValues/BindableProgressBarValue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static implicit operator AdaptiveProgressBarValue(BindableProgressBarValu
8080
}
8181

8282
/// <summary>
83-
/// Creates an <see cref="BindableProgressBarValue"/> that has tbe raw double value.
83+
/// Creates an <see cref="BindableProgressBarValue"/> that has the raw double value.
8484
/// </summary>
8585
/// <param name="d">The raw value</param>
8686
public static implicit operator BindableProgressBarValue(double d)

Microsoft.Toolkit.Uwp.Notifications/Tiles/Elements/Element_TileBinding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public Element_TileBinding(TileTemplateNameV3 template)
6161
public string DisplayName { get; set; }
6262

6363
/// <summary>
64-
/// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overriden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
64+
/// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overridden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
6565
/// </summary>
6666
[NotificationXmlAttribute("lang")]
6767
public string Language { get; set; }

Microsoft.Toolkit.Uwp.Notifications/Tiles/SpecialTemplates/TileBindingContentPhotos.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
namespace Microsoft.Toolkit.Uwp.Notifications
88
{
99
/// <summary>
10-
/// Animates through a slideshow of photos. Supported on all sizes.
10+
/// Animates through a slide show of photos. Supported on all sizes.
1111
/// </summary>
1212
public sealed class TileBindingContentPhotos : ITileBindingContent
1313
{
1414
/// <summary>
15-
/// Gets the collection of slideshow images. Up to 12 images can be provided (Mobile will only display up to 9), which will be used for the slideshow. Adding more than 12 will throw an exception.
15+
/// Gets the collection of slide show images. Up to 12 images can be provided (Mobile will only display up to 9), which will be used for the slide show. Adding more than 12 will throw an exception.
1616
/// </summary>
1717
public IList<TileBasicImage> Images { get; private set; } = new LimitedList<TileBasicImage>(12);
1818

Microsoft.Toolkit.Uwp.Notifications/Tiles/TileBinding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.Toolkit.Uwp.Notifications
1212
public sealed class TileBinding
1313
{
1414
/// <summary>
15-
/// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overriden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
15+
/// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overridden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
1616
/// </summary>
1717
public string Language { get; set; }
1818

Microsoft.Toolkit.Uwp.Notifications/Tiles/TileVisual.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private static bool TryReuseTextElementForLockDetailedText(int lineNumber, strin
111111
throw new ArgumentNullException("binding cannot be null");
112112
}
113113

114-
// If a text element already has an id with the line number (only look at immediate children, since the lockscreen will ignore things under groups/subgroups)
114+
// If a text element already has an id with the line number (only look at immediate children, since the lock screen will ignore things under groups/subgroups)
115115
Element_AdaptiveText matchingIdTextElement = binding.Children.OfType<Element_AdaptiveText>().FirstOrDefault(i => i.Id != null && i.Id.Equals(lineNumber.ToString()));
116116

117117
if (matchingIdTextElement != null)

Microsoft.Toolkit.Uwp.Notifications/Toasts/Elements/Element_ToastBinding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public Element_ToastBinding(ToastTemplateType template)
3737
public Uri BaseUri { get; set; }
3838

3939
/// <summary>
40-
/// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overriden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
40+
/// Gets or sets the target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides that in visual, but can be overridden by that in text. If this value is a literal string, this attribute defaults to the user's UI language. If this value is a string reference, this attribute defaults to the locale chosen by Windows Runtime in resolving the string. See Remarks for when this value isn't specified.
4141
/// </summary>
4242
[NotificationXmlAttribute("lang")]
4343
public string Language { get; set; }

0 commit comments

Comments
 (0)