From c1188619472673e4694933a960eb9a7f274e147f Mon Sep 17 00:00:00 2001
From: Andrey Taritsyn <taritsyn@gmail.com>
Date: Fri, 25 Mar 2016 18:49:50 +0300
Subject: [PATCH] Was made refactoring

---
 DouglasCrockford.JsMin.Net4.sln               |  14 ++++-----
 ...T.nuspec => DouglasCrockford.JsMin.nuspec} |  18 +++++------
 NuGet/build-package.cmd                       |  15 +++++++--
 NuGet/license.txt                             |  29 ------------------
 images/JSMin_Logo128x128.png                  | Bin 0 -> 1910 bytes
 ...oj => DouglasCrockford.JsMin.Net40.csproj} |   4 +--
 ... DouglasCrockford.JsMin.Test.Net45.csproj} |   6 ++--
 7 files changed, 33 insertions(+), 53 deletions(-)
 rename NuGet/{JSMin.NET.nuspec => DouglasCrockford.JsMin.nuspec} (57%)
 delete mode 100644 NuGet/license.txt
 create mode 100644 images/JSMin_Logo128x128.png
 rename src/DouglasCrockford.JsMin/{DouglasCrockford.JsMin.csproj => DouglasCrockford.JsMin.Net40.csproj} (95%)
 rename test/DouglasCrockford.JsMin.Test/{DouglasCrockford.JsMin.Test.csproj => DouglasCrockford.JsMin.Test.Net45.csproj} (97%)

diff --git a/DouglasCrockford.JsMin.Net4.sln b/DouglasCrockford.JsMin.Net4.sln
index 3ca79a7..6dae862 100644
--- a/DouglasCrockford.JsMin.Net4.sln
+++ b/DouglasCrockford.JsMin.Net4.sln
@@ -1,12 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AC8F29F2-7C44-47BB-9EB2-FBF8AE92C792}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DouglasCrockford.JsMin", "src\DouglasCrockford.JsMin\DouglasCrockford.JsMin.csproj", "{24C997B7-B518-4316-B462-79CA93CA1B67}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F8B5DDE5-1532-473B-A80C-0DC559B8EAC4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{191A86C1-B572-4BF6-9480-F3AA8C81375B}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -14,7 +8,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{191A86
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DouglasCrockford.JsMin.Test", "test\DouglasCrockford.JsMin.Test\DouglasCrockford.JsMin.Test.csproj", "{8AA60DEA-FF01-4F54-9BB5-9E79E97EB25C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AC8F29F2-7C44-47BB-9EB2-FBF8AE92C792}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F8B5DDE5-1532-473B-A80C-0DC559B8EAC4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DouglasCrockford.JsMin.Net40", "src\DouglasCrockford.JsMin\DouglasCrockford.JsMin.Net40.csproj", "{24C997B7-B518-4316-B462-79CA93CA1B67}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DouglasCrockford.JsMin.Test.Net45", "test\DouglasCrockford.JsMin.Test\DouglasCrockford.JsMin.Test.Net45.csproj", "{8AA60DEA-FF01-4F54-9BB5-9E79E97EB25C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/NuGet/JSMin.NET.nuspec b/NuGet/DouglasCrockford.JsMin.nuspec
similarity index 57%
rename from NuGet/JSMin.NET.nuspec
rename to NuGet/DouglasCrockford.JsMin.nuspec
index ecfe3a4..db84da8 100644
--- a/NuGet/JSMin.NET.nuspec
+++ b/NuGet/DouglasCrockford.JsMin.nuspec
@@ -1,26 +1,24 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
 	<metadata>
-		<id>JSMin.NET</id>
+		<id>DouglasCrockford.JsMin</id>
 		<version>1.0.0</version>
-		<title>JSMin for .Net</title>
+		<title>JSMin.NET</title>
 		<authors>Andrey Taritsyn</authors>
 		<owners>Andrey Taritsyn</owners>
 		<licenseUrl>http://github.com/Taritsyn/JSMin.NET/blob/master/LICENSE</licenseUrl>
 		<projectUrl>http://github.com/Taritsyn/JSMin.NET</projectUrl>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>A .NET port of the Douglas Crockford's JSMin (http://github.com/douglascrockford/JSMin).</description>
-		<summary>A .NET port of the Douglas Crockford's JSMin.</summary>
+		<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>
 		<copyright>Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
 		<language>en-US</language>
 		<tags>Douglas Crockford JSMin JavaScript JS Minification Minifier Minify</tags>
+		<dependencies>
+			<group targetFramework=".NETFramework4.0-Client" />
+		</dependencies>
 		<references>
 			<reference file="DouglasCrockford.JsMin.dll" />
 		</references>
 	</metadata>
-	<files>
-		<file src="..\src\DouglasCrockford.JsMin\bin\Release\DouglasCrockford.JsMin.dll" target="lib\net40-client" />
-		<file src="readme.txt" />
-		<file src="license.txt" />
-	</files>
 </package>
\ No newline at end of file
diff --git a/NuGet/build-package.cmd b/NuGet/build-package.cmd
index 74c840f..e967575 100644
--- a/NuGet/build-package.cmd
+++ b/NuGet/build-package.cmd
@@ -1,2 +1,13 @@
-\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\DouglasCrockford.JsMin\DouglasCrockford.JsMin.csproj /p:Configuration=Release
-..\.nuget\nuget.exe pack JSMin.NET.nuspec
\ No newline at end of file
+set net40_msbuild=\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
+set nuget_package_manager=..\.nuget\nuget.exe
+
+set project_name=DouglasCrockford.JsMin
+set project_source_dir=..\src\%project_name%
+
+rmdir lib /Q/S
+
+%net40_msbuild% %project_source_dir%\%project_name%.Net40.csproj /p:Configuration=Release
+xcopy %project_source_dir%\bin\Release\%project_name%.dll lib\net40-client\
+copy ..\LICENSE license.txt /Y
+
+%nuget_package_manager% pack %project_name%.nuspec
\ No newline at end of file
diff --git a/NuGet/license.txt b/NuGet/license.txt
deleted file mode 100644
index 7dc8ecd..0000000
--- a/NuGet/license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-JsMinifier.cs
-2013-09-16
-
-Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru
-
-jsmin.c
-2013-03-29
-
-Copyright (c) 2002 Douglas Crockford (www.crockford.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/images/JSMin_Logo128x128.png b/images/JSMin_Logo128x128.png
new file mode 100644
index 0000000000000000000000000000000000000000..208fa4a59960cdf421dd4415dc8e97ad5a0f6070
GIT binary patch
literal 1910
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

literal 0
HcmV?d00001

diff --git a/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.csproj b/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.Net40.csproj
similarity index 95%
rename from src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.csproj
rename to src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.Net40.csproj
index 585b13d..81bdd29 100644
--- a/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.csproj
+++ b/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.Net40.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -26,7 +26,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.csproj b/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.Net45.csproj
similarity index 97%
rename from test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.csproj
rename to test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.Net45.csproj
index 6aeb854..127bbd9 100644
--- a/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.csproj
+++ b/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.Net45.csproj
@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -61,7 +61,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\DouglasCrockford.JsMin\DouglasCrockford.JsMin.csproj">
+    <ProjectReference Include="..\..\src\DouglasCrockford.JsMin\DouglasCrockford.JsMin.Net40.csproj">
       <Project>{24c997b7-b518-4316-b462-79ca93ca1b67}</Project>
       <Name>DouglasCrockford.JsMin</Name>
     </ProjectReference>