Skip to content

Commit 0f72d3d

Browse files
committed
Version 1.1.0 RC 2
1 parent 64e898a commit 0f72d3d

7 files changed

Lines changed: 22 additions & 31 deletions

File tree

.nuget/NuGet.exe

164 KB
Binary file not shown.

NuGet/DouglasCrockford.JsMin.nuspec

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>DouglasCrockford.JsMin</id>
5-
<version>1.1.0-rc1</version>
5+
<version>1.1.0-rc2</version>
66
<title>JSMin for .Net</title>
77
<authors>Andrey Taritsyn</authors>
88
<owners>Andrey Taritsyn</owners>
@@ -12,23 +12,20 @@
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1313
<description>JSMin.NET is a .NET port of the Douglas Crockford's JSMin (http://github.com/douglascrockford/JSMin).</description>
1414
<summary>JSMin.NET is a .NET port of the Douglas Crockford's JSMin.</summary>
15-
<releaseNotes>Added support of .NET Core 5 RC 1.</releaseNotes>
15+
<releaseNotes>Added support of .NET Core 1.0 RC 2.</releaseNotes>
1616
<copyright>Copyright (c) 2013-2016 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1717
<language>en-US</language>
1818
<tags>Douglas Crockford JSMin JavaScript JS Minification Minifier Minify</tags>
1919
<dependencies>
2020
<group targetFramework=".NETFramework4.0-Client" />
2121
<group targetFramework=".NETFramework4.5.1" />
22-
<group targetFramework=".NETPlatform5.4">
23-
<dependency id="System.IO" version="4.0.11-beta-23516" />
24-
<dependency id="System.Runtime" version="4.0.21-beta-23516" />
25-
<dependency id="System.Threading" version="4.0.11-beta-23516" />
22+
<group targetFramework=".NETStandard1.1">
23+
<dependency id="System.IO" version="4.1.0-rc2-24027" />
24+
<dependency id="System.Runtime" version="4.1.0-rc2-24027" />
25+
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-24027" />
26+
<dependency id="System.Threading" version="4.0.11-rc2-24027" />
2627
</group>
2728
</dependencies>
28-
<frameworkAssemblies>
29-
<frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5.1" />
30-
<frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.5.1" />
31-
</frameworkAssemblies>
3229
<references>
3330
<reference file="DouglasCrockford.JsMin.dll" />
3431
</references>

NuGet/build-package.cmd

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
set net40_msbuild=\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
1+
set net40_msbuild="\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
22
set nuget_package_manager=..\.nuget\nuget.exe
3-
4-
set dnx_runtime_dir=%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc1-final\bin
5-
set dnx_runtime=%dnx_runtime_dir%\dnx.exe
6-
set dnx_package_manager=%dnx_runtime_dir%\lib\Microsoft.Dnx.Tooling\Microsoft.Dnx.Tooling.dll
3+
set dotnet_cli="%ProgramFiles%\dotnet\dotnet.exe"
74

85
set project_name=DouglasCrockford.JsMin
96
set project_source_dir=..\src\%project_name%
10-
set project_artifacts_dir=..\artifacts\bin\%project_name%
7+
set project_bin_dir=%project_source_dir%\bin\Release
118

129
rmdir lib /Q/S
1310

14-
%net40_msbuild% %project_source_dir%\%project_name%.Net40.csproj /p:Configuration=Release
15-
xcopy %project_source_dir%\bin\Release\%project_name%.dll lib\net40-client\
11+
%net40_msbuild% "%project_source_dir%\%project_name%.Net40.csproj" /p:Configuration=Release
12+
xcopy %project_bin_dir%\%project_name%.dll lib\net40-client\
1613

17-
%dnx_runtime% --appbase %project_source_dir% %dnx_package_manager% build %project_source_dir% --framework net451 --configuration Release --out %project_artifacts_dir%
18-
xcopy %project_artifacts_dir%\Release\net451\%project_name%.dll lib\net451\ /E
19-
xcopy %project_artifacts_dir%\Release\net451\%project_name%.xml lib\net451\ /E
14+
%dotnet_cli% build "%project_source_dir%" --framework net451 --configuration Release --no-dependencies --no-incremental
15+
xcopy "%project_bin_dir%\net451\%project_name%.dll" lib\net451\ /E
16+
xcopy "%project_bin_dir%\net451\%project_name%.xml" lib\net451\ /E
2017

21-
%dnx_runtime% --appbase %project_source_dir% %dnx_package_manager% build %project_source_dir% --framework dotnet5.4 --configuration Release --out %project_artifacts_dir%
22-
xcopy %project_artifacts_dir%\Release\dotnet5.4\%project_name%.dll lib\dotnet5.4\ /E
23-
xcopy %project_artifacts_dir%\Release\dotnet5.4\%project_name%.xml lib\dotnet5.4\ /E
18+
%dotnet_cli% build "%project_source_dir%" --framework netstandard1.1 --configuration Release --no-dependencies --no-incremental
19+
xcopy "%project_bin_dir%\netstandard1.1\%project_name%.dll" lib\netstandard1.1\ /E
20+
xcopy "%project_bin_dir%\netstandard1.1\%project_name%.xml" lib\netstandard1.1\ /E
2421

2522
copy ..\LICENSE license.txt /Y
2623

NuGet/readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
----------------------------------------------------------------------
4-
README file for JSMin for .Net v1.1.0 RC 1
4+
README file for JSMin for .Net v1.1.0 RC 2
55

66
----------------------------------------------------------------------
77

@@ -17,7 +17,7 @@
1717
=============
1818
RELEASE NOTES
1919
=============
20-
Added support of .NET Core 5 RC 1.
20+
Added support of .NET Core 1.0 RC 2.
2121

2222
=============
2323
DOCUMENTATION

src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
[assembly: AssemblyCulture("")]
1212

1313
[assembly: ComVisible(false)]
14-
#if !NETSTANDARD1_0
1514
[assembly: Guid("0d7b205c-e3d6-4756-9977-29a71052536b")]
16-
#endif
1715

1816
[assembly: AssemblyVersion("1.1.0.0")]
1917
[assembly: AssemblyFileVersion("1.1.0.0")]

src/DouglasCrockford.JsMin/project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
"frameworks": {
77
"net451": { },
8-
"netstandard1.0": {
8+
"netstandard1.1": {
99
"dependencies": {
1010
"System.IO": "4.1.0-rc2-24027",
1111
"System.Runtime": "4.1.0-rc2-24027",
12+
"System.Runtime.InteropServices": "4.1.0-rc2-24027",
1213
"System.Threading": "4.0.11-rc2-24027"
1314
}
1415
}

test/DouglasCrockford.JsMin.Test/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
[assembly: AssemblyCulture("")]
1212

1313
[assembly: ComVisible(false)]
14-
#if !NETCOREAPP1_0
1514
[assembly: Guid("72947ee4-f2b3-42e9-a84b-9a4a5254e974")]
16-
#endif
1715

1816
[assembly: AssemblyVersion("1.1.0.0")]
1917
[assembly: AssemblyFileVersion("1.1.0.0")]

0 commit comments

Comments
 (0)