Merge pull request #15018 from dotnet/darc-release/7.0.2xx-34910bad-72d1-4bc2-9dfa-7d9a8bb8bfd0

[release/7.0.2xx] Update dependencies from dotnet/sdk
2022-11-29 19:52:49 -08:00 · 2022-11-29 19:52:49 -08:00 · e821c9314e
commit e821c9314e
parent 96c153bfec cd889425aa
5 changed files with 74 additions and 27 deletions
--- a/NuGet.config
+++ b/NuGet.config
@ -13,7 +13,6 @@
    <!--  Begin: Package sources from dotnet-runtime -->
    <!--  End: Package sources from dotnet-runtime -->
    <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-pub-dotnet-sdk-6a23c1c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-6a23c1c8/nuget/v3/index.json" />
    <!--  End: Package sources from dotnet-sdk -->
    <!--  Begin: Package sources from dotnet-windowsdesktop -->
    <!--  End: Package sources from dotnet-windowsdesktop -->
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -98,22 +98,22 @@
      <Sha>bb3695688177f5f80eeb3c0498168612e31549d5</Sha>
      <SourceBuild RepoName="test-templates" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.200">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.200-preview.22579.38">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>6a23c1c889293dea64cfc2ac42e37b18222fff5d</Sha>
+      <Sha>09f538a82ca952920cb3a2a33e69d9f77b45c091</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.22567.37">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.22579.38">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>6a23c1c889293dea64cfc2ac42e37b18222fff5d</Sha>
+      <Sha>09f538a82ca952920cb3a2a33e69d9f77b45c091</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.22567.37">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.22579.38">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>6a23c1c889293dea64cfc2ac42e37b18222fff5d</Sha>
+      <Sha>09f538a82ca952920cb3a2a33e69d9f77b45c091</Sha>
      <SourceBuild RepoName="sdk" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.22567.37">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.22579.38">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>6a23c1c889293dea64cfc2ac42e37b18222fff5d</Sha>
+      <Sha>09f538a82ca952920cb3a2a33e69d9f77b45c091</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-rtm.22518.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -124,39 +124,39 @@
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
      <Sha>636e2b7a00a434a354a126f510a56e16ce3c6bbc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.22567.5" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.22578.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>1b8c83ca6fd6f09aa1e5b5cb2cd5bfa376a92818</Sha>
+      <Sha>5b3d9fd9e4fe1770fa44354f9391908d7288fc2a</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.22567.5" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.22578.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>1b8c83ca6fd6f09aa1e5b5cb2cd5bfa376a92818</Sha>
+      <Sha>5b3d9fd9e4fe1770fa44354f9391908d7288fc2a</Sha>
      <SourceBuild RepoName="fsharp" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221111-01" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221128-04" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>b61973970a544ea30d03ac35b6f5535adb64fd4c</Sha>
+      <Sha>a61ec9013bbadc3401a7ca3f17193d027b6ef4fe</Sha>
      <SourceBuild RepoName="vstest" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22558.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22579.2" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/linker</Uri>
-      <Sha>22376ee081ea791b4c8bfa82509f8e45af4bc629</Sha>
+      <Sha>8db10f44053ed4cb95a99676ac7b8ccae681b79d</Sha>
      <SourceBuild RepoName="linker" ManagedOnly="true" />
      <RepoName>linker</RepoName>
    </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-1.22564.5" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-1.22571.11" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>cc6062cd438899ac810b3766a05b8db636e70225</Sha>
+      <Sha>2e846c4211610644773577d2aec8c584ae9412ff</Sha>
      <SourceBuild RepoName="roslyn" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.5.0-preview-22567-05" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="17.5.0-preview-22578-03" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>7037436dc4d2038407c8592b9e256f0cf777f20c</Sha>
+      <Sha>a9df31a0a20c15e3930336dd053487665a0f5fb9</Sha>
      <SourceBuild RepoName="msbuild" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.4.0-rc.117" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.5.0-preview.2.104" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>125f673fd1cdb3cc012f62aa3ce764d2460b89eb</Sha>
+      <Sha>dfe13cc99d13de74f41e9cff35600a2c8958aac1</Sha>
      <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -63,9 +63,9 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.200-preview.22567.37</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.22567.37</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200-preview.22579.38</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.200-preview.22579.38</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.22579.38</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
    <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
    <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
    <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -171,7 +171,7 @@
  <PropertyGroup>
    <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
    <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
-    <MicrosoftNETTestSdkVersion>17.5.0-preview-20221111-01</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.5.0-preview-20221128-04</MicrosoftNETTestSdkVersion>
  </PropertyGroup>
  <!-- dependencies for source-build tarball -->
  <PropertyGroup>
--- a/src/SourceBuild/tarball/content/repos/nuget-client.proj
+++ b/src/SourceBuild/tarball/content/repos/nuget-client.proj
@ -6,6 +6,7 @@
    <RepoApiImplemented>false</RepoApiImplemented>
    <DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
    <DeterministicBuildOptOut>true</DeterministicBuildOptOut>
+    <RepoNoWarns>CS9057</RepoNoWarns>
  </PropertyGroup>

  <ItemGroup>
--- a/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch
+++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Add-package-version-properties-for-source-build.patch
@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Logan Bussell <loganbussell@microsoft.com>
+Date: Mon, 21 Nov 2022 22:32:04 +0000
+Subject: [PATCH] Add package version properties for source-build
+
+Backport: https://github.com/NuGet/Home/issues/12261
+---
+ Directory.Packages.props | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/Directory.Packages.props b/Directory.Packages.props
+index 8afa7dd31..0c4eaecf5 100644
+--- a/Directory.Packages.props
+++ b/Directory.Packages.props
+@@ -9,11 +9,13 @@
+     <VSFrameworkVersion>17.2.0-preview-2-32304-091</VSFrameworkVersion>
+     <VSServicesVersion>16.153.0</VSServicesVersion>
+     <!-- Default MSBuild version -->
+-    <MicrosoftBuildVersion>17.3.1</MicrosoftBuildVersion>
+    <MicrosoftBuildVersion Condition="'$(MicrosoftBuildVersion)' == ''">17.3.1</MicrosoftBuildVersion>
+     <!-- The last package version of MSBuild that works with netcoreapp3.1 or netstandard2.0 is 16.8.0.  Our assemblies are still compiled against MSBuild assembly version 15.1.0.0 which will work with all versions -->
+     <MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netstandard2.0'">16.8.0</MicrosoftBuildVersion>
+     <!-- The last package version of MSBuild that works with net5.0 is 16.11.0.  Our assemblies are still compiled against MSBuild assembly version 15.1.0.0 which will work with all versions -->
+     <MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp5.0'">16.11.0</MicrosoftBuildVersion>
+    <MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion>
+    <SystemComponentModelCompositionPackageVersion Condition="'$(SystemComponentModelCompositionPackageVersion)' == ''">4.5.0</SystemComponentModelCompositionPackageVersion>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+@@ -56,7 +58,7 @@
+     <PackageVersion Include="Microsoft.VisualStudio.VCProjectEngine" Version="$(VSFrameworkVersion)" />
+     <PackageVersion Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.0.7-preview-0001-g5492e466a9" />
+     <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.0.1600" />
+-    <PackageVersion Include="Microsoft.Web.Xdt" Version="3.0.0" />
+    <PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)"/>
+     <PackageVersion Include="Moq" Version="4.18.1" />
+     <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
+     <PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
+@@ -66,7 +68,7 @@
+     <PackageVersion Include="SharpZipLib" Version="1.3.3" />
+     <PackageVersion Include="System.Collections" Version="$(SystemPackagesVersion)" />
+     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+-    <PackageVersion Include="System.ComponentModel.Composition" Version="4.5.0" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionPackageVersion)" />
+     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
+     <PackageVersion Include="System.Diagnostics.Debug" Version="$(SystemPackagesVersion)" />
+     <PackageVersion Include="System.IO.FileSystem.Primitives" Version="$(SystemPackagesVersion)" />