From 6feb442df97178723c6d58b25758a41533abc194 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 14:58:30 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400 -> To Version 7.0.402 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,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1a2c374a..c90061b5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,17 @@ - + + + @@ -39,9 +41,11 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92fdf2ceb..716787d6d 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 @@ c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + bb6521b7b018ff165cb3ca10347c7052d213167c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + bb6521b7b018ff165cb3ca10347c7052d213167c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + bb6521b7b018ff165cb3ca10347c7052d213167c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + bb6521b7b018ff165cb3ca10347c7052d213167c @@ -124,43 +124,43 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 - + https://github.com/dotnet/fsharp - 159a701477f5ca1e2d960e9bf79ce05769b3c671 + 30bbce677c36d8b190c5400dd909ee45bef8ed48 - + https://github.com/dotnet/fsharp - 159a701477f5ca1e2d960e9bf79ce05769b3c671 + 30bbce677c36d8b190c5400dd909ee45bef8ed48 - + https://github.com/microsoft/vstest - bc17bb9693cfc4778ded51aa0ab7f1065433f989 + 76fea143ffe5e3883dcd04e0923b4b8e1e158145 - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker - + https://github.com/dotnet/roslyn - dad7898acd6372d4380612b9f225db0c2cbfa1e9 + 43b0b05cc4f492fd5de00f6f6717409091df8daa - + https://github.com/dotnet/msbuild - 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 + 8ec440e684ef7834461f652276d5e8a88a132532 - + https://github.com/dotnet/msbuild - 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 + 8ec440e684ef7834461f652276d5e8a88a132532 - + https://github.com/nuget/nuget.client - 13f2b6af6e9864711e815cfbffd7aa5015c52cec + b46f5f64159a81d930ac8cdfde96e76f90796c62 diff --git a/eng/Versions.props b/eng/Versions.props index 8ed38a112..330dc4cdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,29 +56,29 @@ - 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.400 - 7.0.400-rtm.23369.15 - 7.0.400-rtm.23369.15 + 7.0.402 + 7.0.402-servicing.23478.9 + 7.0.402-servicing.23478.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23366.1 + 4.7.0-3.23416.9 @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview-23364-03 + 17.7.1-release-23418-01 From b7cc0b053243b8525c776345c769dddb93bab1b6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 16:04:56 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400 -> To Version 7.0.402 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,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.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.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 c90061b5d..3521b1470 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 716787d6d..5e11c5d0f 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 - bb6521b7b018ff165cb3ca10347c7052d213167c + dccb57fb6140b9b13cb97aa6a031b2975e86fc90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb6521b7b018ff165cb3ca10347c7052d213167c + dccb57fb6140b9b13cb97aa6a031b2975e86fc90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb6521b7b018ff165cb3ca10347c7052d213167c + dccb57fb6140b9b13cb97aa6a031b2975e86fc90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb6521b7b018ff165cb3ca10347c7052d213167c + dccb57fb6140b9b13cb97aa6a031b2975e86fc90 @@ -167,13 +167,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 330dc4cdb..fe11374c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.402 - 7.0.402-servicing.23478.9 - 7.0.402-servicing.23478.9 + 7.0.402-servicing.23478.16 + 7.0.402-servicing.23478.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,12 +86,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 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)