From a5cc3d4a30b41f1fb0c1a7e12cdede6f4d0c2282 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 24 Nov 2025 19:50:47 +0100 Subject: [PATCH 1/4] Condition OneLocBuild to only run for the main branch (#1536) The OneLocBuild by default should only run on the main branch. If release branches need different localization, a separate package id needs to be created. --- azure-pipelines.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dcae2b3f..987837a8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -37,8 +37,10 @@ extends: publishAssetsImmediately: true isAssetlessBuild: true enableTelemetry: true - - template: /eng/common/templates-official/job/onelocbuild.yml@self - parameters: - MirrorRepo: sourcelink - LclSource: lclFilesfromPackage - LclPackageId: 'LCL-JUNO-PROD-SOURCELINK' \ No newline at end of file + # The localization setup for main branch. Note difference in package ID. Should not be used with release/ branches. + - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: + - template: /eng/common/templates-official/job/onelocbuild.yml@self + parameters: + MirrorRepo: sourcelink + LclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-SOURCELINK' From 4cc140fff9f54ab590ac03abc1a7f7fc70470adf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Nov 2025 12:18:49 +0000 Subject: [PATCH 2/4] [release/10.0.1xx] Source code updates from dotnet/dotnet (#1541) * Update dependencies from https://github.com/dotnet/dotnet build 292085 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25570.103 -> 10.0.0-beta.25574.102) System.CommandLine (Version 2.0.2 -> 2.0.2) * Update Version.Details.props --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Viktor Hofer --- NuGet.config | 2 +- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 49c74ae8..e135a7d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index cf93bfce..00b944d3 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25570.103 + 10.0.0-beta.25574.102 2.0.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 114d4f78..6edaf1a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/dotnet - 18f6e60aa4755c2be56b2d45165a135d64d4f710 + 1483376c1a0ffb1e5f197266578dbce1e4098783 - + https://github.com/dotnet/dotnet - 18f6e60aa4755c2be56b2d45165a135d64d4f710 + 1483376c1a0ffb1e5f197266578dbce1e4098783 diff --git a/global.json b/global.json index 0e4e9b6c..aaa4098d 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ "dotnet": "10.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25570.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25574.102", "Microsoft.Build.NoTargets": "3.7.0" } } From 0c6b136340321febe5c2df5920881cc78b91e782 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 25 Nov 2025 18:12:15 +0100 Subject: [PATCH 3/4] make Microsoft.Build* a truly static dependency for SB and MSFT build (#1544) --- eng/Version.Details.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6edaf1a0..6971e3e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,14 +12,5 @@ https://github.com/dotnet/dotnet 1483376c1a0ffb1e5f197266578dbce1e4098783 - - - https://github.com/dotnet/msbuild - 02bf66295b64ab368d12933041f7281aad186a2d - - - https://github.com/dotnet/msbuild - 02bf66295b64ab368d12933041f7281aad186a2d - From 52f4e1a956bbdca15762282fda127de14047a693 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 25 Nov 2025 18:12:16 +0100 Subject: [PATCH 4/4] Make System.IO.Hashing a live dependency (#1543) and make Microsoft.Build* a truly static dependency for SB and MSFT build. --- eng/Version.Details.props | 2 ++ eng/Version.Details.xml | 17 ++++------------- eng/Versions.props | 1 - 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4f19d0a7..b42bca2f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,11 +8,13 @@ This file should be imported by eng/Versions.props 10.0.0-beta.25571.105 2.0.0 + 10.0.0-rc.2.25502.107 $(MicrosoftDotNetArcadeSdkPackageVersion) $(SystemCommandLinePackageVersion) + $(SystemIOHashingPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e70ab734..8f444969 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,24 +6,15 @@ https://github.com/dotnet/dotnet 3a0c62bf027fbcb8683a13e78a5b21ae19028ca3 + + https://github.com/dotnet/dotnet + be28ec777bf12db631725399c442448d52093087 + https://github.com/dotnet/dotnet ae0ed89fe1caed1244d7633ba6e41cdd003023f7 - - - https://github.com/dotnet/msbuild - 02bf66295b64ab368d12933041f7281aad186a2d - - - https://github.com/dotnet/msbuild - 02bf66295b64ab368d12933041f7281aad186a2d - - - https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 - diff --git a/eng/Versions.props b/eng/Versions.props index 536542af..49f8ab4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,6 @@ 6.12.1 - 10.0.0 8.0.5