Skip to content

Commit 805438c

Browse files
steinhilbersteinhilber
authored
Merge branch 'main' into fix-weakreferencemessenger-bug
2 parents 0927e56 + 28444e9 commit 805438c

File tree

14 files changed

+278
-154
lines changed

14 files changed

+278
-154
lines changed

‎Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<CopyLocalLockFileAssemblies Condition="'$(CopyLocalLockFileAssemblies)' == ''">false</CopyLocalLockFileAssemblies>
3333
<TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
3434
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
35-
<LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v16.0\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
35+
<LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
3636
<ExtrasImplicitPlatformPackageIsPrivate>true</ExtrasImplicitPlatformPackageIsPrivate>
3737

3838
<!-- Need to override the built-in implicit defines for UAP or it'll be NETCORE5_0. This makes it UAP10_0_10240_0 to match the rest -->

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationCode.bind‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
public bool IsAppUpdated => SystemInformation.Instance.IsAppUpdated;
3636

3737
// To get the first version installed
38-
public PackageVersion FirstVersionInstalled => SystemInformation.Instance.FirstVersionInstalled;
38+
public string FirstVersionInstalled => SystemInformation.Instance.FirstVersionInstalled.ToFormattedString();
39+
40+
// To get the previous version installed
41+
public string PreviousVersionInstalled => SystemInformation.Instance.PreviousVersionInstalled.ToFormattedString();
3942

4043
// To get the first time the app was launched
4144
public DateTime FirstUseTime => SystemInformation.Instance.FirstUseTime;

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationPage.xaml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,18 @@
170170
<StackPanel x:Name="Stack13"
171171
Margin="10"
172172
Orientation="Horizontal">
173+
<TextBlock FontSize="18"
174+
FontWeight="Bold"
175+
Text="Previous version installed:"
176+
TextWrapping="Wrap" />
177+
<TextBlock Margin="20,0"
178+
FontSize="18"
179+
Text="{x:Bind PreviousVersionInstalled}"
180+
TextWrapping="Wrap" />
181+
</StackPanel>
182+
<StackPanel x:Name="Stack14"
183+
Margin="10"
184+
Orientation="Horizontal">
173185
<TextBlock FontSize="18"
174186
FontWeight="Bold"
175187
Text="First use time:"
@@ -179,7 +191,7 @@
179191
Text="{x:Bind FirstUseTime}"
180192
TextWrapping="Wrap" />
181193
</StackPanel>
182-
<StackPanel x:Name="Stack14"
194+
<StackPanel x:Name="Stack15"
183195
Margin="10"
184196
Orientation="Horizontal">
185197
<TextBlock FontSize="18"
@@ -191,7 +203,7 @@
191203
Text="{x:Bind LaunchTime}"
192204
TextWrapping="Wrap" />
193205
</StackPanel>
194-
<StackPanel x:Name="Stack15"
206+
<StackPanel x:Name="Stack16"
195207
Margin="10"
196208
Orientation="Horizontal">
197209
<TextBlock FontSize="18"
@@ -203,7 +215,7 @@
203215
Text="{x:Bind LastLaunchTime}"
204216
TextWrapping="Wrap" />
205217
</StackPanel>
206-
<StackPanel x:Name="Stack16"
218+
<StackPanel x:Name="Stack17"
207219
Margin="10"
208220
Orientation="Horizontal">
209221
<TextBlock FontSize="18"
@@ -215,7 +227,7 @@
215227
Text="{x:Bind LastResetTime, Mode=OneWay}"
216228
TextWrapping="Wrap" />
217229
</StackPanel>
218-
<StackPanel x:Name="Stack17"
230+
<StackPanel x:Name="Stack18"
219231
Margin="10"
220232
Orientation="Horizontal">
221233
<TextBlock FontSize="18"
@@ -227,7 +239,7 @@
227239
Text="{x:Bind LaunchCount, Mode=OneWay}"
228240
TextWrapping="Wrap" />
229241
</StackPanel>
230-
<StackPanel x:Name="Stack18"
242+
<StackPanel x:Name="Stack19"
231243
Margin="10"
232244
Orientation="Horizontal">
233245
<TextBlock FontSize="18"
@@ -239,7 +251,7 @@
239251
Text="{x:Bind TotalLaunchCount}"
240252
TextWrapping="Wrap" />
241253
</StackPanel>
242-
<StackPanel x:Name="Stack19"
254+
<StackPanel x:Name="Stack20"
243255
Margin="10"
244256
Orientation="Horizontal">
245257
<TextBlock FontSize="18"
@@ -284,6 +296,9 @@
284296
<Setter Target="Stack15.Orientation" Value="Vertical" />
285297
<Setter Target="Stack16.Orientation" Value="Vertical" />
286298
<Setter Target="Stack17.Orientation" Value="Vertical" />
299+
<Setter Target="Stack18.Orientation" Value="Vertical" />
300+
<Setter Target="Stack19.Orientation" Value="Vertical" />
301+
<Setter Target="Stack20.Orientation" Value="Vertical" />
287302
</VisualState.Setters>
288303
</VisualState>
289304
</VisualStateGroup>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SystemInformation/SystemInformationPage.xaml.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ public sealed partial class SystemInformationPage : Page
5454
// To get the first version installed
5555
public string FirstVersionInstalled => SystemInformation.Instance.FirstVersionInstalled.ToFormattedString();
5656

57+
// To get the previous version installed
58+
public string PreviousVersionInstalled => SystemInformation.Instance.PreviousVersionInstalled.ToFormattedString();
59+
5760
// To get the first time the app was launched
5861
public string FirstUseTime => SystemInformation.Instance.FirstUseTime.ToString(Culture.DateTimeFormat);
5962

‎Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Windows.UI.Xaml.Controls.Primitives;
1616
using Windows.UI.Xaml.Media;
1717
using ColorPickerSlider = Microsoft.Toolkit.Uwp.UI.Controls.Primitives.ColorPickerSlider;
18+
using ColorSpectrum = Microsoft.UI.Xaml.Controls.Primitives.ColorSpectrum;
1819

1920
namespace Microsoft.Toolkit.Uwp.UI.Controls
2021
{
@@ -52,7 +53,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
5253
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1501:Statement should not be on a single line", Justification = "Inline brackets are used to improve code readability with repeated null checks.")]
5354
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1025:Code should not contain multiple whitespace in a row", Justification = "Whitespace is used to align code in columns for readability.")]
5455
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1306:Field names should begin with lower-case letter", Justification = "Only template parts start with a capital letter. This differentiates them from other fields.")]
55-
public partial class ColorPicker : Windows.UI.Xaml.Controls.ColorPicker
56+
public partial class ColorPicker : Microsoft.UI.Xaml.Controls.ColorPicker
5657
{
5758
internal Color CheckerBackgroundColor { get; set; } = Color.FromArgb(0x19, 0x80, 0x80, 0x80); // Overridden later
5859

@@ -122,6 +123,7 @@ public partial class ColorPicker : Windows.UI.Xaml.Controls.ColorPicker
122123
public ColorPicker()
123124
{
124125
this.DefaultStyleKey = typeof(ColorPicker);
126+
this.DefaultStyleResourceUri = new System.Uri("ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml");
125127

126128
// Setup collections
127129
this.SetValue(CustomPaletteColorsProperty, new ObservableCollection<Color>());
@@ -486,22 +488,22 @@ private ColorChannel GetActiveColorSpectrumThirdDimension()
486488
{
487489
switch (this.ColorSpectrumComponents)
488490
{
489-
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.SaturationValue:
490-
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.ValueSaturation:
491+
case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.SaturationValue:
492+
case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.ValueSaturation:
491493
{
492494
// Hue
493495
return ColorChannel.Channel1;
494496
}
495497

496-
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.HueValue:
497-
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.ValueHue:
498+
case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.HueValue:
499+
case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.ValueHue:
498500
{
499501
// Saturation
500502
return ColorChannel.Channel2;
501503
}
502504

503-
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.HueSaturation:
504-
case Windows.UI.Xaml.Controls.ColorSpectrumComponents.SaturationHue:
505+
case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.HueSaturation:
506+
case Microsoft.UI.Xaml.Controls.ColorSpectrumComponents.SaturationHue:
505507
{
506508
// Value
507509
return ColorChannel.Channel3;
@@ -1125,7 +1127,7 @@ private void DispatcherQueueTimer_Tick(object sender, object e)
11251127
***************************************************************************************/
11261128

11271129
/// <summary>
1128-
/// Callback for when the <see cref="Windows.UI.Xaml.Controls.ColorPicker.Color"/> dependency property value changes.
1130+
/// Callback for when the <see cref="Microsoft.UI.Xaml.Controls.ColorPicker.Color"/> dependency property value changes.
11291131
/// </summary>
11301132
private void OnColorChanged(DependencyObject d, DependencyProperty e)
11311133
{
@@ -1226,7 +1228,7 @@ private void CustomPaletteColors_CollectionChanged(object sender, NotifyCollecti
12261228
/// Event handler for when the color spectrum color is changed.
12271229
/// This occurs when the user presses on the spectrum to select a new color.
12281230
/// </summary>
1229-
private void ColorSpectrum_ColorChanged(ColorSpectrum sender, Windows.UI.Xaml.Controls.ColorChangedEventArgs args)
1231+
private void ColorSpectrum_ColorChanged(ColorSpectrum sender, Microsoft.UI.Xaml.Controls.ColorChangedEventArgs args)
12301232
{
12311233
// It is OK in this case to use the RGB representation
12321234
this.ScheduleColorUpdate(this.ColorSpectrumControl.Color);

‎Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
55
xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
66
xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
7-
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">
7+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
8+
xmlns:winuiprimitives="using:Microsoft.UI.Xaml.Controls.Primitives">
89

910
<SolidColorBrush x:Key="CheckerboardColor0">
1011
<SolidColorBrush.Color>
@@ -120,23 +121,23 @@
120121
Orientation="Vertical" />
121122
<!-- Keep in mind the spectrum is always HSV -->
122123
<!-- This must also not be named 'ColorSpectrum' to differentiate from the base class -->
123-
<ColorSpectrum x:Name="ColorSpectrumControl"
124-
Grid.Row="0"
125-
Grid.RowSpan="2"
126-
Grid.Column="1"
127-
MinWidth="256"
128-
MinHeight="256"
129-
HorizontalAlignment="Stretch"
130-
VerticalAlignment="Stretch"
131-
AutomationProperties.Name="Third Dimension"
132-
Components="{TemplateBinding ColorSpectrumComponents}"
133-
MaxHue="{TemplateBinding MaxHue}"
134-
MaxSaturation="{TemplateBinding MaxSaturation}"
135-
MaxValue="{TemplateBinding MaxValue}"
136-
MinHue="{TemplateBinding MinHue}"
137-
MinSaturation="{TemplateBinding MinSaturation}"
138-
MinValue="{TemplateBinding MinValue}"
139-
Shape="{TemplateBinding ColorSpectrumShape}" />
124+
<winuiprimitives:ColorSpectrum x:Name="ColorSpectrumControl"
125+
Grid.Row="0"
126+
Grid.RowSpan="2"
127+
Grid.Column="1"
128+
MinWidth="256"
129+
MinHeight="256"
130+
HorizontalAlignment="Stretch"
131+
VerticalAlignment="Stretch"
132+
AutomationProperties.Name="Third Dimension"
133+
Components="{TemplateBinding ColorSpectrumComponents}"
134+
MaxHue="{TemplateBinding MaxHue}"
135+
MaxSaturation="{TemplateBinding MaxSaturation}"
136+
MaxValue="{TemplateBinding MaxValue}"
137+
MinHue="{TemplateBinding MinHue}"
138+
MinSaturation="{TemplateBinding MinSaturation}"
139+
MinValue="{TemplateBinding MinValue}"
140+
Shape="{TemplateBinding ColorSpectrumShape}" />
140141
<primitives:ColorPickerSlider x:Name="ColorSpectrumAlphaSlider"
141142
Grid.Row="1"
142143
Grid.RowSpan="2"

‎Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected override void OnApplyTemplate()
142142
}
143143
}
144144

145-
private void ColorPicker_ColorChanged(Windows.UI.Xaml.Controls.ColorPicker sender, ColorChangedEventArgs args)
145+
private void ColorPicker_ColorChanged(Microsoft.UI.Xaml.Controls.ColorPicker sender, Microsoft.UI.Xaml.Controls.ColorChangedEventArgs args)
146146
{
147147
SelectedColor = args.NewColor;
148148
}

‎Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,16 @@ protected override Size MeasureOverride(VirtualizingLayoutContext context, Size
147147
double availableWidth = availableSize.Width;
148148
double availableHeight = availableSize.Height;
149149

150-
double columnWidth = Math.Min(DesiredColumnWidth, availableWidth);
150+
// This ternary prevents the column width from being NaN, which would otherwise cause an exception when measuring item sizes
151+
double columnWidth = double.IsNaN(DesiredColumnWidth) ? availableWidth : Math.Min(DesiredColumnWidth, availableWidth);
151152
if (columnWidth != state.ColumnWidth)
152153
{
153154
// The items will need to be remeasured
154155
state.Clear();
155156
}
156157

157-
state.ColumnWidth = Math.Min(DesiredColumnWidth, availableWidth);
158+
// This ternary prevents the column width from being NaN, which would otherwise cause an exception when measuring item sizes
159+
state.ColumnWidth = double.IsNaN(DesiredColumnWidth) ? availableWidth : Math.Min(DesiredColumnWidth, availableWidth);
158160
int numColumns = Math.Max(1, (int)Math.Floor(availableWidth / state.ColumnWidth));
159161

160162
// adjust for column spacing on all columns expect the first

‎Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/BaseObjectStorageHelper.cs‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System;
66
using System.Collections.Generic;
7-
using System.Reflection;
8-
using System.Runtime.Serialization;
97
using System.Threading.Tasks;
108
using Windows.Storage;
119

@@ -77,7 +75,7 @@ public bool KeyExists(string compositeKey, string key)
7775
/// <param name="key">Key of the object</param>
7876
/// <param name="default">Default value of the object</param>
7977
/// <returns>The T object</returns>
80-
public T Read<T>(string key, T @default = default(T))
78+
public T Read<T>(string key, T @default = default)
8179
{
8280
if (!Settings.Values.TryGetValue(key, out var value) || value == null)
8381
{
@@ -95,7 +93,7 @@ public bool KeyExists(string compositeKey, string key)
9593
/// <param name="key">Key of the object</param>
9694
/// <param name="default">Default value of the object</param>
9795
/// <returns>The T object</returns>
98-
public T Read<T>(string compositeKey, string key, T @default = default(T))
96+
public T Read<T>(string compositeKey, string key, T @default = default)
9997
{
10098
ApplicationDataCompositeValue composite = (ApplicationDataCompositeValue)Settings.Values[compositeKey];
10199
if (composite != null)
@@ -120,9 +118,6 @@ public bool KeyExists(string compositeKey, string key)
120118
/// <param name="value">Object to save</param>
121119
public void Save<T>(string key, T value)
122120
{
123-
var type = typeof(T);
124-
var typeInfo = type.GetTypeInfo();
125-
126121
Settings.Values[key] = serializer.Serialize(value);
127122
}
128123

@@ -182,7 +177,7 @@ public Task<bool> FileExistsAsync(string filePath)
182177
/// <param name="filePath">Path to the file that contains the object</param>
183178
/// <param name="default">Default value of the object</param>
184179
/// <returns>Waiting task until completion with the object in the file</returns>
185-
public async Task<T> ReadFileAsync<T>(string filePath, T @default = default(T))
180+
public async Task<T> ReadFileAsync<T>(string filePath, T @default = default)
186181
{
187182
string value = await StorageFileHelper.ReadTextFromFileAsync(Folder, filePath);
188183
return (value != null) ? serializer.Deserialize<T>(value) : @default;

‎Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/LocalObjectStorageHelper.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using System.Runtime.Serialization;
65
using Windows.Storage;
76

87
namespace Microsoft.Toolkit.Uwp.Helpers

0 commit comments

Comments
 (0)