From fc219bcc8f778c242cc7bf08346c0369cc142467 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:06:37 +0000 Subject: [PATCH 01/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.34 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.34 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 23 ++------------------ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++-------- 3 files changed, 35 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index a5401b038..2802cd154 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,17 @@ - - - - - - + - - - - - - @@ -49,22 +38,14 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5581ce16f..c9b3a6fd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + ca0ebf8e674f65d640b1c52c3199c81d562f31db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + ca0ebf8e674f65d640b1c52c3199c81d562f31db @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 60d640a5c1025d1e9e89188cabe41e692d0f5468 + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 3535ea913..a4cf0a1c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.121-servicing.23367.13 - 6.0.121-servicing.23367.13 + 6.0.123-servicing.23477.34 + 6.0.123-servicing.23477.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.21 + 6.0.22 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 230219d45946a0ab2e8038801bc3299968d1bd0a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 01:37:12 +0000 Subject: [PATCH 02/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.40 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2802cd154..cb4afa3ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,7 @@ + @@ -44,6 +45,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9b3a6fd2..899fdace3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca0ebf8e674f65d640b1c52c3199c81d562f31db + d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca0ebf8e674f65d640b1c52c3199c81d562f31db + d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 diff --git a/eng/Versions.props b/eng/Versions.props index a4cf0a1c1..f53dfa3b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.121 + 6.0.123 @@ -56,8 +56,8 @@ - 6.0.123-servicing.23477.34 - 6.0.123-servicing.23477.34 + 6.0.123-servicing.23477.40 + 6.0.123-servicing.23477.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.121 + 6.0.123 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From ea2c912efe125c9e0f090f9121f50793e6faa2b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 03:08:14 +0000 Subject: [PATCH 03/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.51 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.51 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index cb4afa3ff..6cb6d58e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,6 +19,7 @@ + @@ -48,6 +49,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 899fdace3..cb689fa1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 + faa436e9bd02d1c505ce20017847d73cee1932c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 + faa436e9bd02d1c505ce20017847d73cee1932c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f53dfa3b1..252ee35c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 @@ -56,8 +56,8 @@ - 6.0.123-servicing.23477.40 - 6.0.123-servicing.23477.40 + 6.0.123-servicing.23477.51 + 6.0.123-servicing.23477.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 From d1482ceb6b1a72fd3fd1f86e1ae0e117b977d786 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 06:03:21 +0000 Subject: [PATCH 04/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.58 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.58 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cb6d58e1..119de589a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -40,6 +41,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb689fa1b..1cab14032 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - faa436e9bd02d1c505ce20017847d73cee1932c1 + 8beae7e451ad480a56dbe5058ef9d0374f3c8033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - faa436e9bd02d1c505ce20017847d73cee1932c1 + 8beae7e451ad480a56dbe5058ef9d0374f3c8033 diff --git a/eng/Versions.props b/eng/Versions.props index 252ee35c5..4f5253f90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.19 0.2.0 - 6.0.123-servicing.23477.51 - 6.0.123-servicing.23477.51 + 6.0.123-servicing.23477.58 + 6.0.123-servicing.23477.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f817683aea089c4f30bc317435e8f2e9ee699655 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 14:45:51 +0000 Subject: [PATCH 05/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23478.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 119de589a..b4009a88d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cab14032..6c544b0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8beae7e451ad480a56dbe5058ef9d0374f3c8033 + 09662876479587805f5892daaa54569e6323deb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8beae7e451ad480a56dbe5058ef9d0374f3c8033 + 09662876479587805f5892daaa54569e6323deb3 diff --git a/eng/Versions.props b/eng/Versions.props index 4f5253f90..0249e1e83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.19 - 6.0.23-servicing.23477.19 - 6.0.23-servicing.23477.19 - 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 - 6.0.123-servicing.23477.58 - 6.0.123-servicing.23477.58 + 6.0.123-servicing.23478.12 + 6.0.123-servicing.23478.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fdd48b76205bfc945d802ba28375b9a17aa83414 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 28 Sep 2023 23:44:07 +0000 Subject: [PATCH 06/16] Merged PR 34026: Update SB SDK and XML diff baselines --- .../assets/baselines/MissingXmlDoc.txt | 1 - .../assets/baselines/MsftToSbSdk.diff | 22 +++---------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml 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 4e98d267b..71ae3f0b9 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 @@ -14,20 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./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.NETCore.App.Host.portable-rid/ @@ -42,10 +29,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/ @@ -348,13 +331,13 @@ index ------------ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/ ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll +./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll @@ -431,9 +414,10 @@ index ------------ +./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll -./sdk/x.y.z/System.Drawing.Common.dll ++./sdk/x.y.z/System.Formats.Asn1.dll ./sdk/x.y.z/System.Resources.Extensions.dll --./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll ./sdk/x.y.z/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/System.Security.Cryptography.Xml.dll -./sdk/x.y.z/System.Security.Permissions.dll From 99b0a4d95f9bb80a0c3f540f35c8df4814e97660 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 01:55:02 +0000 Subject: [PATCH 07/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23478.12 -> To Version 6.0.123-servicing.23479.29 Dependency coherency updates VS.Redist.Common.NetCore.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.23-servicing.23475.15 -> To Version 6.0.23-servicing.23479.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b4009a88d..84e9b6596 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,25 @@ + + - + + + + + @@ -41,16 +47,22 @@ + + - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c544b0bd..932a156bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,7 +17,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ac9d0f6242b48fca7e36d519cde33210a798adec - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09662876479587805f5892daaa54569e6323deb3 + 81bd2a95ea21deb9f26a689b6ee58156283b868d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09662876479587805f5892daaa54569e6323deb3 + 81bd2a95ea21deb9f26a689b6ee58156283b868d diff --git a/eng/Versions.props b/eng/Versions.props index 0249e1e83..179012d2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23478.12 - 6.0.123-servicing.23478.12 + 6.0.123-servicing.23479.29 + 6.0.123-servicing.23479.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 From 9415960d4eded05d2f69e0cb9e4c5fc8d3613c1d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:01 +0000 Subject: [PATCH 08/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.29 -> To Version 6.0.123-servicing.23479.39 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 932a156bf..65e097e19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81bd2a95ea21deb9f26a689b6ee58156283b868d + 3fbbefae235360eb12638f0993ab7f7956d87735 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81bd2a95ea21deb9f26a689b6ee58156283b868d + 3fbbefae235360eb12638f0993ab7f7956d87735 diff --git a/eng/Versions.props b/eng/Versions.props index 179012d2c..5c5e6319d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.29 - 6.0.123-servicing.23479.29 + 6.0.123-servicing.23479.39 + 6.0.123-servicing.23479.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8ba6e005be7e3493b89a58f48b8f6046920a79b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:09 +0000 Subject: [PATCH 09/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.39 -> To Version 6.0.123-servicing.23479.48 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65e097e19..b925ef454 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fbbefae235360eb12638f0993ab7f7956d87735 + ae62158db346bbafa5af2f49828120f5fe0abe84 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fbbefae235360eb12638f0993ab7f7956d87735 + ae62158db346bbafa5af2f49828120f5fe0abe84 diff --git a/eng/Versions.props b/eng/Versions.props index 5c5e6319d..70dbaf233 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.39 - 6.0.123-servicing.23479.39 + 6.0.123-servicing.23479.48 + 6.0.123-servicing.23479.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0b05af8774825a123a4e563127e0565afddd1869 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:18 +0000 Subject: [PATCH 10/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.57 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.48 -> To Version 6.0.123-servicing.23479.57 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b925ef454..e29d794dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62158db346bbafa5af2f49828120f5fe0abe84 + e67ea07bc961d270c84659d31bca260e49171eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62158db346bbafa5af2f49828120f5fe0abe84 + e67ea07bc961d270c84659d31bca260e49171eec diff --git a/eng/Versions.props b/eng/Versions.props index 70dbaf233..8450188f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.48 - 6.0.123-servicing.23479.48 + 6.0.123-servicing.23479.57 + 6.0.123-servicing.23479.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 855b6b5d0910fd8330f2667f3970cbb538edaecc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:25 +0000 Subject: [PATCH 11/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.71 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.57 -> To Version 6.0.123-servicing.23479.71 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e29d794dd..ceb77a7a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e67ea07bc961d270c84659d31bca260e49171eec + 082ef34b8850ad9efedd43955188bec151c3ff79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e67ea07bc961d270c84659d31bca260e49171eec + 082ef34b8850ad9efedd43955188bec151c3ff79 diff --git a/eng/Versions.props b/eng/Versions.props index 8450188f6..0343bc766 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.57 - 6.0.123-servicing.23479.57 + 6.0.123-servicing.23479.71 + 6.0.123-servicing.23479.71 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3a33e75529cd5abaf13d579c64c68aa6dcb4ac31 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:34 +0000 Subject: [PATCH 12/16] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++++--------------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 38 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84e9b6596..e4ad17f61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -19,14 +17,10 @@ - - - + - - - + @@ -47,23 +41,17 @@ - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ceb77a7a4..8fe2fb57d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://github.com/dotnet/runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bff71fd17286a916e2b3c416e5d91717ff906b25 + 819017e168bbcb9650a9504406f0d65b483b424c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bff71fd17286a916e2b3c416e5d91717ff906b25 + 819017e168bbcb9650a9504406f0d65b483b424c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bff71fd17286a916e2b3c416e5d91717ff906b25 + 819017e168bbcb9650a9504406f0d65b483b424c https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 082ef34b8850ad9efedd43955188bec151c3ff79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0343bc766..a00c3d73e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,10 +46,10 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From 24086fb71dd39bd42ddee1f3c05499774999398e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 17:56:48 +0000 Subject: [PATCH 13/16] Merged PR 34148: [internal/release/frameshift/6.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.WindowsDesktop.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.123 to 6.0.123 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.123-servicing.23479.10 to 6.0.123-servicing.23480.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.123 to 6.0.123 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) ... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index e4ad17f61..49478e17d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,17 +41,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fe2fb57d..06ce9eb12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 819017e168bbcb9650a9504406f0d65b483b424c + d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 819017e168bbcb9650a9504406f0d65b483b424c + d0deccaa5039ef510feef0dbb63a63dcc88112f5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 819017e168bbcb9650a9504406f0d65b483b424c + d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 082ef34b8850ad9efedd43955188bec151c3ff79 + 1194051db6856c16088cb986345a62dcfa7d89fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 082ef34b8850ad9efedd43955188bec151c3ff79 + 1194051db6856c16088cb986345a62dcfa7d89fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a00c3d73e..24277c346 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.123-servicing.23479.71 - 6.0.123-servicing.23479.71 + 6.0.123-servicing.23480.27 + 6.0.123-servicing.23480.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From a33389fcc17c512c4ce21b1cf88863aa55e7307a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:47 +0000 Subject: [PATCH 14/16] Merged PR 34161: [internal/release/frameshift/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:c1ce247f-982c-4c66-45be-08dbbf92e44a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: c1ce247f-982c-4c66-45be-08dbbf92e44a - **Build**: 20230930.40 - **Date Produced**: October 1, 2023 1:52:22 AM UTC - **Commit**: 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 - **Branch**: refs/heads/internal/release/frameshift/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.123-servicing.23480.27 to 6.0.123-servicing.23480.40][1] - **Microsoft.NET.Sdk**: [from 6.0.123-servicing.23480.27 to 6.0.123-servicing.23480.40][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1194051db6&targetVersion=GC6fe8d6cc28&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:c1ce247f-982c-4c66-45be-08dbbf92e44a) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06ce9eb12..b04700e60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1194051db6856c16088cb986345a62dcfa7d89fc + 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1194051db6856c16088cb986345a62dcfa7d89fc + 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 diff --git a/eng/Versions.props b/eng/Versions.props index 24277c346..2eb7a5b93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23480.27 - 6.0.123-servicing.23480.27 + 6.0.123-servicing.23480.40 + 6.0.123-servicing.23480.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8db2da707c21f242d1a6c5a2bcc331f152828c9d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:35 -0700 Subject: [PATCH 15/16] Update branding to 6.0.124 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d3d273fe2..476cea82c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 23 + 24 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 0099fd01897eee2c6be5a0c41c8a8e9409bca0db Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 10 Oct 2023 18:51:41 -0700 Subject: [PATCH 16/16] .NET Source-Build 6.0.123 October 2023 Updates (#17494) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index bdb786486..c3c5ea3c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.122 + 6.0.123 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index c832b0941..20e7bdc4c 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.122" + "dotnet": "6.0.123" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",