From 50931f872697d9928752b280644bacfdff530721 Mon Sep 17 00:00:00 2001 From: Andrew Bullock Date: Sat, 21 Jul 2018 09:34:36 +0100 Subject: [PATCH 1/3] upgraded to net45, upgraded ecmascript.net reference --- .gitignore | 1 + Code/Shared Assembly Info/SharedAssemblyInfo.cs | 6 +++--- .../Yahoo.Yui.Compressor.Build.MsBuild.csproj | 9 +++++---- .../packages.config | 3 ++- .../Yahoo.Yui.Compressor.Build.Nant.csproj | 14 +++++++------- .../packages.config | 3 ++- .../Yahoo.Yui.Compressor.Tests.csproj | 5 ++--- Code/Yahoo.Yui.Compressor.Tests/packages.config | 3 ++- .../Yahoo.Yui.Compressor.Web.Optimization.csproj | 5 ++--- .../packages.config | 3 ++- .../Yahoo.Yui.Compressor.csproj | 9 +++++---- Code/Yahoo.Yui.Compressor/packages.config | 3 ++- YUICompressor.sln | 7 +++++-- YUICompressor.sln.DotSettings | 9 +++++++++ 14 files changed, 49 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index b26c32d..640b04a 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ App_Data/ *.ncrunchsolution MainAssemblies output +.vs \ No newline at end of file diff --git a/Code/Shared Assembly Info/SharedAssemblyInfo.cs b/Code/Shared Assembly Info/SharedAssemblyInfo.cs index f16aa84..7a9c437 100644 --- a/Code/Shared Assembly Info/SharedAssemblyInfo.cs +++ b/Code/Shared Assembly Info/SharedAssemblyInfo.cs @@ -18,7 +18,7 @@ // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.7.0.0")] -[assembly: AssemblyFileVersion("2.7.0.0")] +[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyFileVersion("3.0.0.0")] -[assembly: CLSCompliant(true)] +[assembly: CLSCompliant(false)] diff --git a/Code/Yahoo.Yui.Compressor.Build.MsBuild/Yahoo.Yui.Compressor.Build.MsBuild.csproj b/Code/Yahoo.Yui.Compressor.Build.MsBuild/Yahoo.Yui.Compressor.Build.MsBuild.csproj index 2e855f7..115a608 100644 --- a/Code/Yahoo.Yui.Compressor.Build.MsBuild/Yahoo.Yui.Compressor.Build.MsBuild.csproj +++ b/Code/Yahoo.Yui.Compressor.Build.MsBuild/Yahoo.Yui.Compressor.Build.MsBuild.csproj @@ -10,7 +10,7 @@ Properties Yahoo.Yui.Compressor.Build.MsBuild Yahoo.Yui.Compressor.Build.MsBuild - v2.0 + v4.5 512 SAK SAK @@ -29,6 +29,7 @@ prompt 4 true + false pdbonly @@ -38,6 +39,7 @@ prompt 4 true + false true @@ -47,9 +49,8 @@ - - ..\..\packages\EcmaScript.Net.1.0.1.0\lib\net20\EcmaScript.NET.dll - True + + ..\..\packages\EcmaScript.NET.2.0.0\lib\net45\EcmaScript.NET.dll diff --git a/Code/Yahoo.Yui.Compressor.Build.MsBuild/packages.config b/Code/Yahoo.Yui.Compressor.Build.MsBuild/packages.config index 4a2efac..da9c758 100644 --- a/Code/Yahoo.Yui.Compressor.Build.MsBuild/packages.config +++ b/Code/Yahoo.Yui.Compressor.Build.MsBuild/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Code/Yahoo.Yui.Compressor.Build.Nant/Yahoo.Yui.Compressor.Build.Nant.csproj b/Code/Yahoo.Yui.Compressor.Build.Nant/Yahoo.Yui.Compressor.Build.Nant.csproj index 2181967..8cd5872 100644 --- a/Code/Yahoo.Yui.Compressor.Build.Nant/Yahoo.Yui.Compressor.Build.Nant.csproj +++ b/Code/Yahoo.Yui.Compressor.Build.Nant/Yahoo.Yui.Compressor.Build.Nant.csproj @@ -10,7 +10,7 @@ Properties Yahoo.Yui.Compressor.Build.Nant Yahoo.Yui.Compressor.Build.Nant - v2.0 + v4.5 512 SAK SAK @@ -18,6 +18,7 @@ SAK ..\..\..\YUICompressor\ true + true @@ -28,6 +29,7 @@ prompt 4 true + false pdbonly @@ -37,11 +39,11 @@ prompt 4 true + false - - ..\..\packages\EcmaScript.Net.1.0.1.0\lib\net20\EcmaScript.NET.dll - True + + ..\..\packages\EcmaScript.NET.2.0.0\lib\net45\EcmaScript.NET.dll False @@ -78,9 +80,7 @@ - - Designer - + diff --git a/Code/Yahoo.Yui.Compressor.Build.Nant/packages.config b/Code/Yahoo.Yui.Compressor.Build.Nant/packages.config index 4a2efac..da9c758 100644 --- a/Code/Yahoo.Yui.Compressor.Build.Nant/packages.config +++ b/Code/Yahoo.Yui.Compressor.Build.Nant/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Code/Yahoo.Yui.Compressor.Tests/Yahoo.Yui.Compressor.Tests.csproj b/Code/Yahoo.Yui.Compressor.Tests/Yahoo.Yui.Compressor.Tests.csproj index 4209ded..8abead2 100644 --- a/Code/Yahoo.Yui.Compressor.Tests/Yahoo.Yui.Compressor.Tests.csproj +++ b/Code/Yahoo.Yui.Compressor.Tests/Yahoo.Yui.Compressor.Tests.csproj @@ -46,9 +46,8 @@ False ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - ..\..\packages\EcmaScript.Net.1.0.1.0\lib\net20\EcmaScript.NET.dll - True + + ..\..\packages\EcmaScript.NET.2.0.0\lib\net45\EcmaScript.NET.dll ..\..\packages\FakeItEasy.1.23.0\lib\net40\FakeItEasy.dll diff --git a/Code/Yahoo.Yui.Compressor.Tests/packages.config b/Code/Yahoo.Yui.Compressor.Tests/packages.config index d0d24e1..f8814fb 100644 --- a/Code/Yahoo.Yui.Compressor.Tests/packages.config +++ b/Code/Yahoo.Yui.Compressor.Tests/packages.config @@ -1,12 +1,13 @@  - + + \ No newline at end of file diff --git a/Code/Yahoo.Yui.Compressor.Web.Optimization/Yahoo.Yui.Compressor.Web.Optimization.csproj b/Code/Yahoo.Yui.Compressor.Web.Optimization/Yahoo.Yui.Compressor.Web.Optimization.csproj index 0bfaa67..2beebfe 100644 --- a/Code/Yahoo.Yui.Compressor.Web.Optimization/Yahoo.Yui.Compressor.Web.Optimization.csproj +++ b/Code/Yahoo.Yui.Compressor.Web.Optimization/Yahoo.Yui.Compressor.Web.Optimization.csproj @@ -45,9 +45,8 @@ False ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - ..\..\packages\EcmaScript.Net.1.0.1.0\lib\net20\EcmaScript.NET.dll - True + + ..\..\packages\EcmaScript.NET.2.0.0\lib\net45\EcmaScript.NET.dll True diff --git a/Code/Yahoo.Yui.Compressor.Web.Optimization/packages.config b/Code/Yahoo.Yui.Compressor.Web.Optimization/packages.config index 4da47ec..d9ebb49 100644 --- a/Code/Yahoo.Yui.Compressor.Web.Optimization/packages.config +++ b/Code/Yahoo.Yui.Compressor.Web.Optimization/packages.config @@ -1,9 +1,10 @@  - + + \ No newline at end of file diff --git a/Code/Yahoo.Yui.Compressor/Yahoo.Yui.Compressor.csproj b/Code/Yahoo.Yui.Compressor/Yahoo.Yui.Compressor.csproj index 039118c..3ca6bf5 100644 --- a/Code/Yahoo.Yui.Compressor/Yahoo.Yui.Compressor.csproj +++ b/Code/Yahoo.Yui.Compressor/Yahoo.Yui.Compressor.csproj @@ -10,7 +10,7 @@ Properties Yahoo.Yui.Compressor Yahoo.Yui.Compressor - v2.0 + v4.5 512 SAK SAK @@ -52,6 +52,7 @@ 4 AllRules.ruleset true + false none @@ -62,14 +63,14 @@ 4 AllRules.ruleset true + false - - ..\..\packages\EcmaScript.Net.1.0.1.0\lib\net20\EcmaScript.NET.dll - True + + ..\..\packages\EcmaScript.NET.2.0.0\lib\net45\EcmaScript.NET.dll diff --git a/Code/Yahoo.Yui.Compressor/packages.config b/Code/Yahoo.Yui.Compressor/packages.config index 4a2efac..da9c758 100644 --- a/Code/Yahoo.Yui.Compressor/packages.config +++ b/Code/Yahoo.Yui.Compressor/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/YUICompressor.sln b/YUICompressor.sln index cd639a3..fbeb33b 100644 --- a/YUICompressor.sln +++ b/YUICompressor.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2042 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yahoo.Yui.Compressor", "Code\Yahoo.Yui.Compressor\Yahoo.Yui.Compressor.csproj", "{AFDF50F0-286B-4490-9EBD-007561864738}" EndProject @@ -48,6 +48,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {84862C5A-6B13-4426-9683-000AA8E8F30F} + EndGlobalSection GlobalSection(TestCaseManagementSettings) = postSolution CategoryFile = YUICompressor.vsmdi EndGlobalSection diff --git a/YUICompressor.sln.DotSettings b/YUICompressor.sln.DotSettings index 67db3f4..a60d638 100644 --- a/YUICompressor.sln.DotSettings +++ b/YUICompressor.sln.DotSettings @@ -9,6 +9,7 @@ NEXT_LINE NEXT_LINE NEXT_LINE + NEVER <?xml version="1.0" encoding="utf-8" ?> <!-- @@ -222,7 +223,15 @@ II.2.12 <HandlesEvent /> </Patterns> TEMP_FOLDER + True + True + True + True + True + True + True True + True True True True From a60172b86a1564055f5ab75a83a6d2a630c72e8c Mon Sep 17 00:00:00 2001 From: Andrew Bullock Date: Sat, 21 Jul 2018 09:35:48 +0100 Subject: [PATCH 2/3] updated nuget package build --- Build/NuGetPackageBuild.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Build/NuGetPackageBuild.proj b/Build/NuGetPackageBuild.proj index ac99e71..d67fd62 100644 --- a/Build/NuGetPackageBuild.proj +++ b/Build/NuGetPackageBuild.proj @@ -98,7 +98,7 @@ - + @@ -131,7 +131,7 @@ This is a direct .NET port of the original Yahoo! UI Library: YUI Compressor." / - + From 9a765ddb6c45d07576f7562bcb96cbfc4b274a08 Mon Sep 17 00:00:00 2001 From: Andrew Bullock Date: Sat, 21 Jul 2018 09:37:42 +0100 Subject: [PATCH 3/3] updated nuspecs --- Build/NuSpecs/YUICompressor.NET.MSBuild.NAnt.nuspec | 4 ++-- Build/NuSpecs/YUICompressor.NET.Web.Optimization.nuspec | 4 ++-- Build/NuSpecs/YUICompressor.NET.nuspec | 2 +- Build/SampleYuiCompressorMsBuild.proj | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Build/NuSpecs/YUICompressor.NET.MSBuild.NAnt.nuspec b/Build/NuSpecs/YUICompressor.NET.MSBuild.NAnt.nuspec index fec638c..3459806 100644 --- a/Build/NuSpecs/YUICompressor.NET.MSBuild.NAnt.nuspec +++ b/Build/NuSpecs/YUICompressor.NET.MSBuild.NAnt.nuspec @@ -19,8 +19,8 @@ This is a direct .NET port of the original Yahoo! UI Library: YUI Compressor.en-au compression, compressor, minification, obfuscation, minify, bundle, bundler, combine, javascript, js, CSS, cascading style sheets - - + + diff --git a/Build/NuSpecs/YUICompressor.NET.Web.Optimization.nuspec b/Build/NuSpecs/YUICompressor.NET.Web.Optimization.nuspec index 3b6d476..9d968ab 100644 --- a/Build/NuSpecs/YUICompressor.NET.Web.Optimization.nuspec +++ b/Build/NuSpecs/YUICompressor.NET.Web.Optimization.nuspec @@ -21,10 +21,10 @@ This is a direct .NET port of the original Yahoo! UI Library: YUI Compressor.en-au compression, compressor, minification, obfuscation, minify, bundle, bundler, combine, javascript, js, CSS, cascading style sheets, optimization, transform - + - + diff --git a/Build/NuSpecs/YUICompressor.NET.nuspec b/Build/NuSpecs/YUICompressor.NET.nuspec index de83dbe..9136fad 100644 --- a/Build/NuSpecs/YUICompressor.NET.nuspec +++ b/Build/NuSpecs/YUICompressor.NET.nuspec @@ -19,7 +19,7 @@ This is a direct .NET port of the original Yahoo! UI Library: YUI Compressor.en-au compression, compressor, minification, obfuscation, minify, bundle, bundler, combine, javascript, js, CSS, cascading style sheets - + diff --git a/Build/SampleYuiCompressorMsBuild.proj b/Build/SampleYuiCompressorMsBuild.proj index cf04490..69d123f 100644 --- a/Build/SampleYuiCompressorMsBuild.proj +++ b/Build/SampleYuiCompressorMsBuild.proj @@ -1,8 +1,8 @@  - - + +