From b5a80b4be43374e6dde43f62e0a80e140dc80031 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 25 Apr 2025 09:15:33 -0700 Subject: [PATCH 1/7] Enable internal feed --- azure-pipelines.yml | 2 ++ eng/build.sh | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 95c03d1c0d4..d53e75e0055 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -103,6 +103,8 @@ extends: enablePublishBuildAssets: true enablePublishUsingPipelines: $(_PublishUsingPipelines) enableSourceBuild: true + sourceBuildParameters: + enableInternalSources: true enableTelemetry: true helixRepo: dotnet/fsharp jobs: diff --git a/eng/build.sh b/eng/build.sh index 1263445973f..892997057a9 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -171,6 +171,13 @@ while [[ $# > 0 ]]; do tfm=$2 shift ;; + # nop implementations of runtime* args sourcebuild might pass in on internal builds + --runtimesourcefeed) + shift + ;; + --runtimesourcefeedkey) + shift + ;; /p:*) properties="$properties $1" ;; From 9513755ce41e25188a61fb75e3b3195c60a15476 Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Sat, 26 Apr 2025 14:15:22 -0700 Subject: [PATCH 2/7] msbuild-trusted --- NuGet.config | 1 + eng/Versions.props | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 944ae5b686e..8daa3d5aad7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,6 +25,7 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index 5ce287e802b..954e381e25f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,7 +102,7 @@ 17.10.40152 17.10.526-pre-g1b474069f5 17.10.41 - 17.13.22 + 17.13.26 $(RoslynVersion) $(RoslynVersion) @@ -138,9 +138,9 @@ 15.0.25123-Dev15Preview - 17.13.22 - 17.13.22 - 17.13.22 + $(MicrosoftBuildVersion) + $(MicrosoftBuildVersion) + $(MicrosoftBuildVersion) $(VisualStudioEditorPackagesVersion) From 866b140ac409ec6f32d81517ecbd8707be2f110a Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Sat, 26 Apr 2025 23:21:04 -0700 Subject: [PATCH 3/7] baseline --- eng/SourceBuildPrebuiltBaseline.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index a3c0b4e6619..a9dfb3d7a4d 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -28,6 +28,10 @@ - + + + + + From d7f44d184590c5440ef2e434fb96ac2183fe32f6 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Wed, 30 Apr 2025 00:40:13 -0700 Subject: [PATCH 4/7] rel/d17.14 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d53e75e0055..0101350c577 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,7 +35,7 @@ variables: # (since for all *new* release branches we insert into VS main and for all *previous* releases we insert into corresponding VS release), # i.e. 'rel/d17.9' *or* 'main' in dotnet/fsharp/refs/heads/main and 'main' in F# dotnet/fsharp/refs/heads/release/dev17.10 (latest release branch) - name: VSInsertionTargetBranchName - value: main + value: rel/d17.14 - name: _TeamName value: FSharp - name: TeamName From da22a79be22b409cae6d4e297cf6d32ea9e7fc07 Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 3 Jun 2025 11:25:55 +0200 Subject: [PATCH 5/7] Apply suggestions from code review --- NuGet.config | 1 - eng/SourceBuildPrebuiltBaseline.xml | 3 --- 2 files changed, 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8daa3d5aad7..944ae5b686e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,6 @@ - diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index a9dfb3d7a4d..83be19ed43e 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -28,9 +28,6 @@ - - - From e59a9220b4e7022065c57bba88923472370ce91d Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Tue, 10 Jun 2025 17:04:31 +0000 Subject: [PATCH 6/7] Update msbuild dependencies using darc --- NuGet.config | 1 - eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 944ae5b686e..48c5b72a3d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3b61734d48..88839b0d7cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,26 +7,26 @@ - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + 322e41fd23063a8c53d8b16a3df6db52638e912c - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + 322e41fd23063a8c53d8b16a3df6db52638e912c - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + 322e41fd23063a8c53d8b16a3df6db52638e912c - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + 322e41fd23063a8c53d8b16a3df6db52638e912c - + https://github.com/dotnet/msbuild - 0ca03f84b7848ce9d7d3e5d1f68c5e090efa4f30 + 322e41fd23063a8c53d8b16a3df6db52638e912c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 954e381e25f..2b456ebd9be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,7 +102,7 @@ 17.10.40152 17.10.526-pre-g1b474069f5 17.10.41 - 17.13.26 + 17.12.36 $(RoslynVersion) $(RoslynVersion) From c9ff0c0008265f2dcd3e337e2d827b0a8d8e998b Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Tue, 10 Jun 2025 18:23:14 +0000 Subject: [PATCH 7/7] Update msbuild dependencies to 17.13.26 using darc --- eng/SourceBuildPrebuiltBaseline.xml | 1 - eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 83be19ed43e..9588baeee16 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -28,7 +28,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88839b0d7cc..65e73d5efe6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,26 +7,26 @@ - + https://github.com/dotnet/msbuild - 322e41fd23063a8c53d8b16a3df6db52638e912c + c192adbb5252264481e8c046a8e0694f7fc7855b - + https://github.com/dotnet/msbuild - 322e41fd23063a8c53d8b16a3df6db52638e912c + c192adbb5252264481e8c046a8e0694f7fc7855b - + https://github.com/dotnet/msbuild - 322e41fd23063a8c53d8b16a3df6db52638e912c + c192adbb5252264481e8c046a8e0694f7fc7855b - + https://github.com/dotnet/msbuild - 322e41fd23063a8c53d8b16a3df6db52638e912c + c192adbb5252264481e8c046a8e0694f7fc7855b - + https://github.com/dotnet/msbuild - 322e41fd23063a8c53d8b16a3df6db52638e912c + c192adbb5252264481e8c046a8e0694f7fc7855b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2b456ebd9be..954e381e25f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,7 +102,7 @@ 17.10.40152 17.10.526-pre-g1b474069f5 17.10.41 - 17.12.36 + 17.13.26 $(RoslynVersion) $(RoslynVersion)