From 4946228186ef5cdcdd58cb5ecd5c168f6ede0bd4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 20:55:43 +0000 Subject: [PATCH] Merged PR 29723: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.3-servicing.23073.3 to 7.0.4-servicing.23118.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.3-servicing.23069.10 to 7.0.4-servicing.23115.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 7.0.0 to 7.0.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.3-servicing.23080.9 to 7.0.4-servicing.23119.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.3-servicing.23072.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.3-servicing.23073.1 to 7.0.4-servicing.23117.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.Net.Compilers.Toolset**: from 4.5.0-3.23070.7 to 4.5.0-6.23109.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0-preview-23061-01 to 17.5.0 (par... --- NuGet.config | 38 ++---- eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 50 ++++---- ...-Exclude-Analyzers-from-source-build.patch | 23 ---- 4 files changed, 97 insertions(+), 130 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch diff --git a/NuGet.config b/NuGet.config index daf27e784..19bd67321 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,22 @@ - - - + + + + + - - + - - - + - - - - - + @@ -49,24 +44,15 @@ - - - + - - + - - - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6711e9149..2adc73944 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0e6192540357f08063fb1127f1a791fb6a3e194c + 27813f8dc98831931e881b37d1847be3300e76fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a2bda10e81d901396c3cff95533529e3a93ad47 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - febee99db845fd8766a13bdb391a07c3ee90b4ba + e56abc45c4f8adc518abfc11a59849d616431e2c https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc6a47e3e33b91bd2690161465db7a6c4149d480 + 1ce1f1ed71df8601a096b8a856840d22fb318bc7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - cce692f665cbefe335ed33369897cea328d5fbcf + 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0a09c7d17212981cb4fd5907fa6a6214966a366d + 0315841ebb89a21c717002224ad9d39f3c21320a https://github.com/dotnet/fsharp @@ -144,14 +144,18 @@ linker - + https://github.com/dotnet/roslyn - 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4 + 6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3 - + https://github.com/dotnet/msbuild - 040e2a90ee794997fc9716487280a54b0ad8fe2a + 81ac93548ee1044f03d0ac363712bb778920ef8c + + + https://github.com/dotnet/msbuild + 81ac93548ee1044f03d0ac363712bb778920ef8c @@ -163,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b - + https://github.com/dotnet/emsdk - 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb + ba16583f6b055e5a0623d817a48f1f2f15629e6b https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 5ecffc42b..106a8ef85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.3-servicing.23072.1 + 7.0.4-servicing.23117.7 - 7.0.3-servicing.23073.1 + 7.0.4-servicing.23117.7 @@ -50,46 +50,46 @@ - 7.0.3 - 7.0.3 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 - 7.0.3-servicing.23080.9 + 7.0.4 + 7.0.4 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 + 7.0.4-servicing.23119.3 0.2.0 - 7.0.200 - 7.0.200-rtm.23080.7 - 7.0.200-rtm.23080.7 + 7.0.201 + 7.0.201-rtm.23120.7 + 7.0.201-rtm.23120.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0 + 7.0.1 - 7.0.3-servicing.23069.10 - 7.0.3-servicing.23069.10 - 7.0.3 - 7.0.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23115.8 + 7.0.4-servicing.23115.8 + 7.0.4 + 7.0.4 + 7.0.4 + 7.0.4 2.1.0 - 7.0.3-servicing.23073.3 - 7.0.3-servicing.23073.3 - 7.0.3 - 7.0.3 + 7.0.4-servicing.23118.3 + 7.0.4-servicing.23118.3 + 7.0.4 + 7.0.4 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.3 - 7.0.3 + 7.0.4 + 7.0.4 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git 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 deleted file mode 100644 index 071ca05da..000000000 --- a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -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);xUnit1004 - - -- -+ - - -