fixed nuget package and arranged projects for .net core

RonenNess · Oct 12, 2021 · 1b0d2fa · 1b0d2fa
1 parent 1e78ead
commit 1b0d2fa
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/GeonBit.UI.Examples/GeonBit.UI.Examples.csproj b/GeonBit.UI.Examples/GeonBit.UI.Examples.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\GeonBit.UI\GeonBit.UI.csproj" />
-    <ProjectReference Include="..\GeonBit.UI\Libs\DataTypes\DataTypes.csproj" />
+    <ProjectReference Include="..\GeonBit.UI\Libs\DataTypes\GeonBit.UI.DataTypes.csproj" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

diff --git a/GeonBit.UI.nuspec b/GeonBit.UI.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
 	<id>GeonBit.UI</id>
-	<version>4.0.2</version>
+	<version>4.0.6.1</version>
 	<authors>Ronen Ness</authors>
 	<owners>RonenNess</owners>
 	<title>MonoGame GeonBit.UI</title>
@@ -21,8 +21,10 @@ It provide all the basic UI elements required to make a game / editor UI, and co
   </metadata>
   <files>
 	<file src="readme.txt" target="" />
-	<file src="GeonBit.UI\bin\Release\netcoreapp3.1\DataTypes.dll" target="lib\geonbitui\DataTypes.dll"/>
-	<file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.dll" target="lib\geonbitui\GeonBit.UI.dll"/>
+	<file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.DataTypes.dll" target="lib\netcoreapp3.1\GeonBit.UI.DataTypes.dll"/>
+	<file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.dll" target="lib\netcoreapp3.1\GeonBit.UI.dll"/>
+    <file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.DataTypes.dll" target="lib\netcoreapp3.1-windows\GeonBit.UI.DataTypes.dll"/>
+	<file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.dll" target="lib\netcoreapp3.1-windows\GeonBit.UI.dll"/>
 	<file src="Help\Documentation.chm" target="Documentation.chm"/>
 	<file src="GeonBit.UI\Content\GeonBit.UI\**\*.*" target="content\Content\GeonBit.UI" /> 
   </files>

diff --git a/GeonBit.UI.sln b/GeonBit.UI.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31710.8
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeonBit.UI", "GeonBit.UI\GeonBit.UI.csproj", "{DD284F36-FCD5-4265-AE4C-28B9A38B9DEF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeonBit.UI", "GeonBit.UI\GeonBit.UI.csproj", "{DD284F36-FCD5-4265-AE4C-28B9A38B9DEF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTypes", "GeonBit.UI\Libs\DataTypes\DataTypes.csproj", "{2C87417A-07A7-440A-AFDA-D624CE4ACE05}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeonBit.UI.DataTypes", "GeonBit.UI\Libs\DataTypes\GeonBit.UI.DataTypes.csproj", "{2C87417A-07A7-440A-AFDA-D624CE4ACE05}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeonBit.UI.Examples", "GeonBit.UI.Examples\GeonBit.UI.Examples.csproj", "{24B1B515-4FA7-495C-9C0C-F806923CB456}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeonBit.UI.Examples", "GeonBit.UI.Examples\GeonBit.UI.Examples.csproj", "{24B1B515-4FA7-495C-9C0C-F806923CB456}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/GeonBit.UI/Content/Content.mgcb b/GeonBit.UI/Content/Content.mgcb
@@ -10,7 +10,8 @@
 
 #-------------------------------- References --------------------------------#
 
-/reference:..\Libs\DataTypes\bin\Release\netcoreapp3.1\DataTypes.dll
+/reference:..\Libs\DataTypes\bin\Release\netcoreapp3.1\GeonBit.UI.DataTypes.dll
+/reference:..\Libs\DataTypes\bin\Release\netcoreapp3.1\GeonBit.UI.DataTypes.dll
 
 #---------------------------------- Content ---------------------------------#
 

diff --git a/GeonBit.UI/GeonBit.UI.csproj b/GeonBit.UI/GeonBit.UI.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="Libs\DataTypes\DataTypes.csproj" />
+    <ProjectReference Include="Libs\DataTypes\GeonBit.UI.DataTypes.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/GeonBit.UI/Libs/DataTypes/DataTypes.csproj → ...ibs/DataTypes/GeonBit.UI.DataTypes.csproj b/GeonBit.UI/Libs/DataTypes/DataTypes.csproj → ...ibs/DataTypes/GeonBit.UI.DataTypes.csproj
diff --git a/GeonBit.UI/Source/UserInterface.cs b/GeonBit.UI/Source/UserInterface.cs
@@ -95,7 +95,7 @@ public enum BuiltinThemes
     public class UserInterface : System.IDisposable
     {
         /// <summary>Current GeonBit.UI version identifier.</summary>
-        public const string VERSION = "4.0.2";
+        public const string VERSION = "4.0.6.1";
 
         /// <summary>
         /// The currently active user interface instance.

diff --git a/README.md b/README.md
@@ -130,7 +130,7 @@ Install-Package GeonBit.UI
 
 Now there are two things to update in the Content Manager:
 
-1. Add a ```Reference``` to the DataTypes.dll lib, located in ```packages\GeonBit.UI.<version>\lib\geonbitui\```
+1. Add a ```Reference``` to the GeonBit.UI.DataTypes.dll lib, located in the nuget package folder.
 2. During installation, GeonBit.UI placed a folder in ```Content\GeonBit.UI```. Add this whole folder, as-is, to your content manager (when asked if to copy or link files, choose link, since the folder is already in its right place).
 
 That's it! Just few things to remember:
@@ -147,8 +147,8 @@ To manually install GeonBit.UI into your project, follow these steps:
 1. **Copy source:** Copy the source code from ```GeonBit.UI/GeonBit.UI/``` into your project source root (just copy the whole folder as-is).
 2. **Add content:** Copy all the Content from ```GeonBit.UI/GeonBit.UI/Content/GeonBit.UI/``` into your MonoGame pipeline Manager (can be done by clicking on "add folder" and selecting the GeonBit.UI folder).
 3. **Install fonts:** You might need to install some fonts that GeonBit.UI uses and don't come by default in windows / linux. To do so, go to the ```GeonBit.UI/GeonBit.UI/Content/Fonts/``` folder and install all the fonts there (they are all free to use including for commercial purposes).
-4. **Build DataTypes dll:** Due to the way resources compile in MonoGame, there's a need to compile additional dll that contains serializable data types:
- 1. Open the project inside ```GeonBit.UI/GeonBit.UI/Libs/```, build it, and add the output dll (```DataTypes.dll```) to your *Content pipeline* ```References``` property and to your *Project Reference* dlls.
+4. **Build GeonBit.UI.DataTypes dll:** Due to the way resources compile in MonoGame, there's a need to compile additional dll that contains serializable data types:
+ 1. Open the project inside ```GeonBit.UI/GeonBit.UI/Libs/```, build it, and add the output dll (```GeonBit.UI.DataTypes.dll```) to your *Content pipeline* ```References``` property and to your *Project Reference* dlls.
  2. You can build only in ```release``` mode, since you'll probably never need to debug it.
  3. You can use the example ```GeonBit.UI.sln``` solution to quickly build it without opening a new solution file.
 
@@ -2062,7 +2062,7 @@ For older MonoGame versions, see [tag 2.1.0.0](https://github.com/RonenNess/Geon
 - Added default value to form GetValue() methods.
 - Fixed bug with animators not working in panels that have clipping overflow when mouse is outside boundaries.
 
-### 4.0.1
+### 4.0.6.1
 
 - Upgraded project to .net core 3.1.
 - Upgraded MonoGame version to 3.8.0.