Merge pull request #13473 from dotnet/darc-main-f7696490-138e-4123-aaa4-a1273a9e8fb5

[main] Update dependencies from dotnet/sdk
2022-03-28 11:21:35 -07:00 · 2022-03-28 11:21:35 -07:00 · 5a16cd63d9
commit 5a16cd63d9
parent a2a2f48f83 091f8bc4e9
5 changed files with 72 additions and 439 deletions
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
  <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-preview.4.22173.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-preview.4.22174.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>34ce693fe39218ad556f9fe29f20c657eb389790</Sha>
+      <Sha>b3640a7d5c6d7119beabaf684e1be34be8abf4e1</Sha>
    </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-preview.4.22173.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-preview.4.22174.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>34ce693fe39218ad556f9fe29f20c657eb389790</Sha>
+      <Sha>b3640a7d5c6d7119beabaf684e1be34be8abf4e1</Sha>
    </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-preview.4.22173.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-preview.4.22174.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>34ce693fe39218ad556f9fe29f20c657eb389790</Sha>
+      <Sha>b3640a7d5c6d7119beabaf684e1be34be8abf4e1</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-preview.4.22173.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-preview.4.22174.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>34ce693fe39218ad556f9fe29f20c657eb389790</Sha>
+      <Sha>b3640a7d5c6d7119beabaf684e1be34be8abf4e1</Sha>
    </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.4.22178.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
+      <Sha>bd43f55230d533af326e727366f61cfd3ed0e050</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.4.22178.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
+      <Sha>bd43f55230d533af326e727366f61cfd3ed0e050</Sha>
    </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.4.22178.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
+      <Sha>bd43f55230d533af326e727366f61cfd3ed0e050</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.4.22178.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
+      <Sha>bd43f55230d533af326e727366f61cfd3ed0e050</Sha>
      <SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.4.22178.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
+      <Sha>bd43f55230d533af326e727366f61cfd3ed0e050</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.4.22178.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
+      <Sha>bd43f55230d533af326e727366f61cfd3ed0e050</Sha>
    </Dependency>
    <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
    <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -48,34 +48,34 @@
      <Uri>https://github.com/dotnet/core-setup</Uri>
      <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.4.22178.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
+      <Sha>bd43f55230d533af326e727366f61cfd3ed0e050</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.4.22175.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ad8f58cdf93dd43210abd1317930185a3ee88bca</Sha>
+      <Sha>a5683c8fc2f8d96021aac956f36e73644cff11c4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-preview.4.22175.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ad8f58cdf93dd43210abd1317930185a3ee88bca</Sha>
+      <Sha>a5683c8fc2f8d96021aac956f36e73644cff11c4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-preview.4.22175.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ad8f58cdf93dd43210abd1317930185a3ee88bca</Sha>
+      <Sha>a5683c8fc2f8d96021aac956f36e73644cff11c4</Sha>
      <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.4.22175.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ad8f58cdf93dd43210abd1317930185a3ee88bca</Sha>
+      <Sha>a5683c8fc2f8d96021aac956f36e73644cff11c4</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="7.0.0-preview.4.22175.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ad8f58cdf93dd43210abd1317930185a3ee88bca</Sha>
+      <Sha>a5683c8fc2f8d96021aac956f36e73644cff11c4</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="7.0.0-preview.4.22175.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ad8f58cdf93dd43210abd1317930185a3ee88bca</Sha>
+      <Sha>a5683c8fc2f8d96021aac956f36e73644cff11c4</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22157.1">
      <Uri>https://github.com/dotnet/test-templates</Uri>
@ -94,32 +94,32 @@
      <Sha>9c17a4a6ee6327c95faa6ce5dba391e0dd91cacd</Sha>
      <SourceBuild RepoName="test-templates" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-preview.4.22174.10" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-preview.4.22175.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>afbebf33947f8d8afa5b76bd2d85099673c2c8c1</Sha>
+      <Sha>370053f349f14610970fdba01561cfb7316892ee</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-preview.4.22174.10" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-preview.4.22175.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>afbebf33947f8d8afa5b76bd2d85099673c2c8c1</Sha>
+      <Sha>370053f349f14610970fdba01561cfb7316892ee</Sha>
      <SourceBuild RepoName="templating" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.4.22175.5">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.4.22178.5">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>67304f2a2a66e3974d7f2d47134905cfa6e095ae</Sha>
+      <Sha>c4d2bb72945b9474e4b591916b59f7f8a601be0b</Sha>
      <SourceBuild RepoName="sdk" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.4.22175.5">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.4.22178.5">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>67304f2a2a66e3974d7f2d47134905cfa6e095ae</Sha>
+      <Sha>c4d2bb72945b9474e4b591916b59f7f8a601be0b</Sha>
    </Dependency>
    <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-preview.3.22166.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-preview.4.22174.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
      <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>f2eb3f7f3cb5b024a560a0f8b51ed0f36d274d2d</Sha>
+      <Sha>625efe296fc7f840b27c62c5937893e8968fea74</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-preview.4.22173.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-preview.4.22174.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
      <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>4992164d8fc5a8b0c05ec1e2d3d462ee93d8a723</Sha>
+      <Sha>c06e274c0b7b5a211c58a650b12325b82de22885</Sha>
    </Dependency>
    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/fsharp</Uri>
@ -146,14 +146,14 @@
      <Sha>f81a859bb414665faafaf9f48b15d76c30df06a0</Sha>
      <SourceBuild RepoName="roslyn" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.2.0-preview-22172-04" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="17.2.0-preview-22175-02" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>b88097615cc49fa050465aff72fd38ca2644117a</Sha>
+      <Sha>058a0262c6b37fba7bb55ec03315232d5d83be6e</Sha>
      <SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.2.0-preview.2.109" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.2.0-preview.2.123" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>919c7e10ebdcc43235c36cf0b72c389d741835a8</Sha>
+      <Sha>8bda466765accefccf516850745ad30dceeab381</Sha>
      <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -30,15 +30,15 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-preview.3.22166.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-preview.4.22174.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-preview.4.22173.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-preview.4.22174.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/templating -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-preview.4.22174.10</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-preview.4.22175.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/test-templates -->
@ -52,44 +52,44 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-preview.4.22174.7</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.4.22174.7</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.4.22174.7</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.4.22174.7</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
-    <dotnetdevcertsPackageVersion>7.0.0-preview.4.22174.7</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>7.0.0-preview.4.22174.7</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-preview.4.22175.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-preview.4.22175.1</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-preview.4.22175.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.4.22175.1</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
+    <dotnetdevcertsPackageVersion>7.0.0-preview.4.22175.1</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>7.0.0-preview.4.22175.1</dotnetusersecretsPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>7.0.100-preview.4.22175.5</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.4.22175.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.100-preview.4.22178.5</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.4.22178.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
    <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
    <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
    <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/corefx -->
-    <MicrosoftNETCorePlatformsPackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>7.0.0-preview.4.22178.1</MicrosoftNETCorePlatformsPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.4.22174.7</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
-    <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-preview.4.22174.7</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.4.22178.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
+    <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-preview.4.22178.1</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.4.22178.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-preview.4.22178.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.4.22178.1</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.4.22178.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
    <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
-    <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-preview.4.22173.1</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
-    <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-preview.4.22173.1</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-preview.4.22173.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
-    <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-preview.4.22173.1</MicrosoftWindowsDesktopAppRefPackageVersion>
+    <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-preview.4.22174.2</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
+    <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-preview.4.22174.2</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-preview.4.22174.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-preview.4.22174.2</MicrosoftWindowsDesktopAppRefPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64    -->
--- 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
@ -1,296 +0,0 @@
-From 157de59d479f2ed179b9b777eaf2b769871e3bf6 Mon Sep 17 00:00:00 2001
-From: Matt Mitchell <mmitche@microsoft.com>
-Date: Sat, 23 Oct 2021 16:41:24 -0700
-Subject: [PATCH] Remove uneeded source build patches and re-patch
-
---
- build/common.project.props                       | 16 ++++++----------
- build/packages.targets                           |  3 ++-
- .../NuGet.Build.Tasks.Pack.csproj                |  4 ++--
- .../NuGet.CommandLine.XPlat.csproj               |  2 +-
- .../SignCommand/CertificateProvider.cs           |  4 ++--
- src/NuGet.Core/NuGet.Common/NuGet.Common.csproj  |  1 -
- .../NuGet.Configuration.csproj                   |  3 +--
- .../NuGet.Frameworks/NuGet.Frameworks.csproj     |  3 +--
- .../NuGet.PackageManagement.csproj               |  2 +-
- .../Signing/Authoring/SignPackageRequest.cs      |  2 ++
- .../NuGet.Packaging/Signing/Cms/NativeUtility.cs |  2 ++
- .../HttpSource/HttpRequestMessageExtensions.cs   |  6 +++---
- .../HttpSource/HttpRetryHandler.cs               |  2 +-
- .../HttpSourceAuthenticationHandler.cs           |  2 +-
- .../NuGet.Versioning/NuGet.Versioning.csproj     |  1 -
- 15 files changed, 25 insertions(+), 28 deletions(-)
-
-diff --git a/build/common.project.props b/build/common.project.props
-index 79a935391..65e482b83 100644
--- a/build/common.project.props
-+++ b/build/common.project.props
-@@ -10,24 +10,20 @@
- 
-   <!-- Common -->
-   <PropertyGroup>
-    <IsBuildOnlyXPLATProjects>$(DotNetBuildFromSource)</IsBuildOnlyXPLATProjects>
-     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-     <NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
-     <NETFXTargetFramework>net472</NETFXTargetFramework>
-    <NETCoreTargetFramework>netcoreapp3.1</NETCoreTargetFramework>
-    <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</NETCoreTargetFramework>
-+    <NETCoreTargetFramework>net6.0</NETCoreTargetFramework>
-     <NETCoreTestTargetFramework>netcoreapp5.0</NETCoreTestTargetFramework>
-    <NetStandardVersion>netstandard2.0</NetStandardVersion>
-    <NetStandardVersion Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</NetStandardVersion>
-+    <IsBuildOnlyXPLATProjects>$(DotNetBuildFromSource)</IsBuildOnlyXPLATProjects>
-+    <NetStandardVersion>netstandard2.0;net6.0</NetStandardVersion>
-     <TargetFrameworksExe>$(NETFXTargetFramework);$(NETCoreTargetFramework)</TargetFrameworksExe>
-     <TargetFrameworksExe Condition="'$(IsBuildOnlyXPLATProjects)' == 'true' OR '$(IsXPlat)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
-    <TargetFrameworksExeForSigning>$(TargetFrameworksExe);netcoreapp5.0</TargetFrameworksExeForSigning>
-    <TargetFrameworksExeForSigning Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework);netcoreapp5.0</TargetFrameworksExeForSigning>
-    <TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe);net6.0</TargetFrameworksExeForSigning>
-+    <TargetFrameworksExeForSigning>$(TargetFrameworksExe);net6.0</TargetFrameworksExeForSigning>
-+    <TargetFrameworksExeForSigning Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework);net6.0</TargetFrameworksExeForSigning>
-     <TargetFrameworksLibrary>$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
-     <TargetFrameworksLibrary Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">$(NetStandardVersion)</TargetFrameworksLibrary>
-    <TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);netcoreapp5.0</TargetFrameworksLibraryForSigning>
-    <TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary);net6.0</TargetFrameworksLibraryForSigning>
-+    <TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);net6.0</TargetFrameworksLibraryForSigning>
-     <TargetFrameworksLibraryForCrossVerificationTests>$(NETFXTargetFramework);netcoreapp5.0</TargetFrameworksLibraryForCrossVerificationTests>
-     <RepositoryRootDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\</RepositoryRootDirectory>
-     <BuildCommonDirectory>$(RepositoryRootDirectory)build\</BuildCommonDirectory>
-diff --git a/build/packages.targets b/build/packages.targets
-index c11557248..0e7dd7861 100644
--- a/build/packages.targets
-+++ b/build/packages.targets
-@@ -10,6 +10,7 @@
-         <CryptographyPackagesVersion>5.0.0</CryptographyPackagesVersion>
-         <NuGetCoreV2Version>2.14.0-rtm-832</NuGetCoreV2Version>
-         <ProjectSystemManagedVersion>17.0.0-beta1-10402-05</ProjectSystemManagedVersion>
-+        <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion Condition="'$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)' == ''">5.0.1-rtm.21063.7</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-     </PropertyGroup>
- 
-     <!-- Test and package versions -->
-@@ -33,7 +34,7 @@
-         <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" />
-+        <PackageReference Update="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
-         <PackageReference Update="Microsoft.Internal.VisualStudio.Shell.Framework" Version="$(VSFrameworkVersion)" />
-         <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-         <PackageReference Update="Microsoft.TeamFoundationServer.ExtendedClient" Version="$(VSServicesVersion)" />
-diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
-index c94acffd8..f4d083e52 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
-+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
-@@ -177,7 +177,7 @@
-       <!-- Build from source can't use ILMerge. -->
-       <ILMergeSubpath Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">ilmerge\</ILMergeSubpath>
-       <PackagePathDir Condition="'$(TargetFramework)' == '$(NETFXTargetFramework)' AND '$(IsBuildOnlyXPLATProjects)' != 'true'">Desktop/</PackagePathDir>
-      <PackagePathDir Condition="'$(TargetFramework)' == '$(NetStandardVersion)'">CoreCLR/</PackagePathDir>
-+      <PackagePathDir Condition="'$(TargetFramework)' == 'netstandard2.0'">CoreCLR/</PackagePathDir>
-     </PropertyGroup>
-     <ItemGroup>
-       <TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet.Build.Tasks.Pack.dll" Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">
-@@ -189,7 +189,7 @@
-       <TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet*.dll" Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">
-         <PackagePath>$(PackagePathDir)</PackagePath>
-       </TfmSpecificPackageFile>
-    </ItemGroup>
-+    </ItemGroup>
-   </Target>
- 
-   <Import Project="$(BuildCommonDirectory)common.targets"/>
-diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
-index 21015c00a..e306cdee4 100644
--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
-+++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
-@@ -18,7 +18,7 @@
-   </ItemGroup>
- 
-   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils" />
-+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
-     <PackageReference Include="System.Diagnostics.Debug" />
-   </ItemGroup>
- 
-diff --git a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs
-index c6ea71243..beac41889 100644
--- a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs
-+++ b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs
-@@ -115,7 +115,7 @@ public static async Task<X509Certificate2Collection> GetCertificatesAsync(Certif
- 
-             return resultCollection;
-         }
-
-+#pragma warning disable CS1998
-         private static async Task<X509Certificate2> LoadCertificateFromFileAsync(CertificateSourceOptions options)
-         {
-             X509Certificate2 cert;
-@@ -154,7 +154,7 @@ private static async Task<X509Certificate2> LoadCertificateFromFileAsync(Certifi
- 
-             return cert;
-         }
-
-+#pragma warning restore CS1998
-         private static X509Certificate2Collection LoadCertificateFromStore(CertificateSourceOptions options)
-         {
-             X509Certificate2Collection resultCollection = null;
-diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
-index e30a079eb..c2b8fe241 100644
--- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
-+++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
-@@ -5,7 +5,6 @@
-   <PropertyGroup>
-     <Description>Common utilities and interfaces for all NuGet libraries.</Description>
-     <TargetFrameworks>$(TargetFrameworksLibrary)</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">$(TargetFrameworks);net45</TargetFrameworks>
-     <TargetFramework />
-     <NoWarn>$(NoWarn);CS1591;CS1574</NoWarn>
-     <PackProject>true</PackProject>
-diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
-index bbc5ba480..18b597c74 100644
--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
-+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
-@@ -6,7 +6,6 @@
-     <Description>NuGet's configuration settings implementation.</Description>
-     <NoWarn>$(NoWarn);CS1591</NoWarn>
-     <TargetFrameworks>$(TargetFrameworksLibrary)</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">$(TargetFrameworks);net45</TargetFrameworks>
-     <TargetFramework />
-     <PackProject>true</PackProject>
-     <Shipping>true</Shipping>
-@@ -29,7 +28,7 @@
-     <Reference Include="System.Xml.Linq" />
-   </ItemGroup>
- 
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' ">
-+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net6.0' ">
-     <PackageReference Include="System.Security.Cryptography.ProtectedData" />
-   </ItemGroup>
- 
-diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
-index b78b1f2ea..a89b516c6 100644
--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
-+++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
-@@ -4,8 +4,7 @@
- 
-   <PropertyGroup>
-     <Description>NuGet's understanding of target frameworks.</Description>
-    <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">$(TargetFrameworksLibrary);netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">$(TargetFrameworksLibrary);net40</TargetFrameworks>
-+    <TargetFrameworks>$(TargetFrameworksLibrary);netstandard2.0</TargetFrameworks>
-     <TargetFramework />
-     <NoWarn>$(NoWarn);CS1591;CS1574;CS1573</NoWarn>
-     <PackProject>true</PackProject>
-diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
-index dfbfcaa8d..a6bb51d6b 100644
--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
-+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
-@@ -35,7 +35,7 @@
-     <Reference Include="System.Net.Http" />
-   </ItemGroup>
- 
-  <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' ">
-+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net6.0' ">
-     <PackageReference Include="System.ComponentModel.Composition" />
-   </ItemGroup>
- 
-diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs
-index e0cfae99f..ce19f2d6e 100644
--- a/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs
-+++ b/src/NuGet.Core/NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs
-@@ -98,7 +98,9 @@ protected virtual void Dispose(bool disposing)
-                 Chain?.Dispose();
- 
- #if IS_SIGNING_SUPPORTED
-+#pragma warning disable CA1416
-                 PrivateKey?.Dispose();
-+#pragma warning restore CA1416
- #endif
-             }
- 
-diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs
-index 565ac60b7..d57e38a65 100644
--- a/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs
-+++ b/src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs
-@@ -120,7 +120,9 @@ internal static SignedCms NativeSign(CmsSigner cmsSigner, byte[] data, CngKey pr
- 
-             signerInfo.cbSize = (uint)Marshal.SizeOf(signerInfo);
-             signerInfo.pCertInfo = MarshalUtility.PtrToStructure<CERT_CONTEXT>(cmsSigner.Certificate.Handle).pCertInfo;
-+#pragma warning disable CA1416
-             signerInfo.hCryptProvOrhNCryptKey = privateKey.Handle.DangerousGetHandle();
-+#pragma warning restore CA1416
-             signerInfo.HashAlgorithm.pszObjId = cmsSigner.DigestAlgorithm.Value;
- 
-             if (cmsSigner.SignerIdentifierType == SubjectIdentifierType.SubjectKeyIdentifier)
-diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs
-index 7c9595268..1ca751850 100644
--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs
-+++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs
-@@ -34,7 +34,7 @@ internal static HttpRequestMessage Clone(this HttpRequestMessage request)
-                 clone.Headers.TryAddWithoutValidation(header.Key, header.Value);
-             }
- 
-#if NET5_0
-+#if NET5_0 || NET6_0
-             var clonedOptions = (IDictionary<string, object>)clone.Options;
-             foreach (var option in request.Options)
-             {
-@@ -118,7 +118,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest
-                 throw new ArgumentNullException(nameof(configuration));
-             }
- 
-#if NET5_0
-+#if NET5_0 || NET6_0
-             request.Options.Set(new HttpRequestOptionsKey<HttpRequestMessageConfiguration>(NuGetConfigurationKey), configuration);
- #else
-             request.Properties[NuGetConfigurationKey] = configuration;
-@@ -128,7 +128,7 @@ public static void SetConfiguration(this HttpRequestMessage request, HttpRequest
-         private static T GetProperty<T>(this HttpRequestMessage request, string key)
-         {
- 
-#if NET5_0
-+#if NET5_0 || NET6_0
-             if (request.Options.TryGetValue<T>(new HttpRequestOptionsKey<T>(key), out T result))
- #else
-             object result;
-diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs
-index c7bcb54bb..30d86fcc9 100644
--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs
-+++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRetryHandler.cs
-@@ -113,7 +113,7 @@ internal HttpRetryHandler(IEnvironmentVariableReader environmentVariableReader)
-                         headerStopwatch = new Stopwatch();
-                         stopwatches.Add(headerStopwatch);
-                     }
-#if NET5_0
-+#if NET5_0 || NET6_0
-                     requestMessage.Options.Set(new HttpRequestOptionsKey<List<Stopwatch>>(StopwatchPropertyName), stopwatches);
- #else
-                     requestMessage.Properties[StopwatchPropertyName] = stopwatches;
-diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs
-index b9ab58ce7..ebf738e52 100644
--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs
-+++ b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs
-@@ -98,7 +98,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
-                 {
-                     List<Stopwatch> stopwatches = null;
- 
-#if NET5_0
-+#if NET5_0 || NET6_0
-                     if (request.Options.TryGetValue(
-                         new HttpRequestOptionsKey<List<Stopwatch>>(HttpRetryHandler.StopwatchPropertyName),
-                         out stopwatches))
-diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj
-index 180293944..8498664b9 100644
--- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj
-+++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj
-@@ -4,7 +4,6 @@
- 
-   <PropertyGroup>
-     <TargetFrameworks>$(TargetFrameworksLibrary)</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">$(TargetFrameworks);net45</TargetFrameworks>
-     <TargetFramework />
-     <Description>NuGet's implementation of Semantic Versioning.</Description>
-     <PackageTags>semver;semantic versioning</PackageTags>
-- 
-2.31.1
-
--- a/src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch
+++ b/src/SourceBuild/tarball/patches/nuget-client/0010-Re-enable-fullfx-TFM-in-NuGet.patch
@ -1,43 +0,0 @@
-From 7f35d623761748721496abcbae2d6f11d4cf1ca8 Mon Sep 17 00:00:00 2001
-From: Chris Rummel <crummel@microsoft.com>
-Date: Fri, 22 Oct 2021 21:12:51 -0500
-Subject: [PATCH] Re-enable fullfx TFM in NuGet.
-
---
- build/common.project.props                                     | 3 +--
- .../NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj       | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/build/common.project.props b/build/common.project.props
-index 000702f58..b29968eaf 100644
--- a/build/common.project.props
-+++ b/build/common.project.props
-@@ -18,11 +18,10 @@
-     <IsBuildOnlyXPLATProjects>$(DotNetBuildFromSource)</IsBuildOnlyXPLATProjects>
-     <NetStandardVersion>netstandard2.0;net6.0</NetStandardVersion>
-     <TargetFrameworksExe>$(NETFXTargetFramework);$(NETCoreTargetFramework)</TargetFrameworksExe>
-    <TargetFrameworksExe Condition="'$(IsBuildOnlyXPLATProjects)' == 'true' OR '$(IsXPlat)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
-+    <TargetFrameworksExe Condition="'$(IsXPlat)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
-     <TargetFrameworksExeForSigning>$(TargetFrameworksExe);net6.0</TargetFrameworksExeForSigning>
-     <TargetFrameworksExeForSigning Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework);net6.0</TargetFrameworksExeForSigning>
-     <TargetFrameworksLibrary>$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
-    <TargetFrameworksLibrary Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">$(NetStandardVersion)</TargetFrameworksLibrary>
-     <TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);net6.0</TargetFrameworksLibraryForSigning>
-     <TargetFrameworksLibraryForCrossVerificationTests>$(NETFXTargetFramework);netcoreapp5.0</TargetFrameworksLibraryForCrossVerificationTests>
-     <RepositoryRootDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\</RepositoryRootDirectory>
-diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
-index f4d083e52..c4eb79b4c 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
-+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
-@@ -176,7 +176,7 @@
-     <PropertyGroup>
-       <!-- Build from source can't use ILMerge. -->
-       <ILMergeSubpath Condition="'$(IsBuildOnlyXPLATProjects)' != 'true'">ilmerge\</ILMergeSubpath>
-      <PackagePathDir Condition="'$(TargetFramework)' == '$(NETFXTargetFramework)' AND '$(IsBuildOnlyXPLATProjects)' != 'true'">Desktop/</PackagePathDir>
-+      <PackagePathDir Condition="'$(TargetFramework)' == '$(NETFXTargetFramework)'">Desktop/</PackagePathDir>
-       <PackagePathDir Condition="'$(TargetFramework)' == 'netstandard2.0'">CoreCLR/</PackagePathDir>
-     </PropertyGroup>
-     <ItemGroup>
-- 
-2.31.1
-
--- a/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch
+++ b/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch
@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons <msimons@microsoft.com>
-Date: Tue, 23 Nov 2021 16:13:36 +0000
-Subject: [PATCH] Update System.Threading.Tasks.DataFlow version
-
-Addresses:
-NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version.  [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
-NuGet.Build.Tasks.csproj : error NU1605:  NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0)  [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
-NuGet.Build.Tasks.csproj : error NU1605:  NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
-
-Backport issue: https://github.com/dotnet/source-build/issues/2311
---
- build/packages.targets | 2 +-
- 1 file changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/build/packages.targets b/build/packages.targets
-index a0aa4cc..ef5a1cc 100644
--- a/build/packages.targets
-+++ b/build/packages.targets
-@@ -58,7 +59,7 @@
-         <PackageReference Update="System.Security.Cryptography.Cng" Version="$(CryptographyPackagesVersion)" />
-         <PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(CryptographyPackagesVersion)" />
-         <PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
-        <PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
-+        <PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
-         <PackageReference Update="VSSDK.TemplateWizardInterface" Version="12.0.4" />
-         <PackageReference Update="VsWebSite.Interop" Version="$(VSFrameworkVersion)" />
-         <PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.9.0" />