Merge #2921 Update dependencies

KSP-CKAN · Nov 22, 2019 · 954b3fc · 954b3fc
2 parents fcdbb2a + 1038ea1
commit 954b3fc
Show file tree

Hide file tree

Showing 45 changed files with 155 additions and 116 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@ All notable changes to this project will be documented in this file.
 
 - [Build] Redeploy Inflator after builds (#2889 by: HebaruSan; reviewed: techman83)
 - [Netkan] Add owners of parent GitHub repos to authors (#2922 by: HebaruSan; reviewed: DasSkelett)
+- [Build] Update dependencies (#2921 by: DasSkelett; reviewed: HebaruSan, politas)
 
 ## v1.26.4 (Orion)
 

diff --git a/Cmdline/CKAN-cmdline.csproj b/Cmdline/CKAN-cmdline.csproj
@@ -43,15 +43,15 @@
       <HintPath>..\_build\lib\nuget\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\_build\lib\nuget\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\_build\lib\nuget\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Transactions" />
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a">
       <HintPath>..\_build\lib\nuget\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac, Version=4.9.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da">
-      <HintPath>..\_build\lib\nuget\Autofac.4.9.2\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da">
+      <HintPath>..\_build\lib\nuget\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Cmdline/packages.config b/Cmdline/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
-</packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
+</packages>
diff --git a/ConsoleUI/CKAN-ConsoleUI.csproj b/ConsoleUI/CKAN-ConsoleUI.csproj
@@ -58,8 +58,8 @@
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\_build\lib\nuget\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac, Version=4.9.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da">
-      <HintPath>..\_build\lib\nuget\Autofac.4.9.2\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da">
+      <HintPath>..\_build\lib\nuget\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Core/CKAN-core.csproj b/Core/CKAN-core.csproj
@@ -49,10 +49,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.9.2" />
+    <PackageReference Include="Autofac" Version="4.9.4" />
     <PackageReference Include="ICSharpCode.SharpZipLib.Patched" Version="0.86.5.1" />
     <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/GUI/CKAN-GUI.csproj b/GUI/CKAN-GUI.csproj
@@ -53,8 +53,8 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.9.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\_build\lib\nuget\Autofac.4.9.2\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da">
+      <HintPath>..\_build\lib\nuget\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="INIFileParser, Version=2.4.0.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
       <HintPath>..\_build\lib\nuget\ini-parser.3.4.0\lib\net20\INIFileParser.dll</HintPath>
@@ -63,7 +63,7 @@
       <HintPath>..\_build\lib\nuget\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\_build\lib\nuget\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\_build\lib\nuget\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/GUI/packages.config b/GUI/packages.config
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.9.2" targetFramework="net45" />
+  <package id="Autofac" version="4.9.4" targetFramework="net45" />
   <package id="ini-parser" version="3.4.0" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
-</packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
+</packages>
diff --git a/Netkan/CKAN-netkan.csproj b/Netkan/CKAN-netkan.csproj
@@ -39,6 +39,15 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da">
+      <HintPath>..\_build\lib\nuget\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
+    </Reference>
+    <Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
+      <HintPath>..\_build\lib\nuget\AWSSDK.Core.3.3.103.64\lib\net45\AWSSDK.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
+      <HintPath>..\_build\lib\nuget\AWSSDK.SQS.3.3.102.31\lib\net45\AWSSDK.SQS.dll</HintPath>
+    </Reference>
     <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
       <HintPath>..\_build\lib\nuget\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
     </Reference>
@@ -49,23 +58,14 @@
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\_build\lib\nuget\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\_build\lib\nuget\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NJsonSchema" Version="10.0.19">
-      <HintPath>..\_build\lib\nuget\NJsonSchema.10.0.19\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="Namotion.Reflection, Version=1.0.7.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102">
+      <HintPath>..\_build\lib\nuget\Namotion.Reflection.1.0.7\lib\net45\Namotion.Reflection.dll</HintPath>
     </Reference>
-    <Reference Include="Namotion.Reflection" Version="1.0.5">
-      <HintPath>..\_build\lib\nuget\Namotion.Reflection.1.0.5\lib\net45\Namotion.Reflection.dll</HintPath>
-    </Reference>
-    <Reference Include="AWSSDK.Core" Version="3.3.103">
-      <HintPath>..\_build\lib\nuget\AWSSDK.Core.3.3.103\lib\net45\AWSSDK.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="AWSSDK.SQS" Version="3.3.100.34">
-      <HintPath>..\_build\lib\nuget\AWSSDK.SQS.3.3.100.34\lib\net45\AWSSDK.SQS.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\_build\lib\nuget\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac, Version=4.9.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da">
-      <HintPath>..\_build\lib\nuget\Autofac.4.9.2\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=10.0.27.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102">
+      <HintPath>..\_build\lib\nuget\NJsonSchema.10.0.27\lib\net45\NJsonSchema.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
@@ -179,6 +179,9 @@
       <Name>CKAN-core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\_build\lib\nuget\AWSSDK.SQS.3.3.102.31\analyzers\dotnet\cs\AWSSDK.SQS.CodeAnalysis.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="BeforeBuild">
     <Exec Command="powershell ../build.ps1 Generate-GlobalAssemblyVersionInfo" Condition="!Exists('../_build/meta/GlobalAssemblyVersionInfo.cs') And '$(OS)' == 'Windows_NT'" />

diff --git a/Netkan/Extensions/JObjectExtensions.cs b/Netkan/Extensions/JObjectExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using log4net;
+using log4net;
 using Newtonsoft.Json.Linq;
 
 namespace CKAN.NetKAN.Extensions

diff --git a/Netkan/Processors/Inflator.cs b/Netkan/Processors/Inflator.cs
@@ -1,14 +1,14 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Collections.Generic;
+using Autofac;
 using log4net;
+using CKAN.Configuration;
 using CKAN.NetKAN.Model;
 using CKAN.NetKAN.Services;
 using CKAN.NetKAN.Transformers;
 using CKAN.NetKAN.Validators;
-using CKAN.Configuration;
-using Autofac;
 
 namespace CKAN.NetKAN.Processors
 {
@@ -61,7 +61,7 @@ internal IEnumerable<Metadata> Inflate(string filename, Metadata netkan, int? re
                 throw;
             }
         }
-        
+
         internal void ValidateCkan(Metadata ckan)
         {
             netkanValidator.Validate(ckan);

diff --git a/Netkan/Processors/QueueHandler.cs b/Netkan/Processors/QueueHandler.cs
@@ -1,15 +1,14 @@
 using System;
-using System.IO;
-using System.Text;
-using System.Linq;
 using System.Collections.Generic;
 using System.Globalization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Amazon;
+using System.IO;
+using System.Linq;
+using System.Text;
 using Amazon.SQS;
 using Amazon.SQS.Model;
 using log4net;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using CKAN.NetKAN.Model;
 
 namespace CKAN.NetKAN.Processors
@@ -69,7 +68,7 @@ private void handleMessages(string url, int howMany, int timeoutMinutes)
                         {
                             QueueUrl = outputQueueURL,
                             Entries  = responses.GetRange(i, Math.Min(howMany, responses.Count - i)),
-                        });                    
+                        });
                     }
                 }
                 catch (Exception e)
@@ -91,7 +90,7 @@ private void handleMessages(string url, int howMany, int timeoutMinutes)
                 }
             }
         }
-        
+
         private IEnumerable<SendMessageBatchRequestEntry> Inflate(Message msg)
         {
             log.DebugFormat("Metadata returned: {0}", msg.Body);
@@ -235,7 +234,7 @@ internal static string serializeCkan(Metadata ckan)
             }
             return sw + Environment.NewLine;
         }
-        
+
         private DeleteMessageBatchRequestEntry Delete(Message msg)
         {
             return new DeleteMessageBatchRequestEntry()
@@ -250,7 +249,7 @@ private DeleteMessageBatchRequestEntry Delete(Message msg)
 
         private readonly string inputQueueURL;
         private readonly string outputQueueURL;
-        
+
         private int responseId = 0;
 
         private static readonly ILog log = LogManager.GetLogger(typeof(QueueHandler));

diff --git a/Netkan/Program.cs b/Netkan/Program.cs
@@ -1,17 +1,17 @@
 using System;
-using System.Net;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Text;
 using CommandLine;
 using log4net;
 using log4net.Core;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using CKAN.NetKAN.Model;
-using CKAN.NetKAN.Transformers;
 using CKAN.NetKAN.Processors;
+using CKAN.NetKAN.Transformers;
 
 namespace CKAN.NetKAN
 {

diff --git a/Netkan/Services/FileService.cs b/Netkan/Services/FileService.cs
@@ -1,6 +1,4 @@
-using System;
 using System.IO;
-using System.Security.Cryptography;
 
 namespace CKAN.NetKAN.Services
 {

diff --git a/Netkan/Services/IModuleService.cs b/Netkan/Services/IModuleService.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using CKAN.NetKAN.Sources.Avc;
 using ICSharpCode.SharpZipLib.Zip;
 using Newtonsoft.Json.Linq;
-using CKAN.NetKAN.Sources.Avc;
 
 namespace CKAN.NetKAN.Services
 {

diff --git a/Netkan/Services/ModuleService.cs b/Netkan/Services/ModuleService.cs
@@ -1,5 +1,5 @@
-using System.IO;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using CKAN.NetKAN.Sources.Avc;

diff --git a/Netkan/Sources/Github/GithubApi.cs b/Netkan/Sources/Github/GithubApi.cs
@@ -1,12 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Collections.Generic;
 using log4net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using CKAN.Versioning;
 using CKAN.NetKAN.Services;
+using CKAN.Versioning;
 
 // We could use OctoKit for this, but since we're only pinging the
 // release API, I'm happy enough without yet another dependency.

diff --git a/Netkan/Sources/Jenkins/JenkinsApi.cs b/Netkan/Sources/Jenkins/JenkinsApi.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Text.RegularExpressions;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using log4net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

diff --git a/Netkan/Sources/Jenkins/JenkinsOptions.cs b/Netkan/Sources/Jenkins/JenkinsOptions.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 

diff --git a/Netkan/Sources/Spacedock/SpacedockMod.cs b/Netkan/Sources/Spacedock/SpacedockMod.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
 
 namespace CKAN.NetKAN.Sources.Spacedock

diff --git a/Netkan/Transformers/AvcKrefTransformer.cs b/Netkan/Transformers/AvcKrefTransformer.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using CKAN.NetKAN.Extensions;
 using CKAN.NetKAN.Model;
-using CKAN.NetKAN.Sources.Avc;
 using CKAN.NetKAN.Services;
+using CKAN.NetKAN.Sources.Avc;
 using log4net;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

diff --git a/Netkan/Transformers/CurseTransformer.cs b/Netkan/Transformers/CurseTransformer.cs
@@ -4,10 +4,10 @@
 using System.Text.RegularExpressions;
 using log4net;
 using Newtonsoft.Json.Linq;
-using CKAN.Versioning;
 using CKAN.NetKAN.Extensions;
 using CKAN.NetKAN.Model;
 using CKAN.NetKAN.Sources.Curse;
+using CKAN.Versioning;
 
 namespace CKAN.NetKAN.Transformers
 {

diff --git a/Netkan/Transformers/DownloadAttributeTransformer.cs b/Netkan/Transformers/DownloadAttributeTransformer.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using log4net;
 using Newtonsoft.Json.Linq;
+using CKAN.NetKAN.Extensions;
 using CKAN.NetKAN.Model;
 using CKAN.NetKAN.Services;
-using CKAN.NetKAN.Extensions;
 
 namespace CKAN.NetKAN.Transformers
 {

diff --git a/Netkan/Transformers/GithubTransformer.cs b/Netkan/Transformers/GithubTransformer.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
 using log4net;
 using Newtonsoft.Json.Linq;
 using CKAN.NetKAN.Extensions;
@@ -105,7 +105,7 @@ private Metadata TransformOne(Metadata metadata, JObject json, GithubRef ghRef,
                 json.SafeAdd("version",  ghRelease.Version.ToString());
                 json.SafeAdd("author",   () => getAuthors(ghRepo, ghRelease));
                 json.SafeAdd("download", ghRelease.Download.ToString());
-                json.SafeAdd(Model.Metadata.UpdatedPropertyName, ghRelease.AssetUpdated);
+                json.SafeAdd(Metadata.UpdatedPropertyName, ghRelease.AssetUpdated);
 
                 if (ghRef.Project.Contains("_"))
                 {

diff --git a/Netkan/Transformers/ITransformer.cs b/Netkan/Transformers/ITransformer.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using CKAN.NetKAN.Model;
+using CKAN.NetKAN.Model;
 
 namespace CKAN.NetKAN.Transformers
 {

diff --git a/Netkan/Transformers/InternalCkanTransformer.cs b/Netkan/Transformers/InternalCkanTransformer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using log4net;
 using CKAN.Versioning;
@@ -48,7 +48,7 @@ public IEnumerable<Metadata> Transform(Metadata metadata, TransformOptions opts)
 
                     json["spec_version"] = ModuleVersion.Max(metadata.SpecVersion, new Metadata(internalJson).SpecVersion)
                         .ToSpecVersionJson();
-                        
+
                     json.SafeMerge("resources", internalJson["resources"]);
 
                     Log.DebugFormat("Transformed metadata:{0}{1}", Environment.NewLine, json);