Remove separate setting for Version and use Assembly Version instead.
authorDean Looyengoed
Thu, 21 Apr 2016 23:00:27 +0200
changeset 8296f56763c08ff
parent 828 1c80e95a7f90
child 830 592efb9cf41d
Remove separate setting for Version and use Assembly Version instead.
Global.cs
Properties/Settings.Designer.cs
Properties/Settings.settings
UI/RibbonCustomizations.cs
app.config
     1.1 --- a/Global.cs	Thu Apr 21 22:53:04 2016 +0200
     1.2 +++ b/Global.cs	Thu Apr 21 23:00:27 2016 +0200
     1.3 @@ -277,7 +277,6 @@
     1.4                  systemInfo = string.Join(Environment.NewLine, new string[]
     1.5                  {
     1.6                      "Serial: " + Properties.Settings.Default.Serial,
     1.7 -                    "Version: " + Properties.Settings.Default.Version,
     1.8                      "Assembly Version: " + Assembly.GetExecutingAssembly().GetName().Version.ToString(),
     1.9                      "Outlook Version: " + Globals.ThisAddIn.Application.Version,
    1.10                      "OS Version: " + Environment.OSVersion.VersionString,
     2.1 --- a/Properties/Settings.Designer.cs	Thu Apr 21 22:53:04 2016 +0200
     2.2 +++ b/Properties/Settings.Designer.cs	Thu Apr 21 23:00:27 2016 +0200
     2.3 @@ -31,14 +31,5 @@
     2.4                  return ((string)(this["Serial"]));
     2.5              }
     2.6          }
     2.7 -        
     2.8 -        [global::System.Configuration.ApplicationScopedSettingAttribute()]
     2.9 -        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2.10 -        [global::System.Configuration.DefaultSettingValueAttribute("1.0.40")]
    2.11 -        public string Version {
    2.12 -            get {
    2.13 -                return ((string)(this["Version"]));
    2.14 -            }
    2.15 -        }
    2.16      }
    2.17  }
     3.1 --- a/Properties/Settings.settings	Thu Apr 21 22:53:04 2016 +0200
     3.2 +++ b/Properties/Settings.settings	Thu Apr 21 23:00:27 2016 +0200
     3.3 @@ -5,8 +5,5 @@
     3.4      <Setting Name="Serial" Type="System.String" Scope="Application">
     3.5        <Value Profile="(Default)">23</Value>
     3.6      </Setting>
     3.7 -    <Setting Name="Version" Type="System.String" Scope="Application">
     3.8 -      <Value Profile="(Default)">1.0.40</Value>
     3.9 -    </Setting>
    3.10    </Settings>
    3.11  </SettingsFile>
    3.12 \ No newline at end of file
     4.1 --- a/UI/RibbonCustomizations.cs	Thu Apr 21 22:53:04 2016 +0200
     4.2 +++ b/UI/RibbonCustomizations.cs	Thu Apr 21 23:00:27 2016 +0200
     4.3 @@ -470,7 +470,7 @@
     4.4          /// </summary>
     4.5          public string LabelControlVersion_GetLabel(Office.IRibbonControl control)
     4.6          {
     4.7 -            return (Properties.Settings.Default.Version);
     4.8 +            return (Assembly.GetExecutingAssembly().GetName().Version.ToString());
     4.9          }
    4.10  
    4.11          /// <summary>
     5.1 --- a/app.config	Thu Apr 21 22:53:04 2016 +0200
     5.2 +++ b/app.config	Thu Apr 21 23:00:27 2016 +0200
     5.3 @@ -10,9 +10,6 @@
     5.4              <setting name="Serial" serializeAs="String">
     5.5                  <value>23</value>
     5.6              </setting>
     5.7 -            <setting name="Version" serializeAs="String">
     5.8 -                <value>1.0.40</value>
     5.9 -            </setting>
    5.10          </pEp.Properties.Settings>
    5.11      </applicationSettings>
    5.12  </configuration>