From 9ec11c42e968769268ae8cef337716cada2d0aef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 06:14:58 +0000 Subject: [PATCH 1/9] Bump terser from 4.8.0 to 4.8.1 in /docs Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- docs/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index cabf966d..2c9f3bae 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -9225,9 +9225,9 @@ "dev": true }, "terser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", - "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz", + "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==", "dev": true, "requires": { "commander": "^2.20.0", From 15e0c0cf344394df44f17ec3ab4fda80c4b42f8d Mon Sep 17 00:00:00 2001 From: Kazuki Ota Date: Thu, 10 Nov 2022 21:36:55 +0900 Subject: [PATCH 2/9] update targetframeworks --- Source/ReactiveProperty.Core/ReactiveProperty.Core.csproj | 2 +- .../ReactiveProperty.NETStandard.csproj | 2 +- .../ReactiveProperty.Platform.Android.csproj | 2 +- .../ReactiveProperty.Platform.Blazor.csproj | 2 +- .../ReactiveProperty.Platform.WPF.csproj | 2 +- .../ReactiveProperty.Platform.iOS.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/ReactiveProperty.Core/ReactiveProperty.Core.csproj b/Source/ReactiveProperty.Core/ReactiveProperty.Core.csproj index 9d30cb35..0f06730c 100644 --- a/Source/ReactiveProperty.Core/ReactiveProperty.Core.csproj +++ b/Source/ReactiveProperty.Core/ReactiveProperty.Core.csproj @@ -2,7 +2,7 @@ ReactiveProperty.Core - netstandard2.0;netcoreapp3.1;net6.0;net472 + netstandard2.0;net6.0;net7.0;net472 ReactiveProperty.Core true key.snk diff --git a/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj b/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj index d0b53828..3dc09e75 100644 --- a/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj +++ b/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj @@ -2,7 +2,7 @@ ReactiveProperty - netstandard2.0;netcoreapp3.1;net6.0;net472 + netstandard2.0;net6.0;net7.0;net472 ReactiveProperty true key.snk diff --git a/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj b/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj index 219d3c5d..3b390135 100644 --- a/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj +++ b/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj @@ -1,7 +1,7 @@  - net6.0-android + net7.0-android ReactiveProperty.XamarinAndroid ReactiveProperty.XamarinAndroid true diff --git a/Source/ReactiveProperty.Platform.Blazor/ReactiveProperty.Platform.Blazor.csproj b/Source/ReactiveProperty.Platform.Blazor/ReactiveProperty.Platform.Blazor.csproj index 8d280b77..84f32bf9 100644 --- a/Source/ReactiveProperty.Platform.Blazor/ReactiveProperty.Platform.Blazor.csproj +++ b/Source/ReactiveProperty.Platform.Blazor/ReactiveProperty.Platform.Blazor.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0 enable enable ReactiveProperty.Blazor diff --git a/Source/ReactiveProperty.Platform.WPF/ReactiveProperty.Platform.WPF.csproj b/Source/ReactiveProperty.Platform.WPF/ReactiveProperty.Platform.WPF.csproj index ab59a58b..940cc80e 100644 --- a/Source/ReactiveProperty.Platform.WPF/ReactiveProperty.Platform.WPF.csproj +++ b/Source/ReactiveProperty.Platform.WPF/ReactiveProperty.Platform.WPF.csproj @@ -1,7 +1,7 @@  - net6.0-windows;netcoreapp3.1;net472 + net6.0-windows;net7.0-windows;net472 ReactiveProperty.WPF true true diff --git a/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj b/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj index f455f7ed..c563d036 100644 --- a/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj +++ b/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj @@ -1,7 +1,7 @@  - net6.0-ios + net7.0-ios ReactiveProperty.XamariniOS ReactiveProperty.XamariniOS true From f9445577145ca16c7d590978300e2a710620fe41 Mon Sep 17 00:00:00 2001 From: Kazuki Ota Date: Thu, 10 Nov 2022 21:59:39 +0900 Subject: [PATCH 3/9] update targetframework for sample projects --- .../Blazor/BlazorSample.Shared/BlazorSample.Shared.csproj | 2 +- Samples/Blazor/BlazorServerApp/BlazorServerApp.csproj | 2 +- Samples/Blazor/BlazorWasmApp/BlazorWasmApp.csproj | 6 +++--- Samples/MultiUIThreadApp/MultiUIThreadApp.csproj | 2 +- Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj | 6 +++--- Samples/Reactive.Todo/Reactive.Todo.csproj | 6 +++--- .../ReactivePropertySamples.WPF.csproj | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Samples/Blazor/BlazorSample.Shared/BlazorSample.Shared.csproj b/Samples/Blazor/BlazorSample.Shared/BlazorSample.Shared.csproj index 7b4045aa..b9e52d80 100644 --- a/Samples/Blazor/BlazorSample.Shared/BlazorSample.Shared.csproj +++ b/Samples/Blazor/BlazorSample.Shared/BlazorSample.Shared.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 enable enable diff --git a/Samples/Blazor/BlazorServerApp/BlazorServerApp.csproj b/Samples/Blazor/BlazorServerApp/BlazorServerApp.csproj index 6578083d..ed55e48f 100644 --- a/Samples/Blazor/BlazorServerApp/BlazorServerApp.csproj +++ b/Samples/Blazor/BlazorServerApp/BlazorServerApp.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/Samples/Blazor/BlazorWasmApp/BlazorWasmApp.csproj b/Samples/Blazor/BlazorWasmApp/BlazorWasmApp.csproj index a493f41c..a87dec2e 100644 --- a/Samples/Blazor/BlazorWasmApp/BlazorWasmApp.csproj +++ b/Samples/Blazor/BlazorWasmApp/BlazorWasmApp.csproj @@ -1,14 +1,14 @@ - net6.0 + net7.0 enable enable - - + + diff --git a/Samples/MultiUIThreadApp/MultiUIThreadApp.csproj b/Samples/MultiUIThreadApp/MultiUIThreadApp.csproj index 24f72655..96e4de23 100644 --- a/Samples/MultiUIThreadApp/MultiUIThreadApp.csproj +++ b/Samples/MultiUIThreadApp/MultiUIThreadApp.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true diff --git a/Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj b/Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj index d8b2b71f..9b9ea64b 100644 --- a/Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj +++ b/Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj @@ -1,12 +1,12 @@  - net6.0-windows + net7.0-windows true Reactive.Todo.Main - - + + diff --git a/Samples/Reactive.Todo/Reactive.Todo.csproj b/Samples/Reactive.Todo/Reactive.Todo.csproj index 159744aa..f7965e85 100644 --- a/Samples/Reactive.Todo/Reactive.Todo.csproj +++ b/Samples/Reactive.Todo/Reactive.Todo.csproj @@ -1,13 +1,13 @@  WinExe - net6.0-windows + net7.0-windows true Reactive.Todo - - + + diff --git a/Samples/ReactivePropertySamples.WPF/ReactivePropertySamples.WPF.csproj b/Samples/ReactivePropertySamples.WPF/ReactivePropertySamples.WPF.csproj index 91269e4e..2b71df44 100644 --- a/Samples/ReactivePropertySamples.WPF/ReactivePropertySamples.WPF.csproj +++ b/Samples/ReactivePropertySamples.WPF/ReactivePropertySamples.WPF.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true From 942bbc4ef6677bbca3eb01bd9b4e416afb2db0f4 Mon Sep 17 00:00:00 2001 From: Kazuki Ota Date: Thu, 10 Nov 2022 22:21:34 +0900 Subject: [PATCH 4/9] update targetframework for benchmark projects --- Benchmark/Benchmark.Current/Benchmark.Current.csproj | 4 ++-- Benchmark/Benchmark.V6/BasicUsages.cs | 6 ++++-- Benchmark/Benchmark.V6/Benchmark.V6.csproj | 4 ++-- Benchmark/Benchmark.V7/Benchmark.V7.csproj | 4 ++-- .../FromEventBenchmark.Rp/FromEventBenchmark.Rp.csproj | 4 ++-- .../FromEventBenchmark.Rx/FromEventBenchmark.Rx.csproj | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Benchmark/Benchmark.Current/Benchmark.Current.csproj b/Benchmark/Benchmark.Current/Benchmark.Current.csproj index 4af32f7d..04d87a5c 100644 --- a/Benchmark/Benchmark.Current/Benchmark.Current.csproj +++ b/Benchmark/Benchmark.Current/Benchmark.Current.csproj @@ -2,11 +2,11 @@ Exe - net6.0 + net7.0 - + diff --git a/Benchmark/Benchmark.V6/BasicUsages.cs b/Benchmark/Benchmark.V6/BasicUsages.cs index 1019794a..2722515c 100644 --- a/Benchmark/Benchmark.V6/BasicUsages.cs +++ b/Benchmark/Benchmark.V6/BasicUsages.cs @@ -18,23 +18,25 @@ public class BasicUsages public ReactivePropertySlim CreateReactivePropertySlimInstance() => new ReactivePropertySlim(); [Benchmark] - public void BasicForReactiveProperty() + public ReadOnlyReactiveProperty BasicForReactiveProperty() { var rp = new ReactiveProperty(); var rrp = rp.ToReadOnlyReactiveProperty(); rp.Value = "xxxx"; rp.Dispose(); + return rrp; } [Benchmark] - public void BasicForReactivePropertySlim() + public ReadOnlyReactivePropertySlim BasicForReactivePropertySlim() { var rp = new ReactivePropertySlim(); var rrp = rp.ToReadOnlyReactivePropertySlim(); rp.Value = "xxxx"; rp.Dispose(); + return rrp; } [Benchmark] diff --git a/Benchmark/Benchmark.V6/Benchmark.V6.csproj b/Benchmark/Benchmark.V6/Benchmark.V6.csproj index 6f8dc8c1..2bd60c2b 100644 --- a/Benchmark/Benchmark.V6/Benchmark.V6.csproj +++ b/Benchmark/Benchmark.V6/Benchmark.V6.csproj @@ -2,12 +2,12 @@ Exe - net6.0-windows + net7.0-windows ReactivePropertyBenchmark - + diff --git a/Benchmark/Benchmark.V7/Benchmark.V7.csproj b/Benchmark/Benchmark.V7/Benchmark.V7.csproj index 31115839..fea718cb 100644 --- a/Benchmark/Benchmark.V7/Benchmark.V7.csproj +++ b/Benchmark/Benchmark.V7/Benchmark.V7.csproj @@ -2,12 +2,12 @@ Exe - net6.0 + net7.0 - + diff --git a/Benchmark/FromEventBenchmark.Rp/FromEventBenchmark.Rp.csproj b/Benchmark/FromEventBenchmark.Rp/FromEventBenchmark.Rp.csproj index 35994e51..5ff0d97a 100644 --- a/Benchmark/FromEventBenchmark.Rp/FromEventBenchmark.Rp.csproj +++ b/Benchmark/FromEventBenchmark.Rp/FromEventBenchmark.Rp.csproj @@ -2,12 +2,12 @@ Exe - net5.0 + net7.0 FromEventBenchmark - + diff --git a/Benchmark/FromEventBenchmark.Rx/FromEventBenchmark.Rx.csproj b/Benchmark/FromEventBenchmark.Rx/FromEventBenchmark.Rx.csproj index e5dae1d8..fa976643 100644 --- a/Benchmark/FromEventBenchmark.Rx/FromEventBenchmark.Rx.csproj +++ b/Benchmark/FromEventBenchmark.Rx/FromEventBenchmark.Rx.csproj @@ -2,12 +2,12 @@ Exe - net5.0 + net7.0 FromEventBenchmark - + From 63f5689e251ca7a2dc04fce0f140b7f339768b92 Mon Sep 17 00:00:00 2001 From: Kazuki Ota Date: Thu, 10 Nov 2022 22:34:42 +0900 Subject: [PATCH 5/9] update lang version --- Source/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props index ff7dcdec..2a07cff8 100644 --- a/Source/Directory.Build.props +++ b/Source/Directory.Build.props @@ -11,7 +11,7 @@ ReactivePropertyIcon_100x100.png https://github.com/runceel/ReactiveProperty git - 10.0 + 11.0 true true true From 9bad83d29f2e5e35486083ea28398c8ee9ff17d8 Mon Sep 17 00:00:00 2001 From: Kazuki Ota Date: Thu, 10 Nov 2022 22:34:57 +0900 Subject: [PATCH 6/9] increment version number --- Source/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props index 2a07cff8..90f52967 100644 --- a/Source/Directory.Build.props +++ b/Source/Directory.Build.props @@ -1,7 +1,7 @@ Reactive.Bindings - 8.1.2 + 8.2.0 neuecc xin9le okazuki https://github.com/runceel/ReactiveProperty rx mvvm async rx-main reactive From cd3be5920e5eeec355fcc0be77130c5c6c8db74d Mon Sep 17 00:00:00 2001 From: Kazuki Ota Date: Thu, 10 Nov 2022 22:50:12 +0900 Subject: [PATCH 7/9] update to .NET 7 for github actions --- .github/workflows/build-and-publish.yml | 2 +- .github/workflows/dotnet-core-unit-testing.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 4b0efee2..a3d28e49 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -7,7 +7,7 @@ on: - 'docs/**' env: - DOTNET_VERSION: 6.0.x + DOTNET_VERSION: 7.0.x jobs: build: diff --git a/.github/workflows/dotnet-core-unit-testing.yml b/.github/workflows/dotnet-core-unit-testing.yml index 870cbb84..dc56f82d 100644 --- a/.github/workflows/dotnet-core-unit-testing.yml +++ b/.github/workflows/dotnet-core-unit-testing.yml @@ -5,7 +5,7 @@ on: branches: [ main ] env: - DOTNET_VERSION: 6.0.x + DOTNET_VERSION: 7.0.x jobs: build: From 5876435f97c4d1cc6414394567cac8e6e5147eea Mon Sep 17 00:00:00 2001 From: Kazuki Ota Date: Thu, 10 Nov 2022 23:13:07 +0900 Subject: [PATCH 8/9] update to .net 7.0 for test projects --- .../ReactiveProperty.Blazor.Tests.csproj | 15 +++++++++------ .../ReactiveProperty.NETStandard.Tests.csproj | 10 +++++----- .../ReactiveProperty.WPF.Tests.csproj | 10 +++++----- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Test/ReactiveProperty.Blazor.Tests/ReactiveProperty.Blazor.Tests.csproj b/Test/ReactiveProperty.Blazor.Tests/ReactiveProperty.Blazor.Tests.csproj index 11fdd174..abc2b30d 100644 --- a/Test/ReactiveProperty.Blazor.Tests/ReactiveProperty.Blazor.Tests.csproj +++ b/Test/ReactiveProperty.Blazor.Tests/ReactiveProperty.Blazor.Tests.csproj @@ -1,18 +1,21 @@ - net6.0 + net7.0 enable false - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/Test/ReactiveProperty.NETStandard.Tests/ReactiveProperty.NETStandard.Tests.csproj b/Test/ReactiveProperty.NETStandard.Tests/ReactiveProperty.NETStandard.Tests.csproj index 02de5986..5ae68440 100644 --- a/Test/ReactiveProperty.NETStandard.Tests/ReactiveProperty.NETStandard.Tests.csproj +++ b/Test/ReactiveProperty.NETStandard.Tests/ReactiveProperty.NETStandard.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 ReactiveProperty.Tests ReactiveProperty.Tests true @@ -11,17 +11,17 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + diff --git a/Test/ReactiveProperty.WPF.Tests/ReactiveProperty.WPF.Tests.csproj b/Test/ReactiveProperty.WPF.Tests/ReactiveProperty.WPF.Tests.csproj index 1b7b077d..e880cab5 100644 --- a/Test/ReactiveProperty.WPF.Tests/ReactiveProperty.WPF.Tests.csproj +++ b/Test/ReactiveProperty.WPF.Tests/ReactiveProperty.WPF.Tests.csproj @@ -1,7 +1,7 @@  - net6.0-windows + net7.0-windows false true ReactiveProperty.Tests @@ -10,13 +10,13 @@ - + - - - + + + From c36c02a14c1f36e4cca1cd201f79c3d32316bd6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:19:34 +0000 Subject: [PATCH 9/9] Bump minimatch from 3.0.4 to 3.1.2 in /docs Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- docs/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 2c9f3bae..15f7cebb 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -6343,9 +6343,9 @@ "dev": true }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { "brace-expansion": "^1.1.7"