Skip to content

Commit a4208e9

Browse files
authored
Merge pull request #13248 from dotnet/merges/main-to-release/dev17.3
Merge main to release/dev17.3
2 parents 8da4790 + 0b3b508 commit a4208e9

21 files changed

+1920
-1464
lines changed

.fantomasignore

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ artifacts/
1616
src/Compiler/Checking/**/*.fs
1717
src/Compiler/CodeGen/**/*.fs
1818
src/Compiler/DependencyManager/**/*.fs
19-
src/Compiler/Facilities/**/*.fs
2019
src/Compiler/Interactive/**/*.fs
2120
src/Compiler/Legacy/**/*.fs
2221
src/Compiler/Optimize/**/*.fs

eng/Build.ps1

+3-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ param (
6161
[string]$officialSkipTests = "false",
6262
[switch]$noVisualStudio,
6363
[switch]$sourceBuild,
64+
[switch]$skipBuild,
6465

6566
[parameter(ValueFromRemainingArguments = $true)][string[]]$properties)
6667

@@ -114,6 +115,7 @@ function Print-Usage() {
114115
Write-Host " -useGlobalNuGetCache Use global NuGet cache."
115116
Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
116117
Write-Host " -sourceBuild Simulate building for source-build."
118+
Write-Host " -skipbuild Skip building product"
117119
Write-Host ""
118120
Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild."
119121
}
@@ -458,7 +460,7 @@ try {
458460
}
459461

460462
$script:BuildMessage = "Failure building product"
461-
if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish) {
463+
if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild) {
462464
if ($noVisualStudio) {
463465
BuildSolution "FSharp.sln"
464466
}

src/Compiler/FSharp.Compiler.Service.fsproj

-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@
483483
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.DependencyManager.Nuget\FSharp.DependencyManager.Nuget.fsproj" />
484484
</ItemGroup>
485485

486-
487486
<ItemGroup Condition="'$(FSHARPCORE_USE_PACKAGE)' != 'true'">
488487
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
489488
</ItemGroup>

0 commit comments

Comments
 (0)