From 923551b0bef564e0d325066df6fe56e61b2cc63e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 14:59:42 +0000 Subject: [PATCH 1/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index b3682484a..e926b86a7 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 159d5de6d..2e9c5c1c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 85778644ee928ab3eb11aac4fef9176851dd9b21 + acb200f3181da8cc111042a65f247bab519b9663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96bb3b05678dde4da2164d4c1b13372855e610d8 + 1d1af5d70029872ea1c9f0d2c18bf5cf4e24cd3e https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aed20729942488335ab21d7bb03a92d87afdb9b1 + 02d7f45dcacc192b40e725d6f6e77ec64e202c7a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e6bd74f8d..c4318dd50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23578.3 @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23578.5 - 7.0.115-servicing.23578.5 + 7.0.115-servicing.23579.12 + 7.0.115-servicing.23579.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.15-servicing.23573.2 - 7.0.15-servicing.23573.2 + 7.0.15-servicing.23579.2 + 7.0.15-servicing.23579.2 7.0.15 7.0.15 From 4366b12f01574e3e8f88a7922caa401c07b7f7b3 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 09:13:56 -0800 Subject: [PATCH 2/5] Update to source-build-externals 203140 --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e9c5c1c7..1fcfa9e54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,9 +176,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - - https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + + https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals + 5e09d1706d8d7b6dadaf767c3a4373ca68a87a32 From d7ebc6f15ed405fc7d86585b92db0df3afcfb28c Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Wed, 29 Nov 2023 10:38:00 -0800 Subject: [PATCH 3/5] Attempt to auth to submodule --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dc33e0a03..f2c4d2133 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -173,7 +173,7 @@ Condition="$(IsRootRepo) != 'true'" /> Date: Wed, 29 Nov 2023 10:42:21 -0800 Subject: [PATCH 4/5] Attempt to auth to submodule --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index f2c4d2133..55d1c4ff9 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -173,7 +173,7 @@ Condition="$(IsRootRepo) != 'true'" /> Date: Wed, 29 Nov 2023 11:04:21 -0800 Subject: [PATCH 5/5] Make auth more general --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 55d1c4ff9..0a9a2ddc0 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,8 +172,9 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> +