From a231cc43aa71c17fca484f08e548f704c7bf5a0e Mon Sep 17 00:00:00 2001 From: loodakrawa Date: Sat, 11 Jun 2016 11:38:17 +1000 Subject: [PATCH] Update packages and add .nuspec --- .../Content/Content.mgcb | 1 - .../Android/Resources/Resource.Designer.cs | 23 +-------- ...iterDotNet.MonoGame.Example.Android.csproj | 15 ++---- .../Platforms/Android/packages.config | 2 +- .../Platforms/LinuxGL/OpenTK.dll.config | 48 +++++++++---------- ...iterDotNet.MonoGame.Example.LinuxGL.csproj | 25 ++++------ .../Platforms/LinuxGL/packages.config | 2 +- ...erDotNet.MonoGame.Example.WindowsDX.csproj | 15 ++---- .../Platforms/WindowsDX/packages.config | 2 +- ...erDotNet.MonoGame.Example.WindowsGL.csproj | 21 ++++---- .../Platforms/WindowsGL/packages.config | 2 +- SpriterDotNet.MonoGame.Example/SpriterGame.cs | 2 +- .../SpriterDotNet.MonoGame.nuspec | 24 ++++++++++ 13 files changed, 81 insertions(+), 101 deletions(-) create mode 100644 SpriterDotNet.MonoGame/SpriterDotNet.MonoGame.nuspec diff --git a/SpriterDotNet.MonoGame.Example/Content/Content.mgcb b/SpriterDotNet.MonoGame.Example/Content/Content.mgcb index fb883cd..8092ca8 100644 --- a/SpriterDotNet.MonoGame.Example/Content/Content.mgcb +++ b/SpriterDotNet.MonoGame.Example/Content/Content.mgcb @@ -11,7 +11,6 @@ #-------------------------------- References --------------------------------# /reference:..\..\SpriterDotNet.MonoGame.Importer\bin\Debug\SpriterDotNet.MonoGame.Importer.dll -/reference:..\..\SpriterDotNet.MonoGame.Importer\bin\Debug\SpriterDotNet.MonoGame.dll #---------------------------------- Content ---------------------------------# diff --git a/SpriterDotNet.MonoGame.Example/Platforms/Android/Resources/Resource.Designer.cs b/SpriterDotNet.MonoGame.Example/Platforms/Android/Resources/Resource.Designer.cs index f56c5f9..95cb79c 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/Android/Resources/Resource.Designer.cs +++ b/SpriterDotNet.MonoGame.Example/Platforms/Android/Resources/Resource.Designer.cs @@ -47,9 +47,6 @@ public partial class Drawable // aapt resource value: 0x7f020000 public const int Icon = 2130837504; - // aapt resource value: 0x7f020001 - public const int monoandroidsplash = 2130837505; - static Drawable() { global::Android.Runtime.ResourceIdManager.UpdateIdValues(); @@ -63,8 +60,8 @@ private Drawable() public partial class Id { - // aapt resource value: 0x7f060000 - public const int MyButton = 2131099648; + // aapt resource value: 0x7f050000 + public const int MyButton = 2131034112; static Id() { @@ -110,22 +107,6 @@ private String() { } } - - public partial class Style - { - - // aapt resource value: 0x7f050000 - public const int Mono_Android_Theme_Splash = 2131034112; - - static Style() - { - global::Android.Runtime.ResourceIdManager.UpdateIdValues(); - } - - private Style() - { - } - } } } #pragma warning restore 1591 diff --git a/SpriterDotNet.MonoGame.Example/Platforms/Android/SpriterDotNet.MonoGame.Example.Android.csproj b/SpriterDotNet.MonoGame.Example/Platforms/Android/SpriterDotNet.MonoGame.Example.Android.csproj index 8aba142..0d1a312 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/Android/SpriterDotNet.MonoGame.Example.Android.csproj +++ b/SpriterDotNet.MonoGame.Example/Platforms/Android/SpriterDotNet.MonoGame.Example.Android.csproj @@ -22,7 +22,7 @@ full false bin\Debug\ - DEBUG;TRACE + DEBUG;TRACE;ANDROID prompt 4 None @@ -31,15 +31,15 @@ pdbonly true bin\Release\ - TRACE + ANDROID prompt 4 False - - ..\..\..\packages\MonoGame.Framework.Android.3.4.0.459\lib\MonoAndroid\MonoGame.Framework.dll + + ..\..\..\packages\MonoGame.Framework.Android.3.5.1.1679\lib\MonoAndroid\MonoGame.Framework.dll True @@ -81,11 +81,4 @@ - \ No newline at end of file diff --git a/SpriterDotNet.MonoGame.Example/Platforms/Android/packages.config b/SpriterDotNet.MonoGame.Example/Platforms/Android/packages.config index 2cd2b67..3c9d92e 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/Android/packages.config +++ b/SpriterDotNet.MonoGame.Example/Platforms/Android/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/OpenTK.dll.config b/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/OpenTK.dll.config index 0fbcf17..7098d39 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/OpenTK.dll.config +++ b/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/OpenTK.dll.config @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/SpriterDotNet.MonoGame.Example.LinuxGL.csproj b/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/SpriterDotNet.MonoGame.Example.LinuxGL.csproj index 25c64b0..4481c05 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/SpriterDotNet.MonoGame.Example.LinuxGL.csproj +++ b/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/SpriterDotNet.MonoGame.Example.LinuxGL.csproj @@ -20,7 +20,7 @@ full false bin\Windows\Debug\ - DEBUG;TRACE;WINDOWS + DEBUG;TRACE;DESKTOP prompt 4 @@ -29,7 +29,7 @@ pdbonly true bin\Windows\Release\ - TRACE;WINDOWS + DESKTOP prompt 4 @@ -37,17 +37,17 @@ Icon.ico + + - $(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll - - - $(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\OpenTK.dll + ..\..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll - $(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\NVorbis.dll + ..\..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll + + + ..\..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll - - @@ -77,11 +77,4 @@ - \ No newline at end of file diff --git a/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/packages.config b/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/packages.config index 5d0a6fd..777c5e4 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/packages.config +++ b/SpriterDotNet.MonoGame.Example/Platforms/LinuxGL/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/SpriterDotNet.MonoGame.Example/Platforms/WindowsDX/SpriterDotNet.MonoGame.Example.WindowsDX.csproj b/SpriterDotNet.MonoGame.Example/Platforms/WindowsDX/SpriterDotNet.MonoGame.Example.WindowsDX.csproj index 32a8a5f..de9caf0 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/WindowsDX/SpriterDotNet.MonoGame.Example.WindowsDX.csproj +++ b/SpriterDotNet.MonoGame.Example/Platforms/WindowsDX/SpriterDotNet.MonoGame.Example.WindowsDX.csproj @@ -21,7 +21,7 @@ full false bin\Windows\Debug\ - DEBUG;TRACE;WINDOWS + DEBUG;TRACE;DESKTOP prompt 4 @@ -30,7 +30,7 @@ pdbonly true bin\Windows\Release\ - TRACE;WINDOWS + DESKTOP prompt 4 @@ -38,8 +38,8 @@ Icon.ico - - ..\..\..\packages\MonoGame.Framework.WindowsDX.3.4.0.459\lib\net40\MonoGame.Framework.dll + + ..\..\..\packages\MonoGame.Framework.WindowsDX.3.5.1.1679\lib\net40\MonoGame.Framework.dll True @@ -68,11 +68,4 @@ - \ No newline at end of file diff --git a/SpriterDotNet.MonoGame.Example/Platforms/WindowsDX/packages.config b/SpriterDotNet.MonoGame.Example/Platforms/WindowsDX/packages.config index 48c85e4..6927ed8 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/WindowsDX/packages.config +++ b/SpriterDotNet.MonoGame.Example/Platforms/WindowsDX/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/SpriterDotNet.MonoGame.Example/Platforms/WindowsGL/SpriterDotNet.MonoGame.Example.WindowsGL.csproj b/SpriterDotNet.MonoGame.Example/Platforms/WindowsGL/SpriterDotNet.MonoGame.Example.WindowsGL.csproj index 7cdbac9..afa9966 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/WindowsGL/SpriterDotNet.MonoGame.Example.WindowsGL.csproj +++ b/SpriterDotNet.MonoGame.Example/Platforms/WindowsGL/SpriterDotNet.MonoGame.Example.WindowsGL.csproj @@ -21,7 +21,7 @@ full false bin\Windows\Debug\ - DEBUG;TRACE;WINDOWS + DEBUG;TRACE;DESKTOP prompt 4 @@ -30,7 +30,7 @@ pdbonly true bin\Windows\Release\ - TRACE;WINDOWS + TRACE;DESKTOP prompt 4 @@ -38,12 +38,16 @@ Icon.ico - - ..\..\..\packages\MonoGame.Framework.WindowsGL.3.4.0.459\lib\net40\MonoGame.Framework.dll + + ..\..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll + True + + + ..\..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll True - ..\..\..\packages\MonoGame.Framework.WindowsGL.3.4.0.459\lib\net40\OpenTK.dll + ..\..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll True @@ -72,11 +76,4 @@ - \ No newline at end of file diff --git a/SpriterDotNet.MonoGame.Example/Platforms/WindowsGL/packages.config b/SpriterDotNet.MonoGame.Example/Platforms/WindowsGL/packages.config index 5d0a6fd..777c5e4 100644 --- a/SpriterDotNet.MonoGame.Example/Platforms/WindowsGL/packages.config +++ b/SpriterDotNet.MonoGame.Example/Platforms/WindowsGL/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/SpriterDotNet.MonoGame.Example/SpriterGame.cs b/SpriterDotNet.MonoGame.Example/SpriterGame.cs index 1f0d809..be46e09 100644 --- a/SpriterDotNet.MonoGame.Example/SpriterGame.cs +++ b/SpriterDotNet.MonoGame.Example/SpriterGame.cs @@ -33,7 +33,7 @@ protected override void Initialize() var dm = graphics.GraphicsDevice.DisplayMode; - #if WINDOWS + #if DESKTOP Window.Position = new Point((dm.Width - Width) / 2, (dm.Height - Height) / 2); #endif diff --git a/SpriterDotNet.MonoGame/SpriterDotNet.MonoGame.nuspec b/SpriterDotNet.MonoGame/SpriterDotNet.MonoGame.nuspec new file mode 100644 index 0000000..bc535a2 --- /dev/null +++ b/SpriterDotNet.MonoGame/SpriterDotNet.MonoGame.nuspec @@ -0,0 +1,24 @@ + + + + + + SpriterDotNet.MonoGame + 1.5.0-rc + Luka "loodakrawa" Sverko + Luka "loodakrawa" Sverko + https://github.com/loodakrawa/SpriterDotNet/blob/develop/LICENSE + https://github.com/loodakrawa/SpriterDotNet + SpriterDotNet.MonoGame + A simple, fast and efficient Spriter implementation in pure C# + Copyright 2016 + Spriter MonoGame + + + + + + + + + \ No newline at end of file