Updated Zero Install .NET

0install · May 16, 2024 · 55189de · 55189de
1 parent c70952d
commit 55189de
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/src/App.config b/src/App.config
@@ -33,7 +33,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.7.6.0" newVersion="0.7.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-0.8.0.0" newVersion="0.8.0.0" />
       </dependentAssembly>
     </assemblyBinding>
     <relativeBindForResources enabled="true" />

diff --git a/src/Commands.WinForms/IntegrateAppForm.cs b/src/Commands.WinForms/IntegrateAppForm.cs
@@ -1,7 +1,6 @@
 // Copyright Bastian Eicher et al.
 // Licensed under the GNU Lesser Public License
 
-using NanoByte.Common.Native;
 using ZeroInstall.DesktopIntegration;
 using ZeroInstall.DesktopIntegration.AccessPoints;
 using ZeroInstall.DesktopIntegration.ViewModel;
@@ -175,12 +174,6 @@ private void SetupDefaultAccessPoints()
         SetupDefaultAccessPoint(checkBoxDefaultProgramsSimple, labelDefaultProgramsSimple, checkBoxDefaultProgramsAll, _state.DefaultProgram);
         SetupCategory(DefaultAccessPoint.TagName, _defaultAccessPointCheckBoxes.ToArray());
 
-        // File type associations cannot be set programmatically on Windows 8, so hide the option
-        _switchToBasicMode += () =>
-        {
-            if (WindowsUtils.IsWindows8) labelFileTypesSimple.Visible = checkBoxFileTypesSimple.Visible = false;
-        };
-
         SetDefaultAccessPoints();
     }
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -24,8 +24,8 @@
     <Version>1.0.0-pre</Version>
 
     <!-- Dependency versions -->
-    <NanoByteCommonVersion>2.18.3</NanoByteCommonVersion>
-    <ZeroInstallVersion>2.25.7</ZeroInstallVersion>
+    <NanoByteCommonVersion>2.18.4</NanoByteCommonVersion>
+    <ZeroInstallVersion>2.25.8</ZeroInstallVersion>
   </PropertyGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)App.config" />

diff --git a/src/OneGet/OneGetContext.cs b/src/OneGet/OneGetContext.cs
@@ -126,7 +126,7 @@ private IEnumerable<Feed> GetCatalogResults(string? query)
         if (string.IsNullOrEmpty(query))
         {
             Log.Info("Returning entire catalog");
-            return GetCatalog().Feeds;
+            return (CatalogManager.GetCached() ?? CatalogManager.GetOnlineSafe()).Feeds;
         }
 
         Log.Info("Searching for short-name match in Catalog: " + query);
@@ -169,7 +169,6 @@ public void DownloadPackage(string fastPackageReference, string location)
                 IconStores.DesktopIntegration(Config, Handler, machineWide: false));
         }
         exporter.DeployImportScript();
-        exporter.DeployBootstrapIntegrate(Handler);
 
         Yield(requirements);