Merge branch 'release/9.1.0'

MvvmCross · Jul 27, 2023 · 29bc284 · 29bc284
2 parents 1df92bb + 8e41694
commit 29bc284
Show file tree

Hide file tree

Showing 193 changed files with 3,207 additions and 3,434 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.2.0",
+      "version": "3.1.0",
       "commands": [
         "dotnet-cake"
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.0.4",
+      "version": "5.1.23",
       "commands": [
         "reportgenerator"
       ]
     },
     "dotnet-sonarscanner": {
-      "version": "5.8.0",
+      "version": "5.13.0",
       "commands": [
         "dotnet-sonarscanner"
       ]

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,20 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+    "ghcr.io/devcontainers/features/dotnet:1": {
+      "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "11"
+    },
+    "ghcr.io/akhildevelops/devcontainer-features/android-cli:0": {}
+  },
+  "customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-dotnettools.csdevkit",
+				"editorconfig.editorconfig"
+			]
+		}
+	}
+}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,3 +5,7 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    dev-dependencies:
+      patterns:
+        - "Xamarin.*"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,54 @@
 # Changelog
 
+## [9.1.0](https://github.com/MvvmCross/MvvmCross/tree/10.0.0) (2023-07-27)
+
+[Full Changelog](https://github.com/MvvmCross/MvvmCross/compare/9.0.10...9.1.0)
+
+**Breaking changes:**
+
+- Remove IMvxViewModel\<TResult\> and IMvxViewModel\<in TParameter, TResult\> [\#4651](https://github.com/MvvmCross/MvvmCross/issues/4651)
+- Remove IMvxViewModelResult [\#4652](https://github.com/MvvmCross/MvvmCross/pull/4652) ([Cheesebaron](https://github.com/Cheesebaron))
+- Remove ViewModel cache. It can lead to leaks and doesn't provide value [\#4650](https://github.com/MvvmCross/MvvmCross/pull/4650) ([Cheesebaron](https://github.com/Cheesebaron))
+- Move Setup to MvxAndroidApplication +semver:breaking [\#4546](https://github.com/MvvmCross/MvvmCross/pull/4546) ([Cheesebaron](https://github.com/Cheesebaron))
+
+**Implemented enhancements:**
+
+- Improve MvxFragmentExtensions.FindAssociatedViewModelType exception messages. [\#4601](https://github.com/MvvmCross/MvvmCross/issues/4601)
+- Add Mac Catalyst TFM to all iOS plugins [\#4585](https://github.com/MvvmCross/MvvmCross/issues/4585)
+- Add MacCatalyst TFM to plugins [\#4627](https://github.com/MvvmCross/MvvmCross/pull/4627) ([Cheesebaron](https://github.com/Cheesebaron))
+
+**Fixed bugs:**
+
+- net6.0 or .net7.0 - The type or namespace name Platforms does not exist in the namespace MvvmCross [\#4656](https://github.com/MvvmCross/MvvmCross/issues/4656)
+- Updating from 9.0.9 to 9.0.10, MvxSplashScreenActivity is missing [\#4621](https://github.com/MvvmCross/MvvmCross/issues/4621)
+- MvxBaseFluentBindingDescription\<TTarget\>.EnsureTargetNameSet does not ensures that target name was set [\#4603](https://github.com/MvvmCross/MvvmCross/issues/4603)
+- "System.InvalidCastException: Specified cast is not valid." during Android RestoreInstanceState [\#4600](https://github.com/MvvmCross/MvvmCross/issues/4600)
+- MvxDialogFragmentPresentationAttribute.Cancelable is not initialized with 'true' when using empty ctor [\#4588](https://github.com/MvvmCross/MvvmCross/issues/4588)
+- System.InvalidCastException getting MvxFragment\<TViewModel\>.ViewModel after Tombstoning [\#4584](https://github.com/MvvmCross/MvvmCross/issues/4584)
+- Java.Lang.ClassNotFoundException after upgrading to version 9.0.8 and only in release [\#4557](https://github.com/MvvmCross/MvvmCross/issues/4557)
+- Fix console platform missing [\#4657](https://github.com/MvvmCross/MvvmCross/pull/4657) ([Cheesebaron](https://github.com/Cheesebaron))
+- EnsureTargetNameSet should ensure a target name or throw [\#4649](https://github.com/MvvmCross/MvvmCross/pull/4649) ([Cheesebaron](https://github.com/Cheesebaron))
+- IntPtr -\> NativeHandle on Apple platforms [\#4635](https://github.com/MvvmCross/MvvmCross/pull/4635) ([Cheesebaron](https://github.com/Cheesebaron))
+
+**Merged pull requests:**
+
+- Fix multiple warnings [\#4658](https://github.com/MvvmCross/MvvmCross/pull/4658) ([Cheesebaron](https://github.com/Cheesebaron))
+- Bump Microsoft.WindowsAppSDK from 1.3.230602002 to 1.3.230724000 [\#4655](https://github.com/MvvmCross/MvvmCross/pull/4655) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump SonarAnalyzer.CSharp from 9.5.0.73987 to 9.6.0.74858 [\#4654](https://github.com/MvvmCross/MvvmCross/pull/4654) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Enable Nullable attributes in IMvxIoCProvider, MvxCommand [\#4648](https://github.com/MvvmCross/MvvmCross/pull/4648) ([Cheesebaron](https://github.com/Cheesebaron))
+- Bump the dev-dependencies group with 16 updates [\#4647](https://github.com/MvvmCross/MvvmCross/pull/4647) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump dotnet-reportgenerator-globaltool from 5.0.4 to 5.1.23 [\#4633](https://github.com/MvvmCross/MvvmCross/pull/4633) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump dotnet-sonarscanner from 5.8.0 to 5.13.0 [\#4632](https://github.com/MvvmCross/MvvmCross/pull/4632) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump Xamarin.GooglePlayServices.Location from 120.0.0 to 121.0.1 [\#4631](https://github.com/MvvmCross/MvvmCross/pull/4631) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump Xamarin.GooglePlayServices.Basement from 118.1.0.1 to 118.2.0.1 [\#4630](https://github.com/MvvmCross/MvvmCross/pull/4630) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Make unit tests run on net7 [\#4629](https://github.com/MvvmCross/MvvmCross/pull/4629) ([Cheesebaron](https://github.com/Cheesebaron))
+- Drop dependency on Newtonsoft.Json [\#4628](https://github.com/MvvmCross/MvvmCross/pull/4628) ([Cheesebaron](https://github.com/Cheesebaron))
+- Update all dependencies [\#4626](https://github.com/MvvmCross/MvvmCross/pull/4626) ([Cheesebaron](https://github.com/Cheesebaron))
+- Update TipCalc Android and Core tutorial [\#4616](https://github.com/MvvmCross/MvvmCross/pull/4616) ([Leo506](https://github.com/Leo506))
+- Combiners registration via Setup.FillValueCombiners\(\) override [\#4615](https://github.com/MvvmCross/MvvmCross/pull/4615) ([snechaev](https://github.com/snechaev))
+- Improved MvxFragmentExtensions.FindAssociatedViewModelType exception messages [\#4602](https://github.com/MvvmCross/MvvmCross/pull/4602) ([ErisApps](https://github.com/ErisApps))
+- Bugfix: MvxDialogFragmentPresentationAttribute.Cancelable is 'false' when using empty ctor. [\#4589](https://github.com/MvvmCross/MvvmCross/pull/4589) ([evgenyvalavin](https://github.com/evgenyvalavin))
+
 ## [9.0.10](https://github.com/MvvmCross/MvvmCross/tree/9.0.10) (2023-05-10)
 
 [Full Changelog](https://github.com/MvvmCross/MvvmCross/compare/9.0.9...9.0.10)

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -27,10 +27,24 @@
 
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">10.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tvos'">10.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.2</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">23</SupportedOSPlatformVersion>
+    <_MvxTargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</_MvxTargetPlatformIdentifier>
+    <_MvxTargetPlatformIsAndroid>false</_MvxTargetPlatformIsAndroid>
+    <_MvxTargetPlatformIsAndroid Condition="'$(_MvxTargetPlatformIdentifier)' == 'android'">True</_MvxTargetPlatformIsAndroid>
+    <_MvxTargetPlatformIsiOS>false</_MvxTargetPlatformIsiOS>
+    <_MvxTargetPlatformIsiOS Condition="'$(_MvxTargetPlatformIdentifier)' == 'ios'">True</_MvxTargetPlatformIsiOS>
+    <_MvxTargetPlatformIsMacCatalyst>false</_MvxTargetPlatformIsMacCatalyst>
+    <_MvxTargetPlatformIsMacCatalyst Condition="'$(_MvxTargetPlatformIdentifier)' == 'maccatalyst'">True</_MvxTargetPlatformIsMacCatalyst>
+    <_MvxTargetPlatformIsmacOS>false</_MvxTargetPlatformIsmacOS>
+    <_MvxTargetPlatformIsmacOS Condition="'$(_MvxTargetPlatformIdentifier)' == 'macos'">True</_MvxTargetPlatformIsmacOS>
+    <_MvxTargetPlatformIstvOS>false</_MvxTargetPlatformIstvOS>
+    <_MvxTargetPlatformIstvOS Condition="'$(_MvxTargetPlatformIdentifier)' == 'tvos'">True</_MvxTargetPlatformIstvOS>
+    <_MvxTargetPlatformIsWindows>false</_MvxTargetPlatformIsWindows>
+    <_MvxTargetPlatformIsWindows Condition="$(_MvxTargetPlatformIdentifier.Contains('windows')) == 'True'">True</_MvxTargetPlatformIsWindows>
+
+    <SupportedOSPlatformVersion Condition=" '$(_MvxTargetPlatformIsiOS)' == 'True' ">10.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition=" '$(_MvxTargetPlatformIstvOS)' == 'True' ">10.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition=" '$(_MvxTargetPlatformIsMacCatalyst)' == 'True' ">13.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition=" '$(_MvxTargetPlatformIsAndroid)' == 'True' ">23</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -58,7 +72,7 @@
       is not set. This is set here since the base MvvmCross assembly and plugins
       will need this property set.
    -->
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows')) ">
+  <PropertyGroup Condition=" '$(_MvxTargetPlatformIsWindows)' == 'True' ">
     <EnableMsixTooling>true</EnableMsixTooling>
   </PropertyGroup>
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,43 +1,42 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="AsyncFixer" Version="1.6.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" />
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.2.0">
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Serilog" Version="2.12.0" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageVersion Include="Serilog" Version="3.0.1" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="7.0.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="2.0.0" />
     <PackageVersion Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
-    <PackageVersion Include="SonarAnalyzer.CSharp" Version="8.51.0.59060" />
+    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.6.0.74858" />
     <PackageVersion Include="SourceLink.Create.CommandLine" Version="2.8.3" />
-    <PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1" />
-    <PackageVersion Include="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.5.0" />
-    <PackageVersion Include="Xamarin.AndroidX.CardView" Version="1.0.0.16" />
-    <PackageVersion Include="Xamarin.AndroidX.ExifInterface" Version="1.3.3.2" />
-    <PackageVersion Include="Xamarin.AndroidX.Fragment" Version="1.5.4" />
-    <PackageVersion Include="Xamarin.AndroidX.Leanback" Version="1.0.0.17" />
-    <PackageVersion Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.10" />
-    <PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.1" />
-    <PackageVersion Include="Xamarin.AndroidX.MediaRouter" Version="1.3.0.1" />
-    <PackageVersion Include="Xamarin.AndroidX.Preference" Version="1.2.0.3" />
-    <PackageVersion Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.8" />
-    <PackageVersion Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.10" />
-    <PackageVersion Include="Xamarin.AndroidX.ViewPager" Version="1.0.0.15" />
+    <PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.3" />
+    <PackageVersion Include="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.6.1.3" />
+    <PackageVersion Include="Xamarin.AndroidX.CardView" Version="1.0.0.21" />
+    <PackageVersion Include="Xamarin.AndroidX.ExifInterface" Version="1.3.6.3" />
+    <PackageVersion Include="Xamarin.AndroidX.Fragment" Version="1.6.0.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Leanback" Version="1.0.0.21" />
+    <PackageVersion Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.19" />
+    <PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.3" />
+    <PackageVersion Include="Xamarin.AndroidX.MediaRouter" Version="1.4.0.2" />
+    <PackageVersion Include="Xamarin.AndroidX.Preference" Version="1.2.0.7" />
+    <PackageVersion Include="Xamarin.AndroidX.RecyclerView" Version="1.3.0.3" />
+    <PackageVersion Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.14" />
+    <PackageVersion Include="Xamarin.AndroidX.ViewPager" Version="1.0.0.19" />
     <PackageVersion Include="Xamarin.FFImageLoading" Version="2.4.11.982" />
-    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.7.0.1" />
-    <PackageVersion Include="Xamarin.GooglePlayServices.Basement" Version="118.1.0.1" />
-    <PackageVersion Include="Xamarin.GooglePlayServices.Location" Version="120.0.0" />
-    <PackageVersion Include="XunitXml.TestLogger" Version="3.0.70" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
+    <PackageVersion Include="Xamarin.GooglePlayServices.Basement" Version="118.2.0.2" />
+    <PackageVersion Include="Xamarin.GooglePlayServices.Location" Version="121.0.1.1" />
+    <PackageVersion Include="XunitXml.TestLogger" Version="3.1.11" />
+    <PackageVersion Include="xunit" Version="2.5.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
   </ItemGroup>
 </Project>
diff --git a/MvvmCross-macos.slnf b/MvvmCross-macos.slnf
@@ -21,6 +21,7 @@
       "Projects\\Playground\\Playground.Core\\Playground.Core.csproj",
       "Projects\\Playground\\Playground.Droid\\Playground.Droid.csproj",
       "Projects\\Playground\\Playground.iOS\\Playground.iOS.csproj",
+      "Projects\\Playground\\Playground.Mac\\Playground.Mac.csproj",
       "UnitTests\\MvvmCross.UnitTest\\MvvmCross.UnitTest.csproj",
       "UnitTests\\Plugins.Color.UnitTest\\MvvmCross.Plugins.Color.UnitTest.csproj",
       "UnitTests\\Plugins.JsonLocalization.UnitTest\\MvvmCross.Plugins.JsonLocalization.UnitTest.csproj",

diff --git a/MvvmCross.Plugins/Color/MvvmCross.Plugin.Color.csproj b/MvvmCross.Plugins/Color/MvvmCross.Plugin.Color.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net6.0-android;net6.0-ios</TargetFrameworks>
+    <TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net6.0-windows10.0.19041.0;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
@@ -20,30 +20,30 @@ This package contains the 'Color' plugin for MvvmCross</Description>
     <Compile Remove="Resources\*.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-ios')) ">
+  <ItemGroup Condition=" '$(_MvxTargetPlatformIsiOS)' == 'True' Or '$(_MvxTargetPlatformIsMacCatalyst)' == 'True' ">
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Ios\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-mac')) ">
+  <ItemGroup Condition=" '$(_MvxTargetPlatformIsmacOS)' == 'True' ">
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Mac\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-tvos')) ">
+  <ItemGroup Condition=" '$(_MvxTargetPlatformIstvOS)' == 'True' ">
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Tvos\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-android')) ">
+  <ItemGroup Condition=" '$(_MvxTargetPlatformIsAndroid)' == 'True' ">
     <Compile Include="Platforms\Android\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows')) ">
+  <ItemGroup Condition=" '$(_MvxTargetPlatformIsWindows)' == 'True' ">
     <Compile Include="Platforms\WinUi\**\*.cs" />
 
     <PackageReference Include="Microsoft.WindowsAppSDK" />

diff --git a/MvvmCross.Plugins/Json/MvvmCross.Plugin.Json.csproj b/MvvmCross.Plugins/Json/MvvmCross.Plugin.Json.csproj
@@ -9,10 +9,6 @@ This package contains the 'Json' plugin for MvvmCross</Description>
     <PackageId>MvvmCross.Plugin.Json</PackageId>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\MvvmCross\MvvmCross.csproj" />
   </ItemGroup>

diff --git a/MvvmCross.Plugins/Json/MvxDateTimeJsonConverter.cs b/MvvmCross.Plugins/Json/MvxDateTimeJsonConverter.cs