mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[release/7.0.3xx] Update dependencies from dotnet/sdk (#15402)

Browse source 
[release/7.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230201-01 to 17.6.0-preview-20230202-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.6.0-1.23081.20 to 4.6.0-1.23101.17 (parent: Microsoft.NET.Sdk)

 - Remove backported source-build razor patch
This commit is contained in:
dotnet-maestro[bot] 2023-02-03 20:52:48 +00:00 committed by GitHub
parent 276c394610
commit 6390db54bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
eng/Version.Details.xml
View file

@ -98,22 +98,22 @@
<Sha>bb3695688177f5f80eeb3c0498168612e31549d5</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.300-preview.23101.17">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.300-preview.23103.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e8d113abe7e4553e3960c3727d80b1df80225374</Sha>
<Sha>6af89373709c6763fed1870546876cbedecaaf6f</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-preview.23101.17">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-preview.23103.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e8d113abe7e4553e3960c3727d80b1df80225374</Sha>
<Sha>6af89373709c6763fed1870546876cbedecaaf6f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-preview.23101.17">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-preview.23103.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e8d113abe7e4553e3960c3727d80b1df80225374</Sha>
<Sha>6af89373709c6763fed1870546876cbedecaaf6f</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-preview.23101.17">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-preview.23103.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e8d113abe7e4553e3960c3727d80b1df80225374</Sha>
<Sha>6af89373709c6763fed1870546876cbedecaaf6f</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">
@ -133,9 +133,9 @@
<Sha>b4317096ea3aacdb48505744c9e371d5310464c2</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.6.0-preview-20230201-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.6.0-preview-20230202-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>d978833419256dccf0167561dabf2fca4e837c16</Sha>
<Sha>7bfe4aaae404d53868bb2bdba1082b8a683aba01</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23068.1" CoherentParentDependency="Microsoft.NET.Sdk">
@ -144,9 +144,9 @@
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-1.23081.20" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-1.23101.17" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f5987d2c4a3cc6d524e63fc851641545ad05af37</Sha>
<Sha>8da03f9cd0471db81cea9a5d7f7f92d3a746c6de</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.6.0-preview-23101-01" CoherentParentDependency="Microsoft.NET.Sdk">

8
eng/Versions.props
View file

@ -63,9 +63,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.300-preview.23101.17</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.300-preview.23101.17</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-preview.23101.17</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.300-preview.23103.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.300-preview.23103.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-preview.23103.3</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.6.0-preview-20230201-01</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.6.0-preview-20230202-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- dependencies for source-build tarball -->
<PropertyGroup>

23
src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch
View file

@ -1,23 +0,0 @@
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" />