Skip to content

Commit 7ac0a54

Browse files
abonieabonie
authored
Merge pull request #18480 from dotnet/merge/main-to-feature/lsp
[automated] Merge branch 'main' => 'feature/lsp'
2 parents 965606d + 0fb3112 commit 7ac0a54

File tree

45 files changed

+1234
-591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1234
-591
lines changed

‎.github/copilot-instructions.md

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# GitHub Copilot Instructions for F# Compiler
2+
3+
## Language and Environment
4+
- Use modern F# with functional-first approach
5+
- Target .NET Standard 2.0 for compatibility
6+
- Avoid external dependencies - the codebase is self-contained
7+
8+
## Code Style and Standards
9+
- Follow [coding standards](docs/coding-standards.md), especially:
10+
- Prefer immutability and pure functions
11+
- Use consistent naming (see abbreviation guide)
12+
- Process complex types recursively with pattern matching
13+
- Avoid single-character identifiers except in established patterns
14+
- This project uses .fsi signature files. When adding a new public API to a namespace/module which will be consumed from other file, add it to the respective .fsi signature file as well
15+
- Follow [overview](docs/overview.md) for key compiler data formats and representations
16+
17+
## Type System Handling
18+
- When working with `TType` instances, use appropriate stripping functions:
19+
- `stripTyparEqns` - Removes inference equations from type parameters
20+
- `stripTyEqns` - Removes type equations and type abbreviations
21+
- `stripTyEqnsAndErase` - Also erases compilation representations
22+
- Match the appropriate stripper to the context (e.g., display vs compilation)
23+
- Check equality with `typeEquiv` after stripping rather than direct comparison
24+
25+
## Core Data Structures
26+
- Use F# discriminated unions for type representations
27+
- Respect representation hiding through access control
28+
- Use `remapX` functions when transforming types across boundaries
29+
- Be aware of performance implications for recursive type operations
30+
31+
## Documentation and Naming
32+
- Document public APIs with XML comments
33+
- Use descriptive function names that indicate transformation direction
34+
- Follow established naming conventions in error messages

‎FSharp.Profiles.props

+10
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
<DefineConstants>BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
77
</PropertyGroup>
88

9+
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj' and $(TolerateUnusedBindings) != 'true'">
10+
<WarningsAsErrors>1182;$(WarningsAsErrors)</WarningsAsErrors>
11+
<WarnOn>1182;$(WarnOn)</WarnOn>
12+
</PropertyGroup>
13+
14+
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.fsproj' and $(TolerateUnusedBindings) == 'true'">
15+
<WarningsNotAsErrors>1182;$(WarningsNotAsErrors)</WarningsNotAsErrors>
16+
<NoWarn>1182;$(NoWarn)</NoWarn>
17+
</PropertyGroup>
18+
919
<PropertyGroup Condition="'$(Configuration)' != 'Proto' and '$(BUILDING_USING_DOTNET)' != 'true' and '$(MSBuildProjectExtension)' == '.fsproj'"> <!-- VB.NET does not understand "preview". It only knows "old","older" and "boomer" :-)) (jk)-->
1020
<LangVersion>preview</LangVersion>
1121
</PropertyGroup>

‎FSharpBuild.Directory.Build.props

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
<SymStoreDirectory>$(ArtifactsDir)\SymStore</SymStoreDirectory>
2828
<ProtoOutputPath>$(ArtifactsDir)\Bootstrap</ProtoOutputPath>
2929
<ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
30-
<WarnOn>$(WarnOn);1182</WarnOn>
31-
<WarningsAsErrors>1182;0025;$(WarningsAsErrors)</WarningsAsErrors>
30+
<WarningsAsErrors>0025;$(WarningsAsErrors)</WarningsAsErrors>
3231
<OtherFlags>$(OtherFlags) --nowarn:3384</OtherFlags>
3332
<OtherFlags>$(OtherFlags) --times --nowarn:75</OtherFlags>
3433
<OtherFlags Condition="$(AdditionalFscCmdFlags) != ''">$(OtherFlags) $(AdditionalFscCmdFlags)</OtherFlags>

‎NuGet.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<clear />
99
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1010
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
11-
<add key="darc-pub-DotNet-msbuild-Trusted-7a09d5e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7a09d5ee/nuget/v3/index.json" />
11+
<add key="darc-pub-DotNet-msbuild-Trusted-7ad4e1c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-7ad4e1c7/nuget/v3/index.json" />
1212
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1313
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1414
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

‎azure-pipelines-PR.yml

+5
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@ stages:
208208
enablePublishBuildAssets: true
209209
enablePublishUsingPipelines: $(_PublishUsingPipelines)
210210
enableSourceBuild: true
211+
sourceBuildParameters:
212+
platforms:
213+
- name: 'Managed'
214+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
215+
buildArguments: '--source-build'
211216
enableTelemetry: true
212217
helixRepo: dotnet/fsharp
213218
jobs:

‎azure-pipelines.yml

+5
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ extends:
103103
enablePublishBuildAssets: true
104104
enablePublishUsingPipelines: $(_PublishUsingPipelines)
105105
enableSourceBuild: true
106+
sourceBuildParameters:
107+
platforms:
108+
- name: 'Managed'
109+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
110+
buildArguments: '--source-build'
106111
enableTelemetry: true
107112
helixRepo: dotnet/fsharp
108113
jobs:

‎buildtools/fslex/fslex.fsproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
<RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
8-
<NoWarn>$(NoWarn);64;1204;1182</NoWarn> <!--Temporary fix for sourcebuild -->
9-
<OtherFlags>$(OtherFlags) --warnaserror-:1182</OtherFlags>
8+
<NoWarn>$(NoWarn);64;1204</NoWarn> <!--Temporary fix for sourcebuild -->
9+
<TolerateUnusedBindings>true</TolerateUnusedBindings>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>

‎buildtools/fsyacc/fsyacc.fsproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
77
<RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
8-
<NoWarn>$(NoWarn);64;1204;1182</NoWarn> <!--Temporary fix for sourcebuild -->
9-
<OtherFlags>$(OtherFlags) --warnaserror-:1182</OtherFlags>
8+
<NoWarn>$(NoWarn);64;1204</NoWarn> <!--Temporary fix for sourcebuild -->
9+
<TolerateUnusedBindings>true</TolerateUnusedBindings>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>

‎docs/release-notes/.FSharp.Core/9.0.300.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
### Added
55
* Added nullability annotations to `.Using` builder method for `async` and `task` builders ([PR #18292](https://github.com/dotnet/fsharp/pull/18292))
6+
* Support for `and!` in `TaskBuilder` ([LanguageSuggestion #1363](https://github.com/fsharp/fslang-suggestions/issues/1363), [PR #18451](https://github.com/dotnet/fsharp/pull/18451))
67

78
### Changed
89

‎eng/Build.ps1

+8-13
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ param (
6868
[switch]$testBenchmarks,
6969
[string]$officialSkipTests = "false",
7070
[switch]$noVisualStudio,
71-
[switch]$sourceBuild,
71+
[switch][Alias('pb')]$productBuild,
7272
[switch]$skipBuild,
7373
[switch]$compressAllMetadata,
7474
[switch]$buildnorealsig = $true,
@@ -133,7 +133,7 @@ function Print-Usage() {
133133
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
134134
Write-Host " -dontUseGlobalNuGetCache Do not use the global NuGet cache"
135135
Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
136-
Write-Host " -sourceBuild Simulate building for source-build."
136+
Write-Host " -productBuild Build the repository in product-build mode."
137137
Write-Host " -skipbuild Skip building product"
138138
Write-Host " -compressAllMetadata Build product with compressed metadata"
139139
Write-Host " -buildnorealsig Build product with realsig- (default use realsig+, where necessary)"
@@ -218,10 +218,6 @@ function Process-Arguments() {
218218
$script:pack = $True;
219219
}
220220

221-
if ($sourceBuild) {
222-
$script:testpack = $False;
223-
}
224-
225221
if ($noBinaryLog) {
226222
$script:binaryLog = $False;
227223
}
@@ -278,7 +274,7 @@ function Update-Arguments() {
278274
}
279275

280276

281-
function BuildSolution([string] $solutionName, $nopack) {
277+
function BuildSolution([string] $solutionName, $packSolution) {
282278
Write-Host "${solutionName}:"
283279

284280
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.$solutionName.binlog") } else { "" }
@@ -292,13 +288,11 @@ function BuildSolution([string] $solutionName, $nopack) {
292288
# Do not set the property to true explicitly, since that would override value projects might set.
293289
$suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
294290

295-
$sourceBuildArgs = if ($sourceBuild) { "/p:DotNetBuildSourceOnly=true /p:DotNetBuildRepo=true" } else { "" }
296-
297291
$BUILDING_USING_DOTNET_ORIG = $env:BUILDING_USING_DOTNET
298292

299293
$env:BUILDING_USING_DOTNET="false"
300294

301-
$pack = if ($nopack -eq $False) {""} else {$pack}
295+
$pack = if ($packSolution -eq $False) {""} else {$pack}
302296

303297
MSBuild $toolsetBuildProj `
304298
$bl `
@@ -307,6 +301,7 @@ function BuildSolution([string] $solutionName, $nopack) {
307301
/p:RepoRoot=$RepoRoot `
308302
/p:Restore=$restore `
309303
/p:Build=$build `
304+
/p:DotNetBuildRepo=$productBuild `
310305
/p:Rebuild=$rebuild `
311306
/p:Pack=$pack `
312307
/p:Sign=$sign `
@@ -319,7 +314,6 @@ function BuildSolution([string] $solutionName, $nopack) {
319314
/p:CompressAllMetadata=$CompressAllMetadata `
320315
/p:BuildNoRealsig=$buildnorealsig `
321316
/v:$verbosity `
322-
$sourceBuildArgs `
323317
$suppressExtensionDeployment `
324318
@properties
325319

@@ -567,7 +561,7 @@ try {
567561
}
568562

569563
$script:BuildMessage = "Failure building product"
570-
if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild -and -not $sourceBuild) {
564+
if ($restore -or $build -or $rebuild -or $pack -or $sign -or $publish -and -not $skipBuild -and -not $productBuild) {
571565
$originalSignValue = $sign
572566
if ($msbuildEngine -eq "dotnet") {
573567
# Building FSharp.sln and VisualFSharp.sln with .NET Core MSBuild
@@ -587,7 +581,8 @@ try {
587581
BuildSolution "FSharp.Benchmarks.sln" $False
588582
}
589583

590-
if ($pack) {
584+
# When building in product build mode, only build the compiler solution.
585+
if ($pack -or $productBuild) {
591586
$properties_storage = $properties
592587
BuildSolution "Microsoft.FSharp.Compiler.sln" $True
593588
$properties = $properties_storage

‎eng/DotNetBuild.props

-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
<!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
2-
32
<Project>
43

54
<PropertyGroup>
65
<GitHubRepositoryName>fsharp</GitHubRepositoryName>
76
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
87
</PropertyGroup>
98

10-
<!--
11-
The build script passes in the full path of the sln to build. This must be overridden in order to build
12-
the cloned source in the inner build.
13-
-->
14-
<Target Name="ConfigureInnerBuildArg"
15-
BeforeTargets="GetSourceBuildCommandConfiguration">
16-
<PropertyGroup>
17-
<InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Microsoft.FSharp.Compiler.sln"</InnerBuildArgs>
18-
</PropertyGroup>
19-
</Target>
20-
219
<!--
2210
The build script bootstraps some tooling for the build. Since the inner build is triggerred via msbuild,
2311
trigger the bootstrapping for the inner build.
@@ -26,7 +14,6 @@
2614
DependsOnTargets="PrepareInnerSourceBuildRepoRoot"
2715
BeforeTargets="RunInnerSourceBuildCommand"
2816
Condition="'$(DotNetBuildSourceOnly)' == 'true'">
29-
3017
<PropertyGroup>
3118
<SourceBuildBootstrapTfmArg Condition="$(SourceBuildBootstrapTfm) != ''">--tfm $(SourceBuildBootstrapTfm)</SourceBuildBootstrapTfmArg>
3219
<DotNetBuildUseMonoRuntime Condition="'$(DotNetBuildUseMonoRuntime)' == ''">false</DotNetBuildUseMonoRuntime>

‎eng/Publishing.props

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
3+
<!-- Update Artifacts with Kind=Package to have additional metadata item Category="ToolingPackage".
4+
Depending on channel configuration, this means that these assets could be pushed to a different feed. -->
5+
<ItemGroup>
6+
<Artifact Update="@(Artifact->WithMetadataValue('Kind', 'Package'))" Category="ToolingPackage" />
7+
</ItemGroup>
8+
9+
</Project>

‎eng/Version.Details.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25209.1">
4+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25223.3">
55
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
6-
<Sha>7dbf5deea5bdccf513df73cba179c4c0ad106010</Sha>
6+
<Sha>19eb5ea4e5f9c4e5256843a92805c8c9e942207d</Sha>
77
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
88
</Dependency>
99
<!-- Intermediate is necessary for source build. -->
10-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.24-preview-25209-01">
10+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.25-preview-25214-09">
1111
<Uri>https://github.com/dotnet/msbuild</Uri>
12-
<Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
12+
<Sha>7ad4e1c76585d0ed6e438da2d4f9394326934399</Sha>
1313
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
1414
</Dependency>
15-
<Dependency Name="Microsoft.Build" Version="17.13.24">
15+
<Dependency Name="Microsoft.Build" Version="17.13.25">
1616
<Uri>https://github.com/dotnet/msbuild</Uri>
17-
<Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
17+
<Sha>7ad4e1c76585d0ed6e438da2d4f9394326934399</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.Build.Framework" Version="17.13.24">
19+
<Dependency Name="Microsoft.Build.Framework" Version="17.13.25">
2020
<Uri>https://github.com/dotnet/msbuild</Uri>
21-
<Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
21+
<Sha>7ad4e1c76585d0ed6e438da2d4f9394326934399</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.13.24">
23+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.13.25">
2424
<Uri>https://github.com/dotnet/msbuild</Uri>
25-
<Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
25+
<Sha>7ad4e1c76585d0ed6e438da2d4f9394326934399</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.13.24">
27+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.13.25">
2828
<Uri>https://github.com/dotnet/msbuild</Uri>
29-
<Sha>7a09d5ee44eb217e9c1ae0bab242c79c70423577</Sha>
29+
<Sha>7ad4e1c76585d0ed6e438da2d4f9394326934399</Sha>
3030
</Dependency>
3131
<Dependency Name="System.Reflection.Metadata" Version="8.0.0">
3232
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
103103
<VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
104104
<MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
105-
<MicrosoftBuildVersion>17.13.24</MicrosoftBuildVersion>
105+
<MicrosoftBuildVersion>17.13.25</MicrosoftBuildVersion>
106106
<!-- Roslyn packages -->
107107
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
108108
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
@@ -138,9 +138,9 @@
138138
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
139139
<!-- -->
140140
<!-- Microsoft Build packages -->
141-
<MicrosoftBuildFrameworkVersion>17.13.24</MicrosoftBuildFrameworkVersion>
142-
<MicrosoftBuildTasksCoreVersion>17.13.24</MicrosoftBuildTasksCoreVersion>
143-
<MicrosoftBuildUtilitiesCoreVersion>17.13.24</MicrosoftBuildUtilitiesCoreVersion>
141+
<MicrosoftBuildFrameworkVersion>17.13.25</MicrosoftBuildFrameworkVersion>
142+
<MicrosoftBuildTasksCoreVersion>17.13.25</MicrosoftBuildTasksCoreVersion>
143+
<MicrosoftBuildUtilitiesCoreVersion>17.13.25</MicrosoftBuildUtilitiesCoreVersion>
144144
<!-- -->
145145
<!-- Visual Studio Editor packages -->
146146
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>

‎eng/build.sh

+14-9
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ usage()
3535
echo " --skipAnalyzers Do not run analyzers during build operations"
3636
echo " --skipBuild Do not run the build"
3737
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
38-
echo " --sourceBuild Simulate building for source-build"
38+
echo " --sourceBuild Build the repository in source-only mode."
39+
echo " --productBuild Build the repository in product-build mode."
3940
echo " --buildnorealsig Build product with realsig- (default use realsig+ where necessary)"
4041
echo " --tfm Override the default target framework"
4142
echo ""
@@ -73,6 +74,7 @@ skip_analyzers=false
7374
skip_build=false
7475
prepare_machine=false
7576
source_build=false
77+
product_build=false
7678
buildnorealsig=true
7779
properties=""
7880

@@ -161,8 +163,12 @@ while [[ $# > 0 ]]; do
161163
--docker)
162164
docker=true
163165
;;
164-
--sourcebuild)
166+
--sourcebuild|--source-build|-sb)
165167
source_build=true
168+
product_build=true
169+
;;
170+
--productbuild|--product-build|-pb)
171+
product_build=true
166172
;;
167173
--buildnorealsig)
168174
buildnorealsig=true
@@ -238,6 +244,9 @@ function BuildSolution {
238244
fi
239245

240246
local projects="$repo_root/FSharp.sln"
247+
if [[ "$product_build" = true ]]; then
248+
projects="$repo_root/Microsoft.FSharp.Compiler.sln"
249+
fi
241250

242251
echo "$projects:"
243252

@@ -247,11 +256,6 @@ function BuildSolution {
247256
if [[ "$UNAME" == "Darwin" ]]; then
248257
enable_analyzers=false
249258
fi
250-
251-
local source_build_args=""
252-
if [[ "$source_build" == true ]]; then
253-
source_build_args="/p:DotNetBuildRepo=true /p:DotNetBuildSourceOnly=true"
254-
fi
255259

256260
# NuGet often exceeds the limit of open files on Mac and Linux
257261
# https://github.com/NuGet/Home/issues/2163
@@ -285,7 +289,7 @@ function BuildSolution {
285289
fi
286290

287291
BuildMessage="Error building tools"
288-
local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto $source_build_args $properties"
292+
local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto /p:DotNetBuildRepo=$product_build /p:DotNetBuildSourceOnly=$source_build $properties"
289293
echo $args
290294
"$DOTNET_INSTALL_DIR/dotnet" $args #$args || exit $?
291295
fi
@@ -309,7 +313,8 @@ function BuildSolution {
309313
/p:QuietRestore=$quiet_restore \
310314
/p:QuietRestoreBinaryLog="$binary_log" \
311315
/p:BuildNoRealsig=$buildnorealsig \
312-
$source_build_args \
316+
/p:DotNetBuildRepo=$product_build \
317+
/p:DotNetBuildSourceOnly=$source_build \
313318
$properties
314319
fi
315320
}

0 commit comments

Comments
 (0)