From 0cd0b31dbe3918e80d46c42c8a5c6d092e7d8a6a Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 28 Feb 2020 19:40:45 +0000 Subject: [PATCH] --- source/ri/ri/App_Start/BundleConfig.cs | 10 +++++++++- source/ri/ri/Properties/AssemblyInfo.cs | 4 ++-- source/ri/ri/util/util.cs | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/source/ri/ri/App_Start/BundleConfig.cs b/source/ri/ri/App_Start/BundleConfig.cs index eafb36e..87ec5aa 100644 --- a/source/ri/ri/App_Start/BundleConfig.cs +++ b/source/ri/ri/App_Start/BundleConfig.cs @@ -8,8 +8,16 @@ namespace ri // For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkId=254725 public static void RegisterBundles(BundleCollection bundles) { + + //case 3730 - this allows any jquery version to be loaded + //but we specifically want 1.9.1 + + //bundles.Add(new ScriptBundle("~/bundles/jquery").Include( + // "~/Scripts/jquery-{version}.js")); + bundles.Add(new ScriptBundle("~/bundles/jquery").Include( - "~/Scripts/jquery-{version}.js")); + "~/Scripts/jquery-1.9.1.js")); + bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include( "~/Scripts/jquery-ui.min.js")); diff --git a/source/ri/ri/Properties/AssemblyInfo.cs b/source/ri/ri/Properties/AssemblyInfo.cs index 2a1c399..32167cd 100644 --- a/source/ri/ri/Properties/AssemblyInfo.cs +++ b/source/ri/ri/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Ground Zero Tech-Works Inc.")] [assembly: AssemblyProduct("AyaNova RI")] -[assembly: AssemblyCopyright("Copyright © 2015-2019")] +[assembly: AssemblyCopyright("Copyright © 2015-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,4 +32,4 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly: AssemblyVersion("7.6.0.0")] -[assembly: AssemblyFileVersion("7.6.0.0")] +[assembly: AssemblyFileVersion("7.6.1.0")] diff --git a/source/ri/ri/util/util.cs b/source/ri/ri/util/util.cs index 77a0f32..4794a00 100644 --- a/source/ri/ri/util/util.cs +++ b/source/ri/ri/util/util.cs @@ -17,7 +17,7 @@ namespace ri.util public static class ay { #region VERSION - public static string Version = "v7.6"; + public static string Version = "v7.6 (patch 1)"; #endregion version