From 0b8a648aa3cdf1c7f63a04b6e7a828d91073b6cc Mon Sep 17 00:00:00 2001 From: Devedse Date: Sat, 29 Dec 2018 21:07:37 +0100 Subject: [PATCH 1/3] Updated to .net Standard 2.0 Updated .gitignore to ignore packages folder Updated minor thing in android example to better set the version --- .gitignore | 3 ++- .../Properties/AndroidManifest.xml | 2 +- .../SpriterDotNet.Example.MonoGame.Android.csproj | 3 +-- .../SpriterDotNet.MonoGame.Importer.csproj | 2 +- SpriterDotNet.MonoGame/SpriterDotNet.MonoGame.csproj | 5 ++--- SpriterDotNet/SpriterDotNet.csproj | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 2852be7..07308f7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ SpriterDotNet.Unity/*.csproj SpriterDotNet.Unity/*.sln SpriterDotNet.Unity/Assets/SpriterDotNet/Lib/*.pdb SpriterDotNet.Unity/Assets/SpriterDotNet/Lib/*.pdb.meta -!SpriterDotNet.Unity/Assets/SpriterDotNet/Lib/*.dll \ No newline at end of file +!SpriterDotNet.Unity/Assets/SpriterDotNet/Lib/*.dll +/packages diff --git a/SpriterDotNet.Example.MonoGame.Android/Properties/AndroidManifest.xml b/SpriterDotNet.Example.MonoGame.Android/Properties/AndroidManifest.xml index 61a435f..abc97e3 100644 --- a/SpriterDotNet.Example.MonoGame.Android/Properties/AndroidManifest.xml +++ b/SpriterDotNet.Example.MonoGame.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/SpriterDotNet.Example.MonoGame.Android/SpriterDotNet.Example.MonoGame.Android.csproj b/SpriterDotNet.Example.MonoGame.Android/SpriterDotNet.Example.MonoGame.Android.csproj index 0aa2219..1b16b21 100644 --- a/SpriterDotNet.Example.MonoGame.Android/SpriterDotNet.Example.MonoGame.Android.csproj +++ b/SpriterDotNet.Example.MonoGame.Android/SpriterDotNet.Example.MonoGame.Android.csproj @@ -12,8 +12,7 @@ 512 true Resources\Resource.Designer.cs - True - v6.0 + v8.1 Properties\AndroidManifest.xml Android diff --git a/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj b/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj index f716d63..40aeeb6 100644 --- a/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj +++ b/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj @@ -3,7 +3,7 @@ netstandard1.4 $(PackageTargetFallback);portable-win8+net45+wpa81 - 1.6.1 + 1.6.2 Luka "loodakrawa" Sverko SpriterDotNet MonoGame content extensions. Copyright (C) 2017 diff --git a/SpriterDotNet.MonoGame/SpriterDotNet.MonoGame.csproj b/SpriterDotNet.MonoGame/SpriterDotNet.MonoGame.csproj index d295f2f..81b576f 100644 --- a/SpriterDotNet.MonoGame/SpriterDotNet.MonoGame.csproj +++ b/SpriterDotNet.MonoGame/SpriterDotNet.MonoGame.csproj @@ -1,9 +1,9 @@  - netstandard1.0 + netstandard2.0 $(PackageTargetFallback);portable-win8+net45+wpa81 - 1.6.1 + 1.6.2 Luka "loodakrawa" Sverko SpriterDotNet MonoGame implementation. Copyright (C) 2017 @@ -16,7 +16,6 @@ - diff --git a/SpriterDotNet/SpriterDotNet.csproj b/SpriterDotNet/SpriterDotNet.csproj index 9c274b6..c2fa7e1 100644 --- a/SpriterDotNet/SpriterDotNet.csproj +++ b/SpriterDotNet/SpriterDotNet.csproj @@ -2,7 +2,7 @@ netstandard1.0 - 1.6.1 + 1.6.2 Luka "loodakrawa" Sverko A simple, fast and efficient Spriter implementation in pure C#. Copyright (C) 2017 From 8e71cc913754ebae4cfd8b3721190a112f8bdab3 Mon Sep 17 00:00:00 2001 From: Devedse Date: Sat, 29 Dec 2018 21:14:35 +0100 Subject: [PATCH 2/3] Fixed build issues --- SpriterDotNet.Example.Content/Content.mgcb | 4 ++-- .../SpriterDotNet.Example.MonoGame.csproj | 2 +- .../SpriterDotNet.MonoGame.Importer.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SpriterDotNet.Example.Content/Content.mgcb b/SpriterDotNet.Example.Content/Content.mgcb index 41f2c6c..0ad1211 100644 --- a/SpriterDotNet.Example.Content/Content.mgcb +++ b/SpriterDotNet.Example.Content/Content.mgcb @@ -13,8 +13,8 @@ /reference:Lib\Newtonsoft.Json.dll /reference:Lib\System.IO.FileSystem.dll /reference:Lib\System.Xml.ReaderWriter.dll -/reference:..\SpriterDotNet.MonoGame.Importer\bin\Debug\netstandard1.4\SpriterDotNet.MonoGame.Importer.dll -/reference:..\SpriterDotNet.MonoGame.Importer\bin\Release\netstandard1.4\SpriterDotNet.MonoGame.Importer.dll +/reference:..\SpriterDotNet.MonoGame.Importer\bin\Debug\netstandard2.0\SpriterDotNet.MonoGame.Importer.dll +/reference:..\SpriterDotNet.MonoGame.Importer\bin\Release\netstandard2.0\SpriterDotNet.MonoGame.Importer.dll #---------------------------------- Content ---------------------------------# diff --git a/SpriterDotNet.Example.MonoGame/SpriterDotNet.Example.MonoGame.csproj b/SpriterDotNet.Example.MonoGame/SpriterDotNet.Example.MonoGame.csproj index 8b24e71..cf85091 100644 --- a/SpriterDotNet.Example.MonoGame/SpriterDotNet.Example.MonoGame.csproj +++ b/SpriterDotNet.Example.MonoGame/SpriterDotNet.Example.MonoGame.csproj @@ -1,7 +1,7 @@  - netstandard1.4 + netstandard2.0 $(PackageTargetFallback);portable-win8+net45+wpa81 diff --git a/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj b/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj index 40aeeb6..8d0d026 100644 --- a/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj +++ b/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj @@ -1,7 +1,7 @@  - netstandard1.4 + netstandard2.0 $(PackageTargetFallback);portable-win8+net45+wpa81 1.6.2 Luka "loodakrawa" Sverko From ed4cb9c9947ab737ff2ec7d9089bf3448680e42b Mon Sep 17 00:00:00 2001 From: Devedse Date: Sat, 29 Dec 2018 21:39:56 +0100 Subject: [PATCH 3/3] Removed the compatibility package from the rest of the csproj's --- .../SpriterDotNet.Example.MonoGame.csproj | 1 - .../SpriterDotNet.MonoGame.Importer.csproj | 1 - 2 files changed, 2 deletions(-) diff --git a/SpriterDotNet.Example.MonoGame/SpriterDotNet.Example.MonoGame.csproj b/SpriterDotNet.Example.MonoGame/SpriterDotNet.Example.MonoGame.csproj index cf85091..47e6b94 100644 --- a/SpriterDotNet.Example.MonoGame/SpriterDotNet.Example.MonoGame.csproj +++ b/SpriterDotNet.Example.MonoGame/SpriterDotNet.Example.MonoGame.csproj @@ -6,7 +6,6 @@ - diff --git a/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj b/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj index 8d0d026..636c4ff 100644 --- a/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj +++ b/SpriterDotNet.MonoGame.Importer/SpriterDotNet.MonoGame.Importer.csproj @@ -16,7 +16,6 @@ -