Update WebHelpers to v2 and add support for netfx 4.7.2

c0shea · Aug 15, 2018 · fe83af7 · fe83af7
1 parent de6a40f
commit fe83af7
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 18 deletions.
diff --git 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="TemplatePackage.Connor O'Shea.945572d8-ea94-41dd-99f9-bfe94e941972" Version="4.2.0" Language="en-US" Publisher="Connor O'Shea" />
+        <Identity Id="TemplatePackage.Connor O'Shea.945572d8-ea94-41dd-99f9-bfe94e941972" Version="4.3.0" Language="en-US" Publisher="Connor O'Shea" />
         <DisplayName>AdminLTE Template</DisplayName>
         <Description xml:space="preserve">A C# ASP.NET MVC Project Template for Visual Studio using the popular AdminLTE Bootstrap Template by Abdullah Almsaeed.</Description>
         <MoreInfo>https://github.com/c0shea/AdminLTE-Template</MoreInfo>

diff --git a/src/AdminLTE Template/ProjectTemplate.csproj b/src/AdminLTE Template/ProjectTemplate.csproj
@@ -104,8 +104,8 @@
             <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
             <Private>True</Private>
         </Reference>
-        <Reference Include="WebHelpers.Mvc5, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-            <HintPath>..\packages\WebHelpers.Mvc5.1.2.0\lib\net45\WebHelpers.Mvc5.dll</HintPath>
+        <Reference Include="WebHelpers.Mvc5, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+            <HintPath>..\packages\WebHelpers.Mvc5.2.0.0\lib\net45\WebHelpers.Mvc5.dll</HintPath>
         </Reference>
     </ItemGroup>
     <ItemGroup>

diff --git a/src/AdminLTE Template/ProjectTemplate.tt b/src/AdminLTE Template/ProjectTemplate.tt
@@ -112,8 +112,8 @@
             <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
             <Private>True</Private>
         </Reference>
-        <Reference Include="WebHelpers.Mvc5, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-            <HintPath>..\packages\WebHelpers.Mvc5.1.2.0\lib\net45\WebHelpers.Mvc5.dll</HintPath>
+        <Reference Include="WebHelpers.Mvc5, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+            <HintPath>..\packages\WebHelpers.Mvc5.2.0.0\lib\net45\WebHelpers.Mvc5.dll</HintPath>
         </Reference>
     </ItemGroup>
     <ItemGroup>

diff --git a/src/AdminLTE Template/ProjectTemplate.txt b/src/AdminLTE Template/ProjectTemplate.txt
@@ -104,8 +104,8 @@
             <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
             <Private>True</Private>
         </Reference>
-        <Reference Include="WebHelpers.Mvc5, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-            <HintPath>..\packages\WebHelpers.Mvc5.1.2.0\lib\net45\WebHelpers.Mvc5.dll</HintPath>
+        <Reference Include="WebHelpers.Mvc5, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+            <HintPath>..\packages\WebHelpers.Mvc5.2.0.0\lib\net45\WebHelpers.Mvc5.dll</HintPath>
         </Reference>
     </ItemGroup>
     <ItemGroup>

diff --git a/src/AdminLTE Template/packages.config b/src/AdminLTE Template/packages.config
@@ -13,7 +13,7 @@
   <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="net45" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net45" />
   <package id="WebGrease" version="1.6.0" targetFramework="net45" />
-  <package id="WebHelpers.Mvc5" version="1.2.0" targetFramework="net45" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="net45" />
   $endif$
   $if$ ($targetframeworkversion$ == 4.5.1)
   <package id="Antlr" version="3.5.0.2" targetFramework="net451" />
@@ -28,7 +28,7 @@
   <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="net451" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net451" />
   <package id="WebGrease" version="1.6.0" targetFramework="net451" />
-  <package id="WebHelpers.Mvc5" version="1.2.0" targetFramework="net451" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="net451" />
   $endif$
   $if$ ($targetframeworkversion$ == 4.5.2)
   <package id="Antlr" version="3.5.0.2" targetFramework="net452" />
@@ -43,7 +43,7 @@
   <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="net452" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net452" />
   <package id="WebGrease" version="1.6.0" targetFramework="net452" />
-  <package id="WebHelpers.Mvc5" version="1.2.0" targetFramework="net452" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="net452" />
   $endif$
   $if$ ($targetframeworkversion$ == 4.6)
   <package id="Antlr" version="3.5.0.2" targetFramework="net46" />
@@ -58,7 +58,7 @@
   <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="net46" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net46" />
   <package id="WebGrease" version="1.6.0" targetFramework="net46" />
-  <package id="WebHelpers.Mvc5" version="1.2.0" targetFramework="net46" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="net46" />
   $endif$
   $if$ ($targetframeworkversion$ == 4.6.1)
   <package id="Antlr" version="3.5.0.2" targetFramework="net461" />
@@ -73,7 +73,7 @@
   <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="net461" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net461" />
   <package id="WebGrease" version="1.6.0" targetFramework="net461" />
-  <package id="WebHelpers.Mvc5" version="1.2.0" targetFramework="net461" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="net461" />
   $endif$
   $if$ ($targetframeworkversion$ == 4.6.2)
   <package id="Antlr" version="3.5.0.2" targetFramework="net462" />
@@ -88,7 +88,7 @@
   <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="net462" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net462" />
   <package id="WebGrease" version="1.6.0" targetFramework="net462" />
-  <package id="WebHelpers.Mvc5" version="1.2.0" targetFramework="net462" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="net462" />
   $endif$
   $if$ ($targetframeworkversion$ == 4.7)
   <package id="Antlr" version="3.5.0.2" targetFramework="net47" />
@@ -103,7 +103,7 @@
   <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="net47" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net47" />
   <package id="WebGrease" version="1.6.0" targetFramework="net47" />
-  <package id="WebHelpers.Mvc5" version="1.2.0" targetFramework="net47" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="net47" />
   $endif$
   $if$ ($targetframeworkversion$ == 4.7.1)
   <package id="Antlr" version="3.5.0.2" targetFramework="net471" />
@@ -118,6 +118,21 @@
   <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="net471" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net471" />
   <package id="WebGrease" version="1.6.0" targetFramework="net471" />
-  <package id="WebHelpers.Mvc5" version="1.2.0" targetFramework="net471" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="net471" />
+  $endif$
+  $if$ ($targetframeworkversion$ == 4.7.2)
+  <package id="Antlr" version="3.5.0.2" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net472" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net472" />
+  <package id="Microsoft.Net.Compilers" version="2.7.0" targetFramework="net472" developmentDependency="true" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net472" />
+  <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="net472" />
+  <package id="WebActivatorEx" version="2.2.0" targetFramework="net472" />
+  <package id="WebGrease" version="1.6.0" targetFramework="net472" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="net472" />
   $endif$
 </packages>
diff --git 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 @@
   <package id="RouteJs.Mvc5" version="2.2.0" targetFramework="<#=netfx.Value#>" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="<#=netfx.Value#>" />
   <package id="WebGrease" version="1.6.0" targetFramework="<#=netfx.Value#>" />
-  <package id="WebHelpers.Mvc5" version="1.2.0" targetFramework="<#=netfx.Value#>" />
+  <package id="WebHelpers.Mvc5" version="2.0.0" targetFramework="<#=netfx.Value#>" />
   $endif$
 <#
     }