nuget: update

RotorsAndCams · Feb 8, 2023 · 278364d · 278364d
1 parent fa78307
commit 278364d
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 17 deletions.
diff --git a/ExtLibs/AltitudeAngelWings.Plugin/AltitudeAngelWings.Plugin.csproj b/ExtLibs/AltitudeAngelWings.Plugin/AltitudeAngelWings.Plugin.csproj
@@ -27,8 +27,9 @@
     <NoWarn>1701;1702;NU1605</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DotSpatial.Projections" Version="3.0.1" />
     <PackageReference Include="DotSpatial.Topology" Version="1.9.0" />
+    <PackageReference Include="MP.DotSpatial.Positioning" Version="4.0.0" />
+    <PackageReference Include="MP.DotSpatial.Projections" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>
 	  <ProjectReference Include="..\..\MissionPlanner.csproj">

diff --git a/ExtLibs/AltitudeAngelWings.Plugin/MissionPlannerAdapter.cs b/ExtLibs/AltitudeAngelWings.Plugin/MissionPlannerAdapter.cs
@@ -12,6 +12,7 @@
 using MissionPlanner;
 using MissionPlanner.Utilities;
 using NodaTime;
+using Resources = AltitudeAngelWings.Plugin.Properties.Resources;
 
 namespace AltitudeAngelWings.Plugin
 {

diff --git a/ExtLibs/DotSpatial.Projections.dll b/ExtLibs/DotSpatial.Projections.dll
diff --git a/ExtLibs/Utilities/MissionPlanner.Utilities.csproj b/ExtLibs/Utilities/MissionPlanner.Utilities.csproj
@@ -38,7 +38,6 @@
     <PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.584.1" />
     <PackageReference Include="csmatio" Version="1.0.20" />
     <PackageReference Include="DotNetZip" Version="1.16.0" />
-    <PackageReference Include="DotSpatial.Projections" Version="3.0.1" />
     <PackageReference Include="ExifLibNet" Version="2.1.3" />
     <PackageReference Include="Flurl" Version="3.0.2" />
     <PackageReference Include="Flurl.Http" Version="3.2.0" />
@@ -49,6 +48,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.13" />
+    <PackageReference Include="MP.DotSpatial.Projections" Version="4.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="SharpCompress" Version="0.29.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />

diff --git a/ExtLibs/Xamarin/GDAL/Resources/Resource.designer.cs b/ExtLibs/Xamarin/GDAL/Resources/Resource.designer.cs
diff --git a/ExtLibs/Xamarin/SkiaTest/SkiaTest.csproj b/ExtLibs/Xamarin/SkiaTest/SkiaTest.csproj
@@ -30,7 +30,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="NetCoreEx.Geometry" Version="3.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="SkiaSharp" Version="2.80.3" />
     <PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.80.3" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.2">

diff --git a/ExtLibs/Xamarin/Xamarin.Android/Resources/Resource.designer.cs b/ExtLibs/Xamarin/Xamarin.Android/Resources/Resource.designer.cs
diff --git a/ExtLibs/Xamarin/Xamarin.Android/Xamarin.Android.csproj b/ExtLibs/Xamarin/Xamarin.Android/Xamarin.Android.csproj
@@ -99,6 +99,9 @@
     <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DotSpatial.Projections">
+      <HintPath>..\..\DotSpatial.Projections.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Mono.Android" />
     <Reference Include="Mono.Android.Export" />
@@ -257,7 +260,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties XamarinHotReloadDebuggerTimeoutExceptionXamarinAndroidHideInfoBar="True" TriggeredFromHotReload="False" />
+      <UserProperties TriggeredFromHotReload="False" XamarinHotReloadDebuggerTimeoutExceptionXamarinAndroidHideInfoBar="True" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
diff --git a/ExtLibs/Xamarin/Xamarin.MacOS/Xamarin.MacOS.csproj b/ExtLibs/Xamarin/Xamarin.MacOS/Xamarin.MacOS.csproj
@@ -55,6 +55,9 @@
     </HttpClientHandler>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DotSpatial.Projections">
+      <HintPath>..\..\DotSpatial.Projections.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac">

diff --git a/ExtLibs/Xamarin/Xamarin.iOS/Xamarin.iOS.csproj b/ExtLibs/Xamarin/Xamarin.iOS/Xamarin.iOS.csproj
@@ -159,6 +159,9 @@
     </ImageAsset>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="DotSpatial.Projections">
+      <HintPath>..\..\DotSpatial.Projections.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>

diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj
@@ -589,16 +589,6 @@
     <PackageReference Include="DotNetZip">
       <Version>1.16.0</Version>
     </PackageReference>
-    <PackageReference Include="DotSpatial.Data" version="3.0.1" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Data.Forms" version="3.0.1" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Extensions" version="3.0.1" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Modeling.Forms" version="3.0.1" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Positioning" Version="3.0.1" />
-    <PackageReference Include="DotSpatial.Projections" version="3.0.1" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Projections.Forms" version="3.0.1" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Serialization" version="3.0.1" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Symbology" version="3.0.1" targetFramework="net462" />
-    <PackageReference Include="DotSpatial.Symbology.Forms" version="3.0.1" targetFramework="net462" />
     <PackageReference Include="Flurl" version="3.0.2" targetFramework="net462" />
     <PackageReference Include="Flurl.Http" version="3.2.0" targetFramework="net462" />
     <PackageReference Include="GDAL" Version="2.3.2" />
@@ -629,6 +619,9 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+    <PackageReference Include="MP.DotSpatial.Data">
+      <Version>4.0.0</Version>
+    </PackageReference>
     <PackageReference Include="NETStandard.Library">
       <Version>2.0.3</Version>
     </PackageReference>

diff --git a/MissionPlannerLib.csproj b/MissionPlannerLib.csproj
@@ -471,7 +471,7 @@
       <Version>1.1.64</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
+      <Version>13.0.2</Version>
     </PackageReference>
  </ItemGroup>