[release/7.0.2xx] Update dependencies from dotnet/sdk (#15122)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-12-16 08:49:43 -06:00 · 2022-12-16 08:49:43 -06:00 · eed7e45af2
commit eed7e45af2
parent 5bb11fee92
7 changed files with 49 additions and 59 deletions
--- 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-preview.22612.1">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.200-preview.22616.1">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>f1de6ee836ad96b92317646815bcb66793b98a7b</Sha>
+      <Sha>bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.22612.1">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.22616.1">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>f1de6ee836ad96b92317646815bcb66793b98a7b</Sha>
+      <Sha>bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.22612.1">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.22616.1">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>f1de6ee836ad96b92317646815bcb66793b98a7b</Sha>
+      <Sha>bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84</Sha>
      <SourceBuild RepoName="sdk" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.22612.1">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.22616.1">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>f1de6ee836ad96b92317646815bcb66793b98a7b</Sha>
+      <Sha>bf20e1dc7aba0b8960f80ab9f25eb274c76a0b84</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,18 +124,18 @@
      <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.22608.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.22615.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>ae1718567f2aab20df7ca07368b9f51d1c376a10</Sha>
+      <Sha>f25ff0cfeaf09cc429a5594032d478443c2dba5d</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.22608.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.22615.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>ae1718567f2aab20df7ca07368b9f51d1c376a10</Sha>
+      <Sha>f25ff0cfeaf09cc429a5594032d478443c2dba5d</Sha>
      <SourceBuild RepoName="fsharp" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221209-03" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221214-01" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>bedc83105652ba5638dfc1ec629f3402af65acd0</Sha>
+      <Sha>d7b66728d22dd5cdee5fb1e2bc385f9f2cd03171</Sha>
      <SourceBuild RepoName="vstest" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22579.2" CoherentParentDependency="Microsoft.NET.Sdk">
@ -144,19 +144,19 @@
      <SourceBuild RepoName="linker" ManagedOnly="true" />
      <RepoName>linker</RepoName>
    </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.22608.26" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.22613.14" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>716366a3830293571eaaad9b1b2b3929b5216f42</Sha>
+      <Sha>c80d6495d55ebbd64372755d236d0e5971b2dfc7</Sha>
      <SourceBuild RepoName="roslyn" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.5.0-preview-22612-01" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="17.5.0-preview-22615-01" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>9c3057b5af56ef92ffde7d1b37dea8ddee74d8b1</Sha>
+      <Sha>eb5ebc23a99af31731a6b6c403ceda0b44aa9966</Sha>
      <SourceBuild RepoName="msbuild" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.5.0-preview.3.126" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.5.0-preview.3.130" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>31f2a1cb6fe3dababe67cdb84e9d6ddb9e3ace04</Sha>
+      <Sha>0e7accb78d0df80cda1bffbcf1d522945e8a1112</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-preview.22612.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.200-preview.22612.1</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.22612.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200-preview.22616.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.200-preview.22616.1</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.22616.1</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-20221209-03</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.5.0-preview-20221214-01</MicrosoftNETTestSdkVersion>
  </PropertyGroup>
  <!-- dependencies for source-build tarball -->
  <PropertyGroup>
--- a/src/SourceBuild/tarball/content/repos/known-good.proj
+++ b/src/SourceBuild/tarball/content/repos/known-good.proj
@ -34,7 +34,7 @@
        <!-- Tier 1 -->
        <RepositoryReference Include="command-line-api" />
        <RepositoryReference Include="diagnostics" />
-        <RepositoryReference Include="razor-compiler" />
+        <RepositoryReference Include="razor" />
        <RepositoryReference Include="xliff-tasks" />
        <RepositoryReference Include="roslyn" />
        <RepositoryReference Include="source-build-externals" />
--- a/src/SourceBuild/tarball/content/repos/razor-compiler.proj
+++ b/src/SourceBuild/tarball/content/repos/razor-compiler.proj
--- a/src/SourceBuild/tarball/content/repos/sdk.proj
+++ b/src/SourceBuild/tarball/content/repos/sdk.proj
@ -39,7 +39,7 @@
    <RepositoryReference Include="fsharp" />
    <RepositoryReference Include="format" />
    <RepositoryReference Include="deployment-tools" />
-    <RepositoryReference Include="razor-compiler" />
+    <RepositoryReference Include="razor" />
  </ItemGroup>

  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
--- a/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch
+++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Define-PackageVersion-props-to-address-prebuilts.patch
@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons <msimons@microsoft.com>
-Date: Mon, 12 Dec 2022 19:30:59 +0000
-Subject: [PATCH] Define PackageVersion props to address prebuilts
-
---
- Directory.Packages.props | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Directory.Packages.props b/Directory.Packages.props
-index e4b41a45f..245ffcc99 100644
--- a/Directory.Packages.props
-+++ b/Directory.Packages.props
-@@ -16,6 +16,8 @@
-     <MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp5.0'">16.11.0</MicrosoftBuildVersion>
-     
-     <!-- Overridden by source build to ensure the same version is used across products, do not remove these properties -->
-+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion Condition="'$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)' == ''">6.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion Condition="'$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)' == ''">6.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-     <MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion>
-     <SystemComponentModelCompositionPackageVersion Condition="'$(SystemComponentModelCompositionPackageVersion)' == ''">4.5.0</SystemComponentModelCompositionPackageVersion>
-   </PropertyGroup>
-@@ -38,8 +40,8 @@
-     <PackageVersion Include="Microsoft.CSharp" Version="$(SystemPackagesVersion)" />
-     <PackageVersion Include="Microsoft.DataAI.NuGetRecommender.Contracts" Version="2.1.0" />
-     <PackageVersion Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview6.19253.5" />
-    <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0" />
-+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
-+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
-     <PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="$(VSFrameworkVersion)" />
-     <PackageVersion Include="Microsoft.Net.Compilers.netcore" Version="3.0.0-dev-61717-03" />
-     <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="3.9.0" />
--- a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch
+++ b/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch
@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+Date: Fri, 16 Dec 2022 03:31:02 +0000
+Subject: [PATCH] Exclude Analyzers from source-build
+
+Backport: https://github.com/dotnet/razor/issues/8035
+---
+ src/Compiler/Directory.Build.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Compiler/Directory.Build.props b/src/Compiler/Directory.Build.props
+index e69a99bf3..f70902a08 100644
+--- a/src/Compiler/Directory.Build.props
+++ b/src/Compiler/Directory.Build.props
+@@ -37,7 +37,7 @@
+     <WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
+   </PropertyGroup>
+ 
+-  <ItemGroup>
+  <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
+     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" NoWarn="NU1608" PrivateAssets="All" />
+     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" NoWarn="NU1608" PrivateAssets="All" />
+     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" PrivateAssets="All" />