jonny_bro/CreamInstaller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

debug versioning

Browse source
This commit is contained in:
pointfeev 2022-06-11 22:37:32 -05:00
parent 6ca07b02de
commit 53a9291dbf
4 changed files with 53 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
CreamInstaller.sln
View file

@ -1,12 +1,17 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.31025.194 VisualStudioVersion = 17.2.32516.85
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreamInstaller", "CreamInstaller\CreamInstaller.csproj", "{6C94C882-7168-435E-B9E3-B4B9222BBF68}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreamInstaller", "CreamInstaller\CreamInstaller.csproj", "{6C94C882-7168-435E-B9E3-B4B9222BBF68}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64 Release|ARM64 = Release|ARM64
@ -14,6 +19,16 @@ Global
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|ARM.ActiveCfg = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|ARM.Build.0 = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|ARM64.Build.0 = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|x64.ActiveCfg = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|x64.Build.0 = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|x86.ActiveCfg = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Debug|x86.Build.0 = Debug|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Release|Any CPU.ActiveCfg = Release|Any CPU {6C94C882-7168-435E-B9E3-B4B9222BBF68}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Release|Any CPU.Build.0 = Release|Any CPU {6C94C882-7168-435E-B9E3-B4B9222BBF68}.Release|Any CPU.Build.0 = Release|Any CPU
{6C94C882-7168-435E-B9E3-B4B9222BBF68}.Release|ARM.ActiveCfg = Release|Any CPU {6C94C882-7168-435E-B9E3-B4B9222BBF68}.Release|ARM.ActiveCfg = Release|Any CPU

7
CreamInstaller/CreamInstaller.csproj
View file

@ -5,7 +5,7 @@
<UseWindowsForms>True</UseWindowsForms> <UseWindowsForms>True</UseWindowsForms>
<ApplicationIcon>Resources\ini.ico</ApplicationIcon> <ApplicationIcon>Resources\ini.ico</ApplicationIcon>
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract> <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
<Version>3.5.2.0</Version> <Version>3.5.2.1</Version>
<PackageIcon>Resources\ini.ico</PackageIcon> <PackageIcon>Resources\ini.ico</PackageIcon>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>2021, pointfeev (https://github.com/pointfeev)</Copyright> <Copyright>2021, pointfeev (https://github.com/pointfeev)</Copyright>
@ -29,11 +29,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>embedded</DebugType> <DebugType>embedded</DebugType>
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>$(DefineConstants)</DefineConstants>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<Optimize>True</Optimize>
<DebugType>embedded</DebugType>
<DefineConstants>$(DefineConstants)</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Gameloop.Vdf" Version="0.6.1" /> <PackageReference Include="Gameloop.Vdf" Version="0.6.1" />

28
CreamInstaller/Forms/MainForm.cs
View file

@ -70,13 +70,24 @@ internal partial class MainForm : CustomForm
checkForUpdatesResult = await updateManager.CheckForUpdatesAsync(cancellationTokenSource.Token); checkForUpdatesResult = await updateManager.CheckForUpdatesAsync(cancellationTokenSource.Token);
cancellationTokenSource.Dispose(); cancellationTokenSource.Dispose();
cancellationTokenSource = null; cancellationTokenSource = null;
#if !DEBUG
if (checkForUpdatesResult.CanUpdate) if (checkForUpdatesResult.CanUpdate)
{ {
#endif
latestVersion = checkForUpdatesResult.LastVersion; latestVersion = checkForUpdatesResult.LastVersion;
versions = checkForUpdatesResult.Versions; versions = checkForUpdatesResult.Versions;
#if !DEBUG
} }
#endif
} }
#if DEBUG
catch (Exception e)
{
e.HandleException(form: this, caption: "Debug exception", acceptButtonText: "OK", cancelButtonText: null);
}
#else
catch { } catch { }
#endif
} }
if (latestVersion is null) if (latestVersion is null)
{ {
@ -92,14 +103,19 @@ internal partial class MainForm : CustomForm
updateButton.Click += new(OnUpdate); updateButton.Click += new(OnUpdate);
changelogTreeView.Visible = true; changelogTreeView.Visible = true;
Version currentVersion = new(Application.ProductVersion); Version currentVersion = new(Application.ProductVersion);
#if DEBUG
foreach (Version version in versions.Where(v => (v > currentVersion || v == latestVersion) && !changelogTreeView.Nodes.ContainsKey(v.ToString())))
#else
foreach (Version version in versions.Where(v => v > currentVersion && !changelogTreeView.Nodes.ContainsKey(v.ToString()))) foreach (Version version in versions.Where(v => v > currentVersion && !changelogTreeView.Nodes.ContainsKey(v.ToString())))
#endif
{ {
TreeNode root = new($"v{version}") TreeNode root = new($"v{version}")
{ {
Name = version.ToString() Name = version.ToString()
}; };
changelogTreeView.Nodes.Add(root); changelogTreeView.Nodes.Add(root);
if (changelogTreeView.Nodes.Count > 0) changelogTreeView.Nodes[0].EnsureVisible(); if (changelogTreeView.Nodes.Count > 0)
changelogTreeView.Nodes[0].EnsureVisible();
_ = Task.Run(async () => _ = Task.Run(async () =>
{ {
HtmlNodeCollection nodes = await HttpClientManager.GetDocumentNodes( HtmlNodeCollection nodes = await HttpClientManager.GetDocumentNodes(
@ -116,7 +132,8 @@ internal partial class MainForm : CustomForm
}; };
root.Nodes.Add(change); root.Nodes.Add(change);
root.Expand(); root.Expand();
if (changelogTreeView.Nodes.Count > 0) changelogTreeView.Nodes[0].EnsureVisible(); if (changelogTreeView.Nodes.Count > 0)
changelogTreeView.Nodes[0].EnsureVisible();
}); });
} }
}); });
@ -178,7 +195,14 @@ internal partial class MainForm : CustomForm
cancellationTokenSource.Dispose(); cancellationTokenSource.Dispose();
cancellationTokenSource = null; cancellationTokenSource = null;
} }
#if DEBUG
catch (Exception ex)
{
ex.HandleException(form: this, caption: "Debug exception", acceptButtonText: "OK", cancelButtonText: null);
}
#else
catch { } catch { }
#endif
if (updateManager is not null && updateManager.IsUpdatePrepared(latestVersion)) if (updateManager is not null && updateManager.IsUpdatePrepared(latestVersion))
{ {

5
CreamInstaller/Program.cs
View file

@ -14,8 +14,13 @@ namespace CreamInstaller;
internal static class Program internal static class Program
{ {
#if DEBUG
internal static readonly string ApplicationName = Application.CompanyName + " v" + Application.ProductVersion + "-debug: " + Application.ProductName;
internal static readonly string ApplicationNameShort = Application.CompanyName + " v" + Application.ProductVersion + "-debug";
#else
internal static readonly string ApplicationName = Application.CompanyName + " v" + Application.ProductVersion + ": " + Application.ProductName; internal static readonly string ApplicationName = Application.CompanyName + " v" + Application.ProductVersion + ": " + Application.ProductName;
internal static readonly string ApplicationNameShort = Application.CompanyName + " v" + Application.ProductVersion; internal static readonly string ApplicationNameShort = Application.CompanyName + " v" + Application.ProductVersion;
#endif
internal static readonly Assembly EntryAssembly = Assembly.GetEntryAssembly(); internal static readonly Assembly EntryAssembly = Assembly.GetEntryAssembly();
internal static readonly Process CurrentProcess = Process.GetCurrentProcess(); internal static readonly Process CurrentProcess = Process.GetCurrentProcess();