From 9e1123cd6f15750b89f46135d85e9bcd58054dde Mon Sep 17 00:00:00 2001 From: Adam Weiss Date: Wed, 6 May 2015 16:18:24 -0400 Subject: [PATCH] Update dependencies and handle octokit upgrade --- .nuget/packages.config | 2 ++ src/Squirrel/Squirrel.csproj | 26 +++++++++-------- src/Squirrel/packages.config | 4 +-- src/SyncReleases/SyncImplementations.cs | 2 +- src/SyncReleases/SyncReleases.csproj | 11 ++++---- src/SyncReleases/packages.config | 4 +-- src/Update/Update.csproj | 32 +++++++++++---------- src/Update/packages.config | 6 ++-- test/Squirrel.Tests.csproj | 37 +++++++++++++------------ test/packages.config | 16 +++++------ 10 files changed, 77 insertions(+), 63 deletions(-) diff --git a/.nuget/packages.config b/.nuget/packages.config index 5f0761264..c4ed22141 100644 --- a/.nuget/packages.config +++ b/.nuget/packages.config @@ -1,5 +1,7 @@  + + \ No newline at end of file diff --git a/src/Squirrel/Squirrel.csproj b/src/Squirrel/Squirrel.csproj index 17a0db10e..ca7425b25 100644 --- a/src/Squirrel/Squirrel.csproj +++ b/src/Squirrel/Squirrel.csproj @@ -51,25 +51,29 @@ ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - - ..\..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll + + ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll + True - - ..\..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Mdb.dll + + ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll + True - - ..\..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Pdb.dll + + ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll + True - - ..\..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Rocks.dll + + ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll + True False ..\..\packages\NuGet.Core.2.8.5\lib\net40-Client\NuGet.Core.dll - - False - ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll + + ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll + True diff --git a/src/Squirrel/packages.config b/src/Squirrel/packages.config index 395098442..97629f09d 100644 --- a/src/Squirrel/packages.config +++ b/src/Squirrel/packages.config @@ -2,7 +2,7 @@ - + - + \ No newline at end of file diff --git a/src/SyncReleases/SyncImplementations.cs b/src/SyncReleases/SyncImplementations.cs index d9f5a20a3..200fcbeb4 100644 --- a/src/SyncReleases/SyncImplementations.cs +++ b/src/SyncReleases/SyncImplementations.cs @@ -50,7 +50,7 @@ public static async Task SyncFromGitHub(string repoUrl, string token, DirectoryI 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.GetAssets(nwo.Item1, nwo.Item2, release.Id); + var assets = await client.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 index 2afcdda78..c42ad67c8 100644 --- a/src/SyncReleases/SyncReleases.csproj +++ b/src/SyncReleases/SyncReleases.csproj @@ -43,12 +43,13 @@ False ..\..\packages\NuGet.Core.2.8.5\lib\net40-Client\NuGet.Core.dll - - False - ..\..\packages\Octokit.0.5.2\lib\net45\Octokit.dll + + ..\..\packages\Octokit.0.10.0\lib\net45\Octokit.dll + True - - ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll + + ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll + True diff --git a/src/SyncReleases/packages.config b/src/SyncReleases/packages.config index 04fc2af45..162cc3a14 100644 --- a/src/SyncReleases/packages.config +++ b/src/SyncReleases/packages.config @@ -3,6 +3,6 @@ - - + + \ No newline at end of file diff --git a/src/Update/Update.csproj b/src/Update/Update.csproj index 38dc7372f..483b6b4e9 100644 --- a/src/Update/Update.csproj +++ b/src/Update/Update.csproj @@ -47,17 +47,21 @@ ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll - - ..\..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll + + ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll + True - - ..\..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Mdb.dll + + ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll + True - - ..\..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Pdb.dll + + ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll + True - - ..\..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Rocks.dll + + ..\..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll + True False @@ -65,9 +69,9 @@ - - False - ..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll + + ..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll + True @@ -81,9 +85,9 @@ - - False - ..\..\packages\WpfAnimatedGif.1.4.9\lib\net\WpfAnimatedGif.dll + + ..\..\packages\WpfAnimatedGif.1.4.12\lib\net\WpfAnimatedGif.dll + True diff --git a/src/Update/packages.config b/src/Update/packages.config index 8f7f47ab8..f9caa00e4 100644 --- a/src/Update/packages.config +++ b/src/Update/packages.config @@ -2,10 +2,10 @@ - + - - + + \ No newline at end of file diff --git a/test/Squirrel.Tests.csproj b/test/Squirrel.Tests.csproj index 2fe26f2c0..b139a7d7a 100644 --- a/test/Squirrel.Tests.csproj +++ b/test/Squirrel.Tests.csproj @@ -1,7 +1,7 @@  - - + + Debug @@ -13,7 +13,7 @@ Squirrel.Tests v4.5 512 - b2a8a210 + c0014311 true @@ -61,9 +61,9 @@ False ..\packages\NuGet.Core.2.8.5\lib\net40-Client\NuGet.Core.dll - - False - ..\packages\Splat.1.5.1\lib\Net45\Splat.dll + + ..\packages\Splat.1.6.2\lib\Net45\Splat.dll + True @@ -73,18 +73,21 @@ - ..\packages\xunit.abstractions.2.0.0-rc3-build2880\lib\net35\xunit.abstractions.dll + ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll + True - - False - ..\packages\xunit.assert.2.0.0-rc3-build2880\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll + + ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll + True - - False - ..\packages\xunit.extensibility.core.2.0.0-rc3-build2880\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll + + ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll + True - - ..\packages\xunit.runner.utility.2.0.0-rc3-build2880\lib\net35\xunit.runner.utility.desktop.dll + + False + ..\packages\xunit.runner.utility.2.0.0\lib\net35\xunit.runner.utility.desktop.dll + True @@ -131,8 +134,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + "$(SolutionDir).nuget\NuGet.exe" pack "$(ProjectPath)" -OutputDirectory "$(ProjectDir)$(OutDir)." -Properties Configuration=$(Configuration) diff --git a/test/packages.config b/test/packages.config index 91eb1852c..432f031c8 100644 --- a/test/packages.config +++ b/test/packages.config @@ -3,12 +3,12 @@ - - - - - - - - + + + + + + + + \ No newline at end of file