Skip to content

Easier compare of open fsharp #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
enricosada wants to merge 1 commit into from
Closed

Easier compare of open fsharp #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,4 @@ tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll

*.csproj.user
*.orig
4 changes: 2 additions & 2 deletions src/fsharp-compiler-build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<ProjectFiles Include="fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj"/>
<ProjectFiles Include="fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj"/>
<ProjectFiles Include="fsharp\Fsc\Fsc.fsproj"/>
<ProjectFiles Include="fsharp\Fsi\Fsi.fsproj"/>
<ProjectFiles Include="fsharp\FsiAnyCpu\FsiAnyCpu.fsproj"/>
<ProjectFiles Include="fsharp\fsi\Fsi.fsproj"/>
<ProjectFiles Include="fsharp\fsiAnyCpu\FsiAnyCpu.fsproj"/>
</ItemGroup>


Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSComp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,4 +1331,4 @@ descriptionUnavailable,"(description unavailable...)"
3176,tcFieldNameConflictsWithGeneratedNameForAnonymousField,"Named field '%s' conflicts with autogenerated name for anonymous field."
3177,tastConstantExpressionOverflow,"This literal expression or attribute argument results in an arithmetic overflow."
3178,tcIllegalStructTypeForConstantExpression,"This is not valid literal expression. The [<Literal>] attribute will be ignored."
3179,fscSystemRuntimeInteropServicesIsRequired,"System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes."
3179,fscSystemRuntimeInteropServicesIsRequired,"System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes."
16 changes: 8 additions & 8 deletions src/fsharp/FSharp.Build/FSharp.Build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
<ProjectGuid>{702A7979-BCF9-4C41-853E-3ADFC9897890}</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<FsSrGen Include="FSBuild.txt">
<Link>FSBuild.txt</Link>
</FsSrGen>
<FsSrGen Include="FSBuild.txt">
<Link>FSBuild.txt</Link>
</FsSrGen>
<Compile Include="InternalsVisibleTo.fs" />
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs">
<Link>assemblyinfo.FSharp.Build.dll.fs</Link>
<Link>Utilities/assemblyinfo.FSharp.Build.dll.fs</Link>
</Compile>
<Compile Include="..\..\utils\CompilerLocationUtils.fs">
<Link>CompilerLocationUtils.fs</Link>
<Link>Utilities/CompilerLocationUtils.fs</Link>
</Compile>
<Compile Include="Fsc.fsi" />
<Compile Include="Fsc.fs" />
Expand Down Expand Up @@ -50,9 +50,9 @@
<Reference Include="Microsoft.Build.Utilities.v12.0" />
<Reference Include="Microsoft.Build.Tasks.v12.0" />
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
</Project>
</Project>
117 changes: 57 additions & 60 deletions src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<Link>ildiag.fs</Link>
</Compile>
<Compile Include="..\ReferenceResolution.fs">
<Link>ReferenceResolution.fs</Link>
<Link>ReferenceResolution.fs</Link>
</Compile>
<Compile Include="..\..\absil\il.fsi">
<Link>il.fsi</Link>
Expand Down Expand Up @@ -180,28 +180,26 @@
<Link>range.fs</Link>
</Compile>
<Compile Include="..\ErrorLogger.fs">
<Link>ErrorLogger.fs</Link>
</Compile>

<Compile Include="..\InternalCollections.fsi">
<Link>ErrorLogger.fs</Link>
</Compile>
<Compile Include="..\InternalCollections.fsi">
<Link>InternalCollections.fsi</Link>
</Compile>
<Compile Include="..\InternalCollections.fs">
<Link>InternalCollections.fs</Link>
</Compile>

<Compile Include="..\..\absil\ilread.fsi">
<Link>ilread.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilread.fs">
<Link>ilread.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fsi">
<Link>ilwrite.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fs">
<Link>ilwrite.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fsi">
<Link>ilwrite.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fs">
<Link>ilwrite.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilreflect.fs">
<Link>ilreflect.fs</Link>
</Compile>
Expand All @@ -214,13 +212,13 @@
<Compile Include="..\..\ilx\ilxsettings.fs">
<Link>ilxsettings.fs</Link>
</Compile>
<Compile Include="..\..\ilx\pubclo.fsi">
<Link>pubclo.fsi</Link>
</Compile>
<Compile Include="..\..\ilx\pubclo.fs">
<Compile Include="..\..\ilx\pubclo.fsi">
<Link>pubclo.fsi</Link>
</Compile>
<Compile Include="..\..\ilx\pubclo.fs">
<Link>pubclo.fs</Link>
</Compile>
<Compile Include="..\..\ilx\cu_erase.fs">
<Compile Include="..\..\ilx\cu_erase.fs">
<Link>cu_erase.fs</Link>
</Compile>
<Compile Include="..\InternalFileSystemUtils.fsi">
Expand All @@ -241,38 +239,38 @@
<Compile Include="..\layout.fs">
<Link>layout.fs</Link>
</Compile>
<Compile Include="..\ast.fs">
<Link>ast.fs</Link>
</Compile>
<Compile Include="pars.fs" />
<Compile Include="..\lexhelp.fsi">
<Link>lexhelp.fsi</Link>
</Compile>
<Compile Include="..\lexhelp.fs">
<Link>lexhelp.fs</Link>
</Compile>
<Compile Include="lex.fs" />
<Compile Include="..\sreflect.fsi">
<Link>sreflect.fsi</Link>
</Compile>
<Compile Include="..\sreflect.fs">
<Link>sreflect.fs</Link>
</Compile>
<Compile Include="..\ast.fs">
<Link>ast.fs</Link>
</Compile>
<Compile Include="pars.fs" />
<Compile Include="..\lexhelp.fsi">
<Link>lexhelp.fsi</Link>
</Compile>
<Compile Include="..\lexhelp.fs">
<Link>lexhelp.fs</Link>
</Compile>
<Compile Include="lex.fs" />
<Compile Include="..\sreflect.fsi">
<Link>sreflect.fsi</Link>
</Compile>
<Compile Include="..\sreflect.fs">
<Link>sreflect.fs</Link>
</Compile>
<Compile Include="..\QueueList.fs">
<Link>QueueList.fs</Link>
</Compile>
<Compile Include="..\tast.fs">
<Link>tast.fs</Link>
</Compile>
<Compile Include="..\env.fs">
<Link>env.fs</Link>
</Compile>
<Compile Include="..\tastops.fsi">
<Link>tastops.fsi</Link>
</Compile>
<Compile Include="..\tastops.fs">
<Link>tastops.fs</Link>
</Compile>
<Link>env.fs</Link>
</Compile>
<Compile Include="..\tastops.fsi">
<Link>tastops.fsi</Link>
</Compile>
<Compile Include="..\tastops.fs">
<Link>tastops.fs</Link>
</Compile>
<Compile Include="..\pickle.fsi">
<Link>pickle.fsi</Link>
</Compile>
Expand All @@ -282,16 +280,15 @@
<Compile Include="..\lexfilter.fs">
<Link>lexfilter.fs</Link>
</Compile>
<Compile Include="..\import.fsi">
<Link>import.fsi</Link>
</Compile>
<Compile Include="..\import.fs">
<Compile Include="..\import.fsi">
<Link>import.fsi</Link>
</Compile>
<Compile Include="..\import.fs">
<Link>import.fs</Link>
</Compile>
<Compile Include="..\infos.fs">
<Link>infos.fs</Link>
</Compile>

<Compile Include="..\NicePrint.fs">
<Link>NicePrint.fs</Link>
</Compile>
Expand All @@ -316,10 +313,10 @@
<Compile Include="..\outcome.fs">
<Link>outcome.fs</Link>
</Compile>
<Compile Include="..\csolve.fsi">
<Link>csolve.fsi</Link>
</Compile>
<Compile Include="..\csolve.fs">
<Compile Include="..\csolve.fsi">
<Link>csolve.fsi</Link>
</Compile>
<Compile Include="..\csolve.fs">
<Link>csolve.fs</Link>
</Compile>
<Compile Include="..\formats.fsi">
Expand All @@ -328,10 +325,10 @@
<Compile Include="..\formats.fs">
<Link>formats.fs</Link>
</Compile>
<Compile Include="..\nameres.fsi">
<Link>nameres.fsi</Link>
</Compile>
<Compile Include="..\nameres.fs">
<Compile Include="..\nameres.fsi">
<Link>nameres.fsi</Link>
</Compile>
<Compile Include="..\nameres.fs">
<Link>nameres.fs</Link>
</Compile>
<Compile Include="..\unsolved.fs">
Expand Down Expand Up @@ -361,10 +358,10 @@
<Compile Include="..\opt.fs">
<Link>opt.fs</Link>
</Compile>
<Compile Include="..\detuple.fsi">
<Link>detuple.fsi</Link>
</Compile>
<Compile Include="..\detuple.fs">
<Compile Include="..\detuple.fsi">
<Link>detuple.fsi</Link>
</Compile>
<Compile Include="..\detuple.fs">
<Link>detuple.fs</Link>
</Compile>
<Compile Include="..\tlr.fsi">
Expand Down Expand Up @@ -418,9 +415,9 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Utilities.v12.0" />
<Reference Include="Microsoft.Build.Tasks.v12.0" />
Expand Down
29 changes: 14 additions & 15 deletions src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,30 @@
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<ItemGroup>
<FsSrGen Include="..\FSInteractiveSettings.txt">
<Link>FSInteractiveSettings.txt</Link>
</FsSrGen>
<FsSrGen Include="..\FSInteractiveSettings.txt">
<Link>FSInteractiveSettings.txt</Link>
</FsSrGen>
<Compile Include="InternalsVisibleTo.fs"/>
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs">
<Link>assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs</Link>
<Link>Utilities/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs</Link>
</Compile>
<Compile Include="..\fsiattrs.fs">
<Link>Utilities/fsiattrs.fs</Link>
</Compile>
<Compile Include="..\fsiaux.fsi">
<Link>fsiaux.fsi</Link>
<Link>InteractiveSettings/fsiaux.fsi</Link>
</Compile>
<Compile Include="..\fsiaux.fs">
<Link>fsiaux.fs</Link>
</Compile>
<Compile Include="..\fsiattrs.fs">
<Link>fsiattrs.fs</Link>
<Link>InteractiveSettings/fsiaux.fs</Link>
</Compile>
</ItemGroup>
<ItemGroup>

<Reference Include="mscorlib" />
<Reference Include="System" />
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
</ProjectReference>
</ItemGroup>
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
</Project>
</Project>
12 changes: 6 additions & 6 deletions src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<TargetFrameworkVersion Condition="'$(TargetFramework)'=='net20'">v2.0</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<FsSrGen Include="..\fsiserver\FSServerShared.txt">
<Link>FSServerShared.txt</Link>
</FsSrGen>
<FsSrGen Include="..\fsiserver\FSServerShared.txt">
<Link>FSServerShared.txt</Link>
</FsSrGen>
<Compile Include="InternalsVisibleTo.fs" />
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs">
<Link>assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs</Link>
Expand All @@ -30,9 +30,9 @@
<Reference Include="System" />
<Reference Include="System.Runtime.Remoting" />
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
</ProjectReference>
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
</Project>
4 changes: 2 additions & 2 deletions src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,13 +500,13 @@
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Utilities.v12.0" />
<Reference Include="Microsoft.Build.Tasks.v12.0" />
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@
<Compile Include="SurfaceArea.4.0.fs" Condition="'$(TargetFramework)' == 'net40'"/>
</ItemGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
</Project>
</Project>
10 changes: 5 additions & 5 deletions src/fsharp/FSharp.Core/FSharp.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@
<Link>Units/SI.fs</Link>
</Compile>
<Compile Include="fslib-extra-pervasives.fsi">
<Link>fslib-extra-pervasives.fsi</Link>
<Link>Extras/fslib-extra-pervasives.fsi</Link>
</Compile>
<Compile Include="fslib-extra-pervasives.fs">
<Link>fslib-extra-pervasives.fs</Link>
<Link>Extras/fslib-extra-pervasives.fs</Link>
</Compile>
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Core.dll.fs">
<Link>assemblyinfo.FSharp.Core.dll.fs</Link>
Expand All @@ -208,9 +208,9 @@
'$(TargetFramework)' == 'sl3-wp' "/>
<Reference Include="System.Observable" Condition="'$(TargetFramework)' == 'sl3-wp' "/>
<Reference Include="System.Core" Condition="'$(TargetFramework)' == 'sl5' OR
'$(TargetFramework)' == 'portable47' OR
'$(TargetFramework)' == 'XNA\5.0' OR
'$(TargetFramework)' == 'sl3-wp' "/>
'$(TargetFramework)' == 'portable47' OR
'$(TargetFramework)' == 'XNA\5.0' OR
'$(TargetFramework)' == 'sl3-wp' "/>
</ItemGroup>
<!-- References -->
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/Linq.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,4 +797,4 @@ module LeafExpressionConverter =


#endif


Loading