diff --git a/PROMS/AdjustBuildRevision/app.config b/PROMS/AdjustBuildRevision/app.config index 2fa6e95d..fd3b4100 100644 --- a/PROMS/AdjustBuildRevision/app.config +++ b/PROMS/AdjustBuildRevision/app.config @@ -1,3 +1,6 @@ - + + + + diff --git a/PROMS/Baseline/App.config b/PROMS/Baseline/App.config index 193f33c8..ff2454c1 100644 --- a/PROMS/Baseline/App.config +++ b/PROMS/Baseline/App.config @@ -1,20 +1,20 @@ - + - -
+ +
- + - + - + 0, 0 @@ -35,8 +35,8 @@ 167 - + - \ No newline at end of file + diff --git a/PROMS/Baseline/Baseline.csproj b/PROMS/Baseline/Baseline.csproj index e867120c..6ab91b25 100644 --- a/PROMS/Baseline/Baseline.csproj +++ b/PROMS/Baseline/Baseline.csproj @@ -9,15 +9,16 @@ Properties Baseline Baseline - v4.5 + v4.6.1 512 SAK SAK SAK SAK + - AnyCPU + x86 true full false @@ -35,6 +36,9 @@ prompt 4 + + true + @@ -76,6 +80,7 @@ True Resources.resx + True diff --git a/PROMS/Baseline/Properties/Resources.Designer.cs b/PROMS/Baseline/Properties/Resources.Designer.cs index 1f9cf194..bbd9a745 100644 --- a/PROMS/Baseline/Properties/Resources.Designer.cs +++ b/PROMS/Baseline/Properties/Resources.Designer.cs @@ -8,64 +8,56 @@ // //------------------------------------------------------------------------------ -namespace Baseline.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Baseline.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } +namespace Baseline.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Baseline.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } } diff --git a/PROMS/Baseline/Properties/Settings.Designer.cs b/PROMS/Baseline/Properties/Settings.Designer.cs index ddd0a043..13e1a71c 100644 --- a/PROMS/Baseline/Properties/Settings.Designer.cs +++ b/PROMS/Baseline/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Baseline.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));