Skip to content

Commit

Permalink
1.3.1 release
Browse files Browse the repository at this point in the history
* Removes nuget.exe and related bits as this is now natively handled by
VS2015
* Added CONTRIBUTORS.md
* Added nuget.config to reset packages folder if changed by a parent
folder config
  • Loading branch information
cyotek committed Mar 19, 2016
1 parent 4b712e0 commit 3e7e64f
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 175 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ packages
bin
obj
NDependOut
push.cmd

6 changes: 0 additions & 6 deletions .nuget/NuGet.Config

This file was deleted.

Binary file removed .nuget/NuGet.exe
Binary file not shown.
144 changes: 0 additions & 144 deletions .nuget/NuGet.targets

This file was deleted.

9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Change Log
==========

1.3.1
-----

### Removed
* Removed nuget.exe and related resources as this is now handled natively by Visual Studio 2015

### Fixed
* Fixed an issue where missing attributes in plain text font files could cause a crash. Thanks to rds1983 for the fix.

1.3.0
-----

Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
### Version 1.3.1
@rds1983
12 changes: 3 additions & 9 deletions Cyotek.Drawing.BitmapFont.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cyotek.Drawing.BitmapFont", "src\Cyotek.Drawing.BitmapFont\Cyotek.Drawing.BitmapFont.csproj", "{A8E42972-0BC3-4F26-99DF-87B6379E875F}"
EndProject
Expand All @@ -10,17 +10,11 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{761D06FC-667F-4F63-8267-8B9F75FA9197}"
ProjectSection(SolutionItems) = preProject
CHANGELOG.md = CHANGELOG.md
CONTRIBUTORS.md = CONTRIBUTORS.md
LICENSE.txt = LICENSE.txt
README.md = README.md
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9CD27474-1C74-43DB-B02F-457C966D8840}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion makerelease.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PUSHD
CD releases
NUGET pack ..\src\Cyotek.Drawing.BitmapFont\Cyotek.Drawing.BitmapFont.csproj -Prop Configuration=Release

%zipexe% -a Cyotek.Drawing.BitmapFont.x.x.x.x.zip ..\src\Cyotek.Drawing.BitmapFont\bin\Release\Cyotek.Drawing.BitmapFont.dll -ex
%zipexe% a -bd -tZip Cyotek.Drawing.BitmapFont.x.x.x.x.zip ..\src\Cyotek.Drawing.BitmapFont\bin\Release\Cyotek.Drawing.BitmapFont.dll

POPD

Expand Down
5 changes: 5 additions & 0 deletions nuget.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<configuration>
<config>
<add key="repositoryPath" value="packages" />
</config>
</configuration>
11 changes: 2 additions & 9 deletions src/BitmapFontViewer/BitmapFontViewer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
Expand All @@ -40,8 +39,9 @@
<ApplicationIcon>..\..\resources\icon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cyotek.Windows.Forms.ImageBox">
<Reference Include="Cyotek.Windows.Forms.ImageBox, Version=1.1.5.1, Culture=neutral, PublicKeyToken=58daa28b0b2de221, processorArchitecture=MSIL">
<HintPath>..\..\packages\CyotekImageBox.1.1.5.1\lib\net20\Cyotek.Windows.Forms.ImageBox.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Expand Down Expand Up @@ -179,13 +179,6 @@
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Cyotek.Drawing.BitmapFont</id>
<version>$version$</version>
<version>1.3.1</version>
<title>Cyotek BitmapFont</title>
<authors>Cyotek</authors>
<authors>Cyotek, rds1983</authors>
<owners>Cyotek</owners>
<licenseUrl>https://raw.githubusercontent.com/cyotek/Cyotek.Drawing.BitmapFont/master/LICENSE.txt</licenseUrl>
<projectUrl>https://github.com/cyotek/Cyotek.Drawing.BitmapFont</projectUrl>
Expand All @@ -17,7 +17,7 @@
Generic parser for the AngelCode BMFont format, supporting the text and XML versions of the format.
</summary>
<releaseNotes />
<copyright>Copyright 2012-2015 Cyotek Ltd.</copyright>
<copyright>Copyright 2012-2016 Cyotek Ltd.</copyright>
<language>en-GB</language>
<tags>bmfont bitmap font cyotek</tags>
</metadata>
Expand Down
6 changes: 3 additions & 3 deletions src/Cyotek.Drawing.BitmapFont/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Cyotek Ltd")]
[assembly: AssemblyProduct("Cyotek Bitmap Font Parser")]
[assembly: AssemblyCopyright("Copyright © 2012-2015 Cyotek Ltd. All Rights Reserved")]
[assembly: AssemblyCopyright("Copyright © 2012-2016 Cyotek Ltd. All Rights Reserved")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: CLSCompliant(true)]
[assembly: Guid("d0f2bfc9-ee27-4fbc-9d0c-c61423b51594")]
[assembly: AssemblyVersion("1.3.0")]
[assembly: AssemblyFileVersion("1.3.0")]
[assembly: AssemblyVersion("1.3.1")]
[assembly: AssemblyFileVersion("1.3.1")]

0 comments on commit 3e7e64f

Please sign in to comment.