Skip to content

Commit 0fb5711

Browse files
author
dotnet-automerge-bot
authored
Merge pull request #7620 from dotnet/merges/master-to-release/dev16.4
Merge master to release/dev16.4
2 parents 3897909 + 73f38e4 commit 0fb5711

File tree

234 files changed

+5216
-10140
lines changed

Some content is hidden

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

234 files changed

+5216
-10140
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ source_link.json
119119
.vs/
120120
System.ValueTuple.dll
121121
tests/fsharpqa/testenv/bin/System.ValueTuple.dll
122-
*/.fake
122+
**/.fake
123+
.ionide
123124
/fcs/packages/
124125
*/paket-files/
125126
/fcs/TestResult.xml

DEVGUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ VSIXInstaller.exe /u:"VisualFSharp"
138138
VSIXInstaller.exe artifacts\VSSetup\Release\VisualFSharpFull.vsix
139139
```
140140

141-
It's important to use `Release` if you want to see if your changes have had a noticable performance impact.
141+
It's important to use `Release` if you want to see if your changes have had a noticeable performance impact.
142142

143143
### Performance and debugging
144144

FSharp.Profiles.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
66
<DefineConstants Condition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
77
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
8-
<DefineConstants>$(DefineConstants);FX_LCIDFROMCODEPAGE</DefineConstants>
98
</PropertyGroup>
109

1110
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('netcoreapp'))">
1211
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1312
<DefineConstants>$(DefineConstants);FX_NO_APP_DOMAINS</DefineConstants>
1413
<DefineConstants>$(DefineConstants);FX_NO_CORHOST_SIGNER</DefineConstants>
15-
<DefineConstants>$(DefineConstants);FX_NO_LINKEDRESOURCES</DefineConstants>
1614
<DefineConstants>$(DefineConstants);FX_NO_PDB_READER</DefineConstants>
1715
<DefineConstants>$(DefineConstants);FX_NO_PDB_WRITER</DefineConstants>
1816
<DefineConstants>$(DefineConstants);FX_NO_SYMBOLSTORE</DefineConstants>

FSharp.sln

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageSer
3939
EndProject
4040
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer.UnitTests", "tests\FSharp.Compiler.LanguageServer.UnitTests\FSharp.Compiler.LanguageServer.UnitTests.fsproj", "{C97819B0-B428-4B96-9CD7-497D2D1C738C}"
4141
EndProject
42+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting", "src\fsharp\FSharp.Compiler.Private.Scripting\FSharp.Compiler.Private.Scripting.fsproj", "{6771860A-614D-4FDD-A655-4C70EBCC91B0}"
43+
EndProject
44+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting.UnitTests", "tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj", "{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}"
45+
EndProject
4246
Global
4347
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4448
Debug|Any CPU = Debug|Any CPU
@@ -205,6 +209,30 @@ Global
205209
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Release|Any CPU.Build.0 = Release|Any CPU
206210
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Release|x86.ActiveCfg = Release|Any CPU
207211
{C97819B0-B428-4B96-9CD7-497D2D1C738C}.Release|x86.Build.0 = Release|Any CPU
212+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
214+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|x86.ActiveCfg = Debug|Any CPU
215+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Debug|x86.Build.0 = Debug|Any CPU
216+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
217+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|Any CPU.Build.0 = Debug|Any CPU
218+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|x86.ActiveCfg = Debug|Any CPU
219+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Proto|x86.Build.0 = Debug|Any CPU
220+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
221+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|Any CPU.Build.0 = Release|Any CPU
222+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|x86.ActiveCfg = Release|Any CPU
223+
{6771860A-614D-4FDD-A655-4C70EBCC91B0}.Release|x86.Build.0 = Release|Any CPU
224+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
225+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
226+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|x86.ActiveCfg = Debug|Any CPU
227+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Debug|x86.Build.0 = Debug|Any CPU
228+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
229+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Proto|Any CPU.Build.0 = Debug|Any CPU
230+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Proto|x86.ActiveCfg = Debug|Any CPU
231+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Proto|x86.Build.0 = Debug|Any CPU
232+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
233+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|Any CPU.Build.0 = Release|Any CPU
234+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|x86.ActiveCfg = Release|Any CPU
235+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|x86.Build.0 = Release|Any CPU
208236
EndGlobalSection
209237
GlobalSection(SolutionProperties) = preSolution
210238
HideSolutionNode = FALSE
@@ -223,6 +251,8 @@ Global
223251
{81B9FE26-C976-4FC7-B6CC-C7DB5903CAA7} = {3840F2E7-3898-45F7-8CF7-1E6829E56DB8}
224252
{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA} = {B8DDA694-7939-42E3-95E5-265C2217C142}
225253
{C97819B0-B428-4B96-9CD7-497D2D1C738C} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
254+
{6771860A-614D-4FDD-A655-4C70EBCC91B0} = {B8DDA694-7939-42E3-95E5-265C2217C142}
255+
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
226256
EndGlobalSection
227257
GlobalSection(ExtensibilityGlobals) = postSolution
228258
SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}

INTERNAL.md

Lines changed: 60 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,7 @@
3131
<disabledPackageSources>
3232
<clear />
3333
</disabledPackageSources>
34+
<fallbackPackageFolders>
35+
<clear />
36+
</fallbackPackageFolders>
3437
</configuration>

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@ You're invited to contribute to future releases of the F# compiler, core library
88

99
Build from the command line:
1010

11-
```bash
11+
```
1212
build.cmd
1313
```
1414

15+
The build depends on an installation of Visual Studio. To build the compiler without this dependency use:
16+
17+
```
18+
build.cmd -noVisualStudio
19+
```
20+
1521
After it's finished, open either `FSharp.sln` or `VisualFSharp.sln` in your editor of choice. The latter solution is larger but includes the F# tools for Visual Studio and its associated infrastructure.
1622

1723
### Quickstart on Linux or macOS
1824

1925
Build from the command line:
2026

21-
```bash
22-
sh ./build.sh
27+
```
28+
./build.sh
2329
```
2430

2531
After it's finished, open `FSharp.sln` in your editor of choice.

VisualFSharp.sln

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,11 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageSer
158158
EndProject
159159
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer.UnitTests", "tests\FSharp.Compiler.LanguageServer.UnitTests\FSharp.Compiler.LanguageServer.UnitTests.fsproj", "{AAF2D233-1C38-4090-8FFA-F7C545625E06}"
160160
EndProject
161-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharp.Editor.Helpers", "vsintegration\src\FSharp.Editor.Helpers\FSharp.Editor.Helpers.csproj", "{79255A92-ED00-40BA-9D64-12FCC664A976}"
161+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSharp.Editor.Helpers", "vsintegration\src\FSharp.Editor.Helpers\FSharp.Editor.Helpers.csproj", "{79255A92-ED00-40BA-9D64-12FCC664A976}"
162+
EndProject
163+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting", "src\fsharp\FSharp.Compiler.Private.Scripting\FSharp.Compiler.Private.Scripting.fsproj", "{20B7BC36-CF51-4D75-9E13-66681C07977F}"
164+
EndProject
165+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private.Scripting.UnitTests", "tests\FSharp.Compiler.Private.Scripting.UnitTests\FSharp.Compiler.Private.Scripting.UnitTests.fsproj", "{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}"
162166
EndProject
163167
Global
164168
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -926,6 +930,30 @@ Global
926930
{79255A92-ED00-40BA-9D64-12FCC664A976}.Release|Any CPU.Build.0 = Release|Any CPU
927931
{79255A92-ED00-40BA-9D64-12FCC664A976}.Release|x86.ActiveCfg = Release|Any CPU
928932
{79255A92-ED00-40BA-9D64-12FCC664A976}.Release|x86.Build.0 = Release|Any CPU
933+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
934+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Debug|Any CPU.Build.0 = Debug|Any CPU
935+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Debug|x86.ActiveCfg = Debug|Any CPU
936+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Debug|x86.Build.0 = Debug|Any CPU
937+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
938+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Proto|Any CPU.Build.0 = Debug|Any CPU
939+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Proto|x86.ActiveCfg = Debug|Any CPU
940+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Proto|x86.Build.0 = Debug|Any CPU
941+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Release|Any CPU.ActiveCfg = Release|Any CPU
942+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Release|Any CPU.Build.0 = Release|Any CPU
943+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Release|x86.ActiveCfg = Release|Any CPU
944+
{20B7BC36-CF51-4D75-9E13-66681C07977F}.Release|x86.Build.0 = Release|Any CPU
945+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
946+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
947+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|x86.ActiveCfg = Debug|Any CPU
948+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Debug|x86.Build.0 = Debug|Any CPU
949+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
950+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Proto|Any CPU.Build.0 = Debug|Any CPU
951+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Proto|x86.ActiveCfg = Debug|Any CPU
952+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Proto|x86.Build.0 = Debug|Any CPU
953+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
954+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Release|Any CPU.Build.0 = Release|Any CPU
955+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Release|x86.ActiveCfg = Release|Any CPU
956+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Release|x86.Build.0 = Release|Any CPU
929957
EndGlobalSection
930958
GlobalSection(SolutionProperties) = preSolution
931959
HideSolutionNode = FALSE
@@ -1001,6 +1029,8 @@ Global
10011029
{60BAFFA5-6631-4328-B044-2E012AB76DCA} = {B8DDA694-7939-42E3-95E5-265C2217C142}
10021030
{AAF2D233-1C38-4090-8FFA-F7C545625E06} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
10031031
{79255A92-ED00-40BA-9D64-12FCC664A976} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
1032+
{20B7BC36-CF51-4D75-9E13-66681C07977F} = {B8DDA694-7939-42E3-95E5-265C2217C142}
1033+
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
10041034
EndGlobalSection
10051035
GlobalSection(ExtensibilityGlobals) = postSolution
10061036
SolutionGuid = {48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

eng/Build.ps1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ function BuildSolution() {
174174
$officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" }
175175
$toolsetBuildProj = InitializeToolset
176176
$quietRestore = !$ci
177-
$testTargetFrameworks = if ($testCoreClr) { "netcoreapp2.1" } else { "" }
177+
$testTargetFrameworks = if ($testCoreClr) { "netcoreapp3.0" } else { "" }
178178

179179
# Do not set the property to true explicitly, since that would override value projects might set.
180180
$suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" }
@@ -310,7 +310,7 @@ try {
310310
Prepare-TempDir
311311
EnablePreviewSdks
312312

313-
# enable us to build netcoreapp2.1 binaries
313+
# enable us to build netcoreapp2.1 product binaries
314314
$global:_DotNetInstallDir = Join-Path $RepoRoot ".dotnet"
315315
InstallDotNetSdk $global:_DotNetInstallDir $GlobalJson.tools.dotnet
316316
InstallDotNetSdk $global:_DotNetInstallDir "2.1.503"
@@ -333,11 +333,12 @@ try {
333333
}
334334

335335
$desktopTargetFramework = "net472"
336-
$coreclrTargetFramework = "netcoreapp2.1"
336+
$coreclrTargetFramework = "netcoreapp3.0"
337337

338338
if ($testDesktop -and -not $noVisualStudio) {
339339
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework
340340
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
341342
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $desktopTargetFramework
342343
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $desktopTargetFramework
343344
TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $desktopTargetFramework
@@ -346,6 +347,7 @@ try {
346347
if ($testCoreClr) {
347348
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
348349
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
349351
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
350352
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
351353
TestUsingNUnit -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $coreclrTargetFramework

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
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.19380.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19463.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>def377f94747dac91482aad67b33a1c011ffc770</Sha>
8+
<Sha>7b731032220c21a3ed0021c72757b1f3122579b2</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

0 commit comments

Comments
 (0)