diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache index 81395e3..9147403 100644 --- a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache +++ b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -73bbb3de17cae454ab54595b2c5a3ff7389a549e +c355ee6932ff22a2f6c7d84b3449927b5b4b5506 diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache index a9cf9be..40f5810 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csprojResolveAssemblyReference.cache differ diff --git a/CMS_SC/App_Start/BundleConfig.cs b/CMS_SC/App_Start/BundleConfig.cs index 62144c2..b41eb4f 100644 --- a/CMS_SC/App_Start/BundleConfig.cs +++ b/CMS_SC/App_Start/BundleConfig.cs @@ -2,54 +2,53 @@ namespace CMS_SC { - 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) - { - bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include( - "~/Scripts/WebForms/WebForms.js", - "~/Scripts/WebForms/WebUIValidation.js", - "~/Scripts/WebForms/MenuStandards.js", - "~/Scripts/WebForms/Focus.js", - "~/Scripts/WebForms/GridView.js", - "~/Scripts/WebForms/DetailsView.js", - "~/Scripts/WebForms/TreeView.js", - "~/Scripts/WebForms/WebParts.js")); + bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include( + "~/Scripts/WebForms/WebForms.js", + "~/Scripts/WebForms/WebUIValidation.js", + "~/Scripts/WebForms/MenuStandards.js", + "~/Scripts/WebForms/Focus.js", + "~/Scripts/WebForms/GridView.js", + "~/Scripts/WebForms/DetailsView.js", + "~/Scripts/WebForms/TreeView.js", + "~/Scripts/WebForms/WebParts.js")); - bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include( - "~/Scripts/WebForms/MsAjax/MicrosoftAjax.js", - "~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js", - "~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js", - "~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js")); + bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include( + "~/Scripts/WebForms/MsAjax/MicrosoftAjax.js", + "~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js", + "~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js", + "~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js")); - // Use the Development version of Modernizr to develop with and learn from. Then, when you’re - // ready for production, use the build tool at http://modernizr.com to pick only the tests you need - bundles.Add(new ScriptBundle("~/bundles/modernizr").Include( - "~/Scripts/modernizr-*")); + // Use the Development version of Modernizr to develop with and learn from. Then, when you’re + // ready for production, use the build tool at http://modernizr.com to pick only the tests you need + bundles.Add(new ScriptBundle("~/bundles/modernizr").Include( + "~/Scripts/modernizr-*")); + + bundles.Add(new ScriptBundle("~/bundles/jquery").Include( + "~/Scripts/jquery-{version}.js")); + + bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include( + "~/Scripts/jquery-ui-{version}.js")); + bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include( + "~/Scripts/jSteamware*")); - bundles.Add(new ScriptBundle("~/bundles/jquery").Include( - "~/Scripts/jquery-{version}.js")); + //bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include( + // "~/Scripts/jquery.unobtrusive*", + // "~/Scripts/jquery.validate*")); - bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include( - "~/Scripts/jquery-ui-{version}.js")); - bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include( - "~/Scripts/jSteamware*")); + // aggiungo bundle dinamico x less --> css + //bundles.Add(new DynamicFolderBundle("less", "*.less")); + // aggiungo bundle dinamico x coffee --> jscript + //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee")); - //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")); - - // 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/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index e04f36a..e19aad2 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index bf7a0a9..37a86f3 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/Jenkinsfile b/Jenkinsfile index 8cb9657..d064a4b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,7 +103,7 @@ pipeline { { parallel ( CMS_SC_ZIP: { - bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=${env.BRANCH_NAME} /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/CMS_SC.zip /p:DeployIisAppPath=\"Default Web Site/CMS_SC\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ CMS_SC/CMS_SC.csproj" + bat "\"${tool 'MSBuild-14.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=${env.BRANCH_NAME} /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:VisualStudioVersion=14.0 /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/CMS_SC.zip /p:DeployIisAppPath=\"Default Web Site/CMS-SC\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ CMS_SC/CMS_SC.csproj" // // SOLO se è tra i branch "cliente" pubblico in dropbox... // if (env.BRANCH_NAME == "Donati") { diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 2336e3a..4b00456 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ