Housekeeping update for WinUI .net6 (#2903)

* Update for WinUI .net6 * remove FluentAssertions packages in test projects * Update ActivationForViewFetcher.cs * Update ReactiveUI.csproj * Update ActivationForViewFetcher.cs * reverted as requested * Update ApiApprovalTests.ReactiveUI.net5.0.approved.txt
reactiveui · Aug 23, 2021 · 6cba841 · 6cba841
1 parent 1de2e78
commit 6cba841
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 19 deletions.
diff --git a/src/Directory.build.targets b/src/Directory.build.targets
@@ -59,6 +59,6 @@
   </PropertyGroup>
 
   <Target Name="ValidateNugetProperties" Condition="!$(IsTestProject) or $(IsTestProject) == ''" BeforeTargets="Compile">
-      <Error Condition="$(PackageDescription) == '' or $(PackageDescription) == $(DefaultPackageDescription)" Text="The Nuget PackageDescription property needs to be set for the project. Currently : '$(PackageDescription)'" />
+    <Error Condition="$(PackageDescription) == '' or $(PackageDescription) == $(DefaultPackageDescription)" Text="The Nuget PackageDescription property needs to be set for the project. Currently : '$(PackageDescription)'" />
   </Target>
 </Project>
diff --git a/src/ReactiveUI.Fody.Analyzer.Test/ReactiveUI.Fody.Analyzer.Test.csproj b/src/ReactiveUI.Fody.Analyzer.Test/ReactiveUI.Fody.Analyzer.Test.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <Nullable>enable</Nullable>

diff --git a/src/ReactiveUI.Fody.Tests/ReactiveUI.Fody.Tests.csproj b/src/ReactiveUI.Fody.Tests/ReactiveUI.Fody.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <FodyTargetFramework>netstandard2.0</FodyTargetFramework>
@@ -27,7 +27,7 @@
   <ItemGroup>
     <None Include="API\**\*.txt" CopyToOutputDirectory="PreserveNewest" LinkBase="/" />
   </ItemGroup>
-
+  
   <Target Name="CopyWeavers" BeforeTargets="Fody.WeavingTask">
     <!-- Fody expects to find weavers in referenced NuGet packages or the Tools directory at the solution level.
          Since this is for testing purposes before a NuGet package is created, we'll just use the Tools directory

diff --git a/src/ReactiveUI.LeakTests/ReactiveUI.LeakTests.csproj b/src/ReactiveUI.LeakTests/ReactiveUI.LeakTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <Nullable>enable</Nullable>

diff --git a/src/ReactiveUI.Testing.Tests/ReactiveUI.Testing.Tests.csproj b/src/ReactiveUI.Testing.Tests/ReactiveUI.Testing.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <FodyTargetFramework>netstandard2.0</FodyTargetFramework>
@@ -14,5 +14,4 @@
   <ItemGroup>
     <None Include="API\**\*.txt" CopyToOutputDirectory="PreserveNewest" LinkBase="/" />
   </ItemGroup>
-
 </Project>
diff --git a/src/ReactiveUI.Tests/ReactiveUI.Tests.csproj b/src/ReactiveUI.Tests/ReactiveUI.Tests.csproj
@@ -94,7 +94,6 @@
       <DependentUpon>TestFormNotCanActivate.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-
   <ItemGroup>
     <Page Update="Platforms\wpf\Mocks\CanExecuteMock\CanExecuteExecutingView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>

diff --git a/src/ReactiveUI.Uwp/Common/RoutedViewHost.cs b/src/ReactiveUI.Uwp/Common/RoutedViewHost.cs
@@ -37,7 +37,6 @@ namespace ReactiveUI
     /// the View and wire up the ViewModel whenever a new ViewModel is
     /// navigated to. Put this control as the only control in your Window.
     /// </summary>
-    [SuppressMessage("Design", "CA1010:Collections should implement generic interface", Justification = "Deliberate usage")]
     public
 #if HAS_UNO
         partial

diff --git a/src/ReactiveUI.WinUI/ActivationForViewFetcher.cs b/src/ReactiveUI.WinUI/ActivationForViewFetcher.cs
@@ -25,7 +25,7 @@ public class ActivationForViewFetcher : IActivationForViewFetcher
         /// <inheritdoc/>
         public IObservable<bool> GetActivationForView(IActivatableView view)
         {
-            if (!(view is FrameworkElement fe))
+            if (view is not FrameworkElement fe)
             {
                 return Observable<bool>.Empty;
             }

diff --git a/src/ReactiveUI.WinUI/ReactiveUI.WinUI.csproj b/src/ReactiveUI.WinUI/ReactiveUI.WinUI.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0-windows10.0.19041.0;net6.0-windows10.0.19041</TargetFrameworks>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetFrameworks>net5.0-windows10.0.19041.0;net6.0-windows10.0.19041.0</TargetFrameworks>
     <PackageDescription>Contains the ReactiveUI platform specific extensions for WinUI Desktop</PackageDescription>
     <RootNamespace>ReactiveUI.WinUI.Desktop</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64</RuntimeIdentifiers>
     <DefineConstants>HAS_WINUI</DefineConstants>
     <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;winui</PackageTags>
     <UseWinUI>true</UseWinUI>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ReactiveUI.WinUI/Registrations.cs b/src/ReactiveUI.WinUI/Registrations.cs
@@ -33,7 +33,7 @@ public void Register(Action<Func<object>, Type> registerFunction)
             if (!ModeDetector.InUnitTestRunner())
             {
                 // NB: On .NET Core, trying to touch DispatcherScheduler blows up :cry:
-                RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(() => { return DispatcherQueueScheduler.Current; });
+                RxApp.MainThreadScheduler = new WaitForDispatcherScheduler(() => DispatcherQueueScheduler.Current);
                 RxApp.TaskpoolScheduler = TaskPoolScheduler.Default;
             }
 

diff --git a/src/ReactiveUI.WinUI/TransitioningContentControl.Empty.cs b/src/ReactiveUI.WinUI/TransitioningContentControl.Empty.cs
@@ -11,9 +11,7 @@ namespace ReactiveUI
     /// <summary>
     /// A control with a single transition.
     /// </summary>
-    [SuppressMessage("Design", "CA1010:Collections should implement generic interface", Justification = "Deliberate usage")]
-    public
-        class TransitioningContentControl : ContentControl
+    public class TransitioningContentControl : ContentControl
     {
     }
 }
diff --git a/src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj b/src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0-windows;net6.0-windows;net461;net472;net48;net5.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0-windows;net6.0-windows;net461;net472;net48;net5.0-windows10.0.19041.0;net6.0-windows10.0.19041.0</TargetFrameworks>
     <AssemblyName>ReactiveUI.Winforms</AssemblyName>
     <RootNamespace>ReactiveUI.Winforms</RootNamespace>
     <PackageDescription>Contains the ReactiveUI platform specific extensions for Windows Forms</PackageDescription>

diff --git a/src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj b/src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0-windows;net6.0-windows;net461;net472;net48;net5.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0-windows;net6.0-windows;net461;net472;net48;net5.0-windows10.0.19041.0;net6.0-windows10.0.19041.0</TargetFrameworks>
     <PackageDescription>Contains the ReactiveUI platform specific extensions for Windows Presentation Foundation (WPF)</PackageDescription>
     <PackageId>ReactiveUI.WPF</PackageId>
     <UseWpf>true</UseWpf>

diff --git a/src/ReactiveUI.sln b/src/ReactiveUI.sln
@@ -2,7 +2,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31613.86
-MinimumVisualStudioVersion = 10.0.40219.1
+MinimumVisualStudioVersion = 16.0.31613.86
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BD9762CF-E104-481C-96A6-26E624B86283}"
 	ProjectSection(SolutionItems) = preProject
 		..\.editorconfig = ..\.editorconfig