Version 1.2.1

electroly · Jan 8, 2023 · 6cb62dd · 6cb62dd
1 parent bd186f7
commit 6cb62dd
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2022 Brian Luft
+Copyright (c) 2016-2023 Brian Luft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/ps1/New-Release.ps1 b/ps1/New-Release.ps1
@@ -3,13 +3,13 @@ Set-StrictMode -Version 3
 Add-Type -AssemblyName System.IO.Compression
 Add-Type -AssemblyName System.IO.Compression.FileSystem
 
-$windowsSdkVersion = '10.0.20348.0'
+$windowsSdkVersion = '10.0.22000.0'
 $windowsSdkDir = "C:\Program Files (x86)\Windows Kits\10\Redist\$windowsSdkVersion\ucrt\DLLs\x64"
 if (-not (Test-Path $windowsSdkDir)) {
     throw "Windows 10 SDK $windowsSdkVersion not found!"
 }
 
-$vsRuntimeVersion = '14.31.31103'
+$vsRuntimeVersion = '14.34.31931'
 $vsRuntimeDir = "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\$vsRuntimeVersion\x64\Microsoft.VC143.CRT"
 if (-not (Test-Path $vsRuntimeDir)) {
     throw "Visual C++ Redistributable $vsRuntimeVersion not found!"
@@ -20,7 +20,7 @@ if (-not (Test-Path $wixDir)) {
     throw "WiX not found!"
 }
 
-$signtool = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.20348.0\x64\signtool.exe"
+$signtool = "C:\Program Files (x86)\Windows Kits\10\bin\$windowsSdkVersion\x64\signtool.exe"
 if (-not (Test-Path $signtool)) {
     throw "Signtool not found!"
 }
@@ -91,6 +91,11 @@ $doneWithFilesXml = $false
 for ($i = 5; $i -lt $heatLines.Length; $i++) {
     if ($heatLines[$i].Contains("</DirectoryRef>")) {
         $doneWithFilesXml = $true
+
+        # heat misses this one
+        $filesXml += '<Component Win64="yes" Id="System.IO.Compression.Native.dll" Guid="D1B5046E-FA58-4D54-AE9D-DF56895DFB5C">' + "`r`n"
+        $filesXml += '<File Id="System.IO.Compression.Native.dll" KeyPath="yes" Source="SourceDir\System.IO.Compression.Native.dll" />' + "`r`n"
+        $filesXml += '</Component>' + "`r`n"
     }
     if (-not $doneWithFilesXml) {
         $filesXml += $heatLines[$i] + "`r`n"

diff --git a/src/SqlNotebook.wxs b/src/SqlNotebook.wxs
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<?define ProductVersion = "1.2.0"?>
+<?define ProductVersion = "1.2.1"?>
 <?define ProductUpgradeCode = "1E7BF0C5-FEDF-4702-A504-6E32A7C86BA4"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product

diff --git a/src/SqlNotebook/MainForm.cs b/src/SqlNotebook/MainForm.cs
@@ -412,7 +412,7 @@ private void AboutMnu_Click(object sender, EventArgs e)
             new[] { siteButton, Ui.OK },
             TaskDialogIcon.Information,
             defaultIsFirst: false,
-            details: $"Version {Application.ProductVersion}\r\n© 2016-2022 Brian Luft"
+            details: $"Version {Application.ProductVersion}\r\n© 2016-2023 Brian Luft"
         );
         if (choice == siteButton)
         {

diff --git a/src/SqlNotebook/Properties/AssemblyInfo.cs b/src/SqlNotebook/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SQL Notebook")]
-[assembly: AssemblyCopyright("© 2016-2022 Brian Luft")]
+[assembly: AssemblyCopyright("© 2016-2023 Brian Luft")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -35,4 +35,4 @@
 [assembly: AssemblyVersion("1.0.0.0")]
 
 // this is Application.ProductVersion
-[assembly: AssemblyFileVersion("1.2.0")]
+[assembly: AssemblyFileVersion("1.2.1")]
diff --git a/src/SqlNotebook/ThirdPartyLicenses.html b/src/SqlNotebook/ThirdPartyLicenses.html
@@ -11,7 +11,7 @@
 </head>
 <body>
   <a moz-do-not-send="true" href="https://sqlnotebook.com"><strong>SQL Notebook</strong></a><br>
-  Copyright (c) 2016-2022 Brian Luft<br>
+  Copyright (c) 2016-2023 Brian Luft<br>
   <br>
   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
   documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

diff --git a/src/chocolatey/sqlnotebook.nuspec b/src/chocolatey/sqlnotebook.nuspec
@@ -12,7 +12,7 @@
         <description>Casual data exploration in SQL.</description>
         <projectUrl>https://sqlnotebook.com</projectUrl>
         <tags>sql sqlite mysql postgresql sql server mssql csv xls excel admin</tags>
-        <copyright>Copyright (C) 2016-2022 Brian Luft</copyright>
+        <copyright>Copyright (C) 2016-2023 Brian Luft</copyright>
         <licenseUrl>https://github.com/electroly/sqlnotebook/blob/master/LICENSE</licenseUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <releaseNotes><![CDATA[

diff --git a/web/index.html b/web/index.html
@@ -15,13 +15,16 @@ <h1>Open source app for casual data exploration in SQL</h1>
   <div style="text-align: center;">
     <div class="screenshot-border">
       <a href="art/main-screenshot.png"><img src="art/main-screenshot.png" id="index-screenshot" class=
-      "scale gray-border" moz-do-not-send="true" alt="" name="index-screenshot" width="475" border="0" height=
-      "432"></a>
+      "scale gray-border" moz-do-not-send="true" alt="" name="index-screenshot" width="475" height="432" border=
+      "0"></a>
     </div>
   </div><br>
   <hr width="100%" size="2">
   <h2>News</h2>
   <ul>
+    <li><b>2023-01-07</b> - Version 1.2.1 is released. This minor release fixes several user reported bugs.
+    <a moz-do-not-send="true" href="https://sqlite.org/releaselog/3_40_1.html">SQLite 3.40.1</a> is now included,
+    adding <code>RIGHT</code> <code>JOIN</code> and <code>FULL OUTER JOIN</code> support to SQL Notebook.<br></li>
     <li><b>2022-05-07</b> - Version 1.2.0 is released. Choosing column types during CSV/XLS import has been improved
     with optional auto-detection and the ability to change types for multiple selected columns at once. Non-public
     schemas in PostgreSQL can now be imported.<br></li>
@@ -37,7 +40,7 @@ <h2>News</h2>
   </ul>
   <div class="screenshot-border" style="float: right; margin-top: 30px; margin-left: 30px;">
     <a href="art/import-screenshot.png"><img moz-do-not-send="true" src="art/import-screenshot.png" alt="" class=
-    "scale gray-border" width="300" border="0" height="231"></a>
+    "scale gray-border" width="300" height="231" border="0"></a>
   </div>
   <h2>Easily import and export data</h2>
   <p>CSV and Excel files can be imported into the notebook as local tables. A graphical import wizard and
@@ -62,7 +65,7 @@ <h2>Run quick queries or write sophisticated scripts</h2>
   backtick or tilde key). It collapses to a tab at the bottom of the window. Console results are not saved.<br></p>
   <div class="screenshot-border" style="float: right; margin-top: 30px; margin-left: 30px;">
     <a href="art/script-screenshot.png"><img moz-do-not-send="true" src="art/script-screenshot.png" alt="" class=
-    "scale gray-border" width="300" border="0" height="253"></a>
+    "scale gray-border" width="300" height="253" border="0"></a>
   </div>
   <h2>Use familiar programming constructs</h2>
   <p>Users with prior SQL or other programming language experience will feel right at home in SQL Notebook. The

diff --git a/web/page.template.html b/web/page.template.html
@@ -34,7 +34,7 @@
 </div></article>
 <footer><div id="footer">
 <hr>
-© 2016-2022 <a href="https://github.com/electroly">Brian Luft</a>
+© 2016-2023 <a href="https://github.com/electroly">Brian Luft</a>
 </div></footer>
 </body>
 </html>