Skip to content

Commit 1b0d2fa

Browse files
RonenNessRonenNess
committed
fixed nuget package and arranged projects for .net core
1 parent 1e78ead commit 1b0d2fa

File tree

8 files changed

+18
-15
lines changed

8 files changed

+18
-15
lines changed

‎GeonBit.UI.Examples/GeonBit.UI.Examples.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<ProjectReference Include="..\GeonBit.UI\GeonBit.UI.csproj" />
14-
<ProjectReference Include="..\GeonBit.UI\Libs\DataTypes\DataTypes.csproj" />
14+
<ProjectReference Include="..\GeonBit.UI\Libs\DataTypes\GeonBit.UI.DataTypes.csproj" />
1515
</ItemGroup>
1616

1717
<Target Name="PostBuild" AfterTargets="PostBuildEvent">

‎GeonBit.UI.nuspec

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>GeonBit.UI</id>
5-
<version>4.0.2</version>
5+
<version>4.0.6.1</version>
66
<authors>Ronen Ness</authors>
77
<owners>RonenNess</owners>
88
<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
2121
</metadata>
2222
<files>
2323
<file src="readme.txt" target="" />
24-
<file src="GeonBit.UI\bin\Release\netcoreapp3.1\DataTypes.dll" target="lib\geonbitui\DataTypes.dll"/>
25-
<file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.dll" target="lib\geonbitui\GeonBit.UI.dll"/>
24+
<file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.DataTypes.dll" target="lib\netcoreapp3.1\GeonBit.UI.DataTypes.dll"/>
25+
<file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.dll" target="lib\netcoreapp3.1\GeonBit.UI.dll"/>
26+
<file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.DataTypes.dll" target="lib\netcoreapp3.1-windows\GeonBit.UI.DataTypes.dll"/>
27+
<file src="GeonBit.UI\bin\Release\netcoreapp3.1\GeonBit.UI.dll" target="lib\netcoreapp3.1-windows\GeonBit.UI.dll"/>
2628
<file src="Help\Documentation.chm" target="Documentation.chm"/>
2729
<file src="GeonBit.UI\Content\GeonBit.UI\**\*.*" target="content\Content\GeonBit.UI" />
2830
</files>

‎GeonBit.UI.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31710.8
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeonBit.UI", "GeonBit.UI\GeonBit.UI.csproj", "{DD284F36-FCD5-4265-AE4C-28B9A38B9DEF}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeonBit.UI", "GeonBit.UI\GeonBit.UI.csproj", "{DD284F36-FCD5-4265-AE4C-28B9A38B9DEF}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTypes", "GeonBit.UI\Libs\DataTypes\DataTypes.csproj", "{2C87417A-07A7-440A-AFDA-D624CE4ACE05}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeonBit.UI.DataTypes", "GeonBit.UI\Libs\DataTypes\GeonBit.UI.DataTypes.csproj", "{2C87417A-07A7-440A-AFDA-D624CE4ACE05}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeonBit.UI.Examples", "GeonBit.UI.Examples\GeonBit.UI.Examples.csproj", "{24B1B515-4FA7-495C-9C0C-F806923CB456}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeonBit.UI.Examples", "GeonBit.UI.Examples\GeonBit.UI.Examples.csproj", "{24B1B515-4FA7-495C-9C0C-F806923CB456}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎GeonBit.UI/Content/Content.mgcb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
#-------------------------------- References --------------------------------#
1212

13-
/reference:..\Libs\DataTypes\bin\Release\netcoreapp3.1\DataTypes.dll
13+
/reference:..\Libs\DataTypes\bin\Release\netcoreapp3.1\GeonBit.UI.DataTypes.dll
14+
/reference:..\Libs\DataTypes\bin\Release\netcoreapp3.1\GeonBit.UI.DataTypes.dll
1415

1516
#---------------------------------- Content ---------------------------------#
1617

‎GeonBit.UI/GeonBit.UI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<ProjectReference Include="Libs\DataTypes\DataTypes.csproj" />
37+
<ProjectReference Include="Libs\DataTypes\GeonBit.UI.DataTypes.csproj" />
3838
</ItemGroup>
3939

4040
</Project>

‎GeonBit.UI/Libs/DataTypes/DataTypes.csproj renamed to ‎GeonBit.UI/Libs/DataTypes/GeonBit.UI.DataTypes.csproj

File renamed without changes.

‎GeonBit.UI/Source/UserInterface.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public enum BuiltinThemes
9595
public class UserInterface : System.IDisposable
9696
{
9797
/// <summary>Current GeonBit.UI version identifier.</summary>
98-
public const string VERSION = "4.0.2";
98+
public const string VERSION = "4.0.6.1";
9999

100100
/// <summary>
101101
/// The currently active user interface instance.

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Install-Package GeonBit.UI
130130
131131
Now there are two things to update in the Content Manager:
132132
133-
1. Add a ```Reference``` to the DataTypes.dll lib, located in ```packages\GeonBit.UI.<version>\lib\geonbitui\```
133+
1. Add a ```Reference``` to the GeonBit.UI.DataTypes.dll lib, located in the nuget package folder.
134134
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).
135135
136136
That's it! Just few things to remember:
@@ -147,8 +147,8 @@ To manually install GeonBit.UI into your project, follow these steps:
147147
1. **Copy source:** Copy the source code from ```GeonBit.UI/GeonBit.UI/``` into your project source root (just copy the whole folder as-is).
148148
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).
149149
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).
150-
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:
151-
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.
150+
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:
151+
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.
152152
2. You can build only in ```release``` mode, since you'll probably never need to debug it.
153153
3. You can use the example ```GeonBit.UI.sln``` solution to quickly build it without opening a new solution file.
154154
@@ -2062,7 +2062,7 @@ For older MonoGame versions, see [tag 2.1.0.0](https://github.com/RonenNess/Geon
20622062
- Added default value to form GetValue() methods.
20632063
- Fixed bug with animators not working in panels that have clipping overflow when mouse is outside boundaries.
20642064

2065-
### 4.0.1
2065+
### 4.0.6.1
20662066

20672067
- Upgraded project to .net core 3.1.
20682068
- Upgraded MonoGame version to 3.8.0.

0 commit comments

Comments
 (0)