From b5fbd1b9bf0f76bacd299241af8e5f72014d874d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 13 Sep 2023 11:57:52 -0400 Subject: [PATCH 01/17] [release/6.0.1xx] Fix aspnetcore build on musl-libc platforms (#17324) --- .../tarball/content/Directory.Build.props | 5 +---- .../tarball/content/repos/aspnetcore.proj | 1 + src/SourceBuild/tarball/content/repos/installer.proj | 2 +- .../tarball/content/tools-local/init-build.proj | 12 ++++++++++++ src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateLayout.targets | 3 +++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 797e54fa6..c4902c251 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -181,6 +181,7 @@ freebsd-$(Platform) osx-$(Platform) linux-$(Platform) + linux-musl-$(Platform) win-$(Platform) $(PortableRid) @@ -230,12 +231,8 @@ - - - - diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index 480f3c713..4a589ea41 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -7,6 +7,7 @@ $(BuildCommandArgs) --arch $(Platform) $(BuildCommandArgs) --no-build-repo-tasks + $(BuildCommandArgs) --os-name linux-musl $(BuildCommandArgs) /p:BuildNodeJs=false $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime) $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index b2c3beed1..81f5e5b6a 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -9,6 +9,7 @@ + @@ -22,6 +23,7 @@ + + + + + + diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 8949af132..a59ed388f 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -6,7 +6,7 @@ microsoft.netcore.app.runtime.$(SharedFrameworkRid) - microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture) + microsoft.netcore.app.crossgen2.$(Crossgen2Rid) $(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 88a053b61..ce5e09b69 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -84,6 +84,9 @@ dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + $(HostOSName)-$(BuildArchitecture) + $(SharedFrameworkRid) + $(SharedFrameworkRid) linux-x64 $(AspNetCoreInstallerRid) From 04d2e433c900d88b9a76b0f3fbd01656c4ba79d2 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Fri, 15 Sep 2023 08:52:47 -0500 Subject: [PATCH 02/17] .NET Source-Build 6.0.122 September 2023 Updates (#17340) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/MissingXmlDoc.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 08cf8283c..d3d273fe2 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.121 + 6.0.122 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index e981a599e..c832b0941 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121" + "dotnet": "6.0.122" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index 38f80e186..bde73ece6 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,6 +1,7 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml +Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From 03c33a186a1ff4982c846da5c3959661227e07dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:05:59 +0000 Subject: [PATCH 03/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.35 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.415-servicing.23477.35 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,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 From Version 6.0.21-servicing.23363.11 -> To Version 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++----------------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 32 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index f27f973a5..99b3e6dd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,17 @@ - - - + - - - - - - @@ -46,21 +38,13 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c3d54c5e..f67f720d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 171bf8e96b7a11471a40fcd6b0376b435e895de8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 171bf8e96b7a11471a40fcd6b0376b435e895de8 diff --git a/eng/Versions.props b/eng/Versions.props index 583c355f0..5040b1d4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.413-servicing.23367.15 - 6.0.413-servicing.23367.15 + 6.0.415-servicing.23477.35 + 6.0.415-servicing.23477.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 From d1579c4f20e5f83e8a5a61dbd08b958a8ac7a0d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:19 +0000 Subject: [PATCH 04/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.42 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.35 -> To Version 6.0.415-servicing.23477.42 --- 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 f67f720d0..4b55484dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 171bf8e96b7a11471a40fcd6b0376b435e895de8 + dabc0c64866617f84f21cdb5d87db6a50e4e5144 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 171bf8e96b7a11471a40fcd6b0376b435e895de8 + dabc0c64866617f84f21cdb5d87db6a50e4e5144 diff --git a/eng/Versions.props b/eng/Versions.props index 5040b1d4c..2c7878bd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.35 - 6.0.415-servicing.23477.35 + 6.0.415-servicing.23477.42 + 6.0.415-servicing.23477.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7ca72019f042f532536608a27e9e558a30122eba Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:27 +0000 Subject: [PATCH 05/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.52 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.42 -> To Version 6.0.415-servicing.23477.52 --- 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 4b55484dc..8ca09bc8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dabc0c64866617f84f21cdb5d87db6a50e4e5144 + 64040b68463b7933255af3d3e2193586fe259d98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dabc0c64866617f84f21cdb5d87db6a50e4e5144 + 64040b68463b7933255af3d3e2193586fe259d98 diff --git a/eng/Versions.props b/eng/Versions.props index 2c7878bd4..49d76812f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.42 - 6.0.415-servicing.23477.42 + 6.0.415-servicing.23477.52 + 6.0.415-servicing.23477.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2191d456f60e9afb47945a2fa2b4acbc27824a8f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:34 +0000 Subject: [PATCH 06/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.56 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.52 -> To Version 6.0.415-servicing.23477.56 --- 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 8ca09bc8a..f82d016f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64040b68463b7933255af3d3e2193586fe259d98 + baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64040b68463b7933255af3d3e2193586fe259d98 + baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 diff --git a/eng/Versions.props b/eng/Versions.props index 49d76812f..dca8bdc9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.52 - 6.0.415-servicing.23477.52 + 6.0.415-servicing.23477.56 + 6.0.415-servicing.23477.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84b8c178115a1afda0a1a364792751987fcc14c8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:42 +0000 Subject: [PATCH 07/17] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99b3e6dd7..b92191712 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,8 +17,10 @@ + + @@ -38,13 +41,16 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f82d016f4..f7baaa280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dca8bdc9e..ed174f841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 - 6.0.413 + 6.0.415 @@ -44,12 +44,12 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.413 + 6.0.415 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7e2be1f5074f3df4b492d2f08181a23d041b4c68 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:04:00 +0000 Subject: [PATCH 08/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.56 -> To Version 6.0.415-servicing.23479.70 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,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,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index b92191712..a14489bf7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7baaa280..2c06860d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,21 +3,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ed174f841..77d04c9bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 - 6.0.415-servicing.23477.56 - 6.0.415-servicing.23477.56 + 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From dffc87a32c4cb34338e5eff2e05ef1f6ef26df36 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:03 +0000 Subject: [PATCH 09/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.70 -> To Version 6.0.415-servicing.23479.30 --- 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 2c06860d8..c727f2dcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + 29bac7a5cef32b4fdd69a79799040347ab4c62fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + 29bac7a5cef32b4fdd69a79799040347ab4c62fc diff --git a/eng/Versions.props b/eng/Versions.props index 77d04c9bf..94567f8c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.70 - 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.30 + 6.0.415-servicing.23479.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76985f56fb3dba1609c07f38a96da85069959957 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:10 +0000 Subject: [PATCH 10/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.30 -> To Version 6.0.415-servicing.23479.40 --- 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 c727f2dcc..9e254f0b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29bac7a5cef32b4fdd69a79799040347ab4c62fc + 798f74fcb6e86c328f6c55cb96907752e0164611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29bac7a5cef32b4fdd69a79799040347ab4c62fc + 798f74fcb6e86c328f6c55cb96907752e0164611 diff --git a/eng/Versions.props b/eng/Versions.props index 94567f8c9..f8f42a414 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.30 - 6.0.415-servicing.23479.30 + 6.0.415-servicing.23479.40 + 6.0.415-servicing.23479.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f68ad03f61c60c15f139226c4aae0119b7d35e60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:17 +0000 Subject: [PATCH 11/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.40 -> To Version 6.0.415-servicing.23479.47 --- 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 9e254f0b3..aa6ea5906 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 798f74fcb6e86c328f6c55cb96907752e0164611 + 1767ce68cb9f27c42d55f34d6f0901153f29d5ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 798f74fcb6e86c328f6c55cb96907752e0164611 + 1767ce68cb9f27c42d55f34d6f0901153f29d5ee diff --git a/eng/Versions.props b/eng/Versions.props index f8f42a414..c56f8747d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.40 - 6.0.415-servicing.23479.40 + 6.0.415-servicing.23479.47 + 6.0.415-servicing.23479.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68bd681d7c03f3c7c61c66ebc18bb4c8539d11d0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:24 +0000 Subject: [PATCH 12/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.56 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.47 -> To Version 6.0.415-servicing.23479.56 --- 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 aa6ea5906..dc6793b95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1767ce68cb9f27c42d55f34d6f0901153f29d5ee + 6e7f11dfd675ac9a715426914d081d0522bf325c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1767ce68cb9f27c42d55f34d6f0901153f29d5ee + 6e7f11dfd675ac9a715426914d081d0522bf325c diff --git a/eng/Versions.props b/eng/Versions.props index c56f8747d..6e00936c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.47 - 6.0.415-servicing.23479.47 + 6.0.415-servicing.23479.56 + 6.0.415-servicing.23479.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d93ea239eefc0c499f3e92060ac88bbb121df4ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:31 +0000 Subject: [PATCH 13/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.56 -> To Version 6.0.415-servicing.23479.70 --- 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 dc6793b95..2c06860d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7f11dfd675ac9a715426914d081d0522bf325c + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7f11dfd675ac9a715426914d081d0522bf325c + 41584f8690a6d383db4c980ff4279dada7d1dd0a diff --git a/eng/Versions.props b/eng/Versions.props index 6e00936c8..77d04c9bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.56 - 6.0.415-servicing.23479.56 + 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 462a63808716c6525ede956568cdd8df6d25f575 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 17:58:22 +0000 Subject: [PATCH 14/17] Merged PR 34149: [internal/release/frameshift/6.0.4xx] 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 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.415 to 6.0.415 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.415-rtm.23479.11 to 6.0.415-rtm.23480.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.415 to 6.0.415 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.P... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index a14489bf7..23ad3ebc8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c06860d8..e4e428567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 77d04c9bf..fae520d6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.415-servicing.23479.70 - 6.0.415-servicing.23479.70 + 6.0.415-servicing.23480.28 + 6.0.415-servicing.23480.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From 6963d2d1e0eb7c42b773f62b1d34fe34a7182d17 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:18 +0000 Subject: [PATCH 15/17] Merged PR 34160: [internal/release/frameshift/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:972ce726-6675-4ba6-cadf-08dbbf3cebf2) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 972ce726-6675-4ba6-cadf-08dbbf3cebf2 - **Build**: 20230930.38 - **Date Produced**: October 1, 2023 1:52:12 AM UTC - **Commit**: bb5ae4829da51d315033bedb73116477b0390cd3 - **Branch**: refs/heads/internal/release/frameshift/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1] - **Microsoft.NET.Sdk**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfe3cff583e&targetVersion=GCbb5ae4829d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:972ce726-6675-4ba6-cadf-08dbbf3cebf2) --- 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 e4e428567..05566786f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 + bb5ae4829da51d315033bedb73116477b0390cd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 + bb5ae4829da51d315033bedb73116477b0390cd3 diff --git a/eng/Versions.props b/eng/Versions.props index fae520d6b..ef5eb1b77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23480.28 - 6.0.415-servicing.23480.28 + 6.0.415-servicing.23480.38 + 6.0.415-servicing.23480.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8bc78a3797571a573b60b68394441ae5b5d49ed6 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:39 -0700 Subject: [PATCH 16/17] Update branding to 6.0.319 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c09ac1668..c3fbc4677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From f756140b8eee50f121c7bf0644a5bc749c690c57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:25:14 +0000 Subject: [PATCH 17/17] [release/6.0.4xx] Update dependencies from dotnet/arcade (#17516) [release/6.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 20 ++++++++- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- eng/common/retain-build.ps1 | 45 +++++++++++++++++++++ eng/common/templates/steps/retain-build.yml | 28 +++++++++++++ global.json | 6 +-- 6 files changed, 101 insertions(+), 12 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/NuGet.config b/NuGet.config index 23ad3ebc8..9401b3f64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,12 +14,21 @@ + + + + + + + + + @@ -41,15 +49,23 @@ - + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05566786f..688060474 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f4ece0e92..fac630493 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23408.5 + 6.0.0-beta.23511.8 diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 new file mode 100644 index 000000000..e7ba975ad --- /dev/null +++ b/eng/common/retain-build.ps1 @@ -0,0 +1,45 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +exit 0 diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/eng/common/templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/global.json b/global.json index 327cfe027..eeff7fa00 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121", + "dotnet": "6.0.123", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23511.8" } }