Fix build

dotnet · Sep 10, 2020 · 7f7d7c3 · 7f7d7c3
1 parent 9f52aba
commit 7f7d7c3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config
@@ -54,7 +54,7 @@
 
         <dependentAssembly>
           <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-          <bindingRedirect oldVersion="12.0.0.0-12.0.0.0" newVersion="9.0.0.0" />
+          <bindingRedirect oldVersion="10.0.0.0-12.0.0.0" newVersion="9.0.0.0" />
         </dependentAssembly>
         <!-- Redirects for components dropped by Visual Studio -->
         <dependentAssembly>

diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config
@@ -43,7 +43,7 @@
 
         <dependentAssembly>
           <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-          <bindingRedirect oldVersion="12.0.0.0-12.0.0.0" newVersion="9.0.0.0" />
+          <bindingRedirect oldVersion="10.0.0.0-12.0.0.0" newVersion="9.0.0.0" />
         </dependentAssembly>
         <!-- Redirects for components dropped by Visual Studio -->
         <dependentAssembly>

diff --git a/src/Tasks/AssemblyDependency/ReferenceTable.cs b/src/Tasks/AssemblyDependency/ReferenceTable.cs
@@ -1309,7 +1309,7 @@ Reference reference
             // If a reference has the SDKName metadata on it then we will only search using a single resolver, that is the InstalledSDKResolver.
             if (reference.SDKName.Length > 0)
             {
-                jaggedResolvers.Add(new Resolver[] { new InstalledSDKResolver(_resolvedSDKReferences, "SDKResolver", _getAssemblyName, _fileExists, _getRuntimeVersion, _getRootedPath, _targetedRuntimeVersion) });
+                jaggedResolvers.Add(new Resolver[] { new InstalledSDKResolver(_resolvedSDKReferences, "SDKResolver", _getAssemblyName, _fileExists, _getRuntimeVersion, _targetedRuntimeVersion) });
             }
             else
             {

diff --git a/src/Tasks/InstalledSDKResolver.cs b/src/Tasks/InstalledSDKResolver.cs
@@ -22,8 +22,8 @@ internal class InstalledSDKResolver : Resolver
         /// <summary>
         /// Construct.
         /// </summary>
-        public InstalledSDKResolver(Dictionary<string, ITaskItem> resolvedSDKs, string searchPathElement, GetAssemblyName getAssemblyName, FileExists fileExists, GetAssemblyRuntimeVersion getRuntimeVersion, GetRootedPath getRootedPath, Version targetedRuntimeVesion)
-            : base(searchPathElement, getAssemblyName, fileExists, getRuntimeVersion, getRootedPath, targetedRuntimeVesion, System.Reflection.ProcessorArchitecture.None, false)
+        public InstalledSDKResolver(Dictionary<string, ITaskItem> resolvedSDKs, string searchPathElement, GetAssemblyName getAssemblyName, FileExists fileExists, GetAssemblyRuntimeVersion getRuntimeVersion, Version targetedRuntimeVesion)
+            : base(searchPathElement, getAssemblyName, fileExists, getRuntimeVersion, targetedRuntimeVesion, System.Reflection.ProcessorArchitecture.None, false)
         {
             _resolvedSDKs = resolvedSDKs;
         }