From eafde058f5b13d71b1653da20c82a158899a02b9 Mon Sep 17 00:00:00 2001 From: James Johnson Date: Sun, 21 Sep 2014 15:22:49 -0400 Subject: [PATCH 1/2] Basic changes to compile in .NET 4.0 --- .nuspec/RequireJsNet.Compressor.nuspec | 6 +- .nuspec/RequireJsNet.ResxToJs.nuspec | 2 +- .nuspec/RequireJsNet.nuspec | 4 +- .../RequireJsNet.Compressor.Demo.csproj | 64 +++++++++---------- .../RequireJsNet.Compressor.ParserDemo.csproj | 4 +- .../RequireJsNet.Compressor.csproj | 3 +- RequireJsNet.Compressor/packages.config | 6 +- RequireJsNet.Docs/RequireJsNet.Docs.csproj | 33 +++++----- RequireJsNet.Docs/packages.config | 4 +- .../RequireJsNet.Examples.csproj | 64 +++++++++---------- RequireJsNet.Examples/Web.config | 8 +-- .../RequireJsNet.ResxToJs.csproj | 10 +-- RequireJsNet.ResxToJs/packages.config | 2 +- RequireJsNet.Tests/RequireJsNet.Tests.csproj | 4 +- RequireJsNet/RequireJsNet.csproj | 19 +++--- RequireJsNet/packages.config | 10 +-- 16 files changed, 122 insertions(+), 121 deletions(-) diff --git a/.nuspec/RequireJsNet.Compressor.nuspec b/.nuspec/RequireJsNet.Compressor.nuspec index 6a7cd0d..ded8175 100644 --- a/.nuspec/RequireJsNet.Compressor.nuspec +++ b/.nuspec/RequireJsNet.Compressor.nuspec @@ -25,9 +25,9 @@ - - - + + + \ No newline at end of file diff --git a/.nuspec/RequireJsNet.ResxToJs.nuspec b/.nuspec/RequireJsNet.ResxToJs.nuspec index 3dbca39..5323d05 100644 --- a/.nuspec/RequireJsNet.ResxToJs.nuspec +++ b/.nuspec/RequireJsNet.ResxToJs.nuspec @@ -19,6 +19,6 @@ - + \ No newline at end of file diff --git a/.nuspec/RequireJsNet.nuspec b/.nuspec/RequireJsNet.nuspec index 503e79e..da70ad1 100644 --- a/.nuspec/RequireJsNet.nuspec +++ b/.nuspec/RequireJsNet.nuspec @@ -22,8 +22,8 @@ - - + + \ No newline at end of file diff --git a/RequireJsNet.Compressor.Demo/RequireJsNet.Compressor.Demo.csproj b/RequireJsNet.Compressor.Demo/RequireJsNet.Compressor.Demo.csproj index defa49a..b9f20a6 100644 --- a/RequireJsNet.Compressor.Demo/RequireJsNet.Compressor.Demo.csproj +++ b/RequireJsNet.Compressor.Demo/RequireJsNet.Compressor.Demo.csproj @@ -15,7 +15,7 @@ RequireJsNet.Compressor.Demo v4.5 false - false + true @@ -42,9 +42,13 @@ - - False + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + + ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + True @@ -56,6 +60,30 @@ + + ..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.Helpers.dll + True + + + ..\packages\Microsoft.AspNet.Mvc.5.0.0\lib\net45\System.Web.Mvc.dll + True + + + ..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Deployment.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Razor.dll + True + @@ -65,41 +93,13 @@ - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.Helpers.dll - - - True - ..\packages\Microsoft.AspNet.Mvc.5.0.0\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.1\lib\net40\System.Web.Optimization.dll - - True - ..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Deployment.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Razor.dll - True ..\packages\WebGrease.1.5.2\lib\WebGrease.dll @@ -198,7 +198,7 @@ True 62301 / - http://localhost/RequireJsNet.Compressor.Demo + http://localhost:62301/ False False diff --git a/RequireJsNet.Compressor.ParserDemo/RequireJsNet.Compressor.ParserDemo.csproj b/RequireJsNet.Compressor.ParserDemo/RequireJsNet.Compressor.ParserDemo.csproj index 5b1dee7..39d347a 100644 --- a/RequireJsNet.Compressor.ParserDemo/RequireJsNet.Compressor.ParserDemo.csproj +++ b/RequireJsNet.Compressor.ParserDemo/RequireJsNet.Compressor.ParserDemo.csproj @@ -45,9 +45,9 @@ ..\packages\Jint.2.1.0.0\lib\portable-net40+sl50+wp80+win\Jint.dll - - False + ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + True ..\packages\RequireJsNet.1.0.7.0\lib\net45\RequireJsNet.dll diff --git a/RequireJsNet.Compressor/RequireJsNet.Compressor.csproj b/RequireJsNet.Compressor/RequireJsNet.Compressor.csproj index 6cb8bd5..78c30ac 100644 --- a/RequireJsNet.Compressor/RequireJsNet.Compressor.csproj +++ b/RequireJsNet.Compressor/RequireJsNet.Compressor.csproj @@ -9,10 +9,11 @@ Properties RequireJsNet.Compressor RequireJsNet.Compressor - v4.5 + v4.0 512 ..\ true + true diff --git a/RequireJsNet.Compressor/packages.config b/RequireJsNet.Compressor/packages.config index 1dd744c..f951029 100644 --- a/RequireJsNet.Compressor/packages.config +++ b/RequireJsNet.Compressor/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/RequireJsNet.Docs/RequireJsNet.Docs.csproj b/RequireJsNet.Docs/RequireJsNet.Docs.csproj index 88b919a..529ec88 100644 --- a/RequireJsNet.Docs/RequireJsNet.Docs.csproj +++ b/RequireJsNet.Docs/RequireJsNet.Docs.csproj @@ -15,7 +15,7 @@ RequireJsNet.Docs v4.5 false - false + true @@ -71,12 +71,15 @@ ..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.3.1.13153\lib\net45-full\DotNetOpenAuth.OpenId.RelyingParty.dll + + True + ..\packages\Microsoft.AspNet.WebPages.OAuth.2.0.30506.0\lib\net40\Microsoft.Web.WebPages.OAuth.dll - - False + ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + True @@ -101,7 +104,6 @@ True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll @@ -109,9 +111,9 @@ ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - - True + ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll + True False @@ -119,19 +121,18 @@ True - ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll - + + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll - + + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll - + + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll @@ -146,10 +147,6 @@ ..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - @@ -320,7 +317,7 @@ True 41319 / - http://localhost/RequireJsNet.Docs + http://localhost:41319/ False False diff --git a/RequireJsNet.Docs/packages.config b/RequireJsNet.Docs/packages.config index fa53060..7bcc08e 100644 --- a/RequireJsNet.Docs/packages.config +++ b/RequireJsNet.Docs/packages.config @@ -9,13 +9,13 @@ - + - + diff --git a/RequireJsNet.Examples/RequireJsNet.Examples.csproj b/RequireJsNet.Examples/RequireJsNet.Examples.csproj index 5efefaa..1fcb6a0 100644 --- a/RequireJsNet.Examples/RequireJsNet.Examples.csproj +++ b/RequireJsNet.Examples/RequireJsNet.Examples.csproj @@ -15,7 +15,7 @@ RequireJsNet.Examples v4.5.1 false - false + true @@ -43,9 +43,13 @@ - - False + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + + ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + True @@ -57,6 +61,30 @@ + + ..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.Helpers.dll + True + + + ..\packages\Microsoft.AspNet.Mvc.5.1.2\lib\net45\System.Web.Mvc.dll + True + + + ..\packages\Microsoft.AspNet.Razor.3.1.2\lib\net45\System.Web.Razor.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.Deployment.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.Razor.dll + True + @@ -66,41 +94,13 @@ - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.Helpers.dll - - - True - ..\packages\Microsoft.AspNet.Mvc.5.1.2\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - True - ..\packages\Microsoft.AspNet.Razor.3.1.2\lib\net45\System.Web.Razor.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.Deployment.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.1.2\lib\net45\System.Web.WebPages.Razor.dll - True ..\packages\WebGrease.1.5.2\lib\WebGrease.dll @@ -227,7 +227,7 @@ True 56524 / - http://localhost/RequireJsNet.Examples + http://localhost:56524/ False False diff --git a/RequireJsNet.Examples/Web.config b/RequireJsNet.Examples/Web.config index 4a93e01..5f647cf 100644 --- a/RequireJsNet.Examples/Web.config +++ b/RequireJsNet.Examples/Web.config @@ -24,6 +24,10 @@ + + + + @@ -36,10 +40,6 @@ - - - - diff --git a/RequireJsNet.ResxToJs/RequireJsNet.ResxToJs.csproj b/RequireJsNet.ResxToJs/RequireJsNet.ResxToJs.csproj index 4a4b133..816cdd7 100644 --- a/RequireJsNet.ResxToJs/RequireJsNet.ResxToJs.csproj +++ b/RequireJsNet.ResxToJs/RequireJsNet.ResxToJs.csproj @@ -9,10 +9,11 @@ Properties RequireJsNet.ResxToJs RequireJsNet.ResxToJs - v4.5 + v4.0 512 ..\ true + true @@ -35,8 +36,9 @@ - - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + + False + ..\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll @@ -53,7 +55,7 @@ - + diff --git a/RequireJsNet.ResxToJs/packages.config b/RequireJsNet.ResxToJs/packages.config index 992a6e6..3d97f00 100644 --- a/RequireJsNet.ResxToJs/packages.config +++ b/RequireJsNet.ResxToJs/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/RequireJsNet.Tests/RequireJsNet.Tests.csproj b/RequireJsNet.Tests/RequireJsNet.Tests.csproj index 3c5cd99..9dec721 100644 --- a/RequireJsNet.Tests/RequireJsNet.Tests.csproj +++ b/RequireJsNet.Tests/RequireJsNet.Tests.csproj @@ -32,9 +32,9 @@ 4 - - False + ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + True diff --git a/RequireJsNet/RequireJsNet.csproj b/RequireJsNet/RequireJsNet.csproj index d695859..2579cc0 100644 --- a/RequireJsNet/RequireJsNet.csproj +++ b/RequireJsNet/RequireJsNet.csproj @@ -9,10 +9,11 @@ Properties RequireJsNet RequireJsNet - v4.5 + v4.0 512 ..\ true + true @@ -36,16 +37,16 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + True True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll True @@ -53,19 +54,19 @@ True - ..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.Razor.dll + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll diff --git a/RequireJsNet/packages.config b/RequireJsNet/packages.config index fc94137..483f9eb 100644 --- a/RequireJsNet/packages.config +++ b/RequireJsNet/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file From d4dc66a2739234f72312ce77cbe836634fba3ee1 Mon Sep 17 00:00:00 2001 From: Cezar Cretu Date: Mon, 22 Sep 2014 17:34:04 +0300 Subject: [PATCH 2/2] no longer storing iis settings in proj files --- .../RequireJsNet.Compressor.Demo.csproj | 13 ++----------- RequireJsNet.Docs/RequireJsNet.Docs.csproj | 13 ++----------- RequireJsNet.Examples/RequireJsNet.Examples.csproj | 13 ++----------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/RequireJsNet.Compressor.Demo/RequireJsNet.Compressor.Demo.csproj b/RequireJsNet.Compressor.Demo/RequireJsNet.Compressor.Demo.csproj index b9f20a6..e8ed9a6 100644 --- a/RequireJsNet.Compressor.Demo/RequireJsNet.Compressor.Demo.csproj +++ b/RequireJsNet.Compressor.Demo/RequireJsNet.Compressor.Demo.csproj @@ -15,7 +15,7 @@ RequireJsNet.Compressor.Demo v4.5 false - true + false @@ -194,16 +194,7 @@ - True - True - 62301 - / - http://localhost:62301/ - False - False - - - False + True diff --git a/RequireJsNet.Docs/RequireJsNet.Docs.csproj b/RequireJsNet.Docs/RequireJsNet.Docs.csproj index 529ec88..1291f9a 100644 --- a/RequireJsNet.Docs/RequireJsNet.Docs.csproj +++ b/RequireJsNet.Docs/RequireJsNet.Docs.csproj @@ -15,7 +15,7 @@ RequireJsNet.Docs v4.5 false - true + false @@ -313,16 +313,7 @@ - True - True - 41319 - / - http://localhost:41319/ - False - False - - - False + True diff --git a/RequireJsNet.Examples/RequireJsNet.Examples.csproj b/RequireJsNet.Examples/RequireJsNet.Examples.csproj index 1fcb6a0..0e71992 100644 --- a/RequireJsNet.Examples/RequireJsNet.Examples.csproj +++ b/RequireJsNet.Examples/RequireJsNet.Examples.csproj @@ -15,7 +15,7 @@ RequireJsNet.Examples v4.5.1 false - true + false @@ -223,16 +223,7 @@ - True - True - 56524 - / - http://localhost:56524/ - False - False - - - False + True