Was made refactoring

Taritsyn · Mar 25, 2016 · c118861 · c118861
1 parent 74deb2d
commit c118861
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 53 deletions.
diff --git a/DouglasCrockford.JsMin.Net4.sln b/DouglasCrockford.JsMin.Net4.sln
@@ -1,20 +1,20 @@
 
 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
 		.nuget\NuGet.exe = .nuget\NuGet.exe
 		.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 → NuGet/DouglasCrockford.JsMin.nuspec b/NuGet/JSMin.NET.nuspec → 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>
diff --git 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
+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
diff --git a/NuGet/license.txt b/NuGet/license.txt
diff --git a/images/JSMin_Logo128x128.png b/images/JSMin_Logo128x128.png
diff --git a/...kford.JsMin/DouglasCrockford.JsMin.csproj → ...JsMin/DouglasCrockford.JsMin.Net40.csproj b/...kford.JsMin/DouglasCrockford.JsMin.csproj → ...JsMin/DouglasCrockford.JsMin.Net40.csproj
@@ -18,15 +18,15 @@
     <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>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <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/...n.Test/DouglasCrockford.JsMin.Test.csproj → .../DouglasCrockford.JsMin.Test.Net45.csproj b/...n.Test/DouglasCrockford.JsMin.Test.csproj → .../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>