From cd717918b5c4344972065fe91256b142b1f27491 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:32:17 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#14806)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22512.8 to 8.0.0-alpha.1.22519.7 (parent: Microsoft.NET.Sdk)
- runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter: from 1.0.0-alpha.1.22478.1 to 1.0.0-alpha.1.22517.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22512.8 to 8.0.0-alpha.1.22519.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.22512.8 to 8.0.0-alpha.1.22519.7 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22512.8 to 8.0.0-alpha.1.22519.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 8.0.0-alpha.1.22512.8 to 8.0.0-alpha.1.22519.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 8.0.0-alpha.1.22512.8 to 8.0.0-alpha.1.22519.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 8.0.0-alpha.1.22512.8 to 8.0.0-alpha.1.22519.7 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22519.5 to 8.0.0-alpha.1.22520.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22519.5 to 8.0.0-alpha.1.22520.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22519.5 to 8.0.0-alpha.1.22520.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22519.5 to 8.0.0-alpha.1.22520.1 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 8.0.0-alpha.1.22519.5 to 8.0.0-alpha.1.22520.1 (parent: Microsoft.NET.Sdk)
- dotnet-user-jwts: from 8.0.0-alpha.1.22519.5 to 8.0.0-alpha.1.22520.1 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 8.0.0-alpha.1.22519.5 to 8.0.0-alpha.1.22520.1 (parent: Microsoft.NET.Sdk)
- Microsoft.FSharp.Compiler: from 12.0.5-beta.22512.1 to 12.5.0-beta.22519.3 (parent: Microsoft.NET.Sdk)
- Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.0-beta.22512.1 to 7.0.1-beta.22519.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221018-02 to 17.5.0-preview-20221019-03 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22518.2 to 7.0.100-1.22520.1 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 4.5.0-1.22519.12 to 4.5.0-1.22520.13 (parent: Microsoft.NET.Sdk)
- Microsoft.Build: from 17.5.0-preview-22518-03 to 17.5.0-preview-22519-01 (parent: Microsoft.NET.Sdk)
- NuGet.Build.Tasks: from 6.5.0-preview.1.16 to 6.5.0-preview.1.23 (parent: Microsoft.NET.Sdk)
- Remove obsolete source-build nuget patch
---
NuGet.config | 2 +-
eng/Version.Details.xml | 102 +++++++++---------
eng/Versions.props | 34 +++---
.../nuget-client/0002-Add-CA2213-NoWarn.patch | 23 ----
4 files changed, 69 insertions(+), 92 deletions(-)
delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch
diff --git a/NuGet.config b/NuGet.config
index d9a54c09f..80dbfd9f4 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6ed39fc36..3d4442963 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,35 +17,35 @@
https://github.com/dotnet/windowsdesktop
c2f71d9552f8c1cf8e6693abb5b7bb2386edc766
-
+
https://github.com/dotnet/llvm-project
- 2e1187ef495010c65842a001f34c46006d5a01bc
+ 8922de40f27c445ffb5f65ff8ab6ced6648680ba
-
+
https://github.com/dotnet/runtime
- d337cba786fa105d1b97ebe5e2f7f89ff0361627
+ 6eb3ccb9507b74798c4bd3241587c4cf3b18866e
-
+
https://github.com/dotnet/runtime
- d337cba786fa105d1b97ebe5e2f7f89ff0361627
+ 6eb3ccb9507b74798c4bd3241587c4cf3b18866e
-
+
https://github.com/dotnet/runtime
- d337cba786fa105d1b97ebe5e2f7f89ff0361627
+ 6eb3ccb9507b74798c4bd3241587c4cf3b18866e
-
+
https://github.com/dotnet/runtime
- d337cba786fa105d1b97ebe5e2f7f89ff0361627
+ 6eb3ccb9507b74798c4bd3241587c4cf3b18866e
-
+
https://github.com/dotnet/runtime
- d337cba786fa105d1b97ebe5e2f7f89ff0361627
+ 6eb3ccb9507b74798c4bd3241587c4cf3b18866e
-
+
https://github.com/dotnet/runtime
- d337cba786fa105d1b97ebe5e2f7f89ff0361627
+ 6eb3ccb9507b74798c4bd3241587c4cf3b18866e
@@ -53,38 +53,38 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/runtime
- d337cba786fa105d1b97ebe5e2f7f89ff0361627
+ 6eb3ccb9507b74798c4bd3241587c4cf3b18866e
-
+
https://github.com/dotnet/aspnetcore
- afeab33afa4d81d3799dd665d6c1f47618815791
+ e855d8ac20a8a17724729ab36ef983ed4c20fab2
-
+
https://github.com/dotnet/aspnetcore
- afeab33afa4d81d3799dd665d6c1f47618815791
+ e855d8ac20a8a17724729ab36ef983ed4c20fab2
-
+
https://github.com/dotnet/aspnetcore
- afeab33afa4d81d3799dd665d6c1f47618815791
+ e855d8ac20a8a17724729ab36ef983ed4c20fab2
-
+
https://github.com/dotnet/aspnetcore
- afeab33afa4d81d3799dd665d6c1f47618815791
+ e855d8ac20a8a17724729ab36ef983ed4c20fab2
-
+
https://github.com/dotnet/aspnetcore
- afeab33afa4d81d3799dd665d6c1f47618815791
+ e855d8ac20a8a17724729ab36ef983ed4c20fab2
-
+
https://github.com/dotnet/aspnetcore
- afeab33afa4d81d3799dd665d6c1f47618815791
+ e855d8ac20a8a17724729ab36ef983ed4c20fab2
-
+
https://github.com/dotnet/aspnetcore
- afeab33afa4d81d3799dd665d6c1f47618815791
+ e855d8ac20a8a17724729ab36ef983ed4c20fab2
https://github.com/dotnet/test-templates
@@ -105,20 +105,20 @@
https://github.com/dotnet/sdk
- 3a31c6422910ff7c71df2f363183cb2a791ecc30
+ 4ac3f83d6f810e6d9e3a7cf605767da6cc8388dc
-
+
https://github.com/dotnet/sdk
- 3a31c6422910ff7c71df2f363183cb2a791ecc30
+ 4ac3f83d6f810e6d9e3a7cf605767da6cc8388dc
-
+
https://github.com/dotnet/sdk
- 3a31c6422910ff7c71df2f363183cb2a791ecc30
+ 4ac3f83d6f810e6d9e3a7cf605767da6cc8388dc
-
+
https://github.com/dotnet/sdk
- 3a31c6422910ff7c71df2f363183cb2a791ecc30
+ 4ac3f83d6f810e6d9e3a7cf605767da6cc8388dc
@@ -129,39 +129,39 @@
https://github.com/dotnet/wpf
dd467046db36ccb0a38989d58be8ff246e2b38d6
-
+
https://github.com/dotnet/fsharp
- 664588e64eff5db2a2fcb44b8dbddfb0ce4bbbf1
+ e707dc8b7a99f0f7c4dd0195709488464b557f77
-
+
https://github.com/dotnet/fsharp
- 664588e64eff5db2a2fcb44b8dbddfb0ce4bbbf1
+ e707dc8b7a99f0f7c4dd0195709488464b557f77
-
+
https://github.com/microsoft/vstest
- bda34b1793ef6ddcd186b7088a6413692efb215e
+ 9a5bb2faf130809253b28d7ad2d434d785901025
-
+
https://github.com/dotnet/linker
- 146197790e7f155beadaeab6b5cc0ac9e5108998
+ add4655706f2d15de40da6a97c9c22d74e34b0e2
linker
-
+
https://github.com/dotnet/roslyn
- 50b404de631906144f43261fa1abeae8f40b75ef
+ 9ec682f330b5a8779b4676a81f11718b5c8ef209
-
+
https://github.com/dotnet/msbuild
- 771017a92b290fb9ca127f7ae33a37d35a9db188
+ 82a30d30731031f57ad95519836abc2772ab472a
-
+
https://github.com/nuget/nuget.client
- fce0153005a97a83bb197eb82bae5cd210a88249
+ 10ce64e63bb15f5fed2f39aa129f70fb370d106a
diff --git a/eng/Versions.props b/eng/Versions.props
index 1ef2f5bf3..5f16bee85 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,13 +53,13 @@
- 8.0.0-alpha.1.22519.5
- 8.0.0-alpha.1.22519.5
- 8.0.0-alpha.1.22519.5
- 8.0.0-alpha.1.22519.5
- 8.0.0-alpha.1.22519.5
- 8.0.0-alpha.1.22519.5
- 8.0.0-alpha.1.22519.5
+ 8.0.0-alpha.1.22520.1
+ 8.0.0-alpha.1.22520.1
+ 8.0.0-alpha.1.22520.1
+ 8.0.0-alpha.1.22520.1
+ 8.0.0-alpha.1.22520.1
+ 8.0.0-alpha.1.22520.1
+ 8.0.0-alpha.1.22520.1
0.2.0
@@ -67,24 +67,24 @@
8.0.100
- 8.0.100-alpha.1.22520.1
- 8.0.100-alpha.1.22520.1
+ 8.0.100-alpha.1.22520.11
+ 8.0.100-alpha.1.22520.11
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 8.0.0-alpha.1.22512.8
+ 8.0.0-alpha.1.22519.7
- 8.0.0-alpha.1.22512.8
- 8.0.0-alpha.1.22512.8
- 8.0.0-alpha.1.22512.8
- 8.0.0-alpha.1.22512.8
- 8.0.0-alpha.1.22512.8
- 8.0.0-alpha.1.22512.8
+ 8.0.0-alpha.1.22519.7
+ 8.0.0-alpha.1.22519.7
+ 8.0.0-alpha.1.22519.7
+ 8.0.0-alpha.1.22519.7
+ 8.0.0-alpha.1.22519.7
+ 8.0.0-alpha.1.22519.7
2.1.0
@@ -185,7 +185,7 @@
2.2.0-beta.19072.10
2.0.0
- 17.5.0-preview-20221018-02
+ 17.5.0-preview-20221019-03
7.0.0-rc.1.22426.10
diff --git a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch
deleted file mode 100644
index 4625e0e9a..000000000
--- a/src/SourceBuild/tarball/patches/nuget-client/0002-Add-CA2213-NoWarn.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons
-Date: Mon, 25 Jul 2022 15:53:59 +0000
-Subject: [PATCH] Add CA2213 NoWarn
-
-Workaround until NuGet updates to build with latest .NET toolset.
----
- build/common.project.props | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/common.project.props b/build/common.project.props
-index 93287fdde..9d1fb3bce 100644
---- a/build/common.project.props
-+++ b/build/common.project.props
-@@ -52,7 +52,7 @@
- $(SolutionPackagesFolder)microsoft.dotnet.maestro.tasks\1.1.0-beta.21378.2\tools\netcoreapp3.1\Microsoft.DotNet.Maestro.Tasks.dll
- $(NoWarn);NU5105;MSB3277
-
-- $(NoWarn);CS1998;CA1416;CS0618;CS1574
-+ $(NoWarn);CS1998;CA1416;CS0618;CS1574;CA2213
-
-
-