From 4e6d2ceebc39732bcd429e7041696c005064ed89 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 11 Feb 2019 19:07:38 +0100 Subject: [PATCH] Refresh boundle --- Jenkinsfile | 2 +- WebSCR/App_Start/BundleConfig.cs | 46 +++++++++++++++---------------- WebSCR/App_Start/RouteConfig.cs | 5 +--- WebSCR/Bundle.config | 2 +- WebSCR/bin/WebSCR.dll | Bin 72192 -> 72192 bytes 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 41e5e3c..9ff7e71 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=259']) { + withEnv(['NEXT_BUILD_NUMBER=260']) { // env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'WebSCR' diff --git a/WebSCR/App_Start/BundleConfig.cs b/WebSCR/App_Start/BundleConfig.cs index 089d819..916a46f 100644 --- a/WebSCR/App_Start/BundleConfig.cs +++ b/WebSCR/App_Start/BundleConfig.cs @@ -1,16 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; using System.Web.Optimization; namespace WebSCR { - public class BundleConfig + public class BundleConfig + { + // For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkId=254726 + public static void RegisterBundles(BundleCollection bundles) { - // For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkId=254726 - public static void RegisterBundles(BundleCollection bundles) - { #if false bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include( "~/Scripts/WebForms/WebForms.js", @@ -34,28 +30,30 @@ namespace WebSCR "~/Scripts/modernizr-*")); #endif - bundles.Add(new ScriptBundle("~/bundles/jquery").Include( - "~/Scripts/jquery-{version}.js")); + bundles.Add(new ScriptBundle("~/bundles/jquery").Include( + "~/Scripts/jquery-{version}.js")); - bundles.Add(new ScriptBundle("~/bundles/jquerymobile").Include( - "~/Scripts/jquery.mobile-{version}.js")); + bundles.Add(new ScriptBundle("~/bundles/jquerymobile").Include( + "~/Scripts/jquery.mobile-{version}.js")); - bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include( - "~/Scripts/jSteamware*")); + bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include( + "~/Scripts/jSteamware*")); - //bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include( - // "~/Scripts/jquery.unobtrusive*", - // "~/Scripts/jquery.validate*")); + //bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include( + // "~/Scripts/jquery.unobtrusive*", + // "~/Scripts/jquery.validate*")); - // aggiungo bundle dinamico x less --> css - bundles.Add(new DynamicFolderBundle("less", "*.less")); +#if false + // aggiungo bundle dinamico x less --> css + bundles.Add(new DynamicFolderBundle("less", "*.less")); +#endif - // aggiungo bundle dinamico x coffee --> jscript - //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee")); + // aggiungo bundle dinamico x coffee --> jscript + //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee")); - // abilito boundle "forzato"! - BundleTable.EnableOptimizations = true; - } + // abilito boundle "forzato"! + BundleTable.EnableOptimizations = true; } + } } \ No newline at end of file diff --git a/WebSCR/App_Start/RouteConfig.cs b/WebSCR/App_Start/RouteConfig.cs index 0d2cab7..d4505f5 100644 --- a/WebSCR/App_Start/RouteConfig.cs +++ b/WebSCR/App_Start/RouteConfig.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.Routing; using Microsoft.AspNet.FriendlyUrls; +using System.Web.Routing; namespace WebSCR { diff --git a/WebSCR/Bundle.config b/WebSCR/Bundle.config index a8a2fe8..65cbcbc 100644 --- a/WebSCR/Bundle.config +++ b/WebSCR/Bundle.config @@ -8,7 +8,7 @@ - +