From 045b8d39b99c1b2de45f9e051158d3d6632dfb76 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 14:54:23 +0000 Subject: [PATCH 1/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.112 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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++------------------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bc601a50..0b04034b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,9 @@ - - - - + - - - - @@ -24,12 +17,9 @@ + - - - - @@ -51,19 +41,13 @@ - - - - + + - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41f0b6154..6b1a9f1e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 diff --git a/eng/Versions.props b/eng/Versions.props index c64853195..294b3043c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.12 + 7.0.12 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 0.2.0 - 7.0.110 - 7.0.110-servicing.23367.22 - 7.0.110-servicing.23367.22 + 7.0.112 + 7.0.112-servicing.23478.7 + 7.0.112-servicing.23478.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53f9a61939f037c237050b290cb9a1f2ccb8a672 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:15:36 +0000 Subject: [PATCH 2/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.112 Dependency coherency updates 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,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.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b04034b8..3aa2e78a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,9 +15,10 @@ + - + @@ -44,8 +45,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b1a9f1e3..a6443618c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 294b3043c..1427dc9b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23478.7 - 7.0.112-servicing.23478.7 + 7.0.112-servicing.23478.18 + 7.0.112-servicing.23478.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,12 +82,12 @@ - 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.12-servicing.23477.20 + 7.0.12-servicing.23477.20 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From f2a621680aed301a573fbf9e64d2168a74ddf530 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 29 Sep 2023 16:24:54 +0000 Subject: [PATCH 3/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.112 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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++--- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++--------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3aa2e78a3..595c01e4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,9 +18,10 @@ - + + @@ -42,14 +43,15 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6443618c..f8bb0ad9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 75eafed7999075bca879940ad0b1a0794061ddb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + c94bac748138456f4feef271b3dc18e4b46453e6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1427dc9b7..d1fff5345 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.12-servicing.23478.3 - 7.0.10-servicing.23364.4 + 7.0.12-servicing.23478.2 @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23478.18 - 7.0.112-servicing.23478.18 + 7.0.112-servicing.23479.5 + 7.0.112-servicing.23479.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12 + 7.0.12 From cae700fe1319db9592763c037ec3ec6995125b7c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:07 +0000 Subject: [PATCH 4/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.66 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.112 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 | 16 ++++++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 595c01e4a..ef9fc45aa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,12 +16,16 @@ + + - + + + @@ -43,14 +47,18 @@ - + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8bb0ad9e..f417e14d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da diff --git a/eng/Versions.props b/eng/Versions.props index d1fff5345..3554f410a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23479.5 - 7.0.112-servicing.23479.5 + 7.0.112-servicing.23479.66 + 7.0.112-servicing.23479.66 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c97215789531577c81c203f54f4b03ca92ab771a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:23:03 +0000 Subject: [PATCH 5/5] Merged PR 34163: [internal/release/frameshift/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:80a7d8ee-cef6-47d1-9179-08dbbf3a441d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 80a7d8ee-cef6-47d1-9179-08dbbf3a441d - **Build**: 20230930.37 - **Date Produced**: October 1, 2023 2:01:44 AM UTC - **Commit**: 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - **Branch**: refs/heads/internal/release/frameshift/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.112 to 7.0.112][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.112-servicing.23479.66 to 7.0.112-servicing.23480.37][1] - **Microsoft.NET.Sdk**: [from 7.0.112-servicing.23479.66 to 7.0.112-servicing.23480.37][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.112-servicing.23479.66 to 7.0.112-servicing.23480.37][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8f60c1c695&targetVersion=GC152e97ccf0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:80a7d8ee-cef6-47d1-9179-08dbbf3a441d) --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef9fc45aa..91f4d8984 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -16,14 +18,18 @@ + + - + + + @@ -47,18 +53,24 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f417e14d7..5131222e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 diff --git a/eng/Versions.props b/eng/Versions.props index 3554f410a..e45ca64c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23479.66 - 7.0.112-servicing.23479.66 + 7.0.112-servicing.23480.37 + 7.0.112-servicing.23480.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)