Skip to content

[automated] Merge branch 'main' => 'release/dev18.0' #18661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 5, 2025
Merged

[automated] Merge branch 'main' => 'release/dev18.0' #18661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bac7602
Do not used arcades publish for signed build of vsixes (#18660)
T-Gro Jun 5, 2025
cb7a056
Merge branch 'release/dev18.0' into merge/main-to-release/dev18.0
T-Gro Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ extends:
- checkout: self
clean: true
- template: /eng/restore-internal-tools.yml
- script: eng\CIBuildNoPublish.cmd
- script: eng\CIBuild.cmd
-configuration $(_BuildConfig)
-prepareMachine
-testAllButIntegrationAndAot
Expand Down
4 changes: 4 additions & 0 deletions eng/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ try {
$script:BuildMessage = "Failure building product"
if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild -and -not $productBuild) {
$originalSignValue = $sign
$originalPublishValue = $publish
if ($msbuildEngine -eq "dotnet") {
# Building FSharp.sln and VisualFSharp.sln with .NET Core MSBuild
# don't produce any artifacts to sign. Skip signing in this case.
Expand All @@ -576,9 +577,12 @@ try {
BuildSolution "FSharp.sln" $False
}
else {
# vsixes do not count as publishing artifacts from Arcade perspective, and arcade publish.proj is failing when it encounters 0 items to publish.
$publish = $False
BuildSolution "VisualFSharp.sln" $False
}
$sign = $originalSignValue
$publish = $originalPublishValue
}

if ($testBenchmarks) {
Expand Down
Loading