diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe index 9f8781d..31fc988 100644 Binary files a/.nuget/NuGet.exe and b/.nuget/NuGet.exe differ diff --git a/NuGet/DouglasCrockford.JsMin.nuspec b/NuGet/DouglasCrockford.JsMin.nuspec index b5409e9..a3a0378 100644 --- a/NuGet/DouglasCrockford.JsMin.nuspec +++ b/NuGet/DouglasCrockford.JsMin.nuspec @@ -2,7 +2,7 @@ DouglasCrockford.JsMin - 1.1.0-rc1 + 1.1.0-rc2 JSMin for .Net Andrey Taritsyn Andrey Taritsyn @@ -12,23 +12,20 @@ true JSMin.NET is a .NET port of the Douglas Crockford's JSMin (http://github.com/douglascrockford/JSMin). JSMin.NET is a .NET port of the Douglas Crockford's JSMin. - Added support of .NET Core 5 RC 1. + Added support of .NET Core 1.0 RC 2. Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru en-US Douglas Crockford JSMin JavaScript JS Minification Minifier Minify - - - - + + + + + - - - - diff --git a/NuGet/build-package.cmd b/NuGet/build-package.cmd index b42c4ac..0727851 100644 --- 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 index 04a289e..7ddd0b9 100644 --- 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 index cdae1a6..50f974b 100644 --- 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")] \ No newline at end of file diff --git a/src/DouglasCrockford.JsMin/project.json b/src/DouglasCrockford.JsMin/project.json index cb88630..d69f9b0 100644 --- 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 index cfadb34..7413d65 100644 --- 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")] \ No newline at end of file