From e87f654f910c0ddbd2829fe0cb729f4728f9ea0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Apr 2025 11:22:01 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/dotnet --- eng/Version.Details.xml | 19 ++++++++++--------- eng/Versions.props | 3 ++- eng/common/SetupNugetSources.sh | 0 eng/common/build.ps1 | 3 ++- eng/common/build.sh | 3 ++- eng/common/core-templates/job/job.yml | 13 ------------- eng/common/cross/install-debs.py | 0 eng/common/cross/tizen-build-rootfs.sh | 0 eng/common/cross/tizen-fetch.sh | 0 eng/common/generate-sbom-prep.sh | 0 eng/common/native/install-dependencies.sh | 0 eng/common/sdk-task.sh | 0 global.json | 2 +- 13 files changed, 17 insertions(+), 26 deletions(-) mode change 100644 => 100755 eng/common/SetupNugetSources.sh mode change 100644 => 100755 eng/common/cross/install-debs.py mode change 100644 => 100755 eng/common/cross/tizen-build-rootfs.sh mode change 100644 => 100755 eng/common/cross/tizen-fetch.sh mode change 100644 => 100755 eng/common/generate-sbom-prep.sh mode change 100644 => 100755 eng/common/native/install-dependencies.sh mode change 100644 => 100755 eng/common/sdk-task.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2f001b36..dbe51ad8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,10 @@ + - - https://github.com/dotnet/command-line-api - 02fe27cd6a9b001c8feb7938e6ef4b3799745759 + + https://github.com/dotnet/dotnet + 49f46ce3082f22cd016b9fffdae880a09b04afcd @@ -19,13 +20,13 @@ - - https://github.com/dotnet/arcade - 235443a5c1136571cacdfd40576f263f26bf5b9b + + https://github.com/dotnet/dotnet + 49f46ce3082f22cd016b9fffdae880a09b04afcd - - https://github.com/dotnet/arcade - 235443a5c1136571cacdfd40576f263f26bf5b9b + + https://github.com/dotnet/dotnet + 49f46ce3082f22cd016b9fffdae880a09b04afcd diff --git a/eng/Versions.props b/eng/Versions.props index 04d6cde3b..06b7ec27f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 2.0.0-beta4.23307.1 + 2.0.0-beta4.25202.102 17.8.3 17.8.3 @@ -19,5 +19,6 @@ 6.12.1 8.0.5 + 10.0.0-beta.25202.102 diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh old mode 100644 new mode 100755 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index d419c3a2e..6b3be1916 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -132,6 +132,7 @@ function Build { /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` /p:Publish=$publish ` + /p:RestoreStaticGraphEnableBinaryLogger=$binaryLog ` @properties } @@ -171,4 +172,4 @@ catch { ExitWithExitCode 1 } -ExitWithExitCode 0 \ No newline at end of file +ExitWithExitCode 0 diff --git a/eng/common/build.sh b/eng/common/build.sh index e24bb68f4..36fba82a3 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -250,6 +250,7 @@ function Build { /p:PerformanceTest=$performance_test \ /p:Sign=$sign \ /p:Publish=$publish \ + /p:RestoreStaticGraphEnableBinaryLogger=$binary_log \ $properties ExitWithExitCode 0 @@ -267,4 +268,4 @@ if [[ "$restore" == true ]]; then InitializeNativeTools fi -Build \ No newline at end of file +Build diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 4dfb3d868..6badecba7 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -73,9 +73,6 @@ jobs: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' - - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - - name: EnableRichCodeNavigation - value: 'true' # Retry signature validation up to three times, waiting 2 seconds between attempts. # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY @@ -147,16 +144,6 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} - - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: - - task: RichCodeNavIndexer@0 - displayName: RichCodeNav Upload - inputs: - languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin - uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} - continueOnError: true - - ${{ each step in parameters.componentGovernanceSteps }}: - ${{ step }} diff --git a/eng/common/cross/install-debs.py b/eng/common/cross/install-debs.py old mode 100644 new mode 100755 diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh old mode 100644 new mode 100755 diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh old mode 100644 new mode 100755 diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh old mode 100644 new mode 100755 diff --git a/global.json b/global.json index 48cc680ee..ed10103d7 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "10.0.100-preview.3.25167.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25171.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25202.102", "Microsoft.Build.NoTargets": "3.7.0" } } From 8fe5736e743ee08c0c4c278a5065ba1d48c51116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 4 Apr 2025 13:55:54 +0200 Subject: [PATCH 2/5] Add dotnet10-transport feed to NuGet.config --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index a684170e0..8582729d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ + + From 8749a411b2bc7e370abf12cfe5267c3fff61ba64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 4 Apr 2025 14:06:34 +0200 Subject: [PATCH 3/5] Add dotnet10 feed to NuGet.config --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 8582729d4..1e239d697 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + From a7e656ab721512f06162a2e180f0fbffbb892f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 4 Apr 2025 17:20:17 +0200 Subject: [PATCH 4/5] Revert System.CommandLine update and remove xliff tasks --- eng/Version.Details.xml | 10 +++------- eng/Versions.props | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbe51ad8e..af0d556d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,9 +2,9 @@ - - https://github.com/dotnet/dotnet - 49f46ce3082f22cd016b9fffdae880a09b04afcd + + https://github.com/dotnet/command-line-api + 02fe27cd6a9b001c8feb7938e6ef4b3799745759 @@ -24,10 +24,6 @@ https://github.com/dotnet/dotnet 49f46ce3082f22cd016b9fffdae880a09b04afcd - - https://github.com/dotnet/dotnet - 49f46ce3082f22cd016b9fffdae880a09b04afcd - https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 06b7ec27f..04d6cde3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 2.0.0-beta4.25202.102 + 2.0.0-beta4.23307.1 17.8.3 17.8.3 @@ -19,6 +19,5 @@ 6.12.1 8.0.5 - 10.0.0-beta.25202.102 From 1b1f21783b2a2a282bac5a0ad519b90d6f9ae44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Sun, 6 Apr 2025 10:35:23 +0200 Subject: [PATCH 5/5] Add arcade packages to SourceBuildPrebuiltBaseline.xml --- eng/SourceBuildPrebuiltBaseline.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index a26a34d85..70e2ecbd6 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -3,5 +3,10 @@ + + + + +