Skip to content
This repository was archived by the owner on Oct 31, 2021. It is now read-only.

Commit 7168790

Browse files
smoothdevelopersmoothdeveloper
committed
update latest FSharpLint (pulls a bunch of stuff / changes proj files due to appearance of framework 463)
1 parent 1919a70 commit 7168790

File tree

11 files changed

+345
-89
lines changed

11 files changed

+345
-89
lines changed

‎paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nuget FSharp.Core
88
nuget FSharp.Data
99
nuget FSharp.Management
1010
nuget FSharp.ViewModule.Core
11-
nuget FSharpLint.Core
11+
nuget FSharpLint.Core prerelease
1212
nuget FsPickler
1313
nuget FsXaml.Wpf
1414
nuget SourceLink.SymbolStore 0.5.0

‎paket.lock‎

Lines changed: 72 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,90 @@ NUGET
99
FSharp.Compiler.Service (10.0.1)
1010
System.Collections.Immutable (>= 1.2)
1111
System.Reflection.Metadata (>= 1.4.1-beta-24227-04)
12-
FSharp.Compiler.Service.ProjectCracker (8.0)
12+
FSharp.Compiler.Service.ProjectCracker (10.0.1)
13+
FSharp.Compiler.Service (>= 10.0.1) - framework: >= net463
14+
Microsoft.Build (>= 14.3) - framework: >= net463
15+
Microsoft.Build.Framework (>= 14.3) - framework: >= net463
16+
Microsoft.Build.Tasks.Core (>= 14.3) - framework: >= net463
17+
Microsoft.Build.Utilities.Core (>= 14.3) - framework: >= net463
18+
Microsoft.FSharp.Core.netcore (>= 1.0.0-alpha-161205) - framework: >= net463
19+
System.Runtime.Serialization.Json (>= 4.0.2) - framework: >= net463
1320
FSharp.Core (4.0.0.1)
1421
FSharp.Data (2.3.2)
1522
FSharp.Management (0.4.2)
1623
FSharp.ViewModule.Core (1.0.5)
1724
FSharp.Core
18-
FSharpLint.Core (0.4.10)
25+
FSharpLint.Core (0.7.0-beta)
1926
FParsec (>= 1.0.2)
20-
FSharp.Compiler.Service (>= 8.0)
21-
FSharp.Compiler.Service.ProjectCracker (>= 8.0)
27+
FSharp.Compiler.Service (>= 10.0.1)
28+
FSharp.Compiler.Service.ProjectCracker (>= 10.0.1)
2229
FsPickler (3.2)
2330
FsXaml.Wpf (3.1.2)
31+
Microsoft.Build (14.3) - framework: >= net463
32+
Microsoft.Build.Framework (14.3) - framework: >= net45
33+
Microsoft.Build.Framework (14.3)
34+
System.Collections (>= 4.0.11) - framework: >= net46
35+
System.Runtime (>= 4.1) - framework: >= net46
36+
System.Runtime.InteropServices (>= 4.1) - framework: >= net46
37+
Microsoft.Build.Tasks.Core (14.3) - framework: >= net463
38+
Microsoft.Build.Framework (14.3) - framework: >= net45
39+
Microsoft.Build.Utilities.Core (14.3) - framework: >= net45
40+
Microsoft.Build.Utilities.Core (14.3)
41+
Microsoft.Build.Framework (14.3) - framework: >= net45
42+
Microsoft.FSharp.Core.netcore (1.0.0-rc-170122) - framework: >= net463
43+
System.Collections (>= 4.0.11)
44+
System.Console (>= 4.0)
45+
System.Diagnostics.Debug (>= 4.0.11)
46+
System.Diagnostics.Tools (>= 4.0.1)
47+
System.Globalization (>= 4.0.11)
48+
System.IO (>= 4.1)
49+
System.Linq (>= 4.1)
50+
System.Linq.Expressions (>= 4.1)
51+
System.Linq.Queryable (>= 4.0.1)
52+
System.Net.Requests (>= 4.0.11)
53+
System.Reflection (>= 4.1)
54+
System.Reflection.Extensions (>= 4.0.1)
55+
System.Resources.ResourceManager (>= 4.0.1)
56+
System.Runtime (>= 4.1)
57+
System.Runtime.Extensions (>= 4.1)
58+
System.Runtime.Numerics (>= 4.0.1)
59+
System.Text.RegularExpressions (>= 4.1)
60+
System.Threading (>= 4.0.11)
61+
System.Threading.Tasks (>= 4.0.11)
62+
System.Threading.Tasks.Parallel (>= 4.0.1)
63+
System.Threading.Thread (>= 4.0)
64+
System.Threading.ThreadPool (>= 4.0.10)
65+
System.Threading.Timer (>= 4.0.1)
2466
SourceLink.SymbolStore (0.5)
67+
System.Collections (4.3)
2568
System.Collections.Immutable (1.2)
69+
System.Console (4.3) - framework: >= net463
70+
System.Diagnostics.Debug (4.3) - framework: >= net463
71+
System.Diagnostics.Tools (4.3) - framework: >= net463
72+
System.Globalization (4.3) - framework: >= net463
73+
System.IO (4.3) - framework: >= net463
74+
System.Linq (4.3) - framework: >= net463
75+
System.Linq.Expressions (4.3) - framework: >= net463
76+
System.Linq.Queryable (4.3) - framework: >= net463
77+
System.Net.Requests (4.3) - framework: >= net463
78+
System.Reflection (4.3) - framework: >= net463
79+
System.Reflection.Extensions (4.3) - framework: >= net463
2680
System.Reflection.Metadata (1.4.1-beta-24430-01)
2781
System.Collections.Immutable (>= 1.2) - framework: >= net45
82+
System.Resources.ResourceManager (4.3) - framework: >= net463
83+
System.Runtime (4.3)
84+
System.Runtime.Extensions (4.3) - framework: >= net463
85+
System.Runtime.InteropServices (4.3)
86+
System.Runtime (>= 4.3) - framework: >= net462
87+
System.Runtime.Numerics (4.3) - framework: >= net463
88+
System.Runtime.Serialization.Json (4.3) - framework: >= net463
89+
System.Text.RegularExpressions (4.3) - framework: >= net463
90+
System.Threading (4.3) - framework: >= net463
91+
System.Threading.Tasks (4.3) - framework: >= net463
92+
System.Threading.Tasks.Parallel (4.3) - framework: >= net463
93+
System.Threading.Thread (4.3) - framework: >= net463
94+
System.Threading.ThreadPool (4.3) - framework: >= net463
95+
System.Threading.Timer (4.3) - framework: >= net463
2896

2997
GROUP Build
3098
NUGET

‎src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@
9393
<Choose>
9494
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
9595
<ItemGroup>
96-
<Reference Include="FSharp.Compiler.Service.MSBuild.v12">
97-
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
96+
<Reference Include="FSharp.Compiler.Service">
97+
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
9898
<Private>True</Private>
9999
<Paket>True</Paket>
100100
</Reference>
101-
<Reference Include="FSharp.Compiler.Service">
102-
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
101+
<Reference Include="FSharp.Compiler.Service.MSBuild.v12">
102+
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
103103
<Private>True</Private>
104104
<Paket>True</Paket>
105105
</Reference>
@@ -131,16 +131,6 @@
131131
<Choose>
132132
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
133133
<ItemGroup>
134-
<Reference Include="FsXaml.Wpf.TypeProvider">
135-
<HintPath>..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.TypeProvider.dll</HintPath>
136-
<Private>True</Private>
137-
<Paket>True</Paket>
138-
</Reference>
139-
<Reference Include="FsXaml.Wpf">
140-
<HintPath>..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.dll</HintPath>
141-
<Private>True</Private>
142-
<Paket>True</Paket>
143-
</Reference>
144134
<Reference Include="PresentationFramework">
145135
<Paket>True</Paket>
146136
</Reference>
@@ -156,6 +146,16 @@
156146
<Reference Include="WindowsBase">
157147
<Paket>True</Paket>
158148
</Reference>
149+
<Reference Include="FsXaml.Wpf">
150+
<HintPath>..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.dll</HintPath>
151+
<Private>True</Private>
152+
<Paket>True</Paket>
153+
</Reference>
154+
<Reference Include="FsXaml.Wpf.TypeProvider">
155+
<HintPath>..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.TypeProvider.dll</HintPath>
156+
<Private>True</Private>
157+
<Paket>True</Paket>
158+
</Reference>
159159
</ItemGroup>
160160
</When>
161161
</Choose>

0 commit comments

Comments
 (0)