Skip to content

Commit 1471a68

Browse files
baronfelbaronfel
authored
September integration done (#913)
September merge * integrate dotnet/fsharp from e1b8537 to 48f932c * notable changes include: * (preview) nameof * (preview) open static classes * Fixed 64-bit integer literal parsing * Better exhaustiveness checking for byte and sbyte pattern matches * Better native resource handling * Script-host assembly load events
2 parents c69274a + d348d6a commit 1471a68

File tree

192 files changed

+4961
-5267
lines changed

Some content is hidden

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

192 files changed

+4961
-5267
lines changed

‎.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@
2525
targets.make text eol=lf
2626

2727
*.bsl linguist-vendored=true
28+
29+
*.png binary

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
192192
FSharp.Compiler.Tools.Nuget/*.nupkg
193193
FSharp.Core.Nuget/*.nupkg
194194
artifacts/*.nupkg
195+
*.bak
196+
*.vserr
197+
*.err
195198
*.orig
196199
*.mdf
197200
*.ldf
@@ -221,7 +224,6 @@ source_link.json
221224
System.ValueTuple.dll
222225
tests/fsharpqa/testenv/bin/System.ValueTuple.dll
223226
lib/netcore/fsc/bin/
224-
225227
!lib/bootstrap/signed/**/*
226228
*/.fake
227229
/fcs/packages/

‎FSharp.Profiles.props

-19
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,23 @@
66
<DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
77
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
88
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>
9-
<DefineConstants>$(DefineConstants);FX_LCIDFROMCODEPAGE</DefineConstants>
109
</PropertyGroup>
1110

1211
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
1312
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1413
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
15-
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
16-
<DefineConstants>$(DefineConstants);FX_NO_BEGINEND_READWRITE</DefineConstants>
17-
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
18-
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
19-
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
2014
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
2115
<DefineConstants>$(DefineConstants);FX_NO_EVENTWAITHANDLE_IDISPOSABLE</DefineConstants>
2216
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
23-
<DefineConstants>$(DefineConstants);FX_NO_LINKEDRESOURCES</DefineConstants>
2417
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
2518
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
2619
<DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
27-
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_MODULE_HANDLES</DefineConstants>
28-
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_ONLY</DefineConstants>
29-
<DefineConstants>$(DefineConstants);FX_NO_RUNTIMEENVIRONMENT</DefineConstants>
30-
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
31-
<DefineConstants>$(DefineConstants);FX_NO_SERVERCODEPAGES</DefineConstants>
3220
<DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>
3321
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONFIGURATION</DefineConstants>
34-
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
35-
<DefineConstants>$(DefineConstants);FX_NO_THREADABORT</DefineConstants>
36-
<DefineConstants>$(DefineConstants);FX_NO_WAITONE_MILLISECONDS</DefineConstants>
37-
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
3822
<DefineConstants>$(DefineConstants);FX_NO_WIN_REGISTRY</DefineConstants>
3923
<DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
4024
<DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
41-
<DefineConstants>$(DefineConstants);FX_REDUCED_EXCEPTIONS</DefineConstants>
4225
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
43-
<DefineConstants>$(DefineConstants);FX_RESHAPED_GLOBALIZATION</DefineConstants>
44-
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
4526
<DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
4627
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
4728
</PropertyGroup>

‎FSharpBuild.Directory.Build.props

+4
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@
9494
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9595
</PropertyGroup>
9696

97+
<PropertyGroup Condition="'$(OS)' == 'Unix'">
98+
<DefineConstants>$(DefineConstants);TESTING_ON_LINUX</DefineConstants>
99+
</PropertyGroup>
100+
97101
<!-- SDK targets override -->
98102
<PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableCompilerRedirection)'!='true' AND Exists('$(ProtoOutputPath)')">
99103
<FSharpTargetsPath>$(ProtoOutputPath)\fsc\Microsoft.FSharp.Targets</FSharpTargetsPath>

‎INTERNAL.md

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Links for internal team members to find build definitions, etc.
2+
3+
Note that usually only the most recent link in each section is interesting. Older links are included for reference only.
4+
5+
## PR Build Definition
6+
7+
The PR build definition can be found [here](https://dev.azure.com/dnceng/public/_build?definitionId=496) or by
8+
navigating through an existing PR.
9+
10+
## Signed Build Definitions
11+
12+
[VS 16.4 to current](https://dev.azure.com/dnceng/internal/_build?definitionId=499&_a=summary)
13+
14+
[VS 15.7 to 16.3](https://dev.azure.com/devdiv/DevDiv/_build/index?definitionId=8978)
15+
16+
[VS 15.6](https://dev.azure.com/devdiv/DevDiv/_build?definitionId=7239)
17+
18+
[VS 15.0 to 15.5](https://dev.azure.com/devdiv/DevDiv/_build?definitionId=5037)
19+
20+
## VS Insertion Generators
21+
22+
VS 16.4 to current - part of the build definition. [See below](#vs-insertions-as-part-of-the-build-definition).
23+
24+
The following insertion generators are automatically invoked upon successful completion of a signed build in each of
25+
their respective branches.
26+
27+
[VS 16.3](https://dev.azure.com/devdiv/DevDiv/_release?definitionId=1839&_a=releases)
28+
29+
[VS 16.2](https://dev.azure.com/devdiv/DevDiv/_release?definitionId=1699&_a=releases)
30+
31+
[VS 16.1](https://dev.azure.com/devdiv/DevDiv/_release?definitionId=1669&_a=releases)
32+
33+
VS 16.0 and prior were done manually
34+
35+
## VS Insertions as part of the build definition
36+
37+
Starting with the 16.4 release and moving forwards, the VS insertion is generated as part of the build. The relevant
38+
bits can be found near the bottom of [`azure-pipelines.yml`](azure-pipelines.yml) under the `VS Insertion` header. The
39+
interesting parameters are `componentBranchName` and `insertTargetBranch`. In short, when an internal signed build
40+
completes and the name of the branch built exactly equals the value in the `componentBranchName` parameter, a component
41+
insertion into VS will be created into the `insertTargetBranch` branch. The link to the insertion PR will be found
42+
near the bottom of the build under the title 'Insert into VS'. Examine the log for 'Insert VS Payload' and near the
43+
bottom you'll see a line that looks like `Created request #xxxxxx at https://...`.
44+
45+
To see all insertions created this way (possibly including for other internal teams), check
46+
[here](https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequests?creatorId=122d5278-3e55-4868-9d40-1e28c2515fc4&_a=active).
47+
48+
## Less interesting links
49+
50+
[Nightly VSIX (master) uploader](https://dev.azure.com/dnceng/internal/_release?_a=releases&definitionId=70). Uploads
51+
a package from every build of `master` to the [Nightly VSIX feed](README.md#using-nightly-releases-in-visual-studio).
52+
53+
[Nightly VSIX (preview) uploader](https://dev.azure.com/dnceng/internal/_release?_a=releases&definitionId=71). Uploads
54+
a package from every build of the branch that corresponds to the current Visual Studio preview to the
55+
[Preview VSIX feed](README.md#using-nightly-releases-in-visual-studio).
56+
57+
[MyGet package uploader](https://dev.azure.com/dnceng/internal/_release?_a=releases&definitionId=69). Uploads various
58+
packages for internal consumption. Feed URL is `https://dotnet.myget.org/F/fsharp/api/v3/index.json`.
59+
60+
[Internal source mirror](https://dev.azure.com/dnceng/internal/_git/dotnet-fsharp).

‎NuGet.config

+5-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
<add key="interactive-window" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
1919
<add key="vs-devcore" value="https://myget.org/F/vs-devcore/api/v3/index.json" />
2020
<add key="vs-editor" value="https://myget.org/F/vs-editor/api/v3/index.json" />
21-
<add key="vssdk" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
22-
<add key="vs-impl" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" />
21+
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
22+
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
2323
<add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
24-
<add key="devcore" value="https://vside.myget.org/F/devcore/api/v3/index.json" />
2524
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
2625
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
2726
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
@@ -32,4 +31,7 @@
3231
<disabledPackageSources>
3332
<clear />
3433
</disabledPackageSources>
34+
<fallbackPackageFolders>
35+
<clear />
36+
</fallbackPackageFolders>
3537
</configuration>

‎eng/Build.ps1

+3
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ function BuildSolution() {
195195
/p:QuietRestore=$quietRestore `
196196
/p:QuietRestoreBinaryLog=$binaryLog `
197197
/p:TestTargetFrameworks=$testTargetFrameworks `
198+
/v:$verbosity `
198199
$suppressExtensionDeployment `
199200
@properties
200201
}
@@ -337,6 +338,7 @@ try {
337338
if ($testDesktop -and -not $noVisualStudio) {
338339
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework
339340
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.LanguageServer.UnitTests\FSharp.Compiler.LanguageServer.UnitTests.fsproj" -targetFramework $desktopTargetFramework
341+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $desktopTargetFramework
340342
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $desktopTargetFramework
341343
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $desktopTargetFramework
342344
TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $desktopTargetFramework
@@ -345,6 +347,7 @@ try {
345347
if ($testCoreClr) {
346348
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
347349
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.LanguageServer.UnitTests\FSharp.Compiler.LanguageServer.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
350+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
348351
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
349352
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
350353
TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $coreclrTargetFramework

‎eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19410.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19476.6">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>e2f5f0f5c20a1fef71845795b09066a5cd892a7e</Sha>
8+
<Sha>b449f372df1a3374ebdc85f42ff137dcda08776b</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/Versions.props

+12-9
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@
1212
<!-- Version number computation -->
1313
<PropertyGroup>
1414
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
15-
<FSLanguageVersion>4.6</FSLanguageVersion>
15+
<FSLanguageVersion>4.7</FSLanguageVersion>
1616
<FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion>
17-
<FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>
17+
<FSCorePackageVersion>$(FSCoreMajorVersion).1</FSCorePackageVersion>
1818
<FSCoreVersionPrefix>$(FSCoreMajorVersion).0</FSCoreVersionPrefix>
1919
<FSCoreVersion>$(FSCoreVersionPrefix).0</FSCoreVersion>
2020
<!-- The current published nuget package -->
21-
<FSharpCoreShippedPackageVersion>4.6.2</FSharpCoreShippedPackageVersion>
21+
<FSharpCoreShippedPackageVersion>4.7.0</FSharpCoreShippedPackageVersion>
2222
<!-- The pattern for specifying the preview package -->
2323
<FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
26-
<FSPackageMajorVersion>10.5</FSPackageMajorVersion>
26+
<FSPackageMajorVersion>10.6</FSPackageMajorVersion>
2727
<FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
2828
<FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
2929
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<VSMajorVersion>16</VSMajorVersion>
33-
<VSMinorVersion>2</VSMinorVersion>
33+
<VSMinorVersion>3</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
3636
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -55,15 +55,13 @@
5555
https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
5656
https://api.nuget.org/v3/index.json;
5757
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
58-
https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json;
5958
https://dotnet.myget.org/F/symreader-converter/api/v3/index.json;
6059
https://dotnet.myget.org/F/interactive-window/api/v3/index.json;
6160
https://myget.org/F/vs-devcore/api/v3/index.json;
6261
https://myget.org/F/vs-editor/api/v3/index.json;
63-
https://vside.myget.org/F/vssdk/api/v3/index.json;
64-
https://vside.myget.org/F/vs-impl/api/v3/index.json;
62+
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json;
63+
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json;
6564
https://myget.org/F/roslyn_concord/api/v3/index.json;
66-
https://vside.myget.org/F/devcore/api/v3/index.json;
6765
</RestoreSources>
6866
<!-- version numbers from files -->
6967
<RoslynVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\RoslynPackageVersion.txt').Trim())</RoslynVersion>
@@ -116,6 +114,8 @@
116114
<MicrosoftVisualStudioComponentModelHostVersion>16.1.89</MicrosoftVisualStudioComponentModelHostVersion>
117115
<MicrosoftVisualStudioDesignerInterfacesVersion>1.1.4322</MicrosoftVisualStudioDesignerInterfacesVersion>
118116
<MicrosoftVisualStudioEditorVersion>16.1.89</MicrosoftVisualStudioEditorVersion>
117+
<MicrosoftVisualStudioEditorImplementationVersion>16.1.89</MicrosoftVisualStudioEditorImplementationVersion>
118+
<MicrosoftVisualStudioGraphModelVersion>16.0.28226-alpha</MicrosoftVisualStudioGraphModelVersion>
119119
<MicrosoftVisualStudioImageCatalogVersion>16.1.28916.169</MicrosoftVisualStudioImageCatalogVersion>
120120
<MicrosoftVisualStudioImagingVersion>16.1.28917.181</MicrosoftVisualStudioImagingVersion>
121121
<MicrosoftVisualStudioLanguageServerClientVersion>16.1.3121</MicrosoftVisualStudioLanguageServerClientVersion>
@@ -125,6 +125,7 @@
125125
<MicrosoftVisualStudioManagedInterfacesVersion>8.0.50728</MicrosoftVisualStudioManagedInterfacesVersion>
126126
<MicrosoftVisualStudioOLEInteropVersion>7.10.6071</MicrosoftVisualStudioOLEInteropVersion>
127127
<MicrosoftVisualStudioPackageLanguageService150Version>16.1.28917.181</MicrosoftVisualStudioPackageLanguageService150Version>
128+
<MicrosoftVisualStudioPlatformVSEditorVersion>16.1.89</MicrosoftVisualStudioPlatformVSEditorVersion>
128129
<MicrosoftVisualStudioProjectAggregatorVersion>8.0.50728</MicrosoftVisualStudioProjectAggregatorVersion>
129130
<MicrosoftVisualStudioProjectSystemVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemVersion>
130131
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
@@ -141,7 +142,9 @@
141142
<MicrosoftVisualStudioShellInterop100Version>10.0.30320</MicrosoftVisualStudioShellInterop100Version>
142143
<MicrosoftVisualStudioShellInterop110Version>11.0.61031</MicrosoftVisualStudioShellInterop110Version>
143144
<MicrosoftVisualStudioShellInterop120Version>12.0.30111</MicrosoftVisualStudioShellInterop120Version>
145+
<MicrosoftVisualStudioShellInterop160DesignTimeVersion>16.0.0</MicrosoftVisualStudioShellInterop160DesignTimeVersion>
144146
<MicrosoftVisualStudioTextDataVersion>16.1.89</MicrosoftVisualStudioTextDataVersion>
147+
<MicrosoftVisualStudioTextInternalVersion>16.1.89</MicrosoftVisualStudioTextInternalVersion>
145148
<MicrosoftVisualStudioTextManagerInteropVersion>7.10.6071</MicrosoftVisualStudioTextManagerInteropVersion>
146149
<MicrosoftVisualStudioTextManagerInterop80Version>8.0.50728</MicrosoftVisualStudioTextManagerInterop80Version>
147150
<MicrosoftVisualStudioTextManagerInterop100Version>10.0.30320</MicrosoftVisualStudioTextManagerInterop100Version>

‎eng/build.sh

+19-4
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ function TestUsingNUnit() {
178178
args="test \"$testproject\" --no-restore --no-build -c $configuration -f $targetframework --test-adapter-path . --logger \"nunit;LogFilePath=$testlogpath\""
179179
"$DOTNET_INSTALL_DIR/dotnet" $args || {
180180
local exit_code=$?
181-
echo "dotnet test failed (exit code '$exit_code')." >&2
181+
Write-PipelineTelemetryError -category 'Test' "dotnet test failed for $testproject:$targetframework (exit code $exit_code)."
182182
ExitWithExitCode $exit_code
183183
}
184184
}
@@ -228,7 +228,11 @@ function BuildSolution {
228228
MSBuild "$repo_root/src/buildtools/buildtools.proj" \
229229
/restore \
230230
/p:Configuration=$bootstrap_config \
231-
/t:Publish
231+
/t:Publish || {
232+
local exit_code=$?
233+
Write-PipelineTelemetryError -category 'Build' "Error building buildtools (exit code '$exit_code')."
234+
ExitWithExitCode $exit_code
235+
}
232236

233237
mkdir -p "$bootstrap_dir"
234238
cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp2.1/publish $bootstrap_dir/fslex
@@ -238,14 +242,19 @@ function BuildSolution {
238242
MSBuild "$repo_root/proto.proj" \
239243
/restore \
240244
/p:Configuration=$bootstrap_config \
241-
/t:Publish
245+
/t:Publish || {
246+
local exit_code=$?
247+
Write-PipelineTelemetryError -category 'Build' "Error building bootstrap compiler (exit code '$exit_code')."
248+
ExitWithExitCode $exit_code
249+
}
242250

243251
cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.1/publish $bootstrap_dir/fsc
244252
fi
245253

246254
# do real build
247255
MSBuild $toolset_build_proj \
248256
$bl \
257+
/v:$verbosity \
249258
/p:Configuration=$configuration \
250259
/p:Projects="$projects" \
251260
/p:RepoRoot="$repo_root" \
@@ -258,7 +267,11 @@ function BuildSolution {
258267
/p:ContinuousIntegrationBuild=$ci \
259268
/p:QuietRestore=$quiet_restore \
260269
/p:QuietRestoreBinaryLog="$binary_log" \
261-
$properties
270+
$properties || {
271+
local exit_code=$?
272+
Write-PipelineTelemetryError -category 'Build' "Error building solution (exit code '$exit_code')."
273+
ExitWithExitCode $exit_code
274+
}
262275
}
263276

264277
InitializeDotNetCli $restore
@@ -272,8 +285,10 @@ if [[ "$test_core_clr" == true ]]; then
272285
coreclrtestframework=netcoreapp3.0
273286
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
274287
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.LanguageServer.UnitTests/FSharp.Compiler.LanguageServer.UnitTests.fsproj" --targetframework $coreclrtestframework
288+
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework
275289
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclrtestframework
276290
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj" --targetframework $coreclrtestframework
277291
fi
278292

279293
ExitWithExitCode 0
294+

0 commit comments

Comments
 (0)