Skip to content

Commit fabd4eb

Browse files
committed
feat(csharp/ExcelAddIn): Add a version number and display it in the GUI
1 parent 5f62c5b commit fabd4eb

File tree

12 files changed

+80
-38
lines changed

12 files changed

+80
-38
lines changed

csharp/ExcelAddIn/util/Utility.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
namespace Deephaven.ExcelAddIn.Util;
55

66
internal static class Utility {
7+
public const string VersionString = "Version 0.8.0";
8+
79
public static T Exchange<T>(ref T item, T newValue) {
810
var result = item;
911
item = newValue;

csharp/ExcelAddIn/views/ConnectionManagerDialog.Designer.cs

Lines changed: 12 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

csharp/ExcelAddIn/views/ConnectionManagerDialog.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Deephaven.ExcelAddIn.Viewmodels;
1+
using Deephaven.ExcelAddIn.Util;
2+
using Deephaven.ExcelAddIn.Viewmodels;
23

34
namespace Deephaven.ExcelAddIn.Views;
45

@@ -18,6 +19,7 @@ public ConnectionManagerDialog() {
1819

1920
_bindingSource.DataSource = typeof(ConnectionManagerDialogRow);
2021
dataGridView1.DataSource = _bindingSource;
22+
versionLabel.Text = Utility.VersionString;
2123
}
2224

2325
public void AddRow(ConnectionManagerDialogRow row) {

csharp/ExcelAddIn/views/ConnectionManagerDialog.resx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
33
<!--
4-
Microsoft ResX Schema
4+
Microsoft ResX Schema
55
66
Version 2.0
77
@@ -48,7 +48,7 @@
4848
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
5353
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -117,7 +117,4 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121-
<value>17, 17</value>
122-
</metadata>
123120
</root>

csharp/ExcelAddIn/views/CredentialsDialog.Designer.cs

Lines changed: 32 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

csharp/ExcelAddIn/views/CredentialsDialog.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Deephaven.ExcelAddIn.ViewModels;
1+
using Deephaven.ExcelAddIn.Util;
2+
using Deephaven.ExcelAddIn.ViewModels;
23

34
namespace ExcelAddIn.views {
45
public partial class CredentialsDialog : Form {
@@ -47,6 +48,9 @@ public CredentialsDialog(CredentialsDialogViewModel vm) {
4748
// Bind the IsDefault property
4849
makeDefaultCheckBox.DataBindings.Add(nameof(makeDefaultCheckBox.Checked),
4950
vm, nameof(vm.IsDefault));
51+
52+
// Set the version label
53+
versionLabel.Text = Utility.VersionString;
5054
}
5155

5256
public void SetTestResultsBox(string testResultsState) {

csharp/ExcelAddIn/views/CredentialsDialog.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
33
<!--
4-
Microsoft ResX Schema
4+
Microsoft ResX Schema
55
66
Version 2.0
77
@@ -48,7 +48,7 @@
4848
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
5353
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter

csharp/ExcelAddInInstaller/ExcelAddInInstaller.aip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
<ROW Property="BannerBitmap" Value="banner.jpg" MultiBuildValue="DefaultBuild:Banner.jpg" Type="1" MsiKey="BannerBitmap"/>
1313
<ROW Property="DialogBitmap" Value="dialog.jpg" MultiBuildValue="DefaultBuild:Dialog.jpg" Type="1" MsiKey="DialogBitmap"/>
1414
<ROW Property="Manufacturer" Value="Deephaven Data Labs LLC"/>
15-
<ROW Property="ProductCode" Value="1033:{5C1E1B63-CC23-4F4D-8564-A843AA5D7413} " Type="16"/>
15+
<ROW Property="ProductCode" Value="1033:{7CA02F46-8607-4C9B-8372-AAAACD94DAC4} " Type="16"/>
1616
<ROW Property="ProductLanguage" Value="1033"/>
1717
<ROW Property="ProductName" Value="Deephaven Excel Add-In"/>
18-
<ROW Property="ProductVersion" Value="1.0.0" Options="32"/>
18+
<ROW Property="ProductVersion" Value="0.8.0" Options="32"/>
1919
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
2020
<ROW Property="UpgradeCode" Value="{98EB9359-8BA3-44BA-A411-AED290E6EBD9}"/>
2121
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -67,7 +67,7 @@
6767
<ROW Component="zstd.dll" ComponentId="{4DE80229-9EDC-40D0-9B91-4E6BCECAC0C9}" Directory_="APPDIR" Attributes="256" KeyPath="zstd.dll"/>
6868
</COMPONENT>
6969
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
70-
<ROW Feature="A0BFC224E0E9125ADE0B2DBF343" Title=".NET Desktop Runtime 8.0.8 x64" Description=".NET Desktop Runtime 8.0.8 x64" Display="3" Level="1" Attributes="0"/>
70+
<ROW Feature="A0BFC224E0E9125ADE0B2DBF343" Title=".NET Desktop Runtime 8.0.12 x64" Description=".NET Desktop Runtime 8.0.12 x64" Display="3" Level="1" Attributes="0"/>
7171
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
7272
<ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
7373
</COMPONENT>
@@ -351,7 +351,7 @@
351351
<ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
352352
</COMPONENT>
353353
<COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
354-
<ROW PrereqKey="A0BFC224E0E9125ADE0B2DBF343" DisplayName=".NET Desktop Runtime 8.0.8 x64" VersionMin="8.0" SetupFileUrl="Prerequisites\.NET 8.0\windowsdesktop-runtime-8.0.8-win-x64.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows 7 RTM x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="fx" TargetName=".NET 8.0\windowsdesktop-runtime-8.0.8-win-x64.exe" Feature="A0BFC224E0E9125ADE0B2DBF343"/>
354+
<ROW PrereqKey="A0BFC224E0E9125ADE0B2DBF343" DisplayName=".NET Desktop Runtime 8.0.12 x64" VersionMin="8.0" SetupFileUrl="Prerequisites\.NET 8.0\windowsdesktop-runtime-8.0.12-win-x64.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows 7 RTM x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="fx" TargetName=".NET 8.0\windowsdesktop-runtime-8.0.12-win-x64.exe" Feature="A0BFC224E0E9125ADE0B2DBF343"/>
355355
<ATTRIBUTE name="PrereqsOrder" value="A0BFC224E0E9125ADE0B2DBF343"/>
356356
</COMPONENT>
357357
<COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.exe
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
This file is a placeholder that creates this directory in source control.
2+
3+
This directory is the location of the prerequisites for the Deephaven Excel
4+
AddIn. Currently it holds the .exe file for the .NET 8.0 Windows Desktop
5+
Runtime installer. You are meant to download this installer from Microsoft
6+
and place it in this directory.
7+
8+
Instructions for doing so are in Confluence in the article entitled
9+
"Creating a Windows MSI Installer for the Deephaven Excel Add-In (2nd gen)"

0 commit comments

Comments
 (0)