Merge pull request #14017 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx

[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-07-07 14:09:43 -07:00 · 2022-07-07 14:09:43 -07:00 · 5892113c0e
commit 5892113c0e
parent edb84895fe af4b8739b3
7 changed files with 87 additions and 17 deletions
--- a/NuGet.config
+++ b/NuGet.config
@ -7,19 +7,16 @@
    <clear />
    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-68bb6fb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-68bb6fb0/nuget/v3/index.json" />
    <!--  End: Package sources from dotnet-aspnetcore -->
    <!--  Begin: Package sources from dotnet-emsdk -->
    <!--  End: Package sources from dotnet-emsdk -->
    <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
    <!--  End: Package sources from DotNet-msbuild-Trusted -->
    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-7cca709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d/nuget/v3/index.json" />
    <!--  End: Package sources from dotnet-runtime -->
    <!--  Begin: Package sources from dotnet-templating -->
    <!--  End: Package sources from dotnet-templating -->
    <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-7d10adc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-7d10adc3/nuget/v3/index.json" />
    <!--  End: Package sources from dotnet-windowsdesktop -->
    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@ -38,14 +35,11 @@
  <disabledPackageSources>
    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-68bb6fb" value="true" />
    <!--  End: Package sources from dotnet-aspnetcore -->
    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-7cca709" value="true" />
    <!--  Begin: Package sources from dotnet-templating -->
    <!--  End: Package sources from dotnet-templating -->
    <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-7d10adc" value="true" />
    <!--  End: Package sources from dotnet-windowsdesktop -->
    <!--  End: Package sources from dotnet-runtime -->
    <!--  Begin: Package sources from dotnet-windowsdesktop -->
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -103,14 +103,14 @@
      <Uri>https://github.com/dotnet/templating</Uri>
      <Sha>60a2f73de55434984bbe3d5ad9281b3863355b31</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.301-rtm.22274.11">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>8daa5f75dfc7592e30e28e71d448621d12442893</Sha>
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.302-servicing.22321.30">
+      <Uri>https://github.com/dotnet/sdk</Uri>
+      <Sha>3ff7c9567a7cbe3a489ef6a895d26c4114e76f1e</Sha>
      <SourceBuild RepoName="sdk" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.301-rtm.22274.11">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>8daa5f75dfc7592e30e28e71d448621d12442893</Sha>
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.302-servicing.22321.30">
+      <Uri>https://github.com/dotnet/sdk</Uri>
+      <Sha>3ff7c9567a7cbe3a489ef6a895d26c4114e76f1e</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="6.0.6-servicing.22267.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -151,9 +151,9 @@
      <Sha>41abc5629965e3f9e41f1e67fdf78345c0c5cc4b</Sha>
      <SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.2.1-rc.2" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
-      <Sha>a8942f45835ba527cedacc02f7a75468f7a7b4bd</Sha>
+    <Dependency Name="NuGet.Build.Tasks" Version="6.2.1-rc.7" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://github.com/nuget/nuget.client</Uri>
+      <Sha>4be14ee6b6587a02f05337505bd840fbcbe898f6</Sha>
      <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -56,8 +56,8 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.301-rtm.22274.11</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.301-rtm.22274.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.302-servicing.22321.30</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.302-servicing.22321.30</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
    <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
    <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
    <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
--- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
+++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
@ -176,6 +176,11 @@
      Command="git submodule update --init --recursive --depth 1"
      WorkingDirectory="$(TarballRepoSourceDir)" />

+    <Exec
+      Command="git submodule foreach 'rm -rf %24%28git rev-parse --git-dir%29/objects ||:'"
+      WorkingDirectory="$(TarballRepoSourceDir)"
+      Condition="$(PreserveTarballGitFolders) != 'true'" />
+
    <Exec
      Command="git config --file $(TarballRepoSourceDir)/.git/config --unset remote.origin.url"
      WorkingDirectory="$(RepoRoot)"/>
@ -329,6 +334,8 @@
      Overwrite="true" />

    <MakeDir Directories="$(TarballRootDir)packages/prebuilt" />
+    <!-- make sure this directory is persisted through source control, NuGet depends on it existing -->
+    <Exec Command="touch $(TarballRootDir)packages/prebuilt/_" />
  </Target>

  <!--
--- a/src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch
+++ b/src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch
@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chris Rummel <crummel@microsoft.com>
+Date: Wed, 22 Jun 2022 05:53:06 -0500
+Subject: [PATCH] Enable work-tree and unsafe-paths to be able to apply in the
+ checked-in tarball.
+
+---
+ eng/SourceBuild.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index 903ee00..4c85819 100644
+--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
+@@ -15,7 +15,7 @@
+     </ItemGroup>
+ 
+     <Exec
+-      Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+      Command="git --work-tree=$(RepoRoot) apply --ignore-whitespace --whitespace=nowarn --unsafe-paths &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+       WorkingDirectory="$(RepoRoot)"
+       Condition="'@(SourceBuildPatchFile)' != ''" />
+   </Target>
--- a/src/SourceBuild/tarball/patches/nuget-client/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch
+++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch
@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chris Rummel <crummel@microsoft.com>
+Date: Wed, 22 Jun 2022 05:55:51 -0500
+Subject: [PATCH] Enable work-tree and unsafe-paths to be able to apply in the
+ checked-in tarball.
+
+---
+ eng/source-build/source-build.proj | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eng/source-build/source-build.proj b/eng/source-build/source-build.proj
+index cbdd6d8..a3e3d63 100644
+--- a/eng/source-build/source-build.proj
+++ b/eng/source-build/source-build.proj
+@@ -57,7 +57,7 @@
+     </ItemGroup>
+ 
+     <Exec
+-      Command="git --work-tree=$(ProjectRoot) apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+      Command="git --work-tree=$(ProjectRoot) apply --ignore-whitespace --whitespace=nowarn --unsafe-paths &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+       WorkingDirectory="$(ProjectRoot)"
+       Condition="'@(SourceBuildPatchFile)' != ''" />
+   </Target>
--- a/src/SourceBuild/tarball/patches/xliff-tasks/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch
+++ b/src/SourceBuild/tarball/patches/xliff-tasks/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch
@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Chris Rummel <crummel@microsoft.com>
+Date: Wed, 22 Jun 2022 05:59:17 -0500
+Subject: [PATCH] Enable work-tree and unsafe-paths to be able to apply in the
+ checked-in tarball.
+
+---
+ eng/SourceBuild.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index 82243ab..147de20 100644
+--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
+@@ -15,7 +15,7 @@
+     </ItemGroup>
+ 
+     <Exec
+-      Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+      Command="git --work-tree=$(RepoRoot) apply --ignore-whitespace --whitespace=nowarn --unsafe-paths &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+       WorkingDirectory="$(RepoRoot)"
+       Condition="'@(SourceBuildPatchFile)' != ''" />
+   </Target>