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: 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 - + 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 diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props index ff7dcdec..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 @@ -11,7 +11,7 @@ ReactivePropertyIcon_100x100.png https://github.com/runceel/ReactiveProperty git - 10.0 + 11.0 true true true 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 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 @@ - + - - - + + +