Merge pull request #392 from runceel/dotnet7

.NET 7
runceel · Nov 10, 2022 · 6b6375f · 6b6375f
2 parents 41f547c + 5876435
commit 6b6375f
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 51 deletions.
diff --git 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
@@ -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
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Benchmark/Benchmark.V6/BasicUsages.cs b/Benchmark/Benchmark.V6/BasicUsages.cs
@@ -18,23 +18,25 @@ public class BasicUsages
         public ReactivePropertySlim<string> CreateReactivePropertySlimInstance() => new ReactivePropertySlim<string>();
 
         [Benchmark]
-        public void BasicForReactiveProperty()
+        public ReadOnlyReactiveProperty<string> BasicForReactiveProperty()
         {
             var rp = new ReactiveProperty<string>();
             var rrp = rp.ToReadOnlyReactiveProperty();
 
             rp.Value = "xxxx";
             rp.Dispose();
+            return rrp;
         }
 
         [Benchmark]
-        public void BasicForReactivePropertySlim()
+        public ReadOnlyReactivePropertySlim<string> BasicForReactivePropertySlim()
         {
             var rp = new ReactivePropertySlim<string>();
             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
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <RootNamespace>ReactivePropertyBenchmark</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
     <PackageReference Include="ReactiveProperty" Version="6.2.0" />
   </ItemGroup>
 

diff --git a/Benchmark/Benchmark.V7/Benchmark.V7.csproj b/Benchmark/Benchmark.V7/Benchmark.V7.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="ReactiveProperty" Version="7.0.0" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="../Benchmark.V6/**/*.cs" Exclude="../Benchmark.V6/bin/**/*.cs;../Benchmark.V6/obj/**/*.cs" />

diff --git a/Benchmark/FromEventBenchmark.Rp/FromEventBenchmark.Rp.csproj b/Benchmark/FromEventBenchmark.Rp/FromEventBenchmark.Rp.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>FromEventBenchmark</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Source\ReactiveProperty.NETStandard\ReactiveProperty.NETStandard.csproj" />

diff --git a/Benchmark/FromEventBenchmark.Rx/FromEventBenchmark.Rx.csproj b/Benchmark/FromEventBenchmark.Rx/FromEventBenchmark.Rx.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>FromEventBenchmark</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
     <PackageReference Include="ReactiveProperty" Version="7.7.1" />
   </ItemGroup>
 

diff --git a/Samples/Blazor/BlazorSample.Shared/BlazorSample.Shared.csproj b/Samples/Blazor/BlazorSample.Shared/BlazorSample.Shared.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/Samples/Blazor/BlazorServerApp/BlazorServerApp.csproj b/Samples/Blazor/BlazorServerApp/BlazorServerApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/Samples/Blazor/BlazorWasmApp/BlazorWasmApp.csproj b/Samples/Blazor/BlazorWasmApp/BlazorWasmApp.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/MultiUIThreadApp/MultiUIThreadApp.csproj b/Samples/MultiUIThreadApp/MultiUIThreadApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 

diff --git a/Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj b/Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssemblyName>Reactive.Todo.Main</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.4.5" />
-    <PackageReference Include="Prism.Wpf" Version="8.0.0.1909" />
+    <PackageReference Include="MahApps.Metro" Version="2.4.9" />
+    <PackageReference Include="Prism.Wpf" Version="8.1.97" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Source\ReactiveProperty.Platform.WPF\ReactiveProperty.Platform.WPF.csproj" />

diff --git a/Samples/Reactive.Todo/Reactive.Todo.csproj b/Samples/Reactive.Todo/Reactive.Todo.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssemblyName>Reactive.Todo</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MahApps.Metro" Version="2.4.5" />
-    <PackageReference Include="Prism.Unity" Version="8.0.0.1909" />
+    <PackageReference Include="MahApps.Metro" Version="2.4.9" />
+    <PackageReference Include="Prism.Unity" Version="8.1.97" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Source\ReactiveProperty.Platform.WPF\ReactiveProperty.Platform.WPF.csproj" />

diff --git a/Samples/ReactivePropertySamples.WPF/ReactivePropertySamples.WPF.csproj b/Samples/ReactivePropertySamples.WPF/ReactivePropertySamples.WPF.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 

diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <RootNamespace>Reactive.Bindings</RootNamespace>
-    <Version>8.1.2</Version>
+    <Version>8.2.0</Version>
     <Authors>neuecc xin9le okazuki</Authors>
     <PackageProjectUrl>https://github.com/runceel/ReactiveProperty</PackageProjectUrl>
     <PackageTags>rx mvvm async rx-main reactive</PackageTags>
@@ -11,7 +11,7 @@
     <PackageIcon>ReactivePropertyIcon_100x100.png</PackageIcon>
     <RepositoryUrl>https://github.com/runceel/ReactiveProperty</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>

diff --git a/Source/ReactiveProperty.Core/ReactiveProperty.Core.csproj b/Source/ReactiveProperty.Core/ReactiveProperty.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>ReactiveProperty.Core</PackageId>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net472</TargetFrameworks>
     <AssemblyName>ReactiveProperty.Core</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>

diff --git a/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj b/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>ReactiveProperty</PackageId>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net472</TargetFrameworks>
     <AssemblyName>ReactiveProperty</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>

diff --git a/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj b/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-android</TargetFramework>
+    <TargetFramework>net7.0-android</TargetFramework>
     <PackageId>ReactiveProperty.XamarinAndroid</PackageId>
     <AssemblyName>ReactiveProperty.XamarinAndroid</AssemblyName>
     <SignAssembly>true</SignAssembly>

diff --git a/Source/ReactiveProperty.Platform.Blazor/ReactiveProperty.Platform.Blazor.csproj b/Source/ReactiveProperty.Platform.Blazor/ReactiveProperty.Platform.Blazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AssemblyName>ReactiveProperty.Blazor</AssemblyName>

diff --git a/Source/ReactiveProperty.Platform.WPF/ReactiveProperty.Platform.WPF.csproj b/Source/ReactiveProperty.Platform.WPF/ReactiveProperty.Platform.WPF.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;net7.0-windows;net472</TargetFrameworks>
     <AssemblyName>ReactiveProperty.WPF</AssemblyName>
     <UseWPF>true</UseWPF>
     <SignAssembly>true</SignAssembly>

diff --git a/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj b/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-ios</TargetFramework>
+    <TargetFramework>net7.0-ios</TargetFramework>
     <PackageId>ReactiveProperty.XamariniOS</PackageId>
     <AssemblyName>ReactiveProperty.XamariniOS</AssemblyName>
     <SignAssembly>true</SignAssembly>

diff --git a/Test/ReactiveProperty.Blazor.Tests/ReactiveProperty.Blazor.Tests.csproj b/Test/ReactiveProperty.Blazor.Tests/ReactiveProperty.Blazor.Tests.csproj
@@ -1,18 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="bunit" Version="1.6.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0" />
+    <PackageReference Include="bunit" Version="1.12.6" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Test/ReactiveProperty.NETStandard.Tests/ReactiveProperty.NETStandard.Tests.csproj b/Test/ReactiveProperty.NETStandard.Tests/ReactiveProperty.NETStandard.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <RootNamespace>ReactiveProperty.Tests</RootNamespace>
     <AssemblyName>ReactiveProperty.Tests</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -11,17 +11,17 @@
   </PropertyGroup>
   <ItemGroup>
     <!--<PackageReference Include="ChainingAssertion.Bin" Version="1.8.1.3" />-->
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="RangedObservableCollection" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Test/ReactiveProperty.WPF.Tests/ReactiveProperty.WPF.Tests.csproj b/Test/ReactiveProperty.WPF.Tests/ReactiveProperty.WPF.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net7.0-windows</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <UseWpf>true</UseWpf>
     <RootNamespace>ReactiveProperty.Tests</RootNamespace>
@@ -10,13 +10,13 @@
   <ItemGroup>
     <!--<PackageReference Include="ChainingAssertion.Bin" Version="1.8.1.3" />-->
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
   </ItemGroup>
 
   <ItemGroup>