From 7ffa605f1a5bc43b62b255856d7e2b0a578585a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 04:57:15 +0000 Subject: [PATCH 1/7] Bump Xamarin.Essentials from 1.7.4 to 1.7.5 Bumps [Xamarin.Essentials](https://github.com/xamarin/Essentials) from 1.7.4 to 1.7.5. - [Release notes](https://github.com/xamarin/Essentials/releases) - [Commits](https://github.com/xamarin/Essentials/compare/1.7.4...1.7.5) --- updated-dependencies: - dependency-name: Xamarin.Essentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj | 2 +- .../MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj | 2 +- .../MvvmScarletToolkit.Xamarin.Forms.Samples.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MvvmScarletToolkit.Xamarin.Forms.Samples.Android/MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj b/src/MvvmScarletToolkit.Xamarin.Forms.Samples.Android/MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj index 895dc35c..45530ad6 100644 --- a/src/MvvmScarletToolkit.Xamarin.Forms.Samples.Android/MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj +++ b/src/MvvmScarletToolkit.Xamarin.Forms.Samples.Android/MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj @@ -55,7 +55,7 @@ - + diff --git a/src/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj b/src/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj index da88e8e3..eafa3688 100644 --- a/src/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj +++ b/src/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj @@ -124,7 +124,7 @@ - + diff --git a/src/MvvmScarletToolkit.Xamarin.Forms.Samples/MvvmScarletToolkit.Xamarin.Forms.Samples.csproj b/src/MvvmScarletToolkit.Xamarin.Forms.Samples/MvvmScarletToolkit.Xamarin.Forms.Samples.csproj index 61f423c0..599970cd 100644 --- a/src/MvvmScarletToolkit.Xamarin.Forms.Samples/MvvmScarletToolkit.Xamarin.Forms.Samples.csproj +++ b/src/MvvmScarletToolkit.Xamarin.Forms.Samples/MvvmScarletToolkit.Xamarin.Forms.Samples.csproj @@ -11,7 +11,7 @@ - + From 02ae3fc2d02b87efc2884f240c90d40d5074f899 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 04:57:29 +0000 Subject: [PATCH 2/7] Bump Microsoft.NET.Test.Sdk from 17.4.1 to 17.5.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.4.1 to 17.5.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.4.1...v17.5.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../MvvmScarletToolkit.Observables.Tests.csproj | 2 +- .../MvvmScarletToolkit.Wpf.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj b/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj index 4bac9309..a47a0b22 100644 --- a/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj +++ b/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj b/src/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj index 152ee745..560cdd4b 100644 --- a/src/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj +++ b/src/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj @@ -11,7 +11,7 @@ - + From e84af47a8fa7c35f47ec2eb1e3b18755b5fd8a62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 04:57:25 +0000 Subject: [PATCH 3/7] Bump NUnit3TestAdapter from 4.3.1 to 4.4.2 Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 4.3.1 to 4.4.2. - [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases) - [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V4.3.1...V4.4.2) --- updated-dependencies: - dependency-name: NUnit3TestAdapter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../MvvmScarletToolkit.Observables.Tests.csproj | 2 +- .../MvvmScarletToolkit.Wpf.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj b/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj index 4bac9309..7b4f7ae9 100644 --- a/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj +++ b/src/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj b/src/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj index 152ee745..f0603522 100644 --- a/src/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj +++ b/src/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj @@ -10,7 +10,7 @@ - + From 0b64a84e70558e1d25c2c0e6727cdad98cde3e67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 04:57:07 +0000 Subject: [PATCH 4/7] Bump Xamarin.Forms from 5.0.0.2545 to 5.0.0.2578 Bumps Xamarin.Forms from 5.0.0.2545 to 5.0.0.2578. --- updated-dependencies: - dependency-name: Xamarin.Forms dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj | 2 +- .../MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj | 2 +- .../MvvmScarletToolkit.Xamarin.Forms.Samples.csproj | 2 +- .../MvvmScarletToolkit.Xamarin.Forms.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MvvmScarletToolkit.Xamarin.Forms.Samples.Android/MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj b/src/MvvmScarletToolkit.Xamarin.Forms.Samples.Android/MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj index 895dc35c..f9da3502 100644 --- a/src/MvvmScarletToolkit.Xamarin.Forms.Samples.Android/MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj +++ b/src/MvvmScarletToolkit.Xamarin.Forms.Samples.Android/MvvmScarletToolkit.Xamarin.Forms.Samples.Android.csproj @@ -54,7 +54,7 @@ - + diff --git a/src/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj b/src/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj index da88e8e3..7e7949b5 100644 --- a/src/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj +++ b/src/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS/MvvmScarletToolkit.Xamarin.Forms.Samples.iOS.csproj @@ -123,7 +123,7 @@ - + diff --git a/src/MvvmScarletToolkit.Xamarin.Forms.Samples/MvvmScarletToolkit.Xamarin.Forms.Samples.csproj b/src/MvvmScarletToolkit.Xamarin.Forms.Samples/MvvmScarletToolkit.Xamarin.Forms.Samples.csproj index 61f423c0..1db14859 100644 --- a/src/MvvmScarletToolkit.Xamarin.Forms.Samples/MvvmScarletToolkit.Xamarin.Forms.Samples.csproj +++ b/src/MvvmScarletToolkit.Xamarin.Forms.Samples/MvvmScarletToolkit.Xamarin.Forms.Samples.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/MvvmScarletToolkit.Xamarin.Forms/MvvmScarletToolkit.Xamarin.Forms.csproj b/src/MvvmScarletToolkit.Xamarin.Forms/MvvmScarletToolkit.Xamarin.Forms.csproj index d448ee32..84500d0b 100644 --- a/src/MvvmScarletToolkit.Xamarin.Forms/MvvmScarletToolkit.Xamarin.Forms.csproj +++ b/src/MvvmScarletToolkit.Xamarin.Forms/MvvmScarletToolkit.Xamarin.Forms.csproj @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + From cf9274db4860c2f5215a7ad096e86a6032cd8654 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 04:57:13 +0000 Subject: [PATCH 5/7] Bump DynamicData from 7.12.11 to 7.13.5 Bumps [DynamicData](https://github.com/reactiveui/DynamicData) from 7.12.11 to 7.13.5. - [Release notes](https://github.com/reactiveui/DynamicData/releases) - [Changelog](https://github.com/reactivemarbles/DynamicData/blob/main/ReleaseNotes.md) - [Commits](https://github.com/reactiveui/DynamicData/compare/7.12.11...7.13.5) --- updated-dependencies: - dependency-name: DynamicData dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../MvvmScarletToolkit.Incubator.csproj | 2 +- .../MvvmScarletToolkit.Observables.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MvvmScarletToolkit.Incubator/MvvmScarletToolkit.Incubator.csproj b/src/MvvmScarletToolkit.Incubator/MvvmScarletToolkit.Incubator.csproj index ff9ea8fb..0ddc7f21 100644 --- a/src/MvvmScarletToolkit.Incubator/MvvmScarletToolkit.Incubator.csproj +++ b/src/MvvmScarletToolkit.Incubator/MvvmScarletToolkit.Incubator.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/MvvmScarletToolkit.Observables/MvvmScarletToolkit.Observables.csproj b/src/MvvmScarletToolkit.Observables/MvvmScarletToolkit.Observables.csproj index a7e705e9..3f2584d4 100644 --- a/src/MvvmScarletToolkit.Observables/MvvmScarletToolkit.Observables.csproj +++ b/src/MvvmScarletToolkit.Observables/MvvmScarletToolkit.Observables.csproj @@ -8,7 +8,7 @@ - + all From daf19a3dd5433d002db6815d7e7d511ad25a4e1b Mon Sep 17 00:00:00 2001 From: Peter Vietense Date: Sun, 16 Apr 2023 17:08:52 +0200 Subject: [PATCH 6/7] PropertyChangedMessageTracker respects property resets to their initial value --- .../PropertyChangedMessageTrackerTests.cs | 40 ++++++++++++++++--- .../PropertyChangedMessageTracker.cs | 2 +- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/MvvmScarletToolkit.Observables.Tests/PropertyChangedMessageTrackerTests.cs b/src/MvvmScarletToolkit.Observables.Tests/PropertyChangedMessageTrackerTests.cs index 9bba429f..0e4793c3 100644 --- a/src/MvvmScarletToolkit.Observables.Tests/PropertyChangedMessageTrackerTests.cs +++ b/src/MvvmScarletToolkit.Observables.Tests/PropertyChangedMessageTrackerTests.cs @@ -102,7 +102,35 @@ public void Track_DoesWork(Func factory) Assert.AreEqual(tracker.CountChanges(viewModel), 1); } - void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e) + { + propertyChanged = true; + } + } + + [Test] + [TestCaseSource(nameof(ViewModelFactories))] + public void Track_With_Reset_Values_DoesWork(Func factory) + { + var propertyChanged = false; + + var messenger = new WeakReferenceMessenger(); + using (var tracker = new PropertyChangedMessageTracker(messenger)) + { + var viewModel = factory(messenger); + viewModel.PropertyChanged += ViewModel_PropertyChanged; + tracker.Track(viewModel); + + viewModel.Property = string.Empty; + viewModel.Property = null; + + Assert.IsTrue(propertyChanged); + Assert.IsFalse(tracker.HasChanges()); + Assert.IsFalse(tracker.HasChanges(viewModel)); + Assert.AreEqual(tracker.CountChanges(viewModel), 0); + } + + void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e) { propertyChanged = true; } @@ -140,7 +168,7 @@ public void StopTracking_DoesWork(Func factory) Assert.AreEqual(tracker.CountChanges(viewModel), 0); } - void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e) { propertyChanged = true; } @@ -178,7 +206,7 @@ public void StopAllTracking_DoesWork(Func factory) Assert.AreEqual(tracker.CountChanges(viewModel), 0); } - void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e) { propertyChanged = true; } @@ -208,7 +236,7 @@ public void SuppressChanges_DoesWork(Func factory) Assert.AreEqual(tracker.CountChanges(viewModel), 0); } - void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e) { propertyChanged = true; } @@ -238,7 +266,7 @@ public void SuppressAllChanges_DoesWork(Func factory Assert.AreEqual(tracker.CountChanges(viewModel), 0); } - void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e) { propertyChanged = true; } @@ -271,7 +299,7 @@ public void SuppressChanges_Stacked_DoesWork(Func fa Assert.AreEqual(tracker.CountChanges(viewModel), 0); } - void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e) { propertyChanged = true; } diff --git a/src/MvvmScarletToolkit.Observables/PropertyChangedMessageTracker.cs b/src/MvvmScarletToolkit.Observables/PropertyChangedMessageTracker.cs index 15711c67..834eb337 100644 --- a/src/MvvmScarletToolkit.Observables/PropertyChangedMessageTracker.cs +++ b/src/MvvmScarletToolkit.Observables/PropertyChangedMessageTracker.cs @@ -361,7 +361,7 @@ public void Upsert(PropertyChangedMessage message) return; } - actualChanges.IsActualChange = true; + actualChanges.IsActualChange = !AreEqual(actualChanges.InitialValue, message.NewValue); actualChanges.NewValue = message.NewValue; } else From 211a3ab439ca0b26d581086f95f6f8ddce2b1a6b Mon Sep 17 00:00:00 2001 From: Peter Vietense Date: Sun, 16 Apr 2023 17:09:16 +0200 Subject: [PATCH 7/7] update .NET sdk --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 94de03c5..2b54c273 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.200", + "version": "7.0.203", "rollForward": "disable" } }