Version 1.1.0 RC 2

Taritsyn · May 20, 2016 · 0f72d3d · 0f72d3d
1 parent 64e898a
commit 0f72d3d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 31 deletions.
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/NuGet/DouglasCrockford.JsMin.nuspec b/NuGet/DouglasCrockford.JsMin.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
 	<metadata>
 		<id>DouglasCrockford.JsMin</id>
-		<version>1.1.0-rc1</version>
+		<version>1.1.0-rc2</version>
 		<title>JSMin for .Net</title>
 		<authors>Andrey Taritsyn</authors>
 		<owners>Andrey Taritsyn</owners>
@@ -12,23 +12,20 @@
 		<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>Added support of .NET Core 5 RC 1.</releaseNotes>
+		<releaseNotes>Added support of .NET Core 1.0 RC 2.</releaseNotes>
 		<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" />
 			<group targetFramework=".NETFramework4.5.1" />
-			<group targetFramework=".NETPlatform5.4">
-				<dependency id="System.IO" version="4.0.11-beta-23516" />
-				<dependency id="System.Runtime" version="4.0.21-beta-23516" />
-				<dependency id="System.Threading" version="4.0.11-beta-23516" />
+			<group targetFramework=".NETStandard1.1">
+				<dependency id="System.IO" version="4.1.0-rc2-24027" />
+				<dependency id="System.Runtime" version="4.1.0-rc2-24027" />
+				<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-24027" />
+				<dependency id="System.Threading" version="4.0.11-rc2-24027" />
 			</group>
 		</dependencies>
-		<frameworkAssemblies>
-			<frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5.1" />
-			<frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5.1" />
-		</frameworkAssemblies>
 		<references>
 			<reference file="DouglasCrockford.JsMin.dll" />
 		</references>

diff --git a/NuGet/build-package.cmd b/NuGet/build-package.cmd
@@ -1,26 +1,23 @@
-set net40_msbuild=\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
+set net40_msbuild="\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
 set nuget_package_manager=..\.nuget\nuget.exe
-
-set dnx_runtime_dir=%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc1-final\bin
-set dnx_runtime=%dnx_runtime_dir%\dnx.exe
-set dnx_package_manager=%dnx_runtime_dir%\lib\Microsoft.Dnx.Tooling\Microsoft.Dnx.Tooling.dll
+set dotnet_cli="%ProgramFiles%\dotnet\dotnet.exe"
 
 set project_name=DouglasCrockford.JsMin
 set project_source_dir=..\src\%project_name%
-set project_artifacts_dir=..\artifacts\bin\%project_name%
+set project_bin_dir=%project_source_dir%\bin\Release
 
 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\
+%net40_msbuild% "%project_source_dir%\%project_name%.Net40.csproj" /p:Configuration=Release
+xcopy %project_bin_dir%\%project_name%.dll lib\net40-client\
 
-%dnx_runtime% --appbase %project_source_dir% %dnx_package_manager% build %project_source_dir% --framework net451 --configuration Release --out %project_artifacts_dir%
-xcopy %project_artifacts_dir%\Release\net451\%project_name%.dll lib\net451\ /E
-xcopy %project_artifacts_dir%\Release\net451\%project_name%.xml lib\net451\ /E
+%dotnet_cli% build "%project_source_dir%" --framework net451 --configuration Release --no-dependencies --no-incremental
+xcopy "%project_bin_dir%\net451\%project_name%.dll" lib\net451\ /E
+xcopy "%project_bin_dir%\net451\%project_name%.xml" lib\net451\ /E
 
-%dnx_runtime% --appbase %project_source_dir% %dnx_package_manager% build %project_source_dir% --framework dotnet5.4 --configuration Release --out %project_artifacts_dir%
-xcopy %project_artifacts_dir%\Release\dotnet5.4\%project_name%.dll lib\dotnet5.4\ /E
-xcopy %project_artifacts_dir%\Release\dotnet5.4\%project_name%.xml lib\dotnet5.4\ /E
+%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
 
 copy ..\LICENSE license.txt /Y
 

diff --git a/NuGet/readme.txt b/NuGet/readme.txt
@@ -1,7 +1,7 @@
 
 
    ----------------------------------------------------------------------
-                 README file for JSMin for .Net v1.1.0 RC 1
+                 README file for JSMin for .Net v1.1.0 RC 2
 
    ----------------------------------------------------------------------
 
@@ -17,7 +17,7 @@
    =============
    RELEASE NOTES
    =============
-   Added support of .NET Core 5 RC 1.
+   Added support of .NET Core 1.0 RC 2.
 
    =============
    DOCUMENTATION

diff --git a/src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs b/src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs
@@ -11,9 +11,7 @@
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
-#if !NETSTANDARD1_0
 [assembly: Guid("0d7b205c-e3d6-4756-9977-29a71052536b")]
-#endif
 
 [assembly: AssemblyVersion("1.1.0.0")]
 [assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/src/DouglasCrockford.JsMin/project.json b/src/DouglasCrockford.JsMin/project.json
@@ -5,10 +5,11 @@
 
 	"frameworks": {
 		"net451": { },
-		"netstandard1.0": {
+		"netstandard1.1": {
 			"dependencies": {
 				"System.IO": "4.1.0-rc2-24027",
 				"System.Runtime": "4.1.0-rc2-24027",
+				"System.Runtime.InteropServices": "4.1.0-rc2-24027",
 				"System.Threading": "4.0.11-rc2-24027"
 			}
 		}

diff --git a/test/DouglasCrockford.JsMin.Test/Properties/AssemblyInfo.cs b/test/DouglasCrockford.JsMin.Test/Properties/AssemblyInfo.cs
@@ -11,9 +11,7 @@
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
-#if !NETCOREAPP1_0
 [assembly: Guid("72947ee4-f2b3-42e9-a84b-9a4a5254e974")]
-#endif
 
 [assembly: AssemblyVersion("1.1.0.0")]
 [assembly: AssemblyFileVersion("1.1.0.0")]