From c6505a010cfe757ffb4b6cb8d2791e6ca5b0ea1d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 21:30:42 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.308 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.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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.10 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 45 ++++------------- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 85 insertions(+), 112 deletions(-) diff --git a/NuGet.config b/NuGet.config index b885835bc..c074bb5a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,34 +10,19 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -59,27 +44,15 @@ - - - - + - - - - + - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d206477b..8910b7ae7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 2e82d9d2458c751ea103d1487b2695d62612fc2d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + 1a043efd50b1f70f42a00ddd5987b94d1d279c5a https://github.com/dotnet/fsharp @@ -138,9 +138,9 @@ e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7db5fcb8c..1da481900 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.11-servicing.23415.5 - 7.0.10-servicing.23364.4 + 7.0.11-servicing.23415.5 @@ -56,22 +56,22 @@ - 7.0.10 - 7.0.10 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 - 7.0.10-servicing.23364.39 + 7.0.11 + 7.0.11 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 0.2.0 - 7.0.307 - 7.0.307-servicing.23367.21 - 7.0.307-servicing.23367.21 + 7.0.308 + 7.0.308-servicing.23416.25 + 7.0.308-servicing.23416.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.10-servicing.23363.12 - 7.0.10-servicing.23363.12 - 7.0.10 - 7.0.10 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23415.17 + 7.0.11-servicing.23415.17 + 7.0.11 + 7.0.11 + 7.0.11 + 7.0.11 2.1.0 - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23415.7 + 7.0.11-servicing.23415.7 + 7.0.11 + 7.0.11 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 7e71db02945cb85e974dcf9b2eb25e9929438883 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:14:47 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.308 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.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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.10 -> To Version 7.0.11 (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 c074bb5a9..fe55a3a6e 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 8910b7ae7..647c5821c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2e82d9d2458c751ea103d1487b2695d62612fc2d + 639189647d647da4008fa57fd63b1d415c84b487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1a043efd50b1f70f42a00ddd5987b94d1d279c5a + 8037dc673134da614f02f4b84f6a9a61e047ae60 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1da481900..f17bca02c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23415.5 + 7.0.11-servicing.23416.5 - 7.0.11-servicing.23415.5 + 7.0.11-servicing.23416.7 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23416.25 - 7.0.308-servicing.23416.25 + 7.0.308-servicing.23416.55 + 7.0.308-servicing.23416.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23415.7 - 7.0.11-servicing.23415.7 + 7.0.11-servicing.23416.8 + 7.0.11-servicing.23416.8 7.0.11 7.0.11