core 3.1 port Squirrel#2

dady8889 · Jul 27, 2020 · 719f563 · 719f563
1 parent 6f2070e
commit 719f563
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 68 deletions.
diff --git a/src/Squirrel.nuspec b/src/Squirrel.nuspec
@@ -9,10 +9,6 @@
     <iconUrl>https://github.com/raw/Squirrel/Squirrel.Windows/master/docs/artwork/Squirrel-Logo-Square.png</iconUrl>
 
     <dependencies>
-      <dependency id="DeltaCompressionDotNet" version="[1.1,2.0)" />
-      <dependency id="Mono.Cecil" version="0.10.4" />
-      <dependency id="SharpCompress" version="[0.23.0]" />
-      <dependency id="Nuget.Core" version="[2.14.0]" />
     </dependencies>
 
     <id>squirrel.windows</id>

diff --git a/src/Squirrel/Squirrel.csproj b/src/Squirrel/Squirrel.csproj
@@ -13,29 +13,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="NuGet.Core" Version="2.14.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Web.Xdt" Version="3.1.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="Mono.Cecil" Version="0.10.4" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DeltaCompressionDotNet" Version="1.1.0.0" />
-    <PackageReference Include="Microsoft.Web.Xdt" Version="2.1.1" />
-    <PackageReference Include="Mono.Cecil" Version="0.9.6.1" />
-    <PackageReference Include="SharpCompress" Version="0.17.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.0.50" />
   </ItemGroup>
 

diff --git a/src/Squirrel/UpdateManager.ApplyReleases.cs b/src/Squirrel/UpdateManager.ApplyReleases.cs
@@ -29,10 +29,10 @@ public ApplyReleasesImpl(string rootAppDirectory)
 
             public async Task<string> ApplyReleases(UpdateInfo updateInfo, bool silentInstall, bool attemptingFullInstall, Action<int> progress = null)
             {
-                progress = progress ?? (_ => { });
+                progress ??= (_ => { });
 
                 progress(0);
-                var release = await createFullPackagesFromDeltas(updateInfo.ReleasesToApply, updateInfo.CurrentlyInstalledVersion);
+                var release = updateInfo.ReleasesToApply.MaxBy(x => x.Version).FirstOrDefault();
                 progress(10);
 
                 if (release == null) {
@@ -303,46 +303,6 @@ await ReleasePackage.ExtractZipForInstall(
                 });
             }
 
-            async Task<ReleaseEntry> createFullPackagesFromDeltas(IEnumerable<ReleaseEntry> releasesToApply, ReleaseEntry currentVersion)
-            {
-                Contract.Requires(releasesToApply != null);
-
-                // If there are no remote releases at all, bail
-                if (!releasesToApply.Any()) {
-                    return null;
-                }
-
-                // If there are no deltas in our list, we're already done
-                if (releasesToApply.All(x => !x.IsDelta)) {
-                    return releasesToApply.MaxBy(x => x.Version).FirstOrDefault();
-                }
-
-                if (!releasesToApply.All(x => x.IsDelta)) {
-                    throw new Exception("Cannot apply combinations of delta and full packages");
-                }
-
-                // Smash together our base full package and the nearest delta
-                var ret = await Task.Run(() => {
-                    var basePkg = new ReleasePackage(Path.Combine(rootAppDirectory, "packages", currentVersion.Filename));
-                    var deltaPkg = new ReleasePackage(Path.Combine(rootAppDirectory, "packages", releasesToApply.First().Filename));
-
-                    var deltaBuilder = new DeltaPackageBuilder(Directory.GetParent(this.rootAppDirectory).FullName);
-
-                    return deltaBuilder.ApplyDeltaPackage(basePkg, deltaPkg,
-                        Regex.Replace(deltaPkg.InputPackageFile, @"-delta.nupkg$", ".nupkg", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));
-                });
-
-                if (releasesToApply.Count() == 1) {
-                    return ReleaseEntry.GenerateFromFile(ret.InputPackageFile);
-                }
-
-                var fi = new FileInfo(ret.InputPackageFile);
-                var entry = ReleaseEntry.GenerateFromFile(fi.OpenRead(), fi.Name);
-
-                // Recursively combine the rest of them
-                return await createFullPackagesFromDeltas(releasesToApply.Skip(1), entry);
-            }
-
             void executeSelfUpdate(SemanticVersion currentVersion)
             {
                 var targetDir = getDirectoryForRelease(currentVersion);

diff --git a/src/SyncReleases/SyncImplementations.cs b/src/SyncReleases/SyncImplementations.cs
@@ -50,13 +50,13 @@ public static async Task SyncFromGitHub(string repoUrl, string token, DirectoryI
             }
 
             var nwo = nwoFromRepoUrl(repoUrl);
-            var releases = (await client.Release.GetAll(nwo.Item1, nwo.Item2))
+            var releases = (await client.Repository.Release.GetAll(nwo.Item1, nwo.Item2))
                 .OrderByDescending(x => x.PublishedAt)
                 .Take(5);
 
             await releases.ForEachAsync(async release => {
                 // NB: Why do I have to double-fetch the release assets? It's already in GetAll
-                var assets = await client.Release.GetAllAssets(nwo.Item1, nwo.Item2, release.Id);
+                var assets = await client.Repository.Release.GetAllAssets(nwo.Item1, nwo.Item2, release.Id);
 
                 await assets
                     .Where(x => x.Name.EndsWith(".nupkg", StringComparison.OrdinalIgnoreCase))

diff --git a/src/SyncReleases/SyncReleases.csproj b/src/SyncReleases/SyncReleases.csproj
@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\vendor\nuget\src\Core\Core.csproj" />
     <ProjectReference Include="..\Squirrel\Squirrel.csproj" />
   </ItemGroup>
 
@@ -23,7 +22,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.0.50" />
+    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02" />
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.2.31" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

diff --git a/src/Update/Update.csproj b/src/Update/Update.csproj
@@ -34,11 +34,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\vendor\nuget\src\Core\Core.csproj" />
     <ProjectReference Include="..\Squirrel\Squirrel.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="NuGet.Core" Version="2.14.0" />
     <PackageReference Include="WpfAnimatedGif" Version="1.4.15.0" />
   </ItemGroup>