Permalink
Browse files

- toolkit versioning improvements

  • Loading branch information...
cozy1 committed Jan 23, 2019
1 parent 2afdf38 commit fe47c38fe205d5a83f8c4e31ee7ea73eeb0d7039
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("e054e9ab")]
[assembly: AssemblyInformationalVersion("2afdf385")]
[assembly: AssemblyConfiguration("")]
@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("e054e9ab")]
[assembly: AssemblyInformationalVersion("2afdf385")]
[assembly: AssemblyConfiguration("")]
@@ -36,9 +36,9 @@ public static string RSTKGuiVersion
get
{
if (GeneralExtensions.IsInDesignMode)
AssemblyConfiguration = "DEVELOPER";
AssemblyConfiguration = "IDE";

return String.Format("{0}-{1} {2}", AssemblyVersion, AssemblyInformationVersion, AssemblyConfiguration);
return String.Format("{0}-{1} {2}", AssemblyVersion, AssemblyInformationVersion, AssemblyConfiguration).Trim();
}
}

@@ -64,7 +64,7 @@ public static string RSTKLibVersion()
var assemblyInformationVersion = assembly.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false).Cast<AssemblyInformationalVersionAttribute>().FirstOrDefault().InformationalVersion.ToString();
var assemblyConfiguration = assembly.GetCustomAttributes(typeof(AssemblyConfigurationAttribute), false).Cast<AssemblyConfigurationAttribute>().FirstOrDefault().Configuration.ToString() ?? "";

return String.Format("{0}-{1} {2}", assemblyVersion, assemblyInformationVersion, assemblyConfiguration);
return String.Format("{0}-{1} {2}", assemblyVersion, assemblyInformationVersion, assemblyConfiguration).Trim();
}

public static string RSTKUpdaterVersion()
@@ -74,7 +74,7 @@ public static string RSTKUpdaterVersion()
var assemblyInformationVersion = assembly.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false).Cast<AssemblyInformationalVersionAttribute>().FirstOrDefault().InformationalVersion.ToString();
var assemblyConfiguration = assembly.GetCustomAttributes(typeof(AssemblyConfigurationAttribute), false).Cast<AssemblyConfigurationAttribute>().FirstOrDefault().Configuration.ToString() ?? "";

return String.Format("{0}-{1} {2}", assemblyVersion, assemblyInformationVersion, assemblyConfiguration);
return String.Format("{0}-{1} {2}", assemblyVersion, assemblyInformationVersion, assemblyConfiguration).Trim();
}

}
@@ -60,7 +60,7 @@ public static ToolkitVersionOnline Load(string versionInfoUrl = "")
{
versionInfoJson = new WebClient().DownloadString(versionInfoUrl);
toolkitVersionOnline = JsonConvert.DeserializeObject<ToolkitVersionOnline>(versionInfoJson);

// recommend update to latest revision under special conditions
var useBeta = ConfigRepository.Instance().GetBoolean("general_usebeta");

@@ -106,6 +106,7 @@ public static ToolkitVersionOnline Load(string versionInfoUrl = "")

public static string GetFileUrl(bool addExtension = false)
{
// forcing use of beta version in GeneralConfig
var useBeta = ConfigRepository.Instance().GetBoolean("general_usebeta");
var lastestReleaseUrl = ConfigRepository.Instance()["general_urllastestrelease"];
var lastestBetaUrl = ConfigRepository.Instance()["general_urllastestbeta"];
@@ -115,7 +116,7 @@ public static string GetFileUrl(bool addExtension = false)
if (!addExtension)
return fileUrl;

// downloader is currently disable Mac Mono/Wine
// downloader is currently disabled for Mac Mono
if (Environment.OSVersion.Platform == PlatformID.MacOSX)
return fileUrl + ".tar.gz";

@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("e054e9ab")]
[assembly: AssemblyInformationalVersion("2afdf385")]
[assembly: AssemblyConfiguration("")]
@@ -1,3 +1,3 @@
2.9.2.0
e054e9ab
2afdf385

0 comments on commit fe47c38

Please sign in to comment.