From 1e926f8fce3f834428d7d352176d6a7aa52e8754 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 10 Mar 2025 23:41:59 -0700 Subject: [PATCH 01/63] Revert changes to NativeAot test due to runtime update --- .../GivenThatWeWantToPublishAnAotApp.cs | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 9417f7eb2cd5..d136a7f9e3d4 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -39,25 +39,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string { testProject.AdditionalProperties["StripSymbols"] = "true"; } - var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); - - string[] ignoredPatterns = null; - - if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - { - ignoredPatterns = new string[] - { - // Both these exclusions can be removed once the min tested version is .NET 10 and the min supported - // XCode version is XCode 16. - - // -ld_classic option is required to workaround bugs in XCode 15 and .NET 9 and older runtimes. - // See https://github.com/dotnet/runtime/issues/97745 for details. - "ld: warning: -ld_classic is deprecated and will be removed in a future release", - // These warnings show up when dotnet/runtime compiled using Apple clang 15+ is used - // with classic linker (either Apple clang 14 or clang 15+ with -ld_classic). - "ld: warning: __LD,__compact_unwind entries for", - }; - } + var testAsset = _testAssetsManager.CreateTestProject(testProject); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); publishCommand @@ -66,7 +48,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string .And.NotHaveStdOutContaining("IL2026") .And.NotHaveStdErrContaining("NETSDK1179") .And.NotHaveStdErrContaining("warning") - .And.NotHaveStdOutContaining("warning", ignoredPatterns); + .And.NotHaveStdOutContaining("warning"); var buildProperties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework); var rid = buildProperties["NETCoreSdkPortableRuntimeIdentifier"]; From d12c226fabddeba48e5d967485ead81de22d4768 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Mar 2025 22:24:44 +0000 Subject: [PATCH 02/63] Update dependencies from https://github.com/dotnet/arcade build 20250220.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25114.5 -> To Version 8.0.0-beta.25120.1 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/cross/toolchain.cmake | 4 ++++ global.json | 4 ++-- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d39cef95a36..881e8276de3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,8 @@ + + @@ -19,6 +21,8 @@ + + @@ -27,14 +31,16 @@ + + - - + + @@ -59,6 +65,8 @@ + + @@ -74,9 +82,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fb092505667..a517b16943ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 499146b39dcb..e8f52430cc2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25114.5 + 8.0.0-beta.25120.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25114.5 + 8.0.0-beta.25120.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index dafabdcaef00..f93dc440df0e 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -280,6 +280,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_toolchain_linker_flag("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -327,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TARGET_ARCH_NAME STREQUAL "armel") add_compile_options(-mfloat-abi=softfp) endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_compile_options("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_compile_options(--target=${TOOLCHAIN}) diff --git a/global.json b/global.json index 29e4c494df4e..d6b08a6813f8 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25114.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25114.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1" } } From 27f44d6312792c01018242288abc9456a2f22fb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Mar 2025 04:00:58 +0000 Subject: [PATCH 03/63] Update dependencies from https://github.com/dotnet/templating build 20250312.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.115-servicing.25156.8 -> To Version 8.0.115-servicing.25162.2 --- NuGet.config | 18 +++++++++++++++--- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d39cef95a36..cd0b2e883244 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,8 @@ + + @@ -19,6 +21,8 @@ + + @@ -27,14 +31,16 @@ + + - - - + + + @@ -59,6 +65,8 @@ + + @@ -74,9 +82,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fb092505667..8e8bfba866fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 0da2c6ec19a265dd1478a9fb736c02117c907179 + e779fed31bb4e3f62b17133cac1cf9de44a3288d - + https://github.com/dotnet/templating - 0da2c6ec19a265dd1478a9fb736c02117c907179 + e779fed31bb4e3f62b17133cac1cf9de44a3288d - + https://github.com/dotnet/templating - 0da2c6ec19a265dd1478a9fb736c02117c907179 + e779fed31bb4e3f62b17133cac1cf9de44a3288d diff --git a/eng/Versions.props b/eng/Versions.props index 499146b39dcb..68ea66d80289 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.115-servicing.25156.8 + 8.0.115-servicing.25162.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 09c97f0d3fbdfc0aaee3e481479ff756606abdfa Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Thu, 13 Mar 2025 17:49:35 -0700 Subject: [PATCH 04/63] [Github Actions] Labels: Add extra labels to check (#47564) --- .github/workflows/pr-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-analysis.yml b/.github/workflows/pr-analysis.yml index b74a99c9799b..653869ada03b 100644 --- a/.github/workflows/pr-analysis.yml +++ b/.github/workflows/pr-analysis.yml @@ -1,7 +1,7 @@ name: PR Analysis on: pull_request: - types: [opened, synchronize, labeled, unlabeled] + types: [opened, labeled, unlabeled] permissions: contents: read pull-requests: read @@ -9,6 +9,6 @@ jobs: allowed-labels: runs-on: ubuntu-latest steps: - - name: Return error if branch is in lockdown or 'do not merge' label is present + - name: Return error if blocking labels are present in PR run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1 - if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }} + if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') || contains(github.event.pull_request.labels.*.name, 'Servicing-consider') || contains(github.event.pull_request.labels.*.name, 'Servicing-more-info') || contains(github.event.pull_request.labels.*.name, 'Servicing-rejected') }} From ca430eb3c1613b41cd2a5e2aa76497370ca36bab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Mar 2025 05:01:46 +0000 Subject: [PATCH 05/63] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250313.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25081.5 -> To Version 8.0.0-alpha.1.25163.2 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4cde543704c7..021c2a9f4b95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad16e06b5393..0faf81c9fdb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ dc30cd1ec22f198d658e011c14525d4d65873991 - + https://github.com/dotnet/source-build-reference-packages - d73fc552386797322e84fa9b2ef5eaa5369de83c + b09e26d761555d806f31af68d6fe5dfdeebf6e38 From f19eed1dcba31ce1e20300551b3ad99ceb4b4819 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Mar 2025 07:06:22 +0000 Subject: [PATCH 06/63] Update dependencies from https://github.com/dotnet/templating build 20250313.8 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.115-servicing.25162.2 -> To Version 8.0.115-servicing.25163.8 --- NuGet.config | 3 +-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b5916a52142..a2a22ec2ccd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,8 +35,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89024ffdf808..e80f8119385d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - e779fed31bb4e3f62b17133cac1cf9de44a3288d + 7cdf1f0e90717817671c87331db6bc44dc1d7eea - + https://github.com/dotnet/templating - e779fed31bb4e3f62b17133cac1cf9de44a3288d + 7cdf1f0e90717817671c87331db6bc44dc1d7eea - + https://github.com/dotnet/templating - e779fed31bb4e3f62b17133cac1cf9de44a3288d + 7cdf1f0e90717817671c87331db6bc44dc1d7eea diff --git a/eng/Versions.props b/eng/Versions.props index ed810ee22224..89b86e8c8bc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.115-servicing.25162.2 + 8.0.115-servicing.25163.8 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 4c44281c293d0491c2159ab5646fe610612b7d85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Mar 2025 16:25:12 +0000 Subject: [PATCH 07/63] [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#47579) Co-authored-by: dotnet-maestro[bot] Co-authored-by: v-wuzhai --- NuGet.config | 1 + eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index a2a22ec2ccd7..d9c1ddfe3dd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,6 +35,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e80f8119385d..f56c092c0f2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ dc30cd1ec22f198d658e011c14525d4d65873991 - + https://github.com/dotnet/source-build-reference-packages - d73fc552386797322e84fa9b2ef5eaa5369de83c + b09e26d761555d806f31af68d6fe5dfdeebf6e38 From 5b8484f1b26db09a2b2e0c2aa3e50bef58042b24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Mar 2025 09:54:14 -0700 Subject: [PATCH 08/63] [release/8.0.3xx] Update dependencies from dotnet/templating (#47583) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- NuGet.config | 1 + eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 021c2a9f4b95..7856fccc7cf9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,6 +29,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0faf81c9fdb1..efada1a7e849 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 643e034bcd7691f83537da605da511458de60b89 + 9a104178ab2f26e0a4e5ead165f7b272090b2114 - + https://github.com/dotnet/templating - 643e034bcd7691f83537da605da511458de60b89 + 9a104178ab2f26e0a4e5ead165f7b272090b2114 - + https://github.com/dotnet/templating - 643e034bcd7691f83537da605da511458de60b89 + 9a104178ab2f26e0a4e5ead165f7b272090b2114 diff --git a/eng/Versions.props b/eng/Versions.props index 64a36985e709..9873611c3d07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.311-servicing.25162.1 + 8.0.311-servicing.25163.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f7ec9feafd0939073964e2d7a60673048dbd4cb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Mar 2025 05:02:47 +0000 Subject: [PATCH 09/63] Update dependencies from https://github.com/dotnet/templating build 20250314.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.311-servicing.25163.1 -> To Version 8.0.311-servicing.25164.2 --- NuGet.config | 3 +-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7856fccc7cf9..5a5af4701808 100644 --- a/NuGet.config +++ b/NuGet.config @@ -29,8 +29,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efada1a7e849..be9bd908b8d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 9a104178ab2f26e0a4e5ead165f7b272090b2114 + f9ebd7d27891161e756c3812c94b2d2e4a7e7d87 - + https://github.com/dotnet/templating - 9a104178ab2f26e0a4e5ead165f7b272090b2114 + f9ebd7d27891161e756c3812c94b2d2e4a7e7d87 - + https://github.com/dotnet/templating - 9a104178ab2f26e0a4e5ead165f7b272090b2114 + f9ebd7d27891161e756c3812c94b2d2e4a7e7d87 diff --git a/eng/Versions.props b/eng/Versions.props index 9873611c3d07..aa1d317404bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.311-servicing.25163.1 + 8.0.311-servicing.25164.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 702118b30c8e308b7e0cce1802857e95229b0c43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Mar 2025 05:02:48 +0000 Subject: [PATCH 10/63] Update dependencies from https://github.com/dotnet/arcade build 20250314.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25120.1 -> To Version 8.0.0-beta.25164.5 --- NuGet.config | 1 - eng/Version.Details.xml | 16 +++++++-------- eng/Versions.props | 4 ++-- eng/common/generate-sbom-prep.ps1 | 20 +++++++++++++------ eng/common/generate-sbom-prep.sh | 17 ++++++++++------ eng/common/templates-official/job/job.yml | 3 ++- .../steps/generate-sbom.yml | 2 +- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 6 +++--- 10 files changed, 45 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9c1ddfe3dd1..a2a22ec2ccd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,7 +35,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f56c092c0f2e..b9584cc072ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + 802042c6e779b73b4edb012ee1d5bae02ec8d41c - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + 802042c6e779b73b4edb012ee1d5bae02ec8d41c - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + 802042c6e779b73b4edb012ee1d5bae02ec8d41c - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + 802042c6e779b73b4edb012ee1d5bae02ec8d41c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 89b86e8c8bc0..2dfb3a8a16f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25120.1 + 8.0.0-beta.25164.5 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25120.1 + 8.0.0-beta.25164.5 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index 3e5c1c74a1c5..a0c7d792a76f 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -4,18 +4,26 @@ Param( . $PSScriptRoot\pipeline-logging-functions.ps1 +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" +$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' +$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName + +Write-Host "Artifact name before : $ArtifactName" +Write-Host "Artifact name after : $SafeArtifactName" + Write-Host "Creating dir $ManifestDirPath" + # create directory for sbom manifest to be placed -if (!(Test-Path -path $ManifestDirPath)) +if (!(Test-Path -path $SbomGenerationDir)) { - New-Item -ItemType Directory -path $ManifestDirPath - Write-Host "Successfully created directory $ManifestDirPath" + New-Item -ItemType Directory -path $SbomGenerationDir + Write-Host "Successfully created directory $SbomGenerationDir" } else{ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." } Write-Host "Updating artifact name" -$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' -Write-Host "Artifact name $artifact_name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index d5c76dc827b4..bbb4922151e6 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -14,19 +14,24 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . $scriptroot/pipeline-logging-functions.sh +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" + manifest_dir=$1 -if [ ! -d "$manifest_dir" ] ; then - mkdir -p "$manifest_dir" - echo "Sbom directory created." $manifest_dir +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +sbom_generation_dir="$manifest_dir/$safe_artifact_name" + +if [ ! -d "$sbom_generation_dir" ] ; then + mkdir -p "$sbom_generation_dir" + echo "Sbom directory created." $sbom_generation_dir else Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." fi -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" echo "Artifact name before : "$artifact_name -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" echo "Artifact name after : "$safe_artifact_name export ARTIFACT_NAME=$safe_artifact_name echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 1f035fee73f4..98ccbd7a9c16 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -38,6 +38,7 @@ parameters: enableSbom: true PackageVersion: 7.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom jobs: - job: ${{ parameters.name }} @@ -261,4 +262,4 @@ jobs: targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' - continueOnError: true \ No newline at end of file + continueOnError: true diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml index 1bf43bf807af..daf0957b68d7 100644 --- a/eng/common/templates-official/steps/generate-sbom.yml +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -35,7 +35,7 @@ steps: PackageName: ${{ parameters.packageName }} BuildDropPath: ${{ parameters.buildDropPath }} PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} + ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) ${{ if ne(parameters.IgnoreDirectories, '') }}: AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a00577ed17aa..82b2798ba307 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -263,7 +263,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index b9b329ce37ff..68db15430230 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -297,7 +297,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index d6b08a6813f8..9982ec1ef3b5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.113", + "dotnet": "8.0.114", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5" } } From 4b85f19796a8b9fdfba934c36d4780869e65f8b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Mar 2025 05:02:53 +0000 Subject: [PATCH 11/63] Update dependencies from https://github.com/dotnet/arcade build 20250314.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25120.1 -> To Version 8.0.0-beta.25164.5 --- NuGet.config | 1 - eng/Version.Details.xml | 16 +++++++-------- eng/Versions.props | 4 ++-- eng/common/generate-sbom-prep.ps1 | 20 +++++++++++++------ eng/common/generate-sbom-prep.sh | 17 ++++++++++------ eng/common/templates-official/job/job.yml | 3 ++- .../steps/generate-sbom.yml | 2 +- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 6 +++--- 10 files changed, 45 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7856fccc7cf9..e30c314a895e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efada1a7e849..609a63983751 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + 802042c6e779b73b4edb012ee1d5bae02ec8d41c - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + 802042c6e779b73b4edb012ee1d5bae02ec8d41c - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + 802042c6e779b73b4edb012ee1d5bae02ec8d41c - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + 802042c6e779b73b4edb012ee1d5bae02ec8d41c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9873611c3d07..846faccfcf2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25120.1 + 8.0.0-beta.25164.5 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25120.1 + 8.0.0-beta.25164.5 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index 3e5c1c74a1c5..a0c7d792a76f 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -4,18 +4,26 @@ Param( . $PSScriptRoot\pipeline-logging-functions.ps1 +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" +$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' +$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName + +Write-Host "Artifact name before : $ArtifactName" +Write-Host "Artifact name after : $SafeArtifactName" + Write-Host "Creating dir $ManifestDirPath" + # create directory for sbom manifest to be placed -if (!(Test-Path -path $ManifestDirPath)) +if (!(Test-Path -path $SbomGenerationDir)) { - New-Item -ItemType Directory -path $ManifestDirPath - Write-Host "Successfully created directory $ManifestDirPath" + New-Item -ItemType Directory -path $SbomGenerationDir + Write-Host "Successfully created directory $SbomGenerationDir" } else{ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." } Write-Host "Updating artifact name" -$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' -Write-Host "Artifact name $artifact_name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index d5c76dc827b4..bbb4922151e6 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -14,19 +14,24 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . $scriptroot/pipeline-logging-functions.sh +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" + manifest_dir=$1 -if [ ! -d "$manifest_dir" ] ; then - mkdir -p "$manifest_dir" - echo "Sbom directory created." $manifest_dir +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +sbom_generation_dir="$manifest_dir/$safe_artifact_name" + +if [ ! -d "$sbom_generation_dir" ] ; then + mkdir -p "$sbom_generation_dir" + echo "Sbom directory created." $sbom_generation_dir else Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." fi -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" echo "Artifact name before : "$artifact_name -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" echo "Artifact name after : "$safe_artifact_name export ARTIFACT_NAME=$safe_artifact_name echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 1f035fee73f4..98ccbd7a9c16 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -38,6 +38,7 @@ parameters: enableSbom: true PackageVersion: 7.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom jobs: - job: ${{ parameters.name }} @@ -261,4 +262,4 @@ jobs: targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' - continueOnError: true \ No newline at end of file + continueOnError: true diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml index 1bf43bf807af..daf0957b68d7 100644 --- a/eng/common/templates-official/steps/generate-sbom.yml +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -35,7 +35,7 @@ steps: PackageName: ${{ parameters.packageName }} BuildDropPath: ${{ parameters.buildDropPath }} PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} + ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) ${{ if ne(parameters.IgnoreDirectories, '') }}: AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a00577ed17aa..82b2798ba307 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -263,7 +263,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index b9b329ce37ff..68db15430230 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -297,7 +297,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index d6b08a6813f8..9982ec1ef3b5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.113", + "dotnet": "8.0.114", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5" } } From 5213445380973bc425704fb06b4c6ef61b8bedca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Mar 2025 03:13:19 +0000 Subject: [PATCH 12/63] Update dependencies from https://github.com/dotnet/templating build 20250316.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.115-servicing.25163.8 -> To Version 8.0.115-servicing.25166.1 --- NuGet.config | 23 +---------------------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index a2a22ec2ccd7..12dfce6e239f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,6 @@ - - - @@ -20,9 +17,6 @@ - - - @@ -30,17 +24,11 @@ - - - - + - - - @@ -65,9 +53,6 @@ - - - @@ -82,14 +67,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9584cc072ff..72a523b4ff5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 7cdf1f0e90717817671c87331db6bc44dc1d7eea + 342a0e1e7d00f65e4c5b31228fb2148b64f81603 - + https://github.com/dotnet/templating - 7cdf1f0e90717817671c87331db6bc44dc1d7eea + 342a0e1e7d00f65e4c5b31228fb2148b64f81603 - + https://github.com/dotnet/templating - 7cdf1f0e90717817671c87331db6bc44dc1d7eea + 342a0e1e7d00f65e4c5b31228fb2148b64f81603 diff --git a/eng/Versions.props b/eng/Versions.props index 2dfb3a8a16f5..6975e1a6ae51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.115-servicing.25163.8 + 8.0.115-servicing.25166.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 7df0cd2899bc567f731655d4f43fc8e199dd258a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 17 Mar 2025 05:03:45 +0000 Subject: [PATCH 13/63] Update dependencies from https://github.com/dotnet/templating build 20250316.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.408-servicing.25163.2 -> To Version 8.0.408-servicing.25166.5 --- NuGet.config | 23 +---------------------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2c9bf7892b79..f11122618150 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,6 @@ - - - @@ -14,9 +11,6 @@ - - - @@ -24,17 +18,11 @@ - - - - + - - - @@ -61,21 +49,12 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 501f6ed83127..439dc7bf1d26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 21231eb04bbada374ed06160e7889c161d4e1453 + 4a8442440cc7c977ec7d5d65c92e00e432162d4e - + https://github.com/dotnet/templating - 21231eb04bbada374ed06160e7889c161d4e1453 + 4a8442440cc7c977ec7d5d65c92e00e432162d4e - + https://github.com/dotnet/templating - 21231eb04bbada374ed06160e7889c161d4e1453 + 4a8442440cc7c977ec7d5d65c92e00e432162d4e diff --git a/eng/Versions.props b/eng/Versions.props index 6bb852027bfe..265d37080595 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.408-servicing.25163.2 + 8.0.408-servicing.25166.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 2dc99eaf6b87ebe318ad5dc2eef4b91356ac78f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Mar 2025 22:54:21 +0000 Subject: [PATCH 14/63] Update dependencies from https://github.com/dotnet/format build 20250325.6 dotnet-format From Version 8.1.546807 -> To Version 8.1.617506 --- NuGet.config | 20 +------------------- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12dfce6e239f..ae5ecfa375c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,16 +5,7 @@ - - - - - - - - - - + @@ -55,15 +46,6 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72a523b4ff5a..c0cce5d1d6d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 - - https://dev.azure.com/dnceng/internal/_git/dotnet-format - 27f18656aab37d71839f562c0653afce07a2d2fd + + https://github.com/dotnet/format + 664013fbe5e68941be81f9a710058db028da788f diff --git a/eng/Versions.props b/eng/Versions.props index 6975e1a6ae51..c39219623548 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ - 8.1.546807 + 8.1.617506 From cd7cd77824f0194c18c2b57ceea4cb99d28d173e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Apr 2025 21:46:55 +0000 Subject: [PATCH 15/63] Update dependencies from https://github.com/dotnet/templating build 20250402.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.115-servicing.25166.1 -> To Version 8.0.116-servicing.25202.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12dfce6e239f..45f20822ac07 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72a523b4ff5a..68e4cb9d30e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 342a0e1e7d00f65e4c5b31228fb2148b64f81603 + a6bfd46fc8b8c127a05603dd12ce715cd303a697 - + https://github.com/dotnet/templating - 342a0e1e7d00f65e4c5b31228fb2148b64f81603 + a6bfd46fc8b8c127a05603dd12ce715cd303a697 - + https://github.com/dotnet/templating - 342a0e1e7d00f65e4c5b31228fb2148b64f81603 + a6bfd46fc8b8c127a05603dd12ce715cd303a697 diff --git a/eng/Versions.props b/eng/Versions.props index 6975e1a6ae51..a4065cd93622 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 8.0.115 + 8.0.116 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.115-servicing.25166.1 + 8.0.116-servicing.25202.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f00237a541027a2f81ca124f0981b4f04cf506d3 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:06:53 -0700 Subject: [PATCH 16/63] Update branding to 8.0.116 (#48107) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6975e1a6ae51..d6538a2ac985 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.115 + 8.0.116 true release From b79fa4922364b9d562a82fae87da05bfc4ad2715 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:07:08 -0700 Subject: [PATCH 17/63] Update branding to 8.0.312 (#48108) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 12032215da49..f1933a29e83e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.311 + 8.0.312 8.0.300 true From 8e7af5ab0e2986fe9950f88db74684548f4cd6ff Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:07:21 -0700 Subject: [PATCH 18/63] Update branding to 8.0.409 (#48109) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 56d6fe90b7a4..309c7d4f650c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.408 + 8.0.409 8.0.400 true From cdf48dd6c3dbbb84822580f4d6eb9ff78dd01408 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:26:58 -0700 Subject: [PATCH 19/63] [release/8.0.1xx] Update dependencies from dotnet/source-build-externals (#48103) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72a523b4ff5a..d8c28c3449e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - dc30cd1ec22f198d658e011c14525d4d65873991 + 16bcad1c13be082bd52ce178896d1119a73081a9 From 99c81e1969b3dfd9d33821eecce6270a44244002 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:27:32 -0700 Subject: [PATCH 20/63] [release/8.0.4xx] Update dependencies from dotnet/format (#47890) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 +--- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index f11122618150..61d96218c546 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ba0921c16e3..59873ea7e580 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 - + https://github.com/dotnet/format - 42ef1d04e544c2a0dca064f9fc982639ca516a84 + 59e6d3d25002f5d630274b7ceb0cb164fdf0a996 diff --git a/eng/Versions.props b/eng/Versions.props index 309c7d4f650c..66451cc56b41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,7 +115,7 @@ - 8.3.607401 + 8.3.617508 From b68b698fe2ad186426207ba2fa7b804f6f22d22d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:27:39 -0700 Subject: [PATCH 21/63] [release/8.0.3xx] Update dependencies from dotnet/format (#47889) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 26 +------------------------- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00ac762da740..28cef02644fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,19 +4,11 @@ - - - - - - + - - - @@ -24,18 +16,11 @@ - - - - - - - @@ -62,23 +47,14 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af33ac8d36cc..b33b9de2cf6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ 80c165644db640d0f309affe0daa281c7e17b939 - + https://github.com/dotnet/format - 42ef1d04e544c2a0dca064f9fc982639ca516a84 + c61d046a6d6dfb63e5cfcee2c3218a13b83e3bff diff --git a/eng/Versions.props b/eng/Versions.props index f1933a29e83e..bb00f0dc204d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,7 +115,7 @@ - 8.3.607401 + 8.3.617507 From e5949fad6dc554da04c5dac41103d1dffa66501c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:41:59 -0700 Subject: [PATCH 22/63] [release/8.0.1xx] Update dependencies from dotnet/razor (#47815) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8c28c3449e9..0a0a14a5aa33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 25ef4aa38b77974263cb10f6e9cbd10135f17b59 - + https://github.com/dotnet/razor - 738705b78cec78396b98e793dcb3466a03a7a269 + 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 - + https://github.com/dotnet/razor - 738705b78cec78396b98e793dcb3466a03a7a269 + 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 - + https://github.com/dotnet/razor - 738705b78cec78396b98e793dcb3466a03a7a269 + 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d6538a2ac985..9e45240df7fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ - 7.0.0-preview.25123.5 - 7.0.0-preview.25123.5 - 7.0.0-preview.25123.5 + 7.0.0-preview.25175.8 + 7.0.0-preview.25175.8 + 7.0.0-preview.25175.8 From 2b284419b031cb7f3f215e7e1dcf666d82a7a012 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 15:46:57 -0700 Subject: [PATCH 23/63] [release/8.0.4xx] Update dependencies from dotnet/templating (#47682) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61d96218c546..b49e68ee97ba 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59873ea7e580..43ae81e1d1ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 4a8442440cc7c977ec7d5d65c92e00e432162d4e + 11015ec62c33cfbb43585fd8fcc5dd97817d9496 - + https://github.com/dotnet/templating - 4a8442440cc7c977ec7d5d65c92e00e432162d4e + 11015ec62c33cfbb43585fd8fcc5dd97817d9496 - + https://github.com/dotnet/templating - 4a8442440cc7c977ec7d5d65c92e00e432162d4e + 11015ec62c33cfbb43585fd8fcc5dd97817d9496 diff --git a/eng/Versions.props b/eng/Versions.props index 66451cc56b41..b7b515ca7ae1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.408-servicing.25166.5 + 8.0.408-servicing.25166.9 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From a60a1a0f96bd496289b43ce5d5202c33964eff6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Apr 2025 00:20:30 +0000 Subject: [PATCH 24/63] [release/8.0.3xx] Update dependencies from dotnet/razor (#47826) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b33b9de2cf6b..a435dd223d64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 25ef4aa38b77974263cb10f6e9cbd10135f17b59 - + https://github.com/dotnet/razor - 291218a1671cc18216b6fc93204619d761515011 + 09ca88197916e545aefea53f16ed1b266644cde9 - + https://github.com/dotnet/razor - 291218a1671cc18216b6fc93204619d761515011 + 09ca88197916e545aefea53f16ed1b266644cde9 - + https://github.com/dotnet/razor - 291218a1671cc18216b6fc93204619d761515011 + 09ca88197916e545aefea53f16ed1b266644cde9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bb00f0dc204d..4bbd49480b9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,9 +179,9 @@ - 7.0.0-preview.25123.3 - 7.0.0-preview.25123.3 - 7.0.0-preview.25123.3 + 7.0.0-preview.25175.5 + 7.0.0-preview.25175.5 + 7.0.0-preview.25175.5 From 75e459ec2adb6a79f02d49999f12acf4352ab3cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Apr 2025 05:02:22 +0000 Subject: [PATCH 25/63] Update dependencies from https://github.com/dotnet/source-build-externals build 20250402.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.25104.1 -> To Version 8.0.0-alpha.1.25202.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a435dd223d64..604d6163fd89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - dc30cd1ec22f198d658e011c14525d4d65873991 + 16bcad1c13be082bd52ce178896d1119a73081a9 From 304012978deb01c3d89a8a62e19228652406694d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Apr 2025 05:02:28 +0000 Subject: [PATCH 26/63] Update dependencies from https://github.com/dotnet/source-build-externals build 20250402.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.25104.1 -> To Version 8.0.0-alpha.1.25202.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43ae81e1d1ed..526eb79bf5aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - dc30cd1ec22f198d658e011c14525d4d65873991 + 16bcad1c13be082bd52ce178896d1119a73081a9 From 9451c234772223cdab7b0b814f9aeaed007be506 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Apr 2025 05:02:28 +0000 Subject: [PATCH 27/63] Update dependencies from https://github.com/dotnet/templating build 20250402.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.408-servicing.25166.9 -> To Version 8.0.409-servicing.25202.5 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index b49e68ee97ba..4da8b1b42cb3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43ae81e1d1ed..0449882f8342 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 11015ec62c33cfbb43585fd8fcc5dd97817d9496 + 4a61383202e8c30b61d746c86b94bd5cbf3d9c39 - + https://github.com/dotnet/templating - 11015ec62c33cfbb43585fd8fcc5dd97817d9496 + 4a61383202e8c30b61d746c86b94bd5cbf3d9c39 - + https://github.com/dotnet/templating - 11015ec62c33cfbb43585fd8fcc5dd97817d9496 + 4a61383202e8c30b61d746c86b94bd5cbf3d9c39 diff --git a/eng/Versions.props b/eng/Versions.props index b7b515ca7ae1..68f21fd263d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 8.0.408 + 8.0.409 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.408-servicing.25166.9 + 8.0.409-servicing.25202.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 1365c9241d5250d1d27f8e23c15f738ed764cdbd Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 3 Apr 2025 00:11:26 -0700 Subject: [PATCH 28/63] Revert changes to eng/Version.Details.xml --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 604d6163fd89..a435dd223d64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 16bcad1c13be082bd52ce178896d1119a73081a9 + dc30cd1ec22f198d658e011c14525d4d65873991 From e3e0f6bf59a55467a4880cc28f4cd214e5eb7e31 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Thu, 3 Apr 2025 11:18:08 -0500 Subject: [PATCH 29/63] Allow container targets to be loaded in more scenarios, even if the targets will be skipped (#47693) --- .../Microsoft.NET.Build.Tasks/sdk/Sdk.targets | 2 +- .../EndToEndTests.cs | 82 ++++++++++++++++++- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets index 3d68d1de7830..15e9ca429aea 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets @@ -64,5 +64,5 @@ Copyright (c) .NET Foundation. All rights reserved. Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\Containers\build\Microsoft.NET.Build.Containers.props')" /> + Condition="$(_IsNotSetContainersTargetsDir) AND Exists('$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets')" /> diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 836022f30f3b..2144a47973cb 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -353,7 +353,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st public async Task EndToEnd_MultiProjectSolution() { ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution)); - DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, $"CreateNewImageTest_EndToEnd_MultiProjectSolution")); + DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, nameof(EndToEnd_MultiProjectSolution))); if (newSolutionDir.Exists) { @@ -431,6 +431,82 @@ public async Task EndToEnd_MultiProjectSolution() commandResult.Should().HaveStdOutContaining("Pushed image 'consoleapp:latest'"); } + /// + /// Tests that a multi-project solution with a library that targets multiple frameworks can be published. + /// This is interesting because before https://github.com/dotnet/sdk/pull/47693 the container targets + /// wouldn't be loaded for multi-TFM project evaluations, so any calls to the PublishContainer target + /// for libraries (which may be multi-targeted even when referenced from a single-target published app project) would fail. + /// It's safe to load the target for libraries in a multi-targeted context because libraries don't have EnableSdkContainerSupport + /// enabled by default, so the target will be skipped. + /// + [DockerAvailableFact] + public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library() + { + ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library)); + DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library))); + + if (newSolutionDir.Exists) + { + newSolutionDir.Delete(recursive: true); + } + + newSolutionDir.Create(); + + // Create solution with projects + new DotnetNewCommand(_testOutput, "sln", "-n", nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library)) + .WithVirtualHive() + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + new DotnetNewCommand(_testOutput, "web", "-n", "WebApp") + .WithVirtualHive() + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + new DotnetCommand(_testOutput, "sln", "add", Path.Combine("WebApp", "WebApp.csproj")) + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + new DotnetNewCommand(_testOutput, "classlib", "-n", "Library") + .WithVirtualHive() + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + new DotnetCommand(_testOutput, "sln", "add", Path.Combine("Library", "Library.csproj")) + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + // Set TFMs for Library - use current toolset + NS2.0 for compatibility + // also set IsPublishable to false + using (FileStream stream = File.Open(Path.Join(newSolutionDir.FullName, "Library", "Library.csproj"), FileMode.Open, FileAccess.ReadWrite)) + { + XDocument document = await XDocument.LoadAsync(stream, LoadOptions.None, CancellationToken.None); + var tfmNode = + document + .Descendants() + .First(e => e.Name.LocalName == "TargetFramework"); + var propertyGroupNode = tfmNode.Parent!; + tfmNode.Remove(); + propertyGroupNode.Add(new XElement("TargetFrameworks", $"{ToolsetInfo.CurrentTargetFramework};netstandard2.0")); + propertyGroupNode.Add(new XElement("IsPublishable", "false")); + stream.SetLength(0); + await document.SaveAsync(stream, SaveOptions.None, CancellationToken.None); + } + + // Publish + CommandResult commandResult = new DotnetCommand(_testOutput, "publish", "/t:PublishContainer") + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute(); + + commandResult.Should().Pass(); + commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'"); + } + [DockerAvailableTheory()] [InlineData("webapi", false)] [InlineData("webapi", true)] @@ -1012,7 +1088,7 @@ public void EndToEndMultiArch_RemoteRegistry() .And.HaveStdOutContaining($"Pushed image '{imageX64}' to registry '{registry}'.") .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to registry '{registry}'.") .And.HaveStdOutContaining($"Pushed image index '{imageIndex}' to registry '{registry}'."); - + // Check that the containers can be run // First pull the image from the registry for each platform ContainerCli.PullCommand( @@ -1029,7 +1105,7 @@ public void EndToEndMultiArch_RemoteRegistry() imageFromRegistry) .Execute() .Should().Pass(); - + // Run the containers ContainerCli.RunCommand( _testOutput, From 36cf06921146bace99bc286d98edd8fe0d2a624e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Apr 2025 11:18:20 -0500 Subject: [PATCH 30/63] [release/8.0.4xx] add a flag to let users opt into serial builds of inner-RID containers (#47475) Co-authored-by: Chet Husk --- .../packaging/build/Microsoft.NET.Build.Containers.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets index ff22ed811e83..687c561d1554 100644 --- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets +++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets @@ -345,7 +345,7 @@ + BuildInParallel="$([MSBuild]::ValueOrDefault('$(ContainerPublishInParallel)', 'true'))"> From 56ef042ec92460d94e319ce11cf2f9e9c01362ee Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Thu, 3 Apr 2025 11:18:29 -0500 Subject: [PATCH 31/63] Force OCI format for inner images when publishing tarballs or to local docker instances (#47398) --- .../Microsoft.NET.Build.Containers.targets | 11 ++++- .../EndToEndTests.cs | 41 +++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets index 687c561d1554..3a65dbd64d7e 100644 --- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets +++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets @@ -304,10 +304,16 @@ <_SkipContainerPublishing>false <_SkipContainerPublishing Condition="$(ContainerArchiveOutputPath) != '' or ( $(ContainerRegistry) == '' and ( $(LocalRegistry) == '' or $(LocalRegistry) == 'Docker' ) )">true - + <_SkipCreateImageIndex>false <_SkipCreateImageIndex Condition="$(ContainerArchiveOutputPath) == '' and $(ContainerRegistry) == '' and $(LocalRegistry) == 'Podman'">true + + + + <_SingleImageContainerFormat Condition="'$(ContainerImageFormat)' != ''">$(ContainerImageFormat) + + <_SingleImageContainerFormat Condition="$(_SkipContainerPublishing) == 'true' ">OCI @@ -337,7 +343,8 @@ ContainerUser=$(ContainerUser); ContainerGenerateLabels=$(ContainerGenerateLabels); ContainerGenerateLabelsImageBaseDigest=$(ContainerGenerateLabelsImageBaseDigest); - _SkipContainerPublishing=$(_SkipContainerPublishing) + _SkipContainerPublishing=$(_SkipContainerPublishing); + ContainerImageFormat=$(_SingleImageContainerFormat) "/> <_rids Remove ="$(_rids)" /> diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 2144a47973cb..c630ef45e541 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -1427,4 +1427,45 @@ static string[] DecideEntrypoint(string rid, string appName, string workingDir) return new[] { $"{workingDir}/{binary}" }; } } + + [DockerAvailableFact(checkContainerdStoreAvailability: true)] + public void EnforcesOciSchemaForMultiRIDTarballOutput() + { + string imageName = NewImageName(); + string tag = "1.0"; + + // Create new console app + DirectoryInfo newProjectDir = CreateNewProject("webapp"); + + // Run PublishContainer for multi-arch with ContainerGenerateLabels + var publishResult = new DotnetCommand( + _testOutput, + "publish", + "/t:PublishContainer", + "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"", + $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}", + $"/p:ContainerRepository={imageName}", + $"/p:ContainerImageTag={tag}", + "/p:EnableSdkContainerSupport=true", + "/p:ContainerArchiveOutputPath=archive.tar.gz", + "-getProperty:GeneratedImageIndex", + "-getItem:GeneratedContainers", + "/bl") + .WithWorkingDirectory(newProjectDir.FullName) + .Execute(); + + publishResult.Should().Pass(); + var jsonDump = JsonDocument.Parse(publishResult.StdOut); + var index = JsonDocument.Parse(jsonDump.RootElement.GetProperty("Properties").GetProperty("GeneratedImageIndex").ToString()); + var containers = jsonDump.RootElement.GetProperty("Items").GetProperty("GeneratedContainers").EnumerateArray().ToArray(); + + index.RootElement.GetProperty("mediaType").GetString().Should().Be("application/vnd.oci.image.index.v1+json"); + containers.Should().HaveCount(2); + foreach (var container in containers) + { + container.GetProperty("ManifestMediaType").GetString().Should().Be("application/vnd.oci.image.manifest.v1+json"); + } + // Cleanup + newProjectDir.Delete(true); + } } From a9f45389b6db9d90e0a834dd5c13652472542e7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Apr 2025 09:27:25 -0700 Subject: [PATCH 32/63] [release/8.0.3xx] Update dependencies from dotnet/templating (#47645) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 28cef02644fc..02e598067bab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 604d6163fd89..3a745c9080b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - f9ebd7d27891161e756c3812c94b2d2e4a7e7d87 + 72950e7ca3f79f6642bead94221b2b8d0616a3d8 - + https://github.com/dotnet/templating - f9ebd7d27891161e756c3812c94b2d2e4a7e7d87 + 72950e7ca3f79f6642bead94221b2b8d0616a3d8 - + https://github.com/dotnet/templating - f9ebd7d27891161e756c3812c94b2d2e4a7e7d87 + 72950e7ca3f79f6642bead94221b2b8d0616a3d8 diff --git a/eng/Versions.props b/eng/Versions.props index 4bbd49480b9b..55671bd91834 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 8.0.311 + 8.0.312 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.311-servicing.25164.2 + 8.0.312-servicing.25202.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 8fbe152df0b04f84603fb1286dbcfce8c86f11ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Apr 2025 15:23:39 -0700 Subject: [PATCH 33/63] [release/8.0.4xx] Update dependencies from dotnet/templating (#48164) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4da8b1b42cb3..52f282f9690b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8eb9929f9c6..7652b8585bd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 4a61383202e8c30b61d746c86b94bd5cbf3d9c39 + 4501fdd4fb107f05fca15ea0fa6db9c82a6eb271 - + https://github.com/dotnet/templating - 4a61383202e8c30b61d746c86b94bd5cbf3d9c39 + 4501fdd4fb107f05fca15ea0fa6db9c82a6eb271 - + https://github.com/dotnet/templating - 4a61383202e8c30b61d746c86b94bd5cbf3d9c39 + 4501fdd4fb107f05fca15ea0fa6db9c82a6eb271 diff --git a/eng/Versions.props b/eng/Versions.props index 68f21fd263d7..57fdfe8009b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.409-servicing.25202.5 + 8.0.409-servicing.25203.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From a7ea0cd54f238358918c01c837bc51b6582e82b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Apr 2025 15:23:57 -0700 Subject: [PATCH 34/63] [release/8.0.3xx] Update dependencies from dotnet/templating (#48162) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 02e598067bab..d69cecbc702d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a745c9080b3..62360ce1b597 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 72950e7ca3f79f6642bead94221b2b8d0616a3d8 + c339ffb1e20866b2e8089a8cd1c3ae76b106af14 - + https://github.com/dotnet/templating - 72950e7ca3f79f6642bead94221b2b8d0616a3d8 + c339ffb1e20866b2e8089a8cd1c3ae76b106af14 - + https://github.com/dotnet/templating - 72950e7ca3f79f6642bead94221b2b8d0616a3d8 + c339ffb1e20866b2e8089a8cd1c3ae76b106af14 diff --git a/eng/Versions.props b/eng/Versions.props index 55671bd91834..33b3f9a0239e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.312-servicing.25202.3 + 8.0.312-servicing.25203.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 89c2b04bbee92b54f4d9f840ee1f3602cf1d9c78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Apr 2025 05:02:23 +0000 Subject: [PATCH 35/63] Update dependencies from https://github.com/dotnet/arcade build 20250404.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25164.5 -> To Version 8.0.0-beta.25204.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8515baf54e56..579a7439d1d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d6a12101862b..7c13f515cea6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25164.5 + 8.0.0-beta.25204.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25164.5 + 8.0.0-beta.25204.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 9982ec1ef3b5..570ed21c0599 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7" } } From 7c65c0d1e0f4ad089545dfe234971fb20430f4fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Apr 2025 05:02:29 +0000 Subject: [PATCH 36/63] Update dependencies from https://github.com/dotnet/arcade build 20250404.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25164.5 -> To Version 8.0.0-beta.25204.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62360ce1b597..0f66a6bec0f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 33b3f9a0239e..5cb24fa0293c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25164.5 + 8.0.0-beta.25204.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25164.5 + 8.0.0-beta.25204.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 9982ec1ef3b5..570ed21c0599 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7" } } From 052b3286d19661c88929bc5ddd63056524d133f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Apr 2025 05:02:38 +0000 Subject: [PATCH 37/63] Update dependencies from https://github.com/dotnet/arcade build 20250404.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25164.5 -> To Version 8.0.0-beta.25204.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7652b8585bd7..be31e2458c16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 57fdfe8009b5..4c8de3ef1960 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25164.5 + 8.0.0-beta.25204.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25164.5 + 8.0.0-beta.25204.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 9982ec1ef3b5..570ed21c0599 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7" } } From 27e83096e2179ef326658ab618cb483b06ab8783 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Apr 2025 03:12:19 +0000 Subject: [PATCH 38/63] Update dependencies from https://github.com/dotnet/msbuild build 20250407.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.22-preview-25121-01 -> To Version 17.8.24-preview-25207-02 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index ab75cad13b06..93f6f3e73467 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 579a7439d1d7..e7b5cc0cc510 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314 - + https://github.com/dotnet/msbuild - bfbb05667061fc94ba2d135e28e3827161947b95 + b46a62a9a9861ce314f4119f968caafedd85741e - + https://github.com/dotnet/msbuild - bfbb05667061fc94ba2d135e28e3827161947b95 + b46a62a9a9861ce314f4119f968caafedd85741e - + https://github.com/dotnet/msbuild - bfbb05667061fc94ba2d135e28e3827161947b95 + b46a62a9a9861ce314f4119f968caafedd85741e diff --git a/eng/Versions.props b/eng/Versions.props index 7c13f515cea6..2ab3c3164180 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ - 17.8.22 + 17.8.24 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 579a7439d1d7..279f0c6080cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - a6bfd46fc8b8c127a05603dd12ce715cd303a697 + 2ce7363f41ab414c2754b4883a50743df3d2b388 - + https://github.com/dotnet/templating - a6bfd46fc8b8c127a05603dd12ce715cd303a697 + 2ce7363f41ab414c2754b4883a50743df3d2b388 - + https://github.com/dotnet/templating - a6bfd46fc8b8c127a05603dd12ce715cd303a697 + 2ce7363f41ab414c2754b4883a50743df3d2b388 diff --git a/eng/Versions.props b/eng/Versions.props index 7c13f515cea6..c67c6877e261 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.116-servicing.25202.2 + 8.0.116-servicing.25206.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From af54c4eae5f271fd48226f939437901294ed8651 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Apr 2025 05:03:12 +0000 Subject: [PATCH 40/63] Update dependencies from https://github.com/dotnet/templating build 20250406.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.312-servicing.25203.1 -> To Version 8.0.312-servicing.25206.4 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index d69cecbc702d..ef67c5726cb3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f66a6bec0f0..afce62ce8ec8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - c339ffb1e20866b2e8089a8cd1c3ae76b106af14 + c2bed41c09564b0abe6392c689f5e75a2c8c2b2a - + https://github.com/dotnet/templating - c339ffb1e20866b2e8089a8cd1c3ae76b106af14 + c2bed41c09564b0abe6392c689f5e75a2c8c2b2a - + https://github.com/dotnet/templating - c339ffb1e20866b2e8089a8cd1c3ae76b106af14 + c2bed41c09564b0abe6392c689f5e75a2c8c2b2a diff --git a/eng/Versions.props b/eng/Versions.props index 5cb24fa0293c..0676564efc2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.312-servicing.25203.1 + 8.0.312-servicing.25206.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 4027983af08937baacc7a0ff27f6daa7ba67314d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Apr 2025 05:03:12 +0000 Subject: [PATCH 41/63] Update dependencies from https://github.com/dotnet/msbuild build 20250407.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.23-preview-25121-03 -> To Version 17.10.25-preview-25207-05 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index d69cecbc702d..a1085fe35fb8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f66a6bec0f0..1e2260458f0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314 - + https://github.com/dotnet/msbuild - f3052339bec221fe67339242439d2b960674265d + 54a3d0c079460f83122c75c8349bed1ed0258135 - + https://github.com/dotnet/msbuild - f3052339bec221fe67339242439d2b960674265d + 54a3d0c079460f83122c75c8349bed1ed0258135 - + https://github.com/dotnet/msbuild - f3052339bec221fe67339242439d2b960674265d + 54a3d0c079460f83122c75c8349bed1ed0258135 diff --git a/eng/Versions.props b/eng/Versions.props index 5cb24fa0293c..595b25d65bf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.10.23 + 17.10.25 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be31e2458c16..e37f02812e62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 4501fdd4fb107f05fca15ea0fa6db9c82a6eb271 + 76ac94d300d991040db03f15ccb250105c32be6f - + https://github.com/dotnet/templating - 4501fdd4fb107f05fca15ea0fa6db9c82a6eb271 + 76ac94d300d991040db03f15ccb250105c32be6f - + https://github.com/dotnet/templating - 4501fdd4fb107f05fca15ea0fa6db9c82a6eb271 + 76ac94d300d991040db03f15ccb250105c32be6f diff --git a/eng/Versions.props b/eng/Versions.props index 4c8de3ef1960..9066b0d525d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.409-servicing.25203.2 + 8.0.409-servicing.25206.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f60392d6a68ed530ac87dc554035486a5eda4fe4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Apr 2025 05:02:25 +0000 Subject: [PATCH 43/63] Update dependencies from https://github.com/dotnet/templating build 20250407.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.409-servicing.25206.5 -> To Version 8.0.409-servicing.25207.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index a20fb4ed89e0..e3f763004357 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e37f02812e62..0a3a5ce05222 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 76ac94d300d991040db03f15ccb250105c32be6f + a8f24d5519fcff94cd145f3c19c745d53fba8290 - + https://github.com/dotnet/templating - 76ac94d300d991040db03f15ccb250105c32be6f + a8f24d5519fcff94cd145f3c19c745d53fba8290 - + https://github.com/dotnet/templating - 76ac94d300d991040db03f15ccb250105c32be6f + a8f24d5519fcff94cd145f3c19c745d53fba8290 diff --git a/eng/Versions.props b/eng/Versions.props index 9066b0d525d9..d94724ec0c05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.409-servicing.25206.5 + 8.0.409-servicing.25207.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 002cdd8e0f54f46147759022cf16a043384f2bf2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Apr 2025 05:02:26 +0000 Subject: [PATCH 44/63] Update dependencies from https://github.com/dotnet/templating build 20250407.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.312-servicing.25206.4 -> To Version 8.0.312-servicing.25207.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index dde87fa22714..36a4c9f42d8f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ae4462391fa..0e91e7926d9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - c2bed41c09564b0abe6392c689f5e75a2c8c2b2a + a406d80ea09a87752f369987d0746ca42c5ee3c5 - + https://github.com/dotnet/templating - c2bed41c09564b0abe6392c689f5e75a2c8c2b2a + a406d80ea09a87752f369987d0746ca42c5ee3c5 - + https://github.com/dotnet/templating - c2bed41c09564b0abe6392c689f5e75a2c8c2b2a + a406d80ea09a87752f369987d0746ca42c5ee3c5 diff --git a/eng/Versions.props b/eng/Versions.props index a886f5ef5fed..3d17438d5546 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.312-servicing.25206.4 + 8.0.312-servicing.25207.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From c1036441267458d4f19a0b63823bd2a7d65d64a0 Mon Sep 17 00:00:00 2001 From: v-wuzhai Date: Tue, 8 Apr 2025 12:12:37 +0000 Subject: [PATCH 45/63] [GitHub Actions] Add synchronize Event (#48245) --- .github/workflows/pr-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-analysis.yml b/.github/workflows/pr-analysis.yml index 653869ada03b..3e8487f7c234 100644 --- a/.github/workflows/pr-analysis.yml +++ b/.github/workflows/pr-analysis.yml @@ -1,7 +1,7 @@ name: PR Analysis on: pull_request: - types: [opened, labeled, unlabeled] + types: [opened, synchronize, labeled, unlabeled] permissions: contents: read pull-requests: read From 28d560cd9be7268202dbf01d100aeea0c64f82f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Apr 2025 05:02:09 +0000 Subject: [PATCH 46/63] Update dependencies from https://github.com/dotnet/arcade build 20250408.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25204.7 -> To Version 8.0.0-beta.25208.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e91e7926d9e..7835b4715019 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3d17438d5546..2d466fe6d0bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25204.7 + 8.0.0-beta.25208.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25204.7 + 8.0.0-beta.25208.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 570ed21c0599..1918bc6863ac 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.114", + "dotnet": "8.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7" } } From 6be82afde3166545e013da8ec230a53a57796fab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Apr 2025 05:02:19 +0000 Subject: [PATCH 47/63] Update dependencies from https://github.com/dotnet/arcade build 20250408.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25204.7 -> To Version 8.0.0-beta.25208.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a3a5ce05222..d9f235ea17d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d94724ec0c05..ad08ca939dc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25204.7 + 8.0.0-beta.25208.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25204.7 + 8.0.0-beta.25208.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 570ed21c0599..1918bc6863ac 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.114", + "dotnet": "8.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7" } } From 4ff970545f6ed6472f107f102e1135e3af077fc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Apr 2025 05:02:15 +0000 Subject: [PATCH 48/63] Update dependencies from https://github.com/dotnet/templating build 20250409.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.312-servicing.25207.1 -> To Version 8.0.312-servicing.25209.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36a4c9f42d8f..87bf0ce05c19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e91e7926d9e..c47b4567ef0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - a406d80ea09a87752f369987d0746ca42c5ee3c5 + 9b1c885219a83187df9fd8778cbc78f05bb6e6d4 - + https://github.com/dotnet/templating - a406d80ea09a87752f369987d0746ca42c5ee3c5 + 9b1c885219a83187df9fd8778cbc78f05bb6e6d4 - + https://github.com/dotnet/templating - a406d80ea09a87752f369987d0746ca42c5ee3c5 + 9b1c885219a83187df9fd8778cbc78f05bb6e6d4 diff --git a/eng/Versions.props b/eng/Versions.props index 3d17438d5546..e04220c9713f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.312-servicing.25207.1 + 8.0.312-servicing.25209.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From d2881a6427af42ab8dbb7498380be4150609b6e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Apr 2025 05:02:15 +0000 Subject: [PATCH 49/63] Update dependencies from https://github.com/dotnet/msbuild build 20250410.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.25-preview-25207-05 -> To Version 17.10.26-servicing-25210-02 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36a4c9f42d8f..b412f6da2db4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e91e7926d9e..f234e1ed0f90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314 - + https://github.com/dotnet/msbuild - 54a3d0c079460f83122c75c8349bed1ed0258135 + 12f3204401afd9eb4311789cdc9a74b496fcf895 - + https://github.com/dotnet/msbuild - 54a3d0c079460f83122c75c8349bed1ed0258135 + 12f3204401afd9eb4311789cdc9a74b496fcf895 - + https://github.com/dotnet/msbuild - 54a3d0c079460f83122c75c8349bed1ed0258135 + 12f3204401afd9eb4311789cdc9a74b496fcf895 diff --git a/eng/Versions.props b/eng/Versions.props index 3d17438d5546..eae34cd96781 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.10.25 + 17.10.26 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a3a5ce05222..e3d6c4fb9065 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314 - + https://github.com/dotnet/msbuild - 2b19be476c8b86077deb82788563d7f7cc53468b + e8f3d27217ec7f7b9296955b74077e0c4f6328c3 - + https://github.com/dotnet/msbuild - 2b19be476c8b86077deb82788563d7f7cc53468b + e8f3d27217ec7f7b9296955b74077e0c4f6328c3 - + https://github.com/dotnet/msbuild - 2b19be476c8b86077deb82788563d7f7cc53468b + e8f3d27217ec7f7b9296955b74077e0c4f6328c3 diff --git a/eng/Versions.props b/eng/Versions.props index d94724ec0c05..32b8ab444d79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.11.26 + 17.11.30 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a3a5ce05222..b83995bdfeba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - a8f24d5519fcff94cd145f3c19c745d53fba8290 + 731d4697ceb43ca5ab88a4994b5a226e0cbf16c4 - + https://github.com/dotnet/templating - a8f24d5519fcff94cd145f3c19c745d53fba8290 + 731d4697ceb43ca5ab88a4994b5a226e0cbf16c4 - + https://github.com/dotnet/templating - a8f24d5519fcff94cd145f3c19c745d53fba8290 + 731d4697ceb43ca5ab88a4994b5a226e0cbf16c4 diff --git a/eng/Versions.props b/eng/Versions.props index d94724ec0c05..b3f7387abd11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.409-servicing.25207.2 + 8.0.409-servicing.25209.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 8c6ee8e01632a321227c48baf5cc37399b097402 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 10 Apr 2025 01:57:47 -0700 Subject: [PATCH 52/63] Disable Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works --- .../WasmPublishIntegrationTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs index 20caa31b5962..7075611f8963 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs @@ -1081,7 +1081,7 @@ public void Publish_HostedApp_WithRidSpecifiedInCLI_Works() AssertRIDPublishOuput(publishCommand, testInstance, hosted: true); } - [ConditionalFact()] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/44179")] public void Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works() { // Arrange From c354bd5cd1800087874140f334f37bbdee9edd07 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 10 Apr 2025 01:59:58 -0700 Subject: [PATCH 53/63] Disable Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works --- .../WasmPublishIntegrationTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs index 20caa31b5962..7075611f8963 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs @@ -1081,7 +1081,7 @@ public void Publish_HostedApp_WithRidSpecifiedInCLI_Works() AssertRIDPublishOuput(publishCommand, testInstance, hosted: true); } - [ConditionalFact()] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/44179")] public void Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works() { // Arrange From c17a6f188558fffb27f5247db144a6bf8f3a2471 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Apr 2025 05:02:30 +0000 Subject: [PATCH 54/63] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250410.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25163.2 -> To Version 8.0.0-alpha.1.25210.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e933536bcc8..310a9de598aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - b09e26d761555d806f31af68d6fe5dfdeebf6e38 + 6ae07097c0f03eb59c8a581faaedcc3f2e4cc42c From 0de985dc8ab127439eae09952e73f732ca53fc44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 05:01:52 +0000 Subject: [PATCH 55/63] Update dependencies from https://github.com/dotnet/msbuild build 20250415.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.11.30-servicing-25210-03 -> To Version 17.11.31-servicing-25215-01 --- NuGet.config | 9 +-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 141c70d2c35c..b02836bc40ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,27 +4,23 @@ - - - + - - @@ -51,15 +47,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 562708fab39b..0b8c792e79a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 6afd7b9f34943078f2e3b747f33350e5fe114269 - + https://github.com/dotnet/msbuild - e8f3d27217ec7f7b9296955b74077e0c4f6328c3 + bc6072029ab59942e3ba6b3db63147f6aab9dabc - + https://github.com/dotnet/msbuild - e8f3d27217ec7f7b9296955b74077e0c4f6328c3 + bc6072029ab59942e3ba6b3db63147f6aab9dabc - + https://github.com/dotnet/msbuild - e8f3d27217ec7f7b9296955b74077e0c4f6328c3 + bc6072029ab59942e3ba6b3db63147f6aab9dabc diff --git a/eng/Versions.props b/eng/Versions.props index bca3bc9c9f28..2f8a2eca5ee1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.11.30 + 17.11.31 $(MicrosoftBuildPackageVersion) - - @@ -18,13 +16,11 @@ - - @@ -51,15 +47,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 562708fab39b..2373771360ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - c7a36e53f91e41943746f97a8c183549364c5092 + c487e860d456cda2580600ad81fd425d3bba21f7 - + https://github.com/dotnet/arcade - c7a36e53f91e41943746f97a8c183549364c5092 + c487e860d456cda2580600ad81fd425d3bba21f7 - + https://github.com/dotnet/arcade - c7a36e53f91e41943746f97a8c183549364c5092 + c487e860d456cda2580600ad81fd425d3bba21f7 - + https://github.com/dotnet/arcade - c7a36e53f91e41943746f97a8c183549364c5092 + c487e860d456cda2580600ad81fd425d3bba21f7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bca3bc9c9f28..22197a51213b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25208.7 + 8.0.0-beta.25214.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25208.7 + 8.0.0-beta.25214.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 4585cfd6bba1..e5f543ea68c2 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/global.json b/global.json index 1918bc6863ac..5208b63f114e 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7" } } From 7892f91f7191adb473a9e97a79e1c4ca8a2c9247 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Wed, 16 Apr 2025 15:56:41 +0000 Subject: [PATCH 57/63] [internal/release/8.0.4xx] MSBuild 17.11.31 MSBuild 17.11.31 via `darc update-dependencies --id 263904` --- NuGet.config | 9 ++++++++- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index b02836bc40ef..f50d1ad8a55d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,8 @@ - + + @@ -19,6 +20,8 @@ + + @@ -47,6 +50,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 673c2fb15f12..f48a7097ee48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,16 +56,16 @@ 6afd7b9f34943078f2e3b747f33350e5fe114269 - https://github.com/dotnet/msbuild - bc6072029ab59942e3ba6b3db63147f6aab9dabc + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 933b72e36e86c22ba73e8b8148488f8298bb73c7 - - https://github.com/dotnet/msbuild - bc6072029ab59942e3ba6b3db63147f6aab9dabc + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 933b72e36e86c22ba73e8b8148488f8298bb73c7 - - https://github.com/dotnet/msbuild - bc6072029ab59942e3ba6b3db63147f6aab9dabc + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 933b72e36e86c22ba73e8b8148488f8298bb73c7 diff --git a/eng/Versions.props b/eng/Versions.props index c217eab2fcd9..d5a8dc90a25d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,10 +130,10 @@ so target one that matches the version in minimumMSBuildVersion. This avoids the need to juggle references to packages that have been updated in newer MSBuild. --> - $([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim()) + 17.8.27 $(MicrosoftBuildMinimumVersion) $(MicrosoftBuildMinimumVersion) - 17.11.31-servicing-25215-01 + 17.11.31-servicing-25210-17 $(MicrosoftBuildMinimumVersion) $(MicrosoftBuildMinimumVersion) $(MicrosoftBuildTasksCorePackageVersion) From b3f255126390fe8af55385736619443d6c7d4a22 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Apr 2025 00:12:06 +0000 Subject: [PATCH 58/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250415.6 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.15-servicing.25164.13 -> To Version 8.0.16-servicing.25215.6 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.15 -> To Version 8.0.16 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 7 +++---- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index f50d1ad8a55d..a722a27f4a96 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -11,17 +12,15 @@ - + - - @@ -51,13 +50,13 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f48a7097ee48..eddf0da50362 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ 731d4697ceb43ca5ab88a4994b5a226e0cbf16c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://github.com/dotnet/emsdk - 6afd7b9f34943078f2e3b747f33350e5fe114269 + adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest 7855c9b221686104532ebf3380f2d45b3613b369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d5a8dc90a25d..38be099211b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,19 +51,19 @@ - 8.0.15 - 8.0.15-servicing.25164.13 - 8.0.15 + 8.0.16 + 8.0.16-servicing.25215.6 + 8.0.16 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.15 - 8.0.15-servicing.25164.13 + 8.0.16 + 8.0.16-servicing.25215.6 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 - 8.0.15 + 8.0.16 8.0.0 8.0.0 8.0.15 @@ -229,7 +229,7 @@ - 8.0.15 + 8.0.16 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 288386918c7febd3648ff52f858805b34c588c32 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Apr 2025 06:18:24 +0000 Subject: [PATCH 59/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20250416.11 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.15-servicing.25165.5 -> To Version 8.0.16-servicing.25216.11 --- NuGet.config | 2 ++ eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index a722a27f4a96..f68b6495fe59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -49,6 +50,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eddf0da50362..3dd4e288671e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c https://github.com/nuget/nuget.client @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c https://github.com/dotnet/xdt @@ -437,9 +437,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8899cb30120d41413065f1b1465cdabefe0a1f9c + 4ae1269bff83362236d0f3bd4c9302e6a1e9341c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 38be099211b7..9e90400fd8ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ 8.0.16 8.0.0 8.0.0 - 8.0.15 + 8.0.16 8.0.0 8.0.0 8.0.0 @@ -169,13 +169,13 @@ - 8.0.15 - 8.0.15-servicing.25165.5 - 8.0.15-servicing.25165.5 - 8.0.15-servicing.25165.5 - 8.0.15-servicing.25165.5 - 8.0.15-servicing.25165.5 - 8.0.15 + 8.0.16 + 8.0.16-servicing.25216.11 + 8.0.16-servicing.25216.11 + 8.0.16-servicing.25216.11 + 8.0.16-servicing.25216.11 + 8.0.16-servicing.25216.11 + 8.0.16 From c77b8334466b3c2e6b76714fa720f825763b2648 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Apr 2025 06:50:14 +0000 Subject: [PATCH 60/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250416.4 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.15 -> To Version 8.0.16 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.15-servicing.25167.9 -> To Version 8.0.16-servicing.25216.4 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index f68b6495fe59..6ff426fb97c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + @@ -61,6 +62,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dd4e288671e..c59d7939c3c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -228,25 +228,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 83fc500260851a71b62ed3e92e672021624c28da + 3696ba6dd113a089bec2da8b9150f5181ec465ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 83fc500260851a71b62ed3e92e672021624c28da + 3696ba6dd113a089bec2da8b9150f5181ec465ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 83fc500260851a71b62ed3e92e672021624c28da + 3696ba6dd113a089bec2da8b9150f5181ec465ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 83fc500260851a71b62ed3e92e672021624c28da + 3696ba6dd113a089bec2da8b9150f5181ec465ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c + 1a7a066fb7594c1083fb07e8ce5d1a8c81bc3b5d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9e90400fd8ed..a9a964f9ba40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.15-servicing.25167.9 + 8.0.16-servicing.25216.4 From e07102a79a0cd37376eb6d79ee6c4544e0234e7b Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 17 Apr 2025 17:26:43 -0500 Subject: [PATCH 61/63] Fix droppped MSBuild internal feed for the 17.8 fix --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 6ff426fb97c3..5b22b98614d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,7 @@ + @@ -53,6 +54,7 @@ + From e47ad747d9c3fa60dd0b4ec41d5ccfffb574337c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Apr 2025 05:27:56 +0000 Subject: [PATCH 62/63] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20250417.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.16 -> To Version 8.0.16 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.16-servicing.25216.4 -> To Version 8.0.16-servicing.25217.3 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5b22b98614d3..4ab9cde95be2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,6 @@ - @@ -25,7 +24,7 @@ - + @@ -54,7 +53,6 @@ - @@ -64,7 +62,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c59d7939c3c0..08f645ce1075 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,23 +230,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3696ba6dd113a089bec2da8b9150f5181ec465ad + cda1f825e91100518205f3d354bd8ea07c5ceac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3696ba6dd113a089bec2da8b9150f5181ec465ad + cda1f825e91100518205f3d354bd8ea07c5ceac2 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3696ba6dd113a089bec2da8b9150f5181ec465ad + cda1f825e91100518205f3d354bd8ea07c5ceac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3696ba6dd113a089bec2da8b9150f5181ec465ad + cda1f825e91100518205f3d354bd8ea07c5ceac2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1a7a066fb7594c1083fb07e8ce5d1a8c81bc3b5d + 5bf5c017e225debf2b431cf33d0e4fad03039032 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a9a964f9ba40..34a62722f736 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 8.0.16-servicing.25216.4 + 8.0.16-servicing.25217.3 From cf4be5430e0194ba8a10a7493f4e46da9b7515f8 Mon Sep 17 00:00:00 2001 From: "Sean Reeser (CSI Interfusion Inc)" Date: Fri, 18 Apr 2025 11:43:35 +0000 Subject: [PATCH 63/63] Updated NuGet.config - add msbuild feed Updated NuGet.config - replace msbuild feed --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 4ab9cde95be2..fed210fd3b97 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,7 @@ + @@ -53,6 +54,7 @@ +