Version update

.gitignore

@@ -26,6 +26,8 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+*.dll
+*.exe
 
 # Visual Studio 2015 cache/options directory
 .vs/

GeonBit.UI.Examples/.config/dotnet-tools.json

@@ -0,0 +1,36 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-mgcb": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb"
+      ]
+    },
+    "dotnet-mgcb-editor": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor"
+      ]
+    },
+    "dotnet-mgcb-editor-linux": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-linux"
+      ]
+    },
+    "dotnet-mgcb-editor-windows": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-windows"
+      ]
+    },
+    "dotnet-mgcb-editor-mac": {
+      "version": "3.8.1.303",
+      "commands": [
+        "mgcb-editor-mac"
+      ]
+    }
+  }
+}

GeonBit.UI.Examples/Content/GeonBit.UI/themes/editor/fonts/Regular.spritefont

@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>Bitstream Vera Sans Mono Roman</FontName>
+    <FontName>Bitstream Vera Sans Mono</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change

GeonBit.UI.Examples/Content/GeonBit.UI/themes/hd/fonts/Regular.spritefont

@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>Bitstream Vera Sans Mono Roman</FontName>
+    <FontName>Bitstream Vera Sans Mono</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change

GeonBit.UI.Examples/Content/GeonBit.UI/themes/lowres/fonts/Bold.spritefont

@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>AnonymousPro-Bold</FontName>
+    <FontName>Anonymous Pro Bold</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change

GeonBit.UI.Examples/Content/GeonBit.UI/themes/lowres/fonts/Italic.spritefont

@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>AnonymousPro-Italic</FontName>
+    <FontName>Anonymous Pro Italic</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change

GeonBit.UI.Examples/Content/GeonBit.UI/themes/lowres/fonts/Regular.spritefont

@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>AnonymousPro-Regular</FontName>
+    <FontName>Anonymous Pro</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,17 +19,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\GeonBit.UI\GeonBit.UI.csproj" />
     <ProjectReference Include="..\GeonBit.UI\Libs\DataTypes\GeonBit.UI.DataTypes.csproj" />
   </ItemGroup>
+
+  <Target Name="RestoreDotnetTools" BeforeTargets="Restore">
+    <Message Text="Restoring dotnet tools" Importance="High" />
+    <Exec Command="dotnet tool restore" />
+  </Target>
 
 </Project>

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.1.0.1</version>
+	<version>4.2.0.1</version>
 	<authors>Ronen Ness</authors>
 	<owners>RonenNess</owners>
 	<title>MonoGame GeonBit.UI</title>
@@ -16,15 +16,15 @@ It provide all the basic elements required to make a game / editor UI, and comes
 	<description>UI system for MonoGame projects.</description>
 	<tags>monogame ui gui hud user-interface gamedev</tags>
 	<dependencies>
-        <group targetFramework=".NETCoreApp3.1" />
+        <group targetFramework=".net6.0" />
 	</dependencies>
   </metadata>
   <files>
 	<file src="readme.txt" target="" />
-	<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="GeonBit.UI\bin\Release\net6.0\GeonBit.UI.DataTypes.dll" target="lib\net6.0\GeonBit.UI.DataTypes.dll"/>
+	<file src="GeonBit.UI\bin\Release\net6.0\GeonBit.UI.dll" target="lib\net6.0\GeonBit.UI.dll"/>
+    <file src="GeonBit.UI\bin\Release\net6.0\GeonBit.UI.DataTypes.dll" target="lib\net6.0-windows\GeonBit.UI.DataTypes.dll"/>
+	<file src="GeonBit.UI\bin\Release\net6.0\GeonBit.UI.dll" target="lib\net6.0-windows\GeonBit.UI.dll"/>
 	<file src="Help\Documentation.chm" target="Documentation.chm"/>
 	<file src="GeonBit.UI.Examples\Content\GeonBit.UI\**\*.*" target="content\Content\GeonBit.UI" /> 
   </files>

GeonBit.UI/GeonBit.UI.csproj

@@ -1,12 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <PackageLicenseFile>C:\Projects\GeonBit.UI\LICENSE</PackageLicenseFile>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <DocumentationFile>bin\GeonBit.UI.xml</DocumentationFile>
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <PackageId>GeonBit.UI</PackageId>
+    <Title>MonoGame GeonBit.UI</Title>
+    <Version>4.2.0.1</Version>
+    <Authors>Ronen Ness</Authors>
+    <Description>GeonBit.UI UI / HUD extension for MonoGame, released with the MIT license.
+It provide all the basic elements required to make a game / editor UI, and comes with few built-in UI skins compatible for commerical projects.</Description>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageTags>monogame ui gui hud user-interface gamedev</PackageTags>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageIcon>nuget_icon.png</PackageIcon>
+    <RepositoryUrl>https://github.com/RonenNess/GeonBit.UI</RepositoryUrl>
+    <PackageOutputPath>$(SolutionDir)</PackageOutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -30,11 +43,26 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
+    <None Include="..\assets\img\nuget_icon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="Libs\DataTypes\GeonBit.UI.DataTypes.csproj" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303">
+    <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="Libs\DataTypes\GeonBit.UI.DataTypes.csproj">
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
+  </ItemGroup>
+
 </Project>

GeonBit.UI/Libs/DataTypes/GeonBit.UI.DataTypes.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
@@ -15,7 +15,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
+	<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /y $(TargetPath) $(SolutionDir)\GeonBit.UI.Examples\Content" />
+  </Target>
+
 </Project>