From 8f9c6a465f38a1b213ccfa7e64e9c091d1883997 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Sep 2023 20:34:14 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 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.12 -> To Version 7.0.12 (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 369e59eb5..5357832cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 033225070..22e8f8926 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea diff --git a/eng/Versions.props b/eng/Versions.props index 8f2b0fdaf..7249b3ca5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 0.2.0 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23464.37 - 7.0.309-servicing.23464.37 + 7.0.309-servicing.23465.23 + 7.0.309-servicing.23465.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ac38fb5554ad7ef316a1e35cc7f92d2eed7596e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Sep 2023 22:26:37 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.12 -> To Version 7.0.12 (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 5357832cd..901e264ee 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 22e8f8926..8943dc5b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eabb0b168f69e1afd828a0f38144405b311e310b + b9a47bfae827dc3a7b38beb00ff6a68aeeb1a2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2fc4e13cada6591f520f2245bf53a3aadb85357 + 52e852eeeba7d94815f4aa698081af53fe313543 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7249b3ca5..6f148faef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.12-servicing.23463.13 + 7.0.12-servicing.23465.7 - 7.0.12-servicing.23463.6 + 7.0.12-servicing.23465.3 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23465.23 - 7.0.309-servicing.23465.23 + 7.0.309-servicing.23465.30 + 7.0.309-servicing.23465.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.12-servicing.23463.5 - 7.0.12-servicing.23463.5 + 7.0.12-servicing.23465.4 + 7.0.12-servicing.23465.4 7.0.12 7.0.12