Skip to content

Commit

Permalink
Version 1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Taritsyn committed Jan 5, 2017
1 parent 52348b3 commit 537da00
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 27 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
JsMinifier.cs
2013-09-16

Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru
Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru

jsmin.c
2013-03-29
Expand Down
7 changes: 4 additions & 3 deletions NuGet/DouglasCrockford.JsMin.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>DouglasCrockford.JsMin</id>
<version>1.1.1</version>
<version>1.1.2</version>
<title>JSMin for .Net</title>
<authors>Andrey Taritsyn</authors>
<owners>Andrey Taritsyn</owners>
Expand All @@ -12,8 +12,9 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>JSMin.NET is a .NET port of the Douglas Crockford's JSMin (http://github.com/douglascrockford/JSMin).</description>
<summary>JSMin.NET is a .NET port of the Douglas Crockford's JSMin.</summary>
<releaseNotes>Optimized memory usage.</releaseNotes>
<copyright>Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
<releaseNotes>1. Added support of .NET Core 1.0.3;
2. `JsMinificationException` class was made serializable.</releaseNotes>
<copyright>Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
<language>en-US</language>
<tags>Douglas Crockford JSMin JavaScript JS Minification Minifier Minify</tags>
<dependencies>
Expand Down
16 changes: 9 additions & 7 deletions NuGet/build-package.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@ set nuget_package_manager=..\.nuget\nuget.exe
set dotnet_cli="%ProgramFiles%\dotnet\dotnet.exe"

set project_name=DouglasCrockford.JsMin
set project_source_dir=..\src\%project_name%
set project_bin_dir=%project_source_dir%\bin\Release
set net4_project_source_dir=..\src\%project_name%.Net4
set net4_project_bin_dir=%net4_project_source_dir%\bin\Release
set dotnet_project_source_dir=..\src\%project_name%
set dotnet_project_bin_dir=%dotnet_project_source_dir%\bin\Release

rmdir lib /Q/S

%net40_msbuild% "%project_source_dir%\%project_name%.Net40.csproj" /p:Configuration=Release
xcopy %project_bin_dir%\%project_name%.dll lib\net40-client\
%net40_msbuild% "%net4_project_source_dir%\%project_name%.Net40.csproj" /p:Configuration=Release
xcopy %net4_project_bin_dir%\%project_name%.dll lib\net40-client\

%dotnet_cli% build "%project_source_dir%" --framework netstandard1.1 --configuration Release --no-dependencies --no-incremental
xcopy "%project_bin_dir%\netstandard1.1\%project_name%.dll" lib\netstandard1.1\ /E
xcopy "%project_bin_dir%\netstandard1.1\%project_name%.xml" lib\netstandard1.1\ /E
%dotnet_cli% build "%dotnet_project_source_dir%" --framework netstandard1.1 --configuration Release --no-dependencies --no-incremental
xcopy "%dotnet_project_bin_dir%\netstandard1.1\%project_name%.dll" lib\netstandard1.1\ /E
xcopy "%dotnet_project_bin_dir%\netstandard1.1\%project_name%.xml" lib\netstandard1.1\ /E

copy ..\LICENSE license.txt /Y

Expand Down
14 changes: 7 additions & 7 deletions NuGet/readme.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@


----------------------------------------------------------------------
README file for JSMin for .Net v1.1.1
--------------------------------------------------------------------------------
README file for JSMin for .Net v1.1.2

----------------------------------------------------------------------
--------------------------------------------------------------------------------

Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru
Copyright (c) 2013-2017 Andrey Taritsyn - http://www.taritsyn.ru


===========
Expand All @@ -17,10 +17,10 @@
=============
RELEASE NOTES
=============
Optimized memory usage.
1. Added support of .NET Core 1.0.3;
2. `JsMinificationException` class was made serializable.

=============
DOCUMENTATION
=============
See more information on GitHub -
http://github.com/Taritsyn/JSMin.NET
See more information on GitHub - http://github.com/Taritsyn/JSMin.NET
6 changes: 3 additions & 3 deletions src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JSMin for .Net")]
[assembly: AssemblyCopyright("Copyright © 2013-2016 Andrey Taritsyn")]
[assembly: AssemblyCopyright("Copyright © 2013-2017 Andrey Taritsyn")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]
[assembly: Guid("0d7b205c-e3d6-4756-9977-29a71052536b")]

[assembly: AssemblyVersion("1.1.1.0")]
[assembly: AssemblyFileVersion("1.1.1.0")]
[assembly: AssemblyVersion("1.1.2.0")]
[assembly: AssemblyFileVersion("1.1.2.0")]
2 changes: 1 addition & 1 deletion src/DouglasCrockford.JsMin/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.1.1",
"version": "1.1.2",

"dependencies": {},

Expand Down
6 changes: 3 additions & 3 deletions test/DouglasCrockford.JsMin.Test/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JSMin for .Net: Tests")]
[assembly: AssemblyCopyright("Copyright © 2013-2016 Andrey Taritsyn")]
[assembly: AssemblyCopyright("Copyright © 2013-2017 Andrey Taritsyn")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]
[assembly: Guid("72947ee4-f2b3-42e9-a84b-9a4a5254e974")]

[assembly: AssemblyVersion("1.1.1.0")]
[assembly: AssemblyFileVersion("1.1.1.0")]
[assembly: AssemblyVersion("1.1.2.0")]
[assembly: AssemblyFileVersion("1.1.2.0")]
4 changes: 2 additions & 2 deletions test/DouglasCrockford.JsMin.Test/project.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"version": "1.1.1",
"version": "1.1.2",

"dependencies": {
"dotnet-test-xunit": "2.2.0-preview2-build1029",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0",
"Microsoft.NETCore.Platforms": "1.0.2",
"xunit": "2.2.0-beta4-build3444",
"DouglasCrockford.JsMin": "1.1.1"
"DouglasCrockford.JsMin": "1.1.2"
},

"testRunner": "xunit",
Expand Down

0 comments on commit 537da00

Please sign in to comment.