Merge branch 'master' into latest-version-displayer

DrewNaylor · Oct 5, 2020 · 4845089 · 4845089
2 parents f6014ce + ca88c6a
commit 4845089
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 89 deletions.
diff --git a/guinget/App.config b/guinget/App.config
@@ -68,6 +68,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Sqlite" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.8.0" newVersion="3.1.8.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/guinget/MainWindow.Designer.vb b/guinget/MainWindow.Designer.vb
diff --git a/guinget/guinget.vbproj b/guinget/guinget.vbproj
@@ -78,8 +78,8 @@
     <Reference Include="libguinget">
       <HintPath>..\libguinget\bin\Debug\libguinget.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Data.Sqlite, Version=3.1.7.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.3.1.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+    <Reference Include="Microsoft.Data.Sqlite, Version=3.1.8.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.3.1.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
     </Reference>
     <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
       <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>

diff --git a/guinget/packages.config b/guinget/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Data.Sqlite" version="3.1.7" targetFramework="net48" />
-  <package id="Microsoft.Data.Sqlite.Core" version="3.1.7" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite" version="3.1.8" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="3.1.8" targetFramework="net48" />
   <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
   <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
   <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />

diff --git a/libguinget/PackageListTools.vb b/libguinget/PackageListTools.vb
@@ -259,7 +259,7 @@ Public Class PackageListTools
                                        Try
                                            If System.IO.File.Exists(tempDir & "\winget-pkgs-master.zip") Then
                                                ' Now extract.
-                                               ZipFile.ExtractToDirectory(tempDir & "\winget-pkgs-master.zip", tempDir & "\winget-pkgs-master")
+                                               ZipFile.ExtractToDirectory(tempDir & "\winget-pkgs-master.zip", tempDir & "\winget-pkgs-master\")
                                            End If
                                        Catch ex As System.IO.FileNotFoundException
                                            MessageBox.Show("Couldn't find " & tempDir & "\winget-pkgs-master.zip",
@@ -278,7 +278,7 @@ Public Class PackageListTools
                                            Try
                                                If System.IO.File.Exists(DatabaseTempDir & "\source.msix") Then
                                                    ' Now extract.
-                                                   ZipFile.ExtractToDirectory(DatabaseTempDir & "\source.msix", DatabaseTempDir & "\source")
+                                                   ZipFile.ExtractToDirectory(DatabaseTempDir & "\source.msix", DatabaseTempDir & "\source\")
                                                End If
                                            Catch ex As System.IO.FileNotFoundException
                                                MessageBox.Show("Couldn't find " & DatabaseTempDir & "\source.msix",
@@ -297,8 +297,8 @@ Public Class PackageListTools
                                            ' The calling app wants to use 7zip, so use it.
                                            Dim extraction7z As New Process
                                            extraction7z.StartInfo.FileName = PathTo7zip
-                                           extraction7z.StartInfo.Arguments = "x -bd " & tempDir & "\winget-pkgs-master.zip -o" & tempDir & "\winget-pkgs-master"
-                                           extraction7z.Start()
+                                       extraction7z.StartInfo.Arguments = "x -bd " & tempDir & "\winget-pkgs-master.zip -o" & tempDir & "\winget-pkgs-master\"
+                                       extraction7z.Start()
                                            ' Wait for 7zip to exit, otherwise it'll move on too soon.
                                            extraction7z.WaitForExit()
 
@@ -307,7 +307,7 @@ Public Class PackageListTools
                                            ' This is for the database.
                                            Dim extraction7zDatabase As New Process
                                            extraction7zDatabase.StartInfo.FileName = PathTo7zip
-                                           extraction7zDatabase.StartInfo.Arguments = "x -bd " & DatabaseTempDir & "\source.msix -o" & DatabaseTempDir & "\source"
+                                           extraction7zDatabase.StartInfo.Arguments = "x -bd " & DatabaseTempDir & "\source.msix -o" & DatabaseTempDir & "\source\"
                                            extraction7zDatabase.Start()
                                            ' Wait for 7zip to exit, otherwise it'll move on too soon.
                                            extraction7zDatabase.WaitForExit()

diff --git a/libguinget/libguinget.vbproj b/libguinget/libguinget.vbproj
@@ -50,8 +50,8 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Data.Sqlite, Version=3.1.7.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.3.1.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
+    <Reference Include="Microsoft.Data.Sqlite, Version=3.1.8.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Sqlite.Core.3.1.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
     </Reference>
     <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.4.976, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
       <HintPath>..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>

diff --git a/libguinget/packages.config b/libguinget/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Data.Sqlite" version="3.1.7" targetFramework="net48" />
-  <package id="Microsoft.Data.Sqlite.Core" version="3.1.7" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite" version="3.1.8" targetFramework="net48" />
+  <package id="Microsoft.Data.Sqlite.Core" version="3.1.8" targetFramework="net48" />
   <package id="SQLitePCLRaw.bundle_e_sqlite3" version="2.0.4" targetFramework="net48" />
   <package id="SQLitePCLRaw.core" version="2.0.4" targetFramework="net48" />
   <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.4" targetFramework="net48" />

diff --git a/update-manifests.bat b/update-manifests.bat
@@ -6,7 +6,7 @@ Rem https://gist.github.com/DrewNaylor/22e3f1cded702fff494a46dabe643fde
 
 
 REM Current script version:
-set VERSIONNUMBER=2020.05-2
+set VERSIONNUMBER=2020.10-1
 
 REM Create variable for the titlebar text when not doing anything:
 set REGULAR_TITLE_BAR=update-manifests Version %VERSIONNUMBER%
@@ -46,7 +46,7 @@ echo If anything happens to your computer, Drew Naylor is not responsible. Use a
 echo Please visit https://github.com/DrewNaylor/guinget/ for more information on this script's parent project, guinget, which is open source.
 echo(
 
-echo The purpose of update-manifests is to expediate the downloading and extracting of winget sources from Microsoft's Community Package Repository. For now, this is the only source supported, but the goal is to support more sources in the future, along with winget gaining that feature whenever it does. Eventually guinget will get its own manifest updater, so this script is just a temporary solution. update-manifests will use PowerShell to download a Zip file from github.com and extract it into "%AppData%\winget-frontends\source\winget-pkgs\pkglist\manifests" using PowerShell and robocopy. Manifests in this folder can be used by other winget frontends in addition to guinget, if they want to. Additionally, manifests from other sources will be extracted to their own "source\" folder. After copying the manifests, you'll be asked if you want to delete the temp files.
+echo The purpose of update-manifests is to expediate the downloading and extracting of winget sources from Microsoft's Community Package Repository. For now, this is the only source supported, but the goal is to support more sources in the future, along with winget gaining that feature whenever it does. Eventually guinget will get its own manifest updater, so this script is just a temporary solution. update-manifests will use PowerShell to download a Zip file from github.com and extract it into "%AppData%\winget-frontends\source\winget-pkgs\pkglist\manifests\" using PowerShell and robocopy. Manifests in this folder can be used by other winget frontends in addition to guinget, if they want to. Additionally, manifests from other sources will be extracted to their own "source\" folder. After copying the manifests, you'll be asked if you want to delete the temp files.
 
 echo(
 echo Windows PowerShell 5.0 or greater is required to run this script. Links are available in the System Requirements in the UXL Launcher README file here:  https://github.com/DrewNaylor/UXL-Launcher/blob/master/README.md#building-uxl-launcher-from-source-system-requirements-and-guide
@@ -108,7 +108,7 @@ REM Set titlebar text to the extracting text:
 title %EXTRACTING_TITLE_BAR%
 echo Extracting package previously downloaded from GitHub...
 echo If you want to cancel, please use Ctrl+C.
-powershell Expand-Archive -Path "$env:AppData\winget-frontends\source\winget-pkgs\temp\winget-pkgs-master.zip" -DestinationPath " '%AppData%\winget-frontends\source\winget-pkgs\temp\winget-pkgs-master' " -Force
+powershell Expand-Archive -Path "$env:AppData\winget-frontends\source\winget-pkgs\temp\winget-pkgs-master.zip" -DestinationPath " '%AppData%\winget-frontends\source\winget-pkgs\temp\winget-pkgs-master\' " -Force
 pause
 
 echo(