From 8a516d2a80c9505e758c77481b83f8ca29e09717 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 22:25:05 +0000 Subject: [PATCH] Merged PR 29817: [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.Net.Compilers.Toolset**: from 4.5.0-6.23109.5 to 4.5.0-6.23123.11 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91 - **Build**: 20230227.10 - **Date Produced**: February 27, 2023 7:35:58 PM UTC - **Commit**: 19d897be95902ca23a704f58d2fa7adf5b13106c - **Branch**: refs/heads/internal/release/7.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.201 to 7.0.202][3] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3] - **Microsoft.NET.Sdk**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3] - **Microsoft.TemplateEngine.Cli**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3] - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23109.5 to 4.5.0-6.23123.11][4] - **Microsoft.Build**: [from 17.5.0 to 17.5.0][5] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1ce1f1e&targetVersion=GC19d897b&_a=files [4]: https://github.com/dotnet/roslyn/compare/6a5a63b...271ccd7 [5]: https://github.com/dotnet/msbuild/compare/81ac935...8ce3029 [DependencyUpdate]: <> (End) [marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91) --- NuGet.config | 11 ++++++++--- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 6 +++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19bd67321..e1a92ae53 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,24 @@ + + - + - + + @@ -44,14 +47,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2adc73944..9f53963bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1ce1f1ed71df8601a096b8a856840d22fb318bc7 + 19d897be95902ca23a704f58d2fa7adf5b13106c @@ -144,14 +144,14 @@ linker - + https://github.com/dotnet/roslyn - 6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3 + 271ccd71554f7d28d2f90551aafd0bdeb5d327aa https://github.com/dotnet/msbuild - 81ac93548ee1044f03d0ac363712bb778920ef8c + 8ce3029f48a4169237024a8f0bb4b07727a151a7 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 975e77088..cce7a122a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.201 - 7.0.201-rtm.23120.7 - 7.0.201-rtm.23120.7 + 7.0.202 + 7.0.202-servicing.23127.10 + 7.0.202-servicing.23127.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)