From bedf712c818dbcf28465a75df33d6c69add35de1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 03:36:40 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++------ eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe24c296a..1bb6599c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,13 +16,13 @@ - + - + - + @@ -47,12 +47,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43ddee938..9be1d6bc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 diff --git a/eng/Versions.props b/eng/Versions.props index b1266a5da..250b8a02f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23518.32 - 7.0.311-servicing.23518.32 + 7.0.311-servicing.23518.45 + 7.0.311-servicing.23518.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.13-servicing.23516.30 - 7.0.13-servicing.23516.30 + 7.0.13-servicing.23517.18 + 7.0.13-servicing.23517.18 7.0.13 7.0.13 7.0.13 @@ -96,10 +96,10 @@ - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23518.5 + 7.0.14-servicing.23518.5 + 7.0.14 + 7.0.14 From ad876c0b5dcdd9de60b33b9274234367f9f141fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 04:41:41 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- 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 1bb6599c4..67fd2b0ed 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 9be1d6bc7..1d76f63d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 diff --git a/eng/Versions.props b/eng/Versions.props index 250b8a02f..35c8377fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23518.45 - 7.0.311-servicing.23518.45 + 7.0.311-servicing.23518.62 + 7.0.311-servicing.23518.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)