Skip to content

Commit 97e1c15

Browse files
dsymedsyme
authored
Merge pull request #853 from dsyme/i56
integrate visualfsharp master
2 parents cd99460 + 2c55887 commit 97e1c15

File tree

121 files changed

+5749
-4740
lines changed

Some content is hidden

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

121 files changed

+5749
-4740
lines changed

‎NuGet.Config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33

44
<solution>
@@ -10,4 +10,4 @@
1010
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1111
</packageSources>
1212

13-
</configuration>
13+
</configuration>

‎PublishToBlob.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PropertyGroup>
1111
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
1212
<!-- This version should be kept in sync with `packages.config` -->
13-
<FeedTasksPackageVersion>1.0.0-prerelease-02219-01</FeedTasksPackageVersion>
13+
<FeedTasksPackageVersion>2.1.0-prerelease-02419-02</FeedTasksPackageVersion>
1414
</PropertyGroup>
1515

1616
<Import Project="$(MSBuildThisFileDirectory)packages\$(FeedTasksPackage).$(FeedTasksPackageVersion)\build\$(FeedTasksPackage).targets" />

‎fcs/.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FSharp.Compiler.Service.netstandard/illex.fs
2+
FSharp.Compiler.Service.netstandard/ilpars.fs
3+
FSharp.Compiler.Service.netstandard/ilpars.fsi
4+
FSharp.Compiler.Service.netstandard/lex.fs
5+
FSharp.Compiler.Service.netstandard/pars.fs
6+
FSharp.Compiler.Service.netstandard/pars.fsi
7+
FSharp.Compiler.Service.netstandard/pplex.fs
8+
FSharp.Compiler.Service.netstandard/pppars.fs
9+
FSharp.Compiler.Service.netstandard/pppars.fsi
10+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@
651651
<Reference Include="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
652652
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
653653
<Reference Include="System.ValueTuple">
654-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
654+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
655655
</Reference>
656656
</ItemGroup>
657657
<Import Project="$(FSharpSourcesRoot)\scripts\fssrgen.targets" Condition="'$(TargetFramework)' != ''" />

‎fcs/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ which does things like:
6060
Yu can push the packages if you have permissions, either automatically using ``build Release`` or manually
6161

6262
set APIKEY=...
63-
.nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.21.0.1.nupkg %APIKEY% -Source https://nuget.org
64-
.nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.MSBuild.v12.21.0.1.nupkg %APIKEY% -Source https://nuget.org
65-
.nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.ProjectCracker.21.0.1.nupkg %APIKEY% -Source https://nuget.org
63+
.nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.22.0.1.nupkg %APIKEY% -Source https://nuget.org
64+
.nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.MSBuild.v12.22.0.1.nupkg %APIKEY% -Source https://nuget.org
65+
.nuget\nuget.exe push release\fcs\FSharp.Compiler.Service.ProjectCracker.22.0.1.nupkg %APIKEY% -Source https://nuget.org
6666

6767

6868
### Use of Paket and FAKE

‎fcs/RELEASE_NOTES.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#### 22.0.1
2+
* Integrate visualfsharp master
3+
* Includes recent memory usage reduction work for ByteFile and ILAttributes
4+
15
#### 21.0.1
26
* Use new .NET SDK project files
37
* FSharp.Compiler.Service nuget now uses net45 and netstandard2.0

‎fcs/build.fsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ let isMono = true
2020
let isMono = false
2121
#endif
2222

23-
let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.4"
23+
24+
let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.102"
2425

2526
let runDotnet workingDir args =
2627
let result =

‎fcs/fcs.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
55

6-
<VersionPrefix>21.0.1</VersionPrefix>
6+
<VersionPrefix>22.0.1</VersionPrefix>
77
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build -->
88
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
99
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>

‎packages.config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<package id="Microsoft.DiaSymReader.PortablePdb" version="1.2.0" />
1414
<package id="Microsoft.DiaSymReader" version="1.1.0" />
1515
<package id="System.ValueTuple" version="4.3.1" />
16+
<package id="System.ValueTuple" version="4.4.0" />
1617
<package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
1718
<package id="Microsoft.Build" version="14.3.0" />
1819
<package id="Microsoft.Build.Framework" version="14.3.0" />
@@ -27,13 +28,13 @@
2728
<package id="NUnit3TestAdapter" version="3.0.8-ctp-8" targetFramework="net45" />
2829
<package id="BenchmarkDotNet" version="0.9.8"/>
2930
<package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
30-
<package id="Newtonsoft.Json" version="8.0.1"/>
31+
<package id="Newtonsoft.Json" version="9.0.1"/>
3132
<!-- FSharp.Compiler.Tools is only used to get a working FSI.EXE to execute some scripts during the build -->
3233
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful -->
3334
<package id="FSharp.Compiler.Tools" version="4.1.27"/>
3435

3536
<!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
36-
<package id="Microsoft.Portable.FSharp.Core" version="4.1.20"/>
37+
<package id="Microsoft.Portable.FSharp.Core" version="10.1.0"/>
3738

3839
<!-- FSharp.Core is used to get back versions of FSharp.Core -->
3940
<package id="FSharp.Core" version="4.1.17"/>

0 commit comments

Comments
 (0)