From 21f0ad70d977b2dfbe814f84b9fe0a534c74a49e Mon Sep 17 00:00:00 2001
From: Mark Kromis <143529142+mkromis@users.noreply.github.com>
Date: Sun, 3 Jul 2022 20:59:05 -0400
Subject: [PATCH] nuget updates

---
 .../SimpleDemo.Avalonia.csproj                | 12 ++++----
 MinoriEditorShell-Avalonia.sln                | 30 +++++++++----------
 ...inoriEditorShell.Platforms.Avalonia.csproj | 23 +++++++-------
 .../MinoriEditorShell.csproj                  | 10 ++-----
 4 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/Demos/SimpleDemo/SimpleDemo.Avalonia/SimpleDemo.Avalonia.csproj b/Demos/SimpleDemo/SimpleDemo.Avalonia/SimpleDemo.Avalonia.csproj
index 42370574..4688dd4e 100644
--- a/Demos/SimpleDemo/SimpleDemo.Avalonia/SimpleDemo.Avalonia.csproj
+++ b/Demos/SimpleDemo/SimpleDemo.Avalonia/SimpleDemo.Avalonia.csproj
@@ -8,12 +8,12 @@
     <AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.10" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
+    <PackageReference Include="Avalonia" Version="0.10.15" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.15" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
     <PackageReference Include="MvvmCross" Version="8.0.2" />
    </ItemGroup>
   <ItemGroup>
diff --git a/MinoriEditorShell-Avalonia.sln b/MinoriEditorShell-Avalonia.sln
index 2720fa9f..1cba21c4 100644
--- a/MinoriEditorShell-Avalonia.sln
+++ b/MinoriEditorShell-Avalonia.sln
@@ -13,10 +13,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SimpleDemo", "SimpleDemo",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleDemo.Core", "Demos\SimpleDemo\SimpleDemo.Core\SimpleDemo.Core.csproj", "{5D755878-EA31-4D57-B5D9-D36EA9275DA9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinoriEditorShell.Platforms.Avolonia", "Modules\MinoriEditorShell.Platforms.Avalonia\MinoriEditorShell.Platforms.Avolonia.csproj", "{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleDemo.Avalonia", "Demos\SimpleDemo\SimpleDemo.Avalonia\SimpleDemo.Avalonia.csproj", "{4AEE5668-722A-4799-9399-DBF9023D14F5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinoriEditorShell.Platforms.Avalonia", "Modules\MinoriEditorShell.Platforms.Avalonia\MinoriEditorShell.Platforms.Avalonia.csproj", "{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -54,18 +54,6 @@ Global
 		{5D755878-EA31-4D57-B5D9-D36EA9275DA9}.Release|x64.Build.0 = Release|Any CPU
 		{5D755878-EA31-4D57-B5D9-D36EA9275DA9}.Release|x86.ActiveCfg = Release|Any CPU
 		{5D755878-EA31-4D57-B5D9-D36EA9275DA9}.Release|x86.Build.0 = Release|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Debug|x64.Build.0 = Debug|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Debug|x86.Build.0 = Debug|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Release|x64.ActiveCfg = Release|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Release|x64.Build.0 = Release|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Release|x86.ActiveCfg = Release|Any CPU
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6}.Release|x86.Build.0 = Release|Any CPU
 		{4AEE5668-722A-4799-9399-DBF9023D14F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4AEE5668-722A-4799-9399-DBF9023D14F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4AEE5668-722A-4799-9399-DBF9023D14F5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -78,12 +66,24 @@ Global
 		{4AEE5668-722A-4799-9399-DBF9023D14F5}.Release|x64.Build.0 = Release|Any CPU
 		{4AEE5668-722A-4799-9399-DBF9023D14F5}.Release|x86.ActiveCfg = Release|Any CPU
 		{4AEE5668-722A-4799-9399-DBF9023D14F5}.Release|x86.Build.0 = Release|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Debug|x64.Build.0 = Debug|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Debug|x86.Build.0 = Debug|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Release|x64.ActiveCfg = Release|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Release|x64.Build.0 = Release|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Release|x86.ActiveCfg = Release|Any CPU
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C7863C93-477E-445B-98A1-F09454583537} = {D9E73129-B533-484C-AEFC-7DA139610289}
 		{40760750-D249-419D-B947-BB18B5A7FC4B} = {3787F54F-76A2-47AE-AA26-79065C6CE52F}
 		{5D755878-EA31-4D57-B5D9-D36EA9275DA9} = {40760750-D249-419D-B947-BB18B5A7FC4B}
-		{761A0C29-1CBC-4AB0-AB90-5899136CAEB6} = {D9E73129-B533-484C-AEFC-7DA139610289}
 		{4AEE5668-722A-4799-9399-DBF9023D14F5} = {40760750-D249-419D-B947-BB18B5A7FC4B}
+		{CCFF52CE-0ECB-4135-946D-D249DE58AA6D} = {D9E73129-B533-484C-AEFC-7DA139610289}
 	EndGlobalSection
 EndGlobal
diff --git a/Modules/MinoriEditorShell.Platforms.Avalonia/MinoriEditorShell.Platforms.Avalonia.csproj b/Modules/MinoriEditorShell.Platforms.Avalonia/MinoriEditorShell.Platforms.Avalonia.csproj
index a2f52d5e..aa5204f1 100644
--- a/Modules/MinoriEditorShell.Platforms.Avalonia/MinoriEditorShell.Platforms.Avalonia.csproj
+++ b/Modules/MinoriEditorShell.Platforms.Avalonia/MinoriEditorShell.Platforms.Avalonia.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>
       MinoriEditorStudio is an application shell similar in concept to the Visual Studio Shell.
       This uses AvalonDock and has an MVVM architecture based on MvvmCross.
@@ -9,7 +9,6 @@
     <Copyright>Copyright 2019</Copyright>
     <PackageProjectUrl>https://github.com/TorisanKitsune/MinoriEditorShell</PackageProjectUrl>
     <RepositoryUrl>https://github.com/TorisanKitsune/MinoriEditorShell</RepositoryUrl>
-    <PackageIconUrl></PackageIconUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>.net40 netcoreapp AvaloniaUI MvvmCross AvalonDock Visual Studio IDE Shell</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -30,18 +29,20 @@
   <ItemGroup>
     <AdditionalFiles Include="..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
-
+  
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\MvvmCross\MvvmCross.Plugins\Messenger\MvvmCross.Plugin.Messenger.csproj" />
-    <ProjectReference Include="..\..\..\..\MvvmCross\MvvmCross\MvvmCross.csproj" />
-    <ProjectReference Include="..\MinoriEditorShell\MinoriEditorShell.csproj" />
-
-    <PackageReference Include="Avalonia" Version="0.10.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
-    <PackageReference Include="Dock.Avalonia" Version="0.10.8" />
-    <PackageReference Include="Dock.Model" Version="0.10.8" />
+    <PackageReference Include="Avalonia" Version="0.10.15" />
+    <PackageReference Include="Dock.Avalonia" Version="0.10.14" />
+    <PackageReference Include="Dock.Model.Avalonia" Version="0.10.14" />
+    <PackageReference Include="MvvmCross" Version="8.0.2" />
+    <PackageReference Include="MvvmCross.Plugin.Messenger" Version="8.0.2" />
     <PackageReference Include="System.ComponentModel.Composition" Version="5.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\MinoriEditorShell\MinoriEditorShell.csproj" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Modules/MinoriEditorShell/MinoriEditorShell.csproj b/Modules/MinoriEditorShell/MinoriEditorShell.csproj
index 5248aa00..d11d446a 100644
--- a/Modules/MinoriEditorShell/MinoriEditorShell.csproj
+++ b/Modules/MinoriEditorShell/MinoriEditorShell.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>
       MinoriEditorStudio is an application shell similar in concept to the Visual Studio Shell.
       This uses AvalonDock and has an MVVM architecture based on MvvmCross.
@@ -9,7 +9,6 @@
     <Copyright>Copyright 2019</Copyright>
     <PackageProjectUrl>https://github.com/TorisanKitsune/MinoriEditorShell</PackageProjectUrl>
     <RepositoryUrl>https://github.com/TorisanKitsune/MinoriEditorShell</RepositoryUrl>
-    <PackageIconUrl></PackageIconUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>.net40 WPF MvvmCross AvalonDock Visual Studio IDE Shell</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -24,16 +23,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="MvvmCross" Version="8.0.2" />
+    <PackageReference Include="MvvmCross.Plugin.Messenger" Version="8.0.2" />
     <PackageReference Include="System.ComponentModel.Composition" Version="5.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\MvvmCross\MvvmCross.Plugins\Messenger\MvvmCross.Plugin.Messenger.csproj" />
-    <ProjectReference Include="..\..\..\..\MvvmCross\MvvmCross\MvvmCross.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="Properties\Settings.settings">
       <Generator>PublicSettingsSingleFileGenerator</Generator>