From e54f57cd94036aa5cbd6272c330e9789b87c3d6a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 22 Nov 2022 18:17:08 +0000 Subject: [PATCH] Merged PR 27754: [internal/release/7.0.1xx] 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.FSharp.Compiler**: from 12.4.0-beta.22563.2 to 12.4.0-beta.22567.3 (parent: Microsoft.NET.Sdk) - **Microsoft.SourceBuild.Intermediate.fsharp**: from 7.0.0-beta.22563.2 to 7.0.0-beta.22567.3 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20221122.10 - **Date Produced**: November 22, 2022 5:42:46 PM UTC - **Commit**: 6ad1faf5090d47eb553c878be3a25610c26d8230 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.101 to 7.0.101][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.101-servicing.22569.6 to 7.0.101-servicing.22572.10][1] - **Microsoft.NET.Sdk**: [from 7.0.101-servicing.22569.6 to 7.0.101-servicing.22572.10][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.101-servicing.22569.6 to 7.0.101-servicing.22572.10][1] - **Microsoft.FSharp.Compiler**: [from 12.4.0-beta.22563.2 to 12.4.0-beta.22567.3][2] - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 7.0.0-beta.22563.2 to 7.0.0-beta.22567.3][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf6ee887&targetVersion=GC6ad1faf&_a=files [2]: https://github.com/dotnet/fsharp/compare/51b8769...3ff020f [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 05aa023ff..a74e15b56 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37fc4c693..0088671fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6ee887211e0b6f83505a3dcb25c4925dbb8b696 + 6ad1faf5090d47eb553c878be3a25610c26d8230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6ee887211e0b6f83505a3dcb25c4925dbb8b696 + 6ad1faf5090d47eb553c878be3a25610c26d8230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6ee887211e0b6f83505a3dcb25c4925dbb8b696 + 6ad1faf5090d47eb553c878be3a25610c26d8230 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6ee887211e0b6f83505a3dcb25c4925dbb8b696 + 6ad1faf5090d47eb553c878be3a25610c26d8230 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 51b87692496d1571d2aa56d4b5c836bfe06e60a1 + 3ff020ff25bac58a33ff65bd42d57ae2542fecd4 - + https://github.com/dotnet/fsharp - 51b87692496d1571d2aa56d4b5c836bfe06e60a1 + 3ff020ff25bac58a33ff65bd42d57ae2542fecd4 diff --git a/eng/Versions.props b/eng/Versions.props index e975fd38e..64a4c4c01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,8 +64,8 @@ 7.0.101 - 7.0.101-servicing.22569.6 - 7.0.101-servicing.22569.6 + 7.0.101-servicing.22572.10 + 7.0.101-servicing.22572.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)