Skip to content

Commit c47c367

Browse files
KevinRansomKevinRansom
committed
Dependency Manager
1 parent 1403751 commit c47c367

File tree

70 files changed

+1927
-279
lines changed

Some content is hidden

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

70 files changed

+1927
-279
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ artifacts/
99
# Patches that may have been generated by scripts.
1010
# (These aren't generally useful to commit directly; if anything, they should be applied.)
1111
scripts/*.patch
12-
1312
/fcs/FSharp.Compiler.Service/illex.fs
1413
/fcs/FSharp.Compiler.Service/ilpars.fs
1514
/fcs/FSharp.Compiler.Service/ilpars.fsi

‎FSharp.sln‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,32 @@ VisualStudioVersion = 16.0.28729.10
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Private", "src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
8+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Server.Shared", "src\fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj", "{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}"
9+
EndProject
810
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core", "src\fsharp\FSharp.Core\FSharp.Core.fsproj", "{DED3BBD7-53F4-428A-8C9F-27968E768605}"
911
EndProject
1012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}"
1113
EndProject
1214
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Build", "src\fsharp\FSharp.Build\FSharp.Build.fsproj", "{702A7979-BCF9-4C41-853E-3ADFC9897890}"
1315
EndProject
14-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsc", "src\fsharp\fsc\fsc.fsproj", "{C94C257C-3C0A-4858-B5D8-D746498D1F08}"
16+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fsc", "src\fsharp\Fsc\Fsc.fsproj", "{C94C257C-3C0A-4858-B5D8-D746498D1F08}"
1517
EndProject
1618
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Interactive.Settings", "src\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj", "{649FA588-F02E-457C-9FCF-87E46407481E}"
1719
EndProject
1820
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsi", "src\fsharp\fsi\fsi.fsproj", "{D0E98C0D-490B-4C61-9329-0862F6E87645}"
21+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fsi", "src\fsharp\fsi\Fsi.fsproj", "{D0E98C0D-490B-4C61-9329-0862F6E87645}"
22+
EndProject
23+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsiAnyCPU", "src\fsharp\fsiAnyCpu\FsiAnyCPU.fsproj", "{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}"
24+
ProjectSection(ProjectDependencies) = postProject
25+
{649FA588-F02E-457C-9FCF-87E46407481E} = {649FA588-F02E-457C-9FCF-87E46407481E}
26+
EndProjectSection
1927
EndProject
2028
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpSuite.Tests", "tests\fsharp\FSharpSuite.Tests.fsproj", "{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
2129
EndProject
2230
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.UnitTests", "tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj", "{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
2331
EndProject
32+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Tests.FSharpSuite", "tests\fsharp\FSharp.Tests.FSharpSuite.fsproj", "{4E7B9500-6DEF-4C33-BF18-246F7E2C0BC6}"
33+
EndProject
2434
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core.UnitTests", "tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj", "{88E2D422-6852-46E3-A740-83E391DC7973}"
2535
EndProject
2636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
@@ -38,6 +48,7 @@ EndProject
3848
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer", "src\fsharp\FSharp.Compiler.LanguageServer\FSharp.Compiler.LanguageServer.fsproj", "{99B3F4A5-80B4-41D9-A073-117DB6D7DBBA}"
3949
EndProject
4050
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}"
51+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.DependencyManager", "src\fsharp\FSharp.DependencyManager\FSharp.DependencyManager.fsproj", "{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}"
4152
EndProject
4253
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}"
4354
EndProject
@@ -65,6 +76,18 @@ Global
6576
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.Build.0 = Release|Any CPU
6677
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.ActiveCfg = Release|Any CPU
6778
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.Build.0 = Release|Any CPU
79+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|Any CPU.Build.0 = Debug|Any CPU
81+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|x86.ActiveCfg = Debug|Any CPU
82+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|x86.Build.0 = Debug|Any CPU
83+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Proto|Any CPU.ActiveCfg = Release|Any CPU
84+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Proto|Any CPU.Build.0 = Release|Any CPU
85+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Proto|x86.ActiveCfg = Release|Any CPU
86+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Proto|x86.Build.0 = Release|Any CPU
87+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Release|Any CPU.ActiveCfg = Release|Any CPU
88+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Release|Any CPU.Build.0 = Release|Any CPU
89+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Release|x86.ActiveCfg = Release|Any CPU
90+
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Release|x86.Build.0 = Release|Any CPU
6891
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6992
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Debug|Any CPU.Build.0 = Debug|Any CPU
7093
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -125,6 +148,18 @@ Global
125148
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Release|Any CPU.Build.0 = Release|Any CPU
126149
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Release|x86.ActiveCfg = Release|Any CPU
127150
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Release|x86.Build.0 = Release|Any CPU
151+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
152+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Debug|Any CPU.Build.0 = Debug|Any CPU
153+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Debug|x86.ActiveCfg = Debug|Any CPU
154+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Debug|x86.Build.0 = Debug|Any CPU
155+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Proto|Any CPU.ActiveCfg = Release|Any CPU
156+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Proto|Any CPU.Build.0 = Release|Any CPU
157+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Proto|x86.ActiveCfg = Release|Any CPU
158+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Proto|x86.Build.0 = Release|Any CPU
159+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Release|Any CPU.ActiveCfg = Release|Any CPU
160+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Release|Any CPU.Build.0 = Release|Any CPU
161+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Release|x86.ActiveCfg = Release|Any CPU
162+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Release|x86.Build.0 = Release|Any CPU
128163
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129164
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
130165
{C163E892-5BF7-4B59-AA99-B0E8079C67C4}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -233,6 +268,18 @@ Global
233268
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|Any CPU.Build.0 = Release|Any CPU
234269
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|x86.ActiveCfg = Release|Any CPU
235270
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC}.Release|x86.Build.0 = Release|Any CPU
271+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
272+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Debug|Any CPU.Build.0 = Debug|Any CPU
273+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Debug|x86.ActiveCfg = Debug|Any CPU
274+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Debug|x86.Build.0 = Debug|Any CPU
275+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Proto|Any CPU.ActiveCfg = Release|Any CPU
276+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Proto|Any CPU.Build.0 = Release|Any CPU
277+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Proto|x86.ActiveCfg = Release|Any CPU
278+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Proto|x86.Build.0 = Release|Any CPU
279+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|Any CPU.ActiveCfg = Release|Any CPU
280+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|Any CPU.Build.0 = Release|Any CPU
281+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|x86.ActiveCfg = Release|Any CPU
282+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851}.Release|x86.Build.0 = Release|Any CPU
236283
EndGlobalSection
237284
GlobalSection(SolutionProperties) = preSolution
238285
HideSolutionNode = FALSE
@@ -244,6 +291,7 @@ Global
244291
{C94C257C-3C0A-4858-B5D8-D746498D1F08} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
245292
{649FA588-F02E-457C-9FCF-87E46407481E} = {B8DDA694-7939-42E3-95E5-265C2217C142}
246293
{D0E98C0D-490B-4C61-9329-0862F6E87645} = {B8DDA694-7939-42E3-95E5-265C2217C142}
294+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B} = {B8DDA694-7939-42E3-95E5-265C2217C142}
247295
{C163E892-5BF7-4B59-AA99-B0E8079C67C4} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
248296
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
249297
{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
@@ -253,6 +301,7 @@ Global
253301
{C97819B0-B428-4B96-9CD7-497D2D1C738C} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
254302
{6771860A-614D-4FDD-A655-4C70EBCC91B0} = {B8DDA694-7939-42E3-95E5-265C2217C142}
255303
{4FEDF286-0252-4EBC-9E75-879CCA3B85DC} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
304+
{8B7BF62E-7D8C-4928-BE40-4E392A9EE851} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
256305
EndGlobalSection
257306
GlobalSection(ExtensibilityGlobals) = postSolution
258307
SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}

‎FSharpTests.Directory.Build.targets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22

3-
<UsingTask TaskName="Fsi" AssemblyFile="$(FSharpBuildAssemblyFile)" />
3+
<UsingTask TaskName="Fsi" AssemblyFile="$(FSharpBuildAssemblyFile)" />
44

55
<Target
66
Name="RunFSharpScript"
@@ -35,8 +35,8 @@
3535
<Output TaskParameter="CommandLineArgs" ItemName="FsiCommandLineArgs" />
3636
</Fsi>
3737

38-
<ItemGroup>
39-
<_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
40-
</ItemGroup>
41-
</Target>
38+
<ItemGroup>
39+
<_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
40+
</ItemGroup>
41+
</Target>
4242
</Project>

‎VisualFSharp.sln‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ EndProject
153153
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}"
154154
EndProject
155155
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}"
156+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.DependencyManager", "src\fsharp\FSharp.DependencyManager\FSharp.DependencyManager.fsproj", "{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}"
156157
EndProject
157158
Global
158159
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -896,6 +897,18 @@ Global
896897
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Release|Any CPU.Build.0 = Release|Any CPU
897898
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Release|x86.ActiveCfg = Release|Any CPU
898899
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2}.Release|x86.Build.0 = Release|Any CPU
900+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
901+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Debug|Any CPU.Build.0 = Debug|Any CPU
902+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Debug|x86.ActiveCfg = Debug|Any CPU
903+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Debug|x86.Build.0 = Debug|Any CPU
904+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
905+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Proto|Any CPU.Build.0 = Debug|Any CPU
906+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Proto|x86.ActiveCfg = Debug|Any CPU
907+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Proto|x86.Build.0 = Debug|Any CPU
908+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Release|Any CPU.ActiveCfg = Release|Any CPU
909+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Release|Any CPU.Build.0 = Release|Any CPU
910+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Release|x86.ActiveCfg = Release|Any CPU
911+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E}.Release|x86.Build.0 = Release|Any CPU
899912
EndGlobalSection
900913
GlobalSection(SolutionProperties) = preSolution
901914
HideSolutionNode = FALSE
@@ -968,6 +981,7 @@ Global
968981
{79255A92-ED00-40BA-9D64-12FCC664A976} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
969982
{20B7BC36-CF51-4D75-9E13-66681C07977F} = {B8DDA694-7939-42E3-95E5-265C2217C142}
970983
{09F56540-AFA5-4694-B7A6-0DBF6D4618C2} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
984+
{F0CB2C0F-4EBF-4E9C-A484-D9C30441757E} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
971985
EndGlobalSection
972986
GlobalSection(ExtensibilityGlobals) = postSolution
973987
SolutionGuid = {48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

‎eng/Versions.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<!-- System.* packages -->
6969
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
7070
<SystemConsoleVersion>4.3.0</SystemConsoleVersion>
71+
<SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
7172
<SystemDesignVersion>4.0.0</SystemDesignVersion>
7273
<SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
7374
<SystemDiagnosticsTraceSourceVersion>4.3.0</SystemDiagnosticsTraceSourceVersion>
@@ -88,6 +89,7 @@
8889
<SystemSecurityClaimsVersion>4.3.0</SystemSecurityClaimsVersion>
8990
<SystemSecurityCryptographyAlgorithmsVersion>4.3.0</SystemSecurityCryptographyAlgorithmsVersion>
9091
<SystemSecurityPrincipalVersion>4.3.0</SystemSecurityPrincipalVersion>
92+
<SystemThreadingTasksDataflowPackageVersion>4.6.0</SystemThreadingTasksDataflowPackageVersion>
9193
<SystemThreadingTasksParallelVersion>4.3.0</SystemThreadingTasksParallelVersion>
9294
<SystemThreadingThreadVersion>4.3.0</SystemThreadingThreadVersion>
9395
<SystemThreadingThreadPoolVersion>4.3.0</SystemThreadingThreadPoolVersion>
@@ -107,6 +109,8 @@
107109
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkVersion>
108110
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCoreVersion>
109111
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildUtilitiesCoreVersion>
112+
<MicrosoftDotNetPlatformAbstractionsVersion>2.1.0</MicrosoftDotNetPlatformAbstractionsVersion>
113+
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
110114
<!-- Visual Studio packages -->
111115
<EnvDTE80Version>8.0.1</EnvDTE80Version>
112116
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>14.0.25420</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>

‎fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
3+
<Project Sdk="Microsoft.NET.Sdk">
24
<Import Project="..\netfx.props" />
35
<Import Project="..\..\src\buildtools\buildtools.targets" />
46
<PropertyGroup>
@@ -517,6 +519,15 @@
517519
<Compile Include="$(FSharpSourcesRoot)/fsharp/DotNetFrameworkDependencies.fs">
518520
<Link>Driver\DotNetFrameworkDependencies.fs</Link>
519521
</Compile>
522+
<Compile Include="$(FSharpSourcesRoot)/fsharp/CompileOps.fsi">
523+
<Compile Include="$(FSharpSourcesRoot)\fsharp\DependencyManager.Integration.fsi">
524+
<Link>Driver\DependencyManager.Integration.fsi</Link>
525+
<Compile Include="$(FSharpSourcesRoot)/fsharp/DependencyManager.Integration.fsi">
526+
<Link>Driver/DependencyManager.Integration.fsi</Link>
527+
</Compile>
528+
<Compile Include="$(FSharpSourcesRoot)/fsharp/DependencyManager.Integration.fs">
529+
<Link>Driver/DependencyManager.Integration.fs</Link>
530+
</Compile>
520531
<Compile Include="$(FSharpSourcesRoot)/fsharp/CompileOps.fsi">
521532
<Link>Driver/CompileOps.fsi</Link>
522533
</Compile>

‎fcs/samples/FscExe/FscMain.fs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,6 @@ module Driver =
266266
if runningOnMono && hasArgument "resident" argv then
267267
let argv = stripArgument "resident" argv
268268

269-
//if not (hasArgument "nologo" argv) then
270-
// printfn "%s" (FSComp.SR.buildProductName(FSharpEnvironment.FSharpTeamVersionNumber))
271-
// printfn "%s" (FSComp.SR.optsCopyright())
272-
273269
let fscServerExe = typeof<TypeInThisAssembly>.Assembly.Location
274270
let exitCodeOpt = FSharpResidentCompiler.FSharpCompilationServer.TryCompileUsingServer (fscServerExe, argv)
275271
match exitCodeOpt with

‎scripts/dotnet-install.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ function GetHTTPResponse([Uri] $Uri)
188188
}
189189
# Default timeout for HttpClient is 100s. For a 50 MB download this assumes 500 KB/s average, any less will time out
190190
# 10 minutes allows it to work over much slower connections.
191-
$HttpClient.Timeout = New-TimeSpan -Minutes 20
191+
$HttpClient.Timeout = New-TimeSpan -Minutes 40
192192
$Response = $HttpClient.GetAsync($Uri).Result
193193
if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode)))
194194
{

0 commit comments

Comments
 (0)