From 64e898aa60ba005524fedc564f066d932d997100 Mon Sep 17 00:00:00 2001 From: Andrey Taritsyn Date: Fri, 20 May 2016 18:11:52 +0300 Subject: [PATCH] Added support of .NET Core 1.0 RC 2 --- DouglasCrockford.JsMin.Dnx.sln | 36 --------------- DouglasCrockford.JsMin.DotNet.sln | 41 ++++++++++++++++++ global.json | 6 +-- .../DouglasCrockford.JsMin.Net40.csproj | 6 +-- .../DouglasCrockford.JsMin.xproj | 19 ++++---- .../Properties/AssemblyInfo.cs | 2 +- src/DouglasCrockford.JsMin/project.json | 30 +++++++------ .../DouglasCrockford.JsMin.Test.Net45.csproj | 3 ++ .../DouglasCrockford.JsMin.Test.xproj | 18 +++----- .../Properties/AssemblyInfo.cs | 2 +- test/DouglasCrockford.JsMin.Test/project.json | 41 ++++++++++-------- JSMin.NET.snk => tools/Key.snk | Bin 12 files changed, 107 insertions(+), 97 deletions(-) delete mode 100644 DouglasCrockford.JsMin.Dnx.sln create mode 100644 DouglasCrockford.JsMin.DotNet.sln rename JSMin.NET.snk => tools/Key.snk (100%) diff --git a/DouglasCrockford.JsMin.Dnx.sln b/DouglasCrockford.JsMin.Dnx.sln deleted file mode 100644 index fb16e83..0000000 --- a/DouglasCrockford.JsMin.Dnx.sln +++ /dev/null @@ -1,36 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1D6A0759-CD94-4369-9DAF-309D61033A7D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{31415BC3-76E0-469C-B0D7-5202E618C0E2}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DouglasCrockford.JsMin", "src\DouglasCrockford.JsMin\DouglasCrockford.JsMin.xproj", "{EEEDF33A-DF5C-4A49-8405-59ACD6D00DD7}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DouglasCrockford.JsMin.Test", "test\DouglasCrockford.JsMin.Test\DouglasCrockford.JsMin.Test.xproj", "{650A5A85-5956-491E-9312-5E25A27D1108}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EEEDF33A-DF5C-4A49-8405-59ACD6D00DD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEEDF33A-DF5C-4A49-8405-59ACD6D00DD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEEDF33A-DF5C-4A49-8405-59ACD6D00DD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEEDF33A-DF5C-4A49-8405-59ACD6D00DD7}.Release|Any CPU.Build.0 = Release|Any CPU - {650A5A85-5956-491E-9312-5E25A27D1108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {650A5A85-5956-491E-9312-5E25A27D1108}.Debug|Any CPU.Build.0 = Debug|Any CPU - {650A5A85-5956-491E-9312-5E25A27D1108}.Release|Any CPU.ActiveCfg = Release|Any CPU - {650A5A85-5956-491E-9312-5E25A27D1108}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {EEEDF33A-DF5C-4A49-8405-59ACD6D00DD7} = {1D6A0759-CD94-4369-9DAF-309D61033A7D} - {650A5A85-5956-491E-9312-5E25A27D1108} = {31415BC3-76E0-469C-B0D7-5202E618C0E2} - EndGlobalSection -EndGlobal diff --git a/DouglasCrockford.JsMin.DotNet.sln b/DouglasCrockford.JsMin.DotNet.sln new file mode 100644 index 0000000..576860a --- /dev/null +++ b/DouglasCrockford.JsMin.DotNet.sln @@ -0,0 +1,41 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25123.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9F90C7A-C39E-48AA-B959-0C163ABFDED3}" + ProjectSection(SolutionItems) = preProject + global.json = global.json + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{06134ABE-D9A1-4D4D-9DBB-9187A4709227}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{67E56EE9-75BA-4CDE-8F7A-CDFCC1FC4447}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DouglasCrockford.JsMin", "src\DouglasCrockford.JsMin\DouglasCrockford.JsMin.xproj", "{6043ADBE-EA02-45F2-AB24-1683E367DD88}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DouglasCrockford.JsMin.Test", "test\DouglasCrockford.JsMin.Test\DouglasCrockford.JsMin.Test.xproj", "{07D76AA7-017F-4E75-A180-08E620F1B17A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6043ADBE-EA02-45F2-AB24-1683E367DD88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6043ADBE-EA02-45F2-AB24-1683E367DD88}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6043ADBE-EA02-45F2-AB24-1683E367DD88}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6043ADBE-EA02-45F2-AB24-1683E367DD88}.Release|Any CPU.Build.0 = Release|Any CPU + {07D76AA7-017F-4E75-A180-08E620F1B17A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {07D76AA7-017F-4E75-A180-08E620F1B17A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {07D76AA7-017F-4E75-A180-08E620F1B17A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {07D76AA7-017F-4E75-A180-08E620F1B17A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {6043ADBE-EA02-45F2-AB24-1683E367DD88} = {06134ABE-D9A1-4D4D-9DBB-9187A4709227} + {07D76AA7-017F-4E75-A180-08E620F1B17A} = {67E56EE9-75BA-4CDE-8F7A-CDFCC1FC4447} + EndGlobalSection +EndGlobal diff --git a/global.json b/global.json index 9962b6f..b0009fa 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "projects": [ "src", "test" ], "sdk": { - "version": "1.0.0-rc1-final", - "runtime": "clr", + "version": "1.0.0-preview1-002702", + "runtime": "coreclr", "architecture": "x86" } -} \ No newline at end of file +} diff --git a/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.Net40.csproj b/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.Net40.csproj index 81bdd29..a86333b 100644 --- a/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.Net40.csproj +++ b/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.Net40.csproj @@ -34,7 +34,7 @@ true - ..\..\JSMin.NET.snk + ..\..\tools\Key.snk @@ -46,8 +46,8 @@ - - JSMin.NET.snk + + Key.snk diff --git a/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.xproj b/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.xproj index c6a49df..29b7f07 100644 --- a/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.xproj +++ b/src/DouglasCrockford.JsMin/DouglasCrockford.JsMin.xproj @@ -4,19 +4,18 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + + - eeedf33a-df5c-4a49-8405-59acd6d00dd7 + 6043adbe-ea02-45f2-ab24-1683e367dd88 DouglasCrockford.JsMin - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5 + 2.0 - True - - True - - - \ No newline at end of file + + diff --git a/src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs b/src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs index d6dda70..cdae1a6 100644 --- a/src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs +++ b/src/DouglasCrockford.JsMin/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -#if !DOTNET5_4 +#if !NETSTANDARD1_0 [assembly: Guid("0d7b205c-e3d6-4756-9977-29a71052536b")] #endif diff --git a/src/DouglasCrockford.JsMin/project.json b/src/DouglasCrockford.JsMin/project.json index d44544e..cb88630 100644 --- a/src/DouglasCrockford.JsMin/project.json +++ b/src/DouglasCrockford.JsMin/project.json @@ -1,23 +1,25 @@ { - "version": "1.1.0-rc1", - "description": "", - "authors": [ "" ], - "tags": [ "" ], - "projectUrl": "", - "licenseUrl": "", + "version": "1.1.0-rc2", - "compilationOptions": { - "keyFile": "../../JSMin.NET.snk" - }, + "dependencies": { }, "frameworks": { "net451": { }, - "dotnet5.4": { + "netstandard1.0": { "dependencies": { - "System.IO": "4.0.11-beta-23516", - "System.Runtime": "4.0.21-beta-23516", - "System.Threading": "4.0.11-beta-23516" + "System.IO": "4.1.0-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Threading": "4.0.11-rc2-24027" } } + }, + + "buildOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk", + "nowarn": [ + "CS1591" + ], + "xmlDoc": true } -} +} \ No newline at end of file diff --git a/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.Net45.csproj b/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.Net45.csproj index 127bbd9..19bc8ee 100644 --- a/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.Net45.csproj +++ b/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.Net45.csproj @@ -69,6 +69,9 @@ + + + diff --git a/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.xproj b/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.xproj index 0f85222..cbce366 100644 --- a/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.xproj +++ b/test/DouglasCrockford.JsMin.Test/DouglasCrockford.JsMin.Test.xproj @@ -4,25 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - 650a5a85-5956-491e-9312-5e25a27d1108 + 07d76aa7-017f-4e75-a180-08e620f1b17a DouglasCrockford.JsMin.Test - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5 2.0 - True - - True - - - - - + \ No newline at end of file diff --git a/test/DouglasCrockford.JsMin.Test/Properties/AssemblyInfo.cs b/test/DouglasCrockford.JsMin.Test/Properties/AssemblyInfo.cs index db52fec..cfadb34 100644 --- a/test/DouglasCrockford.JsMin.Test/Properties/AssemblyInfo.cs +++ b/test/DouglasCrockford.JsMin.Test/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -#if !DNXCORE50 +#if !NETCOREAPP1_0 [assembly: Guid("72947ee4-f2b3-42e9-a84b-9a4a5254e974")] #endif diff --git a/test/DouglasCrockford.JsMin.Test/project.json b/test/DouglasCrockford.JsMin.Test/project.json index c5126b7..fe70985 100644 --- a/test/DouglasCrockford.JsMin.Test/project.json +++ b/test/DouglasCrockford.JsMin.Test/project.json @@ -1,27 +1,34 @@ { - "version": "1.1.0-rc1", - "description": "", - "authors": [ "" ], - "tags": [ "" ], - "projectUrl": "", - "licenseUrl": "", - - "tooling": { - "defaultNamespace": "<%= namespace %>" - }, + "version": "1.1.0-rc2", "dependencies": { + "dotnet-test-xunit": "1.0.0-rc2-build10015", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final", + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", "xunit": "2.1.0", - "xunit.runner.dnx": "2.1.0-rc1-build204", - "DouglasCrockford.JsMin": "1.1.0-rc1" + "DouglasCrockford.JsMin": "1.1.0-rc2" }, - "commands": { - "test": "xunit.runner.dnx" - }, + "testRunner": "xunit", "frameworks": { - "dnx451": { }, - "dnxcore50": { } + "net451": { }, + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net451+win8" + ], + "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-3002702", + "type": "platform" + } + } + } + }, + + "buildOptions": { + "warningsAsErrors": true, + "emitEntryPoint": false } } \ No newline at end of file diff --git a/JSMin.NET.snk b/tools/Key.snk similarity index 100% rename from JSMin.NET.snk rename to tools/Key.snk