From 963ddf47fb6ebcab52251f086320b3fff986b10b Mon Sep 17 00:00:00 2001 From: shgu Date: Fri, 17 Aug 2018 14:28:44 -0700 Subject: [PATCH] Added Newtonsoft.Json to exclusion list --- src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb | 3 ++- src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb index fd4d8dcbdc9..ed6e84e15ed 100644 --- a/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb +++ b/src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb @@ -296,7 +296,8 @@ Public Class BuildDevDivInsertionFiles packageName.StartsWith("Microsoft.Build") OrElse packageName = "Microsoft.Composition" OrElse packageName = "System.Net.Http" OrElse - packageName = "System.Diagnostics.DiagnosticSource" Then + packageName = "System.Diagnostics.DiagnosticSource" OrElse + packageName = "Newtonsoft.Json" Then Continue For End If diff --git a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs index 595296233fa..b2a4674e181 100644 --- a/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs +++ b/src/Tools/BuildBoss/CompilerNuGetCheckerUtil.cs @@ -171,7 +171,8 @@ IEnumerable removeItemsNotNeededToDelpoy(List relativeNames) PathComparer.Equals("EnvDTE.dll", item) || PathComparer.Equals("Microsoft.Composition", item) || PathComparer.Equals("System.Threading.Tasks.Dataflow.dll", item) || - PathComparer.Equals("System.Runtime.InteropServices.RuntimeInformation.dll", item)) + PathComparer.Equals("System.Runtime.InteropServices.RuntimeInformation.dll", item) || + PathComparer.Equals("Newtonsoft.Json", item)) { continue; } -- GitLab