From fe83af76035727c7f4f5338768dd07170ef4660b Mon Sep 17 00:00:00 2001 From: Connor O'Shea Date: Tue, 14 Aug 2018 22:28:04 -0400 Subject: [PATCH] Update WebHelpers to v2 and add support for netfx 4.7.2 --- README.md | 2 +- .../source.extension.vsixmanifest | 2 +- src/AdminLTE Template/ProjectTemplate.csproj | 4 +-- src/AdminLTE Template/ProjectTemplate.tt | 4 +-- src/AdminLTE Template/ProjectTemplate.txt | 4 +-- src/AdminLTE Template/packages.config | 31 ++++++++++++++----- src/AdminLTE Template/packages.tt | 5 +-- 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 4be2953..c0d0cc0 100644 --- a/README.md +++ b/README.md @@ -29,4 +29,4 @@ by [Abdullah Almsaeed](https://almsaeedstudio.com/). | jQuery | 3.3.1 | [GitHub](https://github.com/jquery/jquery) | Moment.js | 2.21.0 | [GitHub](https://github.com/moment/moment/) | slimScroll | 1.3.8 | [GitHub](https://github.com/rochal/jQuery-slimScroll) -| WebHelpers.Mvc5 | 1.2.0 | [GitHub](https://github.com/c0shea/WebHelpers.Mvc5) +| WebHelpers.Mvc5 | 2.0.0 | [GitHub](https://github.com/c0shea/WebHelpers.Mvc5) diff --git a/src/AdminLTE Template Installer/source.extension.vsixmanifest b/src/AdminLTE Template Installer/source.extension.vsixmanifest index 278c98b..3c1ee44 100644 --- a/src/AdminLTE Template Installer/source.extension.vsixmanifest +++ b/src/AdminLTE Template Installer/source.extension.vsixmanifest @@ -1,7 +1,7 @@ - + AdminLTE Template A C# ASP.NET MVC Project Template for Visual Studio using the popular AdminLTE Bootstrap Template by Abdullah Almsaeed. https://github.com/c0shea/AdminLTE-Template diff --git a/src/AdminLTE Template/ProjectTemplate.csproj b/src/AdminLTE Template/ProjectTemplate.csproj index 9c9224b..c79366d 100644 --- a/src/AdminLTE Template/ProjectTemplate.csproj +++ b/src/AdminLTE Template/ProjectTemplate.csproj @@ -104,8 +104,8 @@ ..\packages\WebGrease.1.6.0\lib\WebGrease.dll True - - ..\packages\WebHelpers.Mvc5.1.2.0\lib\net45\WebHelpers.Mvc5.dll + + ..\packages\WebHelpers.Mvc5.2.0.0\lib\net45\WebHelpers.Mvc5.dll diff --git a/src/AdminLTE Template/ProjectTemplate.tt b/src/AdminLTE Template/ProjectTemplate.tt index faac4c1..489f175 100644 --- a/src/AdminLTE Template/ProjectTemplate.tt +++ b/src/AdminLTE Template/ProjectTemplate.tt @@ -112,8 +112,8 @@ ..\packages\WebGrease.1.6.0\lib\WebGrease.dll True - - ..\packages\WebHelpers.Mvc5.1.2.0\lib\net45\WebHelpers.Mvc5.dll + + ..\packages\WebHelpers.Mvc5.2.0.0\lib\net45\WebHelpers.Mvc5.dll diff --git a/src/AdminLTE Template/ProjectTemplate.txt b/src/AdminLTE Template/ProjectTemplate.txt index 9c9224b..c79366d 100644 --- a/src/AdminLTE Template/ProjectTemplate.txt +++ b/src/AdminLTE Template/ProjectTemplate.txt @@ -104,8 +104,8 @@ ..\packages\WebGrease.1.6.0\lib\WebGrease.dll True - - ..\packages\WebHelpers.Mvc5.1.2.0\lib\net45\WebHelpers.Mvc5.dll + + ..\packages\WebHelpers.Mvc5.2.0.0\lib\net45\WebHelpers.Mvc5.dll diff --git a/src/AdminLTE Template/packages.config b/src/AdminLTE Template/packages.config index 91e1e52..14c964c 100644 --- a/src/AdminLTE Template/packages.config +++ b/src/AdminLTE Template/packages.config @@ -13,7 +13,7 @@ - + $endif$ $if$ ($targetframeworkversion$ == 4.5.1) @@ -28,7 +28,7 @@ - + $endif$ $if$ ($targetframeworkversion$ == 4.5.2) @@ -43,7 +43,7 @@ - + $endif$ $if$ ($targetframeworkversion$ == 4.6) @@ -58,7 +58,7 @@ - + $endif$ $if$ ($targetframeworkversion$ == 4.6.1) @@ -73,7 +73,7 @@ - + $endif$ $if$ ($targetframeworkversion$ == 4.6.2) @@ -88,7 +88,7 @@ - + $endif$ $if$ ($targetframeworkversion$ == 4.7) @@ -103,7 +103,7 @@ - + $endif$ $if$ ($targetframeworkversion$ == 4.7.1) @@ -118,6 +118,21 @@ - + + $endif$ + $if$ ($targetframeworkversion$ == 4.7.2) + + + + + + + + + + + + + $endif$ \ No newline at end of file diff --git a/src/AdminLTE Template/packages.tt b/src/AdminLTE Template/packages.tt index facfc8a..dd7ac38 100644 --- a/src/AdminLTE Template/packages.tt +++ b/src/AdminLTE Template/packages.tt @@ -16,7 +16,8 @@ {"4.6.1", "net461"}, {"4.6.2", "net462"}, {"4.7", "net47"}, - {"4.7.1", "net471"} + {"4.7.1", "net471"}, + {"4.7.2", "net472"} }; foreach (var netfx in frameworkVersions) @@ -35,7 +36,7 @@ - + $endif$ <# }