From 11c4b95c74f9cf0485929d204f9c4af6848ca322 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:17 +0000 Subject: [PATCH 01/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23523.37 -> To Version 6.0.126-servicing.23574.1 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04bd44..03f09e6af7f9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,11 +40,14 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039431cbabbd..a891e96734cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e5c0220b5ebe21277a6943f32ca92e666d30e37 + 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a8b4ec801637f85c99edb62569b72d99c550da7e + cb1f8762b907a48ebcb8f8d41151559940b8258a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a8b4ec801637f85c99edb62569b72d99c550da7e + cb1f8762b907a48ebcb8f8d41151559940b8258a diff --git a/eng/Versions.props b/eng/Versions.props index 616f2592a029..c2386ebf9377 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.125 + 6.0.126 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.125-servicing.23523.37 - 6.0.125-servicing.23523.37 + 6.0.126-servicing.23574.1 + 6.0.126-servicing.23574.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.125 + 6.0.126 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7e88e103532bc6b8c82f1f56305f1ef2d3fdc4bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 11:48:52 +0000 Subject: [PATCH 02/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231107.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23523.40 -> To Version 6.0.321-servicing.23557.13 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 From Version 6.0.22 -> To Version 6.0.25 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0 --- NuGet.config | 8 -------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index df347d0f2098..2cf5556c3e9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5513d3a8b00..8b5940b6c8b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 733590df6146364699e0d3d8d465f2f8da15b063 + c07a6a58ea26fce79dad801f5fb862989cf41d1a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 733590df6146364699e0d3d8d465f2f8da15b063 + c07a6a58ea26fce79dad801f5fb862989cf41d1a @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c689826cd161..24c27b260149 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.320-servicing.23523.40 - 6.0.320-servicing.23523.40 + 6.0.321-servicing.23557.13 + 6.0.321-servicing.23557.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -185,7 +185,7 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.22 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 0ca2699de54d6a13c02fca0d129d92c1fd3efa08 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 24 Nov 2023 15:00:25 +0000 Subject: [PATCH 03/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231124.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23557.13 -> To Version 6.0.321-servicing.23574.2 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3e9c..88cf52afd8ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,17 @@ + + + @@ -37,9 +40,12 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b5940b6c8b4..a6ece6385f5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 + 965a793efc765ddbea3c43e43c13b8e956b61946 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd + 2813f390b0d8ad577f32f27a1c57031e56f02f45 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6e525a642fe66413e4edf553f5bbc73ea5c866e5 + 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c07a6a58ea26fce79dad801f5fb862989cf41d1a + 99f231333f8e3d364f357315d99e36473238b694 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c07a6a58ea26fce79dad801f5fb862989cf41d1a + 99f231333f8e3d364f357315d99e36473238b694 diff --git a/eng/Versions.props b/eng/Versions.props index 24c27b260149..cf7e6d2c7179 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.320 + 6.0.321 @@ -44,20 +44,20 @@ - 6.0.25 - 6.0.25 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 - 6.0.25-servicing.23523.15 + 6.0.26 + 6.0.26 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 + 6.0.26-servicing.23573.6 0.2.0 - 6.0.321-servicing.23557.13 - 6.0.321-servicing.23557.13 + 6.0.321-servicing.23574.2 + 6.0.321-servicing.23574.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.25-servicing.23519.12 - 6.0.25-servicing.23519.12 - 6.0.25 - 6.0.25 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23572.29 + 6.0.26-servicing.23572.29 + 6.0.26 + 6.0.26 + 6.0.26 + 6.0.26 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.320 + 6.0.321 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 17da9de8d38bd26d596f3c7548e4b79cd5178412 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:54:07 +0000 Subject: [PATCH 04/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23574.2 -> To Version 6.0.321-servicing.23578.7 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 88cf52afd8ac..dcba8ce77776 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6ece6385f5c..1a40c404e0a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99f231333f8e3d364f357315d99e36473238b694 + 948bfb9e66e38a2e16fd7f22acf011950671745e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 99f231333f8e3d364f357315d99e36473238b694 + 948bfb9e66e38a2e16fd7f22acf011950671745e diff --git a/eng/Versions.props b/eng/Versions.props index cf7e6d2c7179..2d4d53542773 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.321-servicing.23574.2 - 6.0.321-servicing.23574.2 + 6.0.321-servicing.23578.7 + 6.0.321-servicing.23578.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fd7471c9072304c51021a2216c218af95959ca2e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 28 Nov 2023 11:54:25 +0000 Subject: [PATCH 05/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23574.1 -> To Version 6.0.126-servicing.23578.6 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03f09e6af7f9..fe7817f00d21 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a891e96734cc..7e5d919ef86e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2813f390b0d8ad577f32f27a1c57031e56f02f45 + 00f7c0edf759ec4fa22094a1571b1b1530ffe183 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb1f8762b907a48ebcb8f8d41151559940b8258a + b3a797e95e70efc1a8360afc0ab845f0b5fc668a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cb1f8762b907a48ebcb8f8d41151559940b8258a + b3a797e95e70efc1a8360afc0ab845f0b5fc668a diff --git a/eng/Versions.props b/eng/Versions.props index c2386ebf9377..c68cdb0ad64f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 - 6.0.26-servicing.23573.6 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 + 6.0.26-servicing.23577.12 0.2.0 - 6.0.126-servicing.23574.1 - 6.0.126-servicing.23574.1 + 6.0.126-servicing.23578.6 + 6.0.126-servicing.23578.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aef743128cbc7065ce729367f2a6d454b0ed6f43 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:30:26 +0000 Subject: [PATCH 06/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23578.6 -> To Version 6.0.126-servicing.23579.2 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe7817f00d21..4fab6601bd16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -40,14 +40,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e5d919ef86e..a4bf66b6a35e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8f42eeeef2041f39db00cf87a08ad9e6eb3f613d + e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b3a797e95e70efc1a8360afc0ab845f0b5fc668a + bf47a20af74904ba30cc994c491f744e86545dd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b3a797e95e70efc1a8360afc0ab845f0b5fc668a + bf47a20af74904ba30cc994c491f744e86545dd7 diff --git a/eng/Versions.props b/eng/Versions.props index c68cdb0ad64f..7731bf09cc04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.126-servicing.23578.6 - 6.0.126-servicing.23578.6 + 6.0.126-servicing.23579.2 + 6.0.126-servicing.23579.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f67edca3e3879fff6f1074109aa31d6208c59dbd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 12:31:51 +0000 Subject: [PATCH 07/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231128.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23578.7 -> To Version 6.0.321-servicing.23578.32 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a40c404e0a5..92114992ec88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 948bfb9e66e38a2e16fd7f22acf011950671745e + d6528f6c173ae76eb6584c31d14b3da885f8fc04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 948bfb9e66e38a2e16fd7f22acf011950671745e + d6528f6c173ae76eb6584c31d14b3da885f8fc04 diff --git a/eng/Versions.props b/eng/Versions.props index 2d4d53542773..3067e7c6deb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23578.7 - 6.0.321-servicing.23578.7 + 6.0.321-servicing.23578.32 + 6.0.321-servicing.23578.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c5ba2d60898886b63e6bb657f25503d24680855f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 29 Nov 2023 13:57:21 +0000 Subject: [PATCH 08/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231129.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23578.32 -> To Version 6.0.321-servicing.23579.9 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index dcba8ce77776..db5a4ec11560 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92114992ec88..64d7e889efe4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 00f7c0edf759ec4fa22094a1571b1b1530ffe183 + ed655b45693cabc1de87e4d76d0785a3868396c2 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6528f6c173ae76eb6584c31d14b3da885f8fc04 + 176ba6c92b4d6c388a0117ae030d9b547f727c66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6528f6c173ae76eb6584c31d14b3da885f8fc04 + 176ba6c92b4d6c388a0117ae030d9b547f727c66 diff --git a/eng/Versions.props b/eng/Versions.props index 3067e7c6deb5..301d1a62bbdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 - 6.0.26-servicing.23577.12 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 + 6.0.26-servicing.23578.6 0.2.0 - 6.0.321-servicing.23578.32 - 6.0.321-servicing.23578.32 + 6.0.321-servicing.23579.9 + 6.0.321-servicing.23579.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 74bce27a5926a4a430b802efe4aeccf187ef1c9e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:24 +0000 Subject: [PATCH 09/55] Merged PR 35744: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20231201.7 - **Date Produced**: December 1, 2023 7:13:07 PM UTC - **Commit**: 280895b0c4e22fe6995fa31637d14a8da840d8d0 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23579.2 to 6.0.126-servicing.23601.7][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbf47a20af7&targetVersion=GC280895b0c4&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4fab6601bd16..f22372130108 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4bf66b6a35e..8c74919a0de6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf47a20af74904ba30cc994c491f744e86545dd7 + 280895b0c4e22fe6995fa31637d14a8da840d8d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bf47a20af74904ba30cc994c491f744e86545dd7 + 280895b0c4e22fe6995fa31637d14a8da840d8d0 diff --git a/eng/Versions.props b/eng/Versions.props index 7731bf09cc04..be784a3b6596 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.126-servicing.23579.2 - 6.0.126-servicing.23579.2 + 6.0.126-servicing.23601.7 + 6.0.126-servicing.23601.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4f752a3091c853a2eccf6afeae6d9053ada1e385 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 1 Dec 2023 19:40:30 +0000 Subject: [PATCH 10/55] Merged PR 35745: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231201.8 - **Date Produced**: December 1, 2023 7:14:50 PM UTC - **Commit**: b8d95c56bfc86959c20083313656913cbaa6eabd - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23579.9 to 6.0.321-servicing.23601.8][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23579.9 to 6.0.321-servicing.23601.8][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-dev-certs**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] - **dotnet-user-secrets**: [from 6.0.26-servicing.23578.6 to 6.0.26-servicing.23601.6][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC176ba6c92b&targetVersion=GCb8d95c56bf&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCed655b4569&targetVersion=GC4ed6b143f1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index db5a4ec11560..e9eac60af4cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64d7e889efe4..00511bda626b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed655b45693cabc1de87e4d76d0785a3868396c2 + 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 176ba6c92b4d6c388a0117ae030d9b547f727c66 + b8d95c56bfc86959c20083313656913cbaa6eabd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 176ba6c92b4d6c388a0117ae030d9b547f727c66 + b8d95c56bfc86959c20083313656913cbaa6eabd diff --git a/eng/Versions.props b/eng/Versions.props index 301d1a62bbdb..630f4c7769dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 - 6.0.26-servicing.23578.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.6 0.2.0 - 6.0.321-servicing.23579.9 - 6.0.321-servicing.23579.9 + 6.0.321-servicing.23601.8 + 6.0.321-servicing.23601.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From de57e296c6d868343c7bb814ab2292fdd143da00 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:22:51 +0000 Subject: [PATCH 11/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23601.7 -> To Version 6.0.126-servicing.23601.15 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index f22372130108..9a61de72623a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c74919a0de6..c54327a2dae3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280895b0c4e22fe6995fa31637d14a8da840d8d0 + 3652ba2a882726bbaed0dc2e906154197ded6811 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 280895b0c4e22fe6995fa31637d14a8da840d8d0 + 3652ba2a882726bbaed0dc2e906154197ded6811 diff --git a/eng/Versions.props b/eng/Versions.props index be784a3b6596..4a187c317d3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.126-servicing.23601.7 - 6.0.126-servicing.23601.7 + 6.0.126-servicing.23601.15 + 6.0.126-servicing.23601.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e366881c1d5148b133e00795877fbfaedf9f385e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 1 Dec 2023 20:29:19 +0000 Subject: [PATCH 12/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231201.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23601.8 -> To Version 6.0.321-servicing.23601.16 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9eac60af4cb..98638b9ae52d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00511bda626b..62ffc36fdcf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4ed6b143f1b3e8de62590966d21d92f5f9e9c006 + 3fcbb4e1ccc6d063f7fce7c9977698b809111758 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8d95c56bfc86959c20083313656913cbaa6eabd + 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8d95c56bfc86959c20083313656913cbaa6eabd + 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 diff --git a/eng/Versions.props b/eng/Versions.props index 630f4c7769dd..fef08b7bdcb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 - 6.0.26-servicing.23601.6 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 + 6.0.26-servicing.23601.8 0.2.0 - 6.0.321-servicing.23601.8 - 6.0.321-servicing.23601.8 + 6.0.321-servicing.23601.16 + 6.0.321-servicing.23601.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 05d232d7760c452688dc302e20b6f9da41105d9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:27:46 +0000 Subject: [PATCH 13/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23601.16 -> To Version 6.0.321-servicing.23604.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98638b9ae52d..6b6abf24e6ea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,14 +44,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62ffc36fdcf3..824d1e2fe1c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fef08b7bdcb4..c837eb64159e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.321-servicing.23601.16 - 6.0.321-servicing.23601.16 + 6.0.321-servicing.23604.13 + 6.0.321-servicing.23604.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From 1f121863d4457763492b55e8fc8fa78ce0cbb589 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:28:35 +0000 Subject: [PATCH 14/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23601.15 -> To Version 6.0.126-servicing.23604.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a61de72623a..51d242180aac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,16 +44,20 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c54327a2dae3..72d2cedbe26c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3652ba2a882726bbaed0dc2e906154197ded6811 + 493e67d12750dc460c159ff6a5c81fec6e525f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3652ba2a882726bbaed0dc2e906154197ded6811 + 493e67d12750dc460c159ff6a5c81fec6e525f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4a187c317d3f..061193e71ba9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.126-servicing.23601.15 - 6.0.126-servicing.23601.15 + 6.0.126-servicing.23604.12 + 6.0.126-servicing.23604.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26 From 5f19470397cdaf2c7dfc47f384e201fc90944ad2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:25:34 +0000 Subject: [PATCH 15/55] Merged PR 35828: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20231205.14 - **Date Produced**: December 5, 2023 10:05:04 PM UTC - **Commit**: 9b8cdd0062a889793bda0f84365492c6e21ff981 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23604.12 to 6.0.126-servicing.23605.14][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC493e67d127&targetVersion=GC9b8cdd0062&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51d242180aac..36c575133302 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -50,8 +50,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72d2cedbe26c..671fad883f10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 493e67d12750dc460c159ff6a5c81fec6e525f46 + 9b8cdd0062a889793bda0f84365492c6e21ff981 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 493e67d12750dc460c159ff6a5c81fec6e525f46 + 9b8cdd0062a889793bda0f84365492c6e21ff981 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 061193e71ba9..e07ebd6dd601 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23604.12 - 6.0.126-servicing.23604.12 + 6.0.126-servicing.23605.14 + 6.0.126-servicing.23605.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 151c083a87082989475106b8ebb08cfca977f3aa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 22:26:57 +0000 Subject: [PATCH 16/55] Merged PR 35830: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.26 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.300**: from 6.0.25 to 6.0.26 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231205.15 - **Date Produced**: December 5, 2023 10:05:22 PM UTC - **Commit**: c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23604.13 to 6.0.321-servicing.23605.15][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23604.13 to 6.0.321-servicing.23605.15][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.26 to 6.0.26][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.26 to 6.0.26][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.300**: [from 6.0.25 to 6.0.26][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1f85f2a52e&targetVersion=GCc22a743f3a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [3]: https://github.com/dotnet/emsdk/compare/d8bc162ccf...5ccc36f598 [DependencyUpdate]: <> (End)... --- NuGet.config | 7 +++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b6abf24e6ea..575275834c06 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,12 +11,12 @@ + - - + @@ -48,8 +48,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 824d1e2fe1c6..aea92804fd30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f85f2a52ec422c16c8991f6cd24124c084e87d1 + c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f85f2a52ec422c16c8991f6cd24124c084e87d1 + c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 + 5ccc36f5985e2089f47c97a19c250e65ddefd0ba https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index c837eb64159e..da8399e55ecb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23604.13 - 6.0.321-servicing.23604.13 + 6.0.321-servicing.23605.15 + 6.0.321-servicing.23605.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 6.0.26 6.0.26 6.0.26 @@ -185,7 +185,7 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.25 + 6.0.26 $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 1e2c0c0af5208112c081e6788a841f94be4c0bd5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:28:28 +0000 Subject: [PATCH 17/55] Merged PR 35838: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.126 to 6.0.126 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.126 to 6.0.126 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20231205.20 - **Date Produced**: December 5, 2023 11:06:57 PM UTC - **Commit**: 45302fdcb923ce0d0c28b9f34f7684443b980a62 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1] - **Microsoft.NET.Sdk**: [from 6.0.126-servicing.23605.14 to 6.0.126-servicing.23605.20][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.126 to 6.0.126][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.126-servicing.23578.2 to 6.0.126-servicing.23605.4][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.126 to 6.0.126][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9b8cdd0062&targetVersion=GC45302fdcb9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe58a1e0535&targetVersion=GC28656189e4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36c575133302..e7470c4b2b23 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -52,8 +51,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 671fad883f10..89d861c82373 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e58a1e0535c781fc1c12a5bbbc81c5044260d3e0 + 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8cdd0062a889793bda0f84365492c6e21ff981 + 45302fdcb923ce0d0c28b9f34f7684443b980a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9b8cdd0062a889793bda0f84365492c6e21ff981 + 45302fdcb923ce0d0c28b9f34f7684443b980a62 diff --git a/eng/Versions.props b/eng/Versions.props index e07ebd6dd601..9d7973343ff3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.14 - 6.0.126-servicing.23605.14 + 6.0.126-servicing.23605.20 + 6.0.126-servicing.23605.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aa3e2f103a246defb8718640fa7b54643460f423 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 23:33:27 +0000 Subject: [PATCH 18/55] Merged PR 35839: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.321 to 6.0.321 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.321 to 6.0.321 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20231205.22 - **Date Produced**: December 5, 2023 11:12:12 PM UTC - **Commit**: 96ce218210ee10662e18423d95be11527ff19222 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.NET.Sdk**: [from 6.0.321-servicing.23605.15 to 6.0.321-servicing.23605.22][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.321 to 6.0.321][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.321-servicing.23573.13 to 6.0.321-servicing.23605.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.321 to 6.0.321][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc22a743f3a&targetVersion=GC96ce218210&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC6b4fc213e7&targetVersion=GC757b2e642e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 575275834c06..3eb49cca2b0b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -50,8 +49,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aea92804fd30..b1b71e0d7740 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d + 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 + 96ce218210ee10662e18423d95be11527ff19222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22a743f3adc2dafbf2bc9b4993e23ca15d0c828 + 96ce218210ee10662e18423d95be11527ff19222 diff --git a/eng/Versions.props b/eng/Versions.props index da8399e55ecb..f4cd922099b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.321-servicing.23605.15 - 6.0.321-servicing.23605.15 + 6.0.321-servicing.23605.22 + 6.0.321-servicing.23605.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d9445f2ea5b7c1eaadd126545bf313f45a676696 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:07:04 +0000 Subject: [PATCH 19/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.20 -> To Version 6.0.126-servicing.23605.30 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7470c4b2b23..fbf9c4902cbb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89d861c82373..6114908f03ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45302fdcb923ce0d0c28b9f34f7684443b980a62 + 3359fe0db5f3f0c33f81fd2c15ff44421512390f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 45302fdcb923ce0d0c28b9f34f7684443b980a62 + 3359fe0db5f3f0c33f81fd2c15ff44421512390f diff --git a/eng/Versions.props b/eng/Versions.props index 9d7973343ff3..b326a0658965 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.126-servicing.23605.20 - 6.0.126-servicing.23605.20 + 6.0.126-servicing.23605.30 + 6.0.126-servicing.23605.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a71a77b9ff73eaa90537fade61a4d2af97f918a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 00:21:22 +0000 Subject: [PATCH 20/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23605.22 -> To Version 6.0.321-servicing.23605.31 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3eb49cca2b0b..3371ee0f3ddb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -43,8 +42,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1b71e0d7740..039f6a3466f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3fcbb4e1ccc6d063f7fce7c9977698b809111758 + d504a7b7dab277712646747e9f5cce0d9507245e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96ce218210ee10662e18423d95be11527ff19222 + b6662b12057b934f96c560cd077a7b15b0e0c156 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96ce218210ee10662e18423d95be11527ff19222 + b6662b12057b934f96c560cd077a7b15b0e0c156 diff --git a/eng/Versions.props b/eng/Versions.props index f4cd922099b7..a6a9cf9a9ad5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.26 6.0.26 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 - 6.0.26-servicing.23601.8 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 + 6.0.26-servicing.23605.6 0.2.0 - 6.0.321-servicing.23605.22 - 6.0.321-servicing.23605.22 + 6.0.321-servicing.23605.31 + 6.0.321-servicing.23605.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a706d50916a1dd757a838896dddbb6798fa2e748 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:15:19 +0000 Subject: [PATCH 21/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.37 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.126-servicing.23605.30 -> To Version 6.0.126-servicing.23605.37 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbf9c4902cbb..e97435cf7ced 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6114908f03ef..b750cf3294dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28656189e49c05368afda92b482da8c0049d5638 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3359fe0db5f3f0c33f81fd2c15ff44421512390f + 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3359fe0db5f3f0c33f81fd2c15ff44421512390f + 3f5d0be2f51d49013230c45b5a9a6dad582f40f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b326a0658965..1f643f677710 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.126-servicing.23605.30 - 6.0.126-servicing.23605.30 + 6.0.126-servicing.23605.37 + 6.0.126-servicing.23605.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From 8e5f7d62eb49b3bd82bfd818380559c9a5c7120b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Dec 2023 01:19:41 +0000 Subject: [PATCH 22/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231205.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23605.31 -> To Version 6.0.321-servicing.23605.38 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.26 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3371ee0f3ddb..78b63002ea32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039f6a3466f5..1a2687e3eb31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 456adb551c1878a5dcc44f0b6e7d69de4789cbdc + 84ebced93b7a69ba3332fe6000354306d4eea9dd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 757b2e642e3fb918bae9a87715c8c2fddbc9b3bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6662b12057b934f96c560cd077a7b15b0e0c156 + 2f5d8604a65edf0c457ff3f600fad88b42568244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6662b12057b934f96c560cd077a7b15b0e0c156 + 2f5d8604a65edf0c457ff3f600fad88b42568244 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b4d268210a29a07ba7a3003360b2b037881880db + c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 981ef8014ab994eb3fce88dd81b815fce930dfa5 + e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a6a9cf9a9ad5..13e0ab3db8b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.26-servicing.23573.4 + 6.0.26-servicing.23605.5 - 6.0.26-servicing.23573.8 + 6.0.26-servicing.23605.3 @@ -56,8 +56,8 @@ - 6.0.321-servicing.23605.31 - 6.0.321-servicing.23605.31 + 6.0.321-servicing.23605.38 + 6.0.321-servicing.23605.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.26-servicing.23604.3 - 6.0.26-servicing.23604.3 + 6.0.26-servicing.23605.4 + 6.0.26-servicing.23605.4 6.0.26 6.0.26 From 9003cd429054f0cccd53643955a6c63023d184b7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 11 Dec 2023 16:14:25 +0000 Subject: [PATCH 23/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.115 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 637dd025e4a6..805cabdda001 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64be1c99dec9..572de4dc3a83 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0aa76c865eb72b183247119752dfabca811f17a + 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 diff --git a/eng/Versions.props b/eng/Versions.props index 0173becfd420..ad3fcc7dc520 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.115 - 7.0.115-servicing.23601.25 - 7.0.115-servicing.23601.25 + 7.0.115-servicing.23611.7 + 7.0.115-servicing.23611.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44d4ecfd328d54a6f867e3fd8fbae991e904eb8d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:13:37 -0600 Subject: [PATCH 24/55] Add back security-partners-dotnet pipeline (#17955) --- .../pipelines/security-partners-dotnet.yml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000000..562530c964a5 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,33 @@ +# DO NOT DELETE: This is used to validate PRs in the internal security-partners-dotnet repo + +trigger: none + +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + +jobs: +- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From fc65f1f49b76c9e0a4af1b23d0a516cd7576db7c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:46 -0800 Subject: [PATCH 25/55] Update branding to 6.0.127 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 616f2592a029..eaeeefcc7e70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 26 + 27 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From e063df560162542bb2a1b6258b89dbd650822f1a Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 9 Jan 2024 21:23:36 +0100 Subject: [PATCH 26/55] .NET Source-Build 6.0.126 January 2024 Updates (#18155) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index eaeeefcc7e70..cc3f8afd0090 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.125 + 6.0.126 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 06cde48c2218..d503a61b9f7f 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.125" + "dotnet": "6.0.126" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From aeb5cae516262a7a3bd67804667e6fd6a8f8d0de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:46:22 -0800 Subject: [PATCH 27/55] [release/6.0.1xx] Update dependencies from dotnet/arcade (#18200) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- .../templates/job/publish-build-assets.yml | 4 ++-- .../templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 6 +++--- 13 files changed, 34 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e97435cf7ced..1aadfd0ee62e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,28 @@ - + + + + + + + + @@ -42,16 +49,21 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b750cf3294dc..1292acafdf64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f11f8a7855e3..337516a40f11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23517.3 + 6.0.0-beta.24059.3 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e7641341b..8fda30bdce2b 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecdcf1..4e4116f1d0bf 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d957922a6..49938f0c89f7 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7764..1e779fec4dd1 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518ac58..ac9a95778fcd 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0e10e7db69c7..01da2420df60 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -123,7 +123,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147116..239b17010fa7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -53,7 +53,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -68,7 +68,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a43ca..fae340f4d20d 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,7 +11,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fc022ca9b266..d49c6156bf0a 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -162,7 +162,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 diff --git a/global.json b/global.json index 1410185dde5b..8bf2c6315a9f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123", + "dotnet": "6.0.126", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" } } From 9bfe9ba33ea880945a44d06a23a54bec991f36f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:46:50 -0800 Subject: [PATCH 28/55] [release/6.0.4xx] Update dependencies from dotnet/arcade (#18198) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 4 ++-- eng/common/templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 6 +++--- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0478bcbf125c..72a435584c9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c9fa2f63b748..a3aef0fc8f61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23517.3 + 6.0.0-beta.24059.3 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e7641341b..8fda30bdce2b 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecdcf1..4e4116f1d0bf 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d957922a6..49938f0c89f7 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7764..1e779fec4dd1 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518ac58..ac9a95778fcd 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0e10e7db69c7..01da2420df60 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -123,7 +123,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147116..239b17010fa7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -53,7 +53,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -68,7 +68,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a43ca..fae340f4d20d 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,7 +11,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fc022ca9b266..d49c6156bf0a 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -162,7 +162,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 diff --git a/global.json b/global.json index 1410185dde5b..8bf2c6315a9f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123", + "dotnet": "6.0.126", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3" } } From e33a1900c70c8cedf44a8b6dc2427d807307ccc1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:09 +0000 Subject: [PATCH 29/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.115 -> To Version 7.0.116 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 805cabdda001..c540d5b6a4dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -25,7 +22,7 @@ - + @@ -52,16 +49,13 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69806ea2323f..986a7a3193dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d26c769c9167ac9012c3e1fc0be86c9acffbde5 + 86cfebd55c61090f03b1dbc23726f223780f6277 diff --git a/eng/Versions.props b/eng/Versions.props index aa6ecfe7084d..b065f63a8a14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.115 - 7.0.115-servicing.23611.7 - 7.0.115-servicing.23611.7 + 7.0.116 + 7.0.116-servicing.24052.13 + 7.0.116-servicing.24052.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6b3619857a42c31572cec730efa103ddca4e406 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:26 +0000 Subject: [PATCH 30/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- 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 c540d5b6a4dc..76a1552bc7ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 986a7a3193dd..252b3b23b444 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86cfebd55c61090f03b1dbc23726f223780f6277 + 91cd67046410b063fc65d3ef8e9ec816019e6b87 diff --git a/eng/Versions.props b/eng/Versions.props index b065f63a8a14..163cdd2e53bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24052.13 - 7.0.116-servicing.24052.13 + 7.0.116-servicing.24059.23 + 7.0.116-servicing.24059.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 954efb0193d3502595a66a37b85ab4318f0fea70 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Jan 2024 21:46:43 +0000 Subject: [PATCH 31/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- 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 76a1552bc7ae..cddbc2bcf966 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 252b3b23b444..38e81f8dcc5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91cd67046410b063fc65d3ef8e9ec816019e6b87 + 9d7476029043125e1f2acb5477c99b1d2710f12c diff --git a/eng/Versions.props b/eng/Versions.props index 163cdd2e53bd..fdf41eb71a31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24059.23 - 7.0.116-servicing.24059.23 + 7.0.116-servicing.24060.20 + 7.0.116-servicing.24060.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bf9a94271eee83c7ee38ccd865283c3b4786387c Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 10 Jan 2024 15:22:15 -0800 Subject: [PATCH 32/55] Update MsftToSbSdk.diff baseline (#18205) --- .../assets/baselines/MsftToSbSdk.diff | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 71ae3f0b9a65..dfeb1a2f8812 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,7 +14,20 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -29,6 +42,10 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ From 10b2130b4d30de802d3e117159130417f813ee23 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:16:26 +0000 Subject: [PATCH 33/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++------ eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index cddbc2bcf966..e9a2fa634263 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -22,12 +23,10 @@ - + - - - + @@ -49,18 +48,17 @@ + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa311536b8e3..713af0f51ce9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9d7476029043125e1f2acb5477c99b1d2710f12c + 383d1cee7ce36156a4adf5d0779c1eb94bf85357 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4bb45da0f3d5..eab48d2072c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,13 +56,13 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24060.20 - 7.0.116-servicing.24060.20 + 7.0.116-servicing.24061.12 + 7.0.116-servicing.24061.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From 6811cdf123d8a9cc9836b18ebf42fdfd96fde951 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 11 Jan 2024 20:17:01 +0000 Subject: [PATCH 34/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.312 -> To Version 7.0.313 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++++++---- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 59 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2102f9bcf7df..fb6caa4933b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,23 @@ - + + + + + - + - + @@ -44,15 +48,17 @@ - + + + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b80909b84ea9..408592dd673c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - acb200f3181da8cc111042a65f247bab519b9663 + d62704f831ab66265d54c5d09b24a82bff2deac2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 + ecd58f375010a7fac5165a1ff584f8e336c9e044 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a87e751ac0a46a6a69fb55a63a8f96a71ecace7c + 18d8a2987501c4439ddadf2501a80760f4f87de3 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 1d272c1ef7277b7cc38148300732e6a72848bedc - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 02d7f45dcacc192b40e725d6f6e77ec64e202c7a + 963a6a55dd6f72f604651fff7c1515dadcd37a39 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e2302f9ba0d9..e6fe2f14254e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.15-servicing.23578.3 + 7.0.16-servicing.24060.7 @@ -56,22 +56,22 @@ - 7.0.15 - 7.0.15 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 - 7.0.15-servicing.23601.10 + 7.0.16 + 7.0.16 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 0.2.0 - 7.0.312 - 7.0.312-servicing.23601.26 - 7.0.312-servicing.23601.26 + 7.0.313 + 7.0.313-servicing.24061.13 + 7.0.313-servicing.24061.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.15-servicing.23579.2 - 7.0.15-servicing.23579.2 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24060.13 + 7.0.16-servicing.24060.13 + 7.0.16 + 7.0.16 From c99b7cbaecc983f7f32f52dd2f10441615e6f3e6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:16:53 +0000 Subject: [PATCH 35/55] Merged PR 36614: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20240117.58 - **Date Produced**: January 18, 2024 7:27:50 AM UTC - **Commit**: d833c87a5bda1313c0ab48d5c8dca96c675b9906 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][3] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24066.29 to 7.0.116-servicing.24067.58][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC26033f320535f652724e744bd4758ca0bf0a6495&targetVersion=GCd833c87a5bda1313c0ab48d5c8dca96c675b9906&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.14 (parent: Microsoft.NET.S... --- NuGet.config | 24 ++++------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 75 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9a2fa634263..7f6b1aab08a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,22 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 713af0f51ce9..9eb2b16894ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + 15564036208e2608d636de11fc8161ca437e022a https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 383d1cee7ce36156a4adf5d0779c1eb94bf85357 + d833c87a5bda1313c0ab48d5c8dca96c675b9906 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -154,22 +154,22 @@ 6918b863aa37ad0699f98482fbab9f7a52e65a92 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 24f8150c97f9d26a7b5d77e983938e18d48e7d9f + 1653cf17925473602f5460c5e4682a0dab4c4d22 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index eab48d2072c4..4c6e3217f48f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.14 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24061.12 - 7.0.116-servicing.24061.12 + 7.0.116-servicing.24067.58 + 7.0.116-servicing.24067.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,18 +82,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From fa2462ce4ee7d7715b27b7280d7639d8b4081654 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:38 +0000 Subject: [PATCH 36/55] Merged PR 36620: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.16-servicing.24060.13 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24061.3 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.15-servicing.23573.3 to 7.0.16-servicing.24060.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.16-servicing.24060.7 to 7.0.16-servicing.24060.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **NuGet.Build.Tasks**: from 6.6.0-rc.66 to 6.6.2-rc.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (parent: Mic... --- NuGet.config | 24 ++++------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++--------- 3 files changed, 75 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index fb6caa4933b8..6f5b3eb004fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,23 +10,19 @@ - + - - - + - - - + - + - + @@ -48,17 +44,15 @@ - + - - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 408592dd673c..4743d6d1f1f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d62704f831ab66265d54c5d09b24a82bff2deac2 + 01e02684374c6bf4541b7507ce041409ae410f63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ecd58f375010a7fac5165a1ff584f8e336c9e044 + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18d8a2987501c4439ddadf2501a80760f4f87de3 + 62ea411d627ffda407db98c1cf655d5a3590b03e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1d272c1ef7277b7cc38148300732e6a72848bedc + b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 963a6a55dd6f72f604651fff7c1515dadcd37a39 + b05bc3d0cf33b94b37f8dec5d6b2829d508209eb https://github.com/dotnet/fsharp @@ -158,22 +158,22 @@ 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a + 07cf447d8f8b3d6b9e7bf641ab8ec7de966b1254 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc - + https://github.com/dotnet/emsdk - 33b038b591f6e19c32a390333d41292cbd86d93c + ca510604d1667f32b4fa4653e3d3b64be8136bdc https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e6fe2f14254e..0d5bcdc877ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.15-servicing.23573.3 + 7.0.16-servicing.24060.7 - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24060.16 @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24061.13 - 7.0.313-servicing.24061.13 + 7.0.313-servicing.24068.18 + 7.0.313-servicing.24068.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15 - 7.0.15 - 7.0.15 - 7.0.15 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16 + 7.0.16 + 7.0.16 + 7.0.16 2.1.0 - 7.0.16-servicing.24060.13 - 7.0.16-servicing.24060.13 + 7.0.16-servicing.24061.3 + 7.0.16-servicing.24061.3 7.0.16 7.0.16 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From bbc374d7eb4e40d296696d4e9bba4e4c8a90eaff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:23:42 +0000 Subject: [PATCH 37/55] Merged PR 36621: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.16 to 7.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20240118.19 - **Date Produced**: January 18, 2024 6:07:10 PM UTC - **Commit**: 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24067.58 to 7.0.116-servicing.24068.19][1] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.16 to 7.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.16 to 7.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-dev-certs**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-user-jwts**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] - **dotnet-user-secrets**: [from 7.0.16-servicing.24067.14 to 7.0.16-servicing.24067.19][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd833c87a5bda1313c0ab48d5c8dca96c675b9... --- 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 7f6b1aab08a1..8e9c45524d8f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9eb2b16894ba..0075e31bd1a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 15564036208e2608d636de11fc8161ca437e022a + ba2ce5819947cc6aa7724dbc54201d5c6596de0c https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d833c87a5bda1313c0ab48d5c8dca96c675b9906 + 7be026ba4909ce67a2ecc4043d0380f8b309b4ca diff --git a/eng/Versions.props b/eng/Versions.props index 4c6e3217f48f..9a441a7dbed5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 - 7.0.16-servicing.24067.14 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 + 7.0.16-servicing.24067.19 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24067.58 - 7.0.116-servicing.24067.58 + 7.0.116-servicing.24068.19 + 7.0.116-servicing.24068.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f43cfe985a1c2db5a5dfc14942d87f56db0e4ff4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:39:54 +0000 Subject: [PATCH 38/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.16 -> To Version 7.0.16 (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 8e9c45524d8f..392ad1905a85 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 0075e31bd1a7..fdc738d3d3ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7be026ba4909ce67a2ecc4043d0380f8b309b4ca + 78d5754b2fc94c74d13a077881f2f949794af51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9a441a7dbed5..4c53265d4412 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.19 - 7.0.116-servicing.24068.19 + 7.0.116-servicing.24068.45 + 7.0.116-servicing.24068.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From 0567446bee7ababba20744e3e1fa473c5c474762 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:41:02 +0000 Subject: [PATCH 39/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.16 -> To Version 7.0.16 (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 6f5b3eb004fd..07444b91d02c 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 4743d6d1f1f8..38a0c4a79587 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01e02684374c6bf4541b7507ce041409ae410f63 + f58ad2d644bb52baf49e85be027bf2db3fced446 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62ea411d627ffda407db98c1cf655d5a3590b03e + c9fbcd1e5682e75d1fb95f5a3360856f56786685 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6 + 3d504675f930028236a0f09e47c900ad48bd3d6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b05bc3d0cf33b94b37f8dec5d6b2829d508209eb + 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0d5bcdc877ac..82de004e9f36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24060.7 + 7.0.16-servicing.24067.11 - 7.0.16-servicing.24060.16 + 7.0.16-servicing.24068.4 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.18 - 7.0.313-servicing.24068.18 + 7.0.313-servicing.24068.44 + 7.0.313-servicing.24068.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.16-servicing.24061.3 - 7.0.16-servicing.24061.3 + 7.0.16-servicing.24068.4 + 7.0.16-servicing.24068.4 7.0.16 7.0.16 From 2afd97a62d728b2d2f5b3792e5dd6c87be983dc9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 00:52:52 +0000 Subject: [PATCH 40/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 --- 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 392ad1905a85..a1d045602687 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 fdc738d3d3ba..fb2cc75ba84d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 78d5754b2fc94c74d13a077881f2f949794af51c + 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 diff --git a/eng/Versions.props b/eng/Versions.props index 4c53265d4412..cc58440f1058 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.45 - 7.0.116-servicing.24068.45 + 7.0.116-servicing.24068.56 + 7.0.116-servicing.24068.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3bd45e79833ff0f4a17dad1295fb7dd036f55a94 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 01:37:57 +0000 Subject: [PATCH 41/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.58 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 --- 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 07444b91d02c..50c222de89c1 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 38a0c4a79587..4496a1dc6fd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9fbcd1e5682e75d1fb95f5a3360856f56786685 + 4134f29a2fe73e76e8b031618b758b914c6c8984 diff --git a/eng/Versions.props b/eng/Versions.props index 82de004e9f36..bbf9116cce33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.44 - 7.0.313-servicing.24068.44 + 7.0.313-servicing.24068.58 + 7.0.313-servicing.24068.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From da8e258b32b9c95aaf26f3f212b1a617d9929475 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 02:55:00 +0000 Subject: [PATCH 42/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 --- 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 50c222de89c1..5549476fcad7 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 4496a1dc6fd4..e150f5306ad8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4134f29a2fe73e76e8b031618b758b914c6c8984 + 1f3b71634ebe0f75164461f73d6305d1aeb4403d diff --git a/eng/Versions.props b/eng/Versions.props index bbf9116cce33..057dc78355c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.58 - 7.0.313-servicing.24068.58 + 7.0.313-servicing.24068.62 + 7.0.313-servicing.24068.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0afed19147be62d0b830b193142e2f6dc2a17e9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 17:43:53 +0000 Subject: [PATCH 43/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.116 -> To Version 7.0.116 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.16 -> To Version 7.0.16 (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 a1d045602687..99d9d34a866e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb2cc75ba84d..592f18792459 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0277d57f52677a9a9a5575c2fada5a90b39a5ec5 + a73e6ff24023ae17e8d5882a8f40545b20bf3428 diff --git a/eng/Versions.props b/eng/Versions.props index cc58440f1058..94b2f770f495 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.116 - 7.0.116-servicing.24068.56 - 7.0.116-servicing.24068.56 + 7.0.116-servicing.24069.8 + 7.0.116-servicing.24069.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd89f67b3269985002ccd1a77cc92c6638843478 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 18:36:49 +0000 Subject: [PATCH 44/55] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.313 -> To Version 7.0.313 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.16 -> To Version 7.0.16 (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 5549476fcad7..1b1c47835273 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 23e106392c38..335b739c9656 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ba2ce5819947cc6aa7724dbc54201d5c6596de0c + 610fe433e07b32ed451ed99d07df63be47c29050 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f3b71634ebe0f75164461f73d6305d1aeb4403d + e526ba29cdfac238c7dc40905b855b2ddc7d9d77 diff --git a/eng/Versions.props b/eng/Versions.props index 25873eb66223..8c83c5c71e5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.16 7.0.16 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 - 7.0.16-servicing.24067.19 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 + 7.0.16-servicing.24068.15 0.2.0 @@ -70,8 +70,8 @@ 7.0.313 - 7.0.313-servicing.24068.62 - 7.0.313-servicing.24068.62 + 7.0.313-servicing.24069.10 + 7.0.313-servicing.24069.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f32ea3eca6d54c98c43e68c4b738dd7d8ea0cfd9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Feb 2024 12:11:27 -0800 Subject: [PATCH 45/55] Update branding to 6.0.128 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 337516a40f11..98b098d165e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 27 + 28 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From a9611179dbf184d9f0c59284cf236356cd91afae Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Feb 2024 14:23:02 -0800 Subject: [PATCH 46/55] Update branding to 6.0.420 (#18528) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a3aef0fc8f61..e6d73f51f08f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 19 + 20 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 331c3a1909fa9415b023b44626bd5f7d4f0575f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:43:10 -0800 Subject: [PATCH 47/55] [release/7.0.3xx] Update WiX to latest release (#18601) Co-authored-by: Jacques Eloff --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e5f1dc724778..d40ea3bdc6a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,7 +145,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548e97..e6cd301f7a46 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 527bc988c182..495a51be3ba6 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -11,7 +11,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From aa39fb2795c2117d13d1728a381d8b2dfaf70c21 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 12 Feb 2024 09:43:33 -0800 Subject: [PATCH 48/55] Update WiX to latest release (#18599) --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9ed96ff174a8..ab4ea83b275a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,7 +141,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548e97..e6cd301f7a46 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 527bc988c182..495a51be3ba6 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -11,7 +11,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From ca56ddf2bd13fc307403b5b4ecb513e560e966e7 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 14 Feb 2024 02:26:10 +0100 Subject: [PATCH 49/55] .NET Source-Build 7.0.116 February 2024 Updates (#18653) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index ab4ea83b275a..0e762a39bcd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,8 +216,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.115 - 7.0.115 + 7.0.116 + 7.0.116 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index ff635fdbf715..68bdc9ac865a 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115" + "dotnet": "7.0.116" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From cb33239406eead37662f9901566f10eb0bc856df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:05:05 +0000 Subject: [PATCH 50/55] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73ed55f618b0..66894993a201 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - feda715e3fb6d511eaa39071bb9d77351cf4d943 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index d40ea3bdc6a4..3ed4b96cf8bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24065.4 + 7.0.0-beta.24114.2 diff --git a/global.json b/global.json index 30aff205100f..126e99650f11 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" } } From 5f3a79178154a4a4348333c7fa38053edca8c6fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:07:13 +0000 Subject: [PATCH 51/55] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.2 From 932aab20dc43cd2437c36cb8c5c5fc957a7c06ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 15:59:14 +0000 Subject: [PATCH 52/55] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66894993a201..a34794467c8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 5fd1dbf1679abc625e9e74614d9d7a28d151d675 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3ed4b96cf8bb..55103469931b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24114.2 + 7.0.0-beta.24114.4 diff --git a/global.json b/global.json index 126e99650f11..5d42d1e74d7b 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From bf88ec8a077abe4ded4f98f4b24e26704fd8e404 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:00:13 +0000 Subject: [PATCH 53/55] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24065.4 -> To Version 7.0.0-beta.24114.4 From e44eb502e47d80c8d90d8339b9f2c28546bf41a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:29:14 +0000 Subject: [PATCH 54/55] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24059.5 -> To Version 7.0.0-beta.24114.4 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99d9d34a866e..3fddfa878f9e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 592f18792459..351bf8ed3d88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 024ad85464aa..a1ed9ad1c2f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24114.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080edf..81ea061512be 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index fd9164f9a3bc..5d42d1e74d7b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } } From 723427fa6b1d977a869523fca1f22fed23ade3c5 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Sat, 17 Feb 2024 08:10:10 -0600 Subject: [PATCH 55/55] Update SDK diff baseline (#18706) --- .../assets/baselines/MsftToSbSdk.diff | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 0f16c9546945..4d662a3c3fe9 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -25,9 +25,6 @@ index ------------ +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml +./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll @@ -48,10 +45,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/