From 3a599e14538159c5783599782bdd580d297188cc Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Tue, 8 Mar 2022 03:01:20 +0000
Subject: [PATCH] Resolve source-build nuget.client patch conflicts

---
 ...1-Remove-uneeded-source-build-patches-and-re-patch.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch
index 34d37ba0b..b8c668ab7 100644
--- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch
+++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch
@@ -33,7 +33,7 @@ index 79a935391..65e482b83 100644
      <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
      <NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
      <NETFXTargetFramework>net472</NETFXTargetFramework>
--    <NETCoreTargetFramework>netcoreapp2.1</NETCoreTargetFramework>
+-    <NETCoreTargetFramework>netcoreapp3.1</NETCoreTargetFramework>
 -    <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</NETCoreTargetFramework>
 +    <NETCoreTargetFramework>net6.0</NETCoreTargetFramework>
      <NETCoreTestTargetFramework>netcoreapp5.0</NETCoreTestTargetFramework>
@@ -69,7 +69,7 @@ index c11557248..0e7dd7861 100644
  
      <!-- Test and package versions -->
 @@ -33,7 +34,7 @@
-         <PackageReference Update="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildPackageVersion)" />
+         <PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" />
          <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" />
          <PackageReference Update="Microsoft.DataAI.NuGetRecommender.Contracts" Version="2.1.0" />
 -        <PackageReference Update="Microsoft.Extensions.CommandLineUtils" Version="1.0.1" />
@@ -94,7 +94,7 @@ index c94acffd8..f4d083e52 100644
        <TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet*.dll" Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">
          <PackagePath>$(PackagePathDir)</PackagePath>
        </TfmSpecificPackageFile>
--    </ItemGroup>    
+-    </ItemGroup>
 +    </ItemGroup>
    </Target>