Migrate from .NET 5.0 to 6.0 + bump nugets

yariker · Sep 12, 2023 · c6e3af5 · c6e3af5
1 parent 54f4e9b
commit c6e3af5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -11,9 +11,9 @@ A lightweight MVVM framework for .NET inspired by [MVVM Light Toolkit](https://g
 
 ## Supported platforms
 
-- .NET Framework 4.6.2 & .NET 5.0 (WPF)
-- Universal Windows Platform (UWP)
+- .NET Framework 4.6.2 & .NET 6.0 (WPF)
 - .NET Standard 2.0 (Xamarin.Forms, Avalonia, MAUI, etc.)
+- Universal Windows Platform (UWP)
 
 ## Installation
 

diff --git a/src/MvvmMicro.Tests/MvvmMicro.Tests.csproj b/src/MvvmMicro.Tests/MvvmMicro.Tests.csproj
@@ -6,24 +6,24 @@
     <AssemblyName>MvvmMicro.Test</AssemblyName>
     <RootNamespace>MvvmMicro.Test</RootNamespace>
     <LangVersion>10.0</LangVersion>
-	  <Nullable>warnings</Nullable>
+    <Nullable>warnings</Nullable>
     <UseWPF Condition="'$(TargetFramework)' == 'net462'">true</UseWPF>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/MvvmMicro/CommandBase.cs b/src/MvvmMicro/CommandBase.cs
@@ -10,7 +10,7 @@ namespace MvvmMicro;
 /// </summary>
 public abstract class CommandBase : ObservableObject, ICommand
 {
-#if NETFRAMEWORK || NET5_0_OR_GREATER
+#if NETFRAMEWORK || NET6_0_OR_GREATER
     /// <inheritdoc cref="ICommand.CanExecuteChanged" />
     public event EventHandler CanExecuteChanged
     {
@@ -33,7 +33,7 @@ public event EventHandler CanExecuteChanged
     /// </summary>
     public void RaiseCanExecuteChanged()
     {
-#if NETFRAMEWORK || NET5_0_OR_GREATER
+#if NETFRAMEWORK || NET6_0_OR_GREATER
         CommandManager.InvalidateRequerySuggested();
 #else
         CanExecuteChanged?.Invoke(this, EventArgs.Empty);

diff --git a/src/MvvmMicro/MvvmMicro.csproj b/src/MvvmMicro/MvvmMicro.csproj
@@ -1,35 +1,35 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.44">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462;net5.0-windows;uap10.0.19041</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net6.0-windows;uap10.0.19041</TargetFrameworks>
     <AssemblyName>MvvmMicro</AssemblyName>
     <RootNamespace>MvvmMicro</RootNamespace>
-	  <Authors>Yaroslav Bugaria</Authors>
-	  <Product>MvvmMicro</Product>
-	  <Description>A clean and lightweight MVVM framework for WPF, UWP and .NET Standard inspired by MVVM Light Toolkit.</Description>
-	  <Copyright>(c) Yaroslav Bugaria, $([System.DateTime]::Now.ToString(yyyy))</Copyright>
-	  <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	  <NeutralLanguage>en-US</NeutralLanguage>
-	  <AssemblyOriginatorKeyFile>MvvmMicro.snk</AssemblyOriginatorKeyFile>
-	  <SignAssembly>true</SignAssembly>
-	  <LangVersion>10.0</LangVersion>
+    <Authors>Yaroslav Bugaria</Authors>
+    <Product>MvvmMicro</Product>
+    <Description>A clean and lightweight MVVM framework for WPF, UWP and .NET Standard inspired by MVVM Light Toolkit.</Description>
+    <Copyright>(c) Yaroslav Bugaria, $([System.DateTime]::Now.ToString(yyyy))</Copyright>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <AssemblyOriginatorKeyFile>MvvmMicro.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <LangVersion>10.0</LangVersion>
     <Nullable>warnings</Nullable>
   </PropertyGroup>
 
   <PropertyGroup>
-	  <IsPackable>true</IsPackable>
-	  <PackageId>MvvmMicro</PackageId>
-	  <PackageIcon>icon.png</PackageIcon>
-	  <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-	  <PackageProjectUrl>https://github.com/yariker/MvvmMicro</PackageProjectUrl>
-	  <RepositoryUrl>https://github.com/yariker/MvvmMicro.git</RepositoryUrl>
-	  <RepositoryType>git</RepositoryType>
-	  <PackageTags>mvvm wpf uwp xamarin-forms</PackageTags>
-	  <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <IsPackable>true</IsPackable>
+    <PackageId>MvvmMicro</PackageId>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageProjectUrl>https://github.com/yariker/MvvmMicro</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/yariker/MvvmMicro.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>mvvm wpf uwp xamarin-forms</PackageTags>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <!-- Reference WPF libraries on .NET Framework & .NET 5. -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net5.0-windows'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net6.0-windows'">
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
@@ -48,5 +48,5 @@
       <PackagePath></PackagePath>
     </None>
   </ItemGroup>
-  
+
 </Project>