From 9003cd429054f0cccd53643955a6c63023d184b7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:14:25 +0000 Subject: [PATCH 01/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 637dd025e..805cabdda 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64be1c99d..572de4dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 diff --git a/eng/Versions.props b/eng/Versions.props index 0173becfd..ad3fcc7dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23601.25 - 7.0.115-servicing.23601.25 + 7.0.115-servicing.23611.7 + 7.0.115-servicing.23611.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e33a1900c70c8cedf44a8b6dc2427d807307ccc1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:09 +0000 Subject: [PATCH 02/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.116 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 805cabdda..c540d5b6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -25,7 +22,7 @@ - + @@ -52,16 +49,13 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69806ea23..986a7a319 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 diff --git a/eng/Versions.props b/eng/Versions.props index aa6ecfe70..b065f63a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.115 - 7.0.115-servicing.23611.7 - 7.0.115-servicing.23611.7 + 7.0.116 + 7.0.116-servicing.24052.13 + 7.0.116-servicing.24052.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6b3619857a42c31572cec730efa103ddca4e406 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:26 +0000 Subject: [PATCH 03/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index c540d5b6a..76a1552bc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 986a7a319..252b3b23b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 diff --git a/eng/Versions.props b/eng/Versions.props index b065f63a8..163cdd2e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24052.13 - 7.0.116-servicing.24052.13 + 7.0.116-servicing.24059.23 + 7.0.116-servicing.24059.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 954efb0193d3502595a66a37b85ab4318f0fea70 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:43 +0000 Subject: [PATCH 04/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 76a1552bc..cddbc2bcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 252b3b23b..38e81f8dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c diff --git a/eng/Versions.props b/eng/Versions.props index 163cdd2e5..fdf41eb71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24059.23 - 7.0.116-servicing.24059.23 + 7.0.116-servicing.24060.20 + 7.0.116-servicing.24060.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 10b2130b4d30de802d3e117159130417f813ee23 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:16:26 +0000 Subject: [PATCH 05/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++------ eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index cddbc2bcf..e9a2fa634 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -22,12 +23,10 @@ - + - - - + @@ -49,18 +48,17 @@ + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa311536b..713af0f51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4bb45da0f..eab48d207 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,13 +56,13 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24060.20 - 7.0.116-servicing.24060.20 + 7.0.116-servicing.24061.12 + 7.0.116-servicing.24061.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From c99b7cbaecc983f7f32f52dd2f10441615e6f3e6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:16:53 +0000 Subject: [PATCH 06/12] Merged PR 36614: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20240117.58 - **Date Produced**: January 18, 2024 7:27:50 AM UTC - **Commit**: d833c87a5bda1313c0ab48d5c8dca96c675b9906 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][3] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC26033f320535f652724e744bd4758ca0bf0a6495&targetVersion=GCd833c87a5bda1313c0ab48d5c8dca96c675b9906&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) [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.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.14 (parent: Microsoft.NET.S... --- NuGet.config | 24 ++++------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 75 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9a2fa634..7f6b1aab0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,22 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 713af0f51..9eb2b1689 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -154,22 +154,22 @@ 6918b863aa37ad0699f98482fbab9f7a52e65a92 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 24f8150c97f9d26a7b5d77e983938e18d48e7d9f + 1653cf17925473602f5460c5e4682a0dab4c4d22 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index eab48d207..4c6e3217f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24061.12 - 7.0.116-servicing.24061.12 + 7.0.116-servicing.24067.58 + 7.0.116-servicing.24067.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,18 +82,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From bbc374d7eb4e40d296696d4e9bba4e4c8a90eaff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:42 +0000 Subject: [PATCH 07/12] Merged PR 36621: [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.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (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**: 20240118.19 - **Date Produced**: January 18, 2024 6:07:10 PM UTC - **Commit**: 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-dev-certs**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-user-jwts**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-user-secrets**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd833c87a5bda1313c0ab48d5c8dca96c675b9... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7f6b1aab0..8e9c45524 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9eb2b1689..0075e31bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca diff --git a/eng/Versions.props b/eng/Versions.props index 4c6e3217f..9a441a7db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24067.58 - 7.0.116-servicing.24067.58 + 7.0.116-servicing.24068.19 + 7.0.116-servicing.24068.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f43cfe985a1c2db5a5dfc14942d87f56db0e4ff4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:39:54 +0000 Subject: [PATCH 08/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e9c45524..392ad1905 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0075e31bd..fdc738d3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9a441a7db..4c53265d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.19 - 7.0.116-servicing.24068.19 + 7.0.116-servicing.24068.45 + 7.0.116-servicing.24068.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From 2afd97a62d728b2d2f5b3792e5dd6c87be983dc9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 00:52:52 +0000 Subject: [PATCH 09/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 392ad1905..a1d045602 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdc738d3d..fb2cc75ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 diff --git a/eng/Versions.props b/eng/Versions.props index 4c53265d4..cc58440f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.45 - 7.0.116-servicing.24068.45 + 7.0.116-servicing.24068.56 + 7.0.116-servicing.24068.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0afed19147be62d0b830b193142e2f6dc2a17e9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 17:43:53 +0000 Subject: [PATCH 10/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.16 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index a1d045602..99d9d34a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb2cc75ba..592f18792 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 diff --git a/eng/Versions.props b/eng/Versions.props index cc58440f1..94b2f770f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.56 - 7.0.116-servicing.24068.56 + 7.0.116-servicing.24069.8 + 7.0.116-servicing.24069.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e44eb502e47d80c8d90d8339b9f2c28546bf41a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:29:14 +0000 Subject: [PATCH 11/12] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24059.5 -> To Version 7.0.0-beta.24114.4 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99d9d34a8..3fddfa878 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 592f18792..351bf8ed3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 024ad8546..a1ed9ad1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24114.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080..81ea06151 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index fd9164f9a..5d42d1e74 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From 723427fa6b1d977a869523fca1f22fed23ade3c5 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Sat, 17 Feb 2024 08:10:10 -0600 Subject: [PATCH 12/12] Update SDK diff baseline (#18706) --- .../assets/baselines/MsftToSbSdk.diff | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 0f16c9546..4d662a3c3 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -25,9 +25,6 @@ index ------------ +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll @@ -48,10 +45,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/