Skip to content

Fix ngen error #1648

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

Merged
KevinRansom merged 18 commits into from
Oct 22, 2016
Merged

Fix ngen error #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b708921
Always use FSharp.Core not fsharp.core (#1610)
dsyme Oct 14, 2016
79430d2
simplify use of if-defs (#1614)
dsyme Oct 14, 2016
8b434e0
Don't try to deploy vsix during OSS build. Specify prereq in vsixman…
KevinRansom Oct 14, 2016
2a9b5ef
Add fsx files to workspaces (#1612)
OmarTawfik Oct 15, 2016
00bab99
(Nugetize F# templates. Ensure value tuple installed on create templ…
KevinRansom Oct 15, 2016
749ba2d
Don't match braces at the end of the caret (#1619)
OmarTawfik Oct 15, 2016
e0318a8
FSharp ms build task to support new xommand line options (#1616)
KevinRansom Oct 15, 2016
2fe5a3b
Add support for generating sourcelink record in portable pdbs. Fixes…
KevinRansom Oct 15, 2016
d648787
Ensure that portable libraries have correct hintpath for preview 5
KevinRansom Oct 16, 2016
39480c4
Ensure that portable libraries have correct hintpath for preview 5 (#…
KevinRansom Oct 16, 2016
edfc77c
Merge https://github.com/Microsoft/visualfsharp
KevinRansom Oct 16, 2016
d64ff35
cleanup build and test scripts (#1615)
dsyme Oct 16, 2016
7d7033a
Merge https://github.com/Microsoft/visualfsharp
KevinRansom Oct 16, 2016
513f6e2
Replaced missed file
KevinRansom Oct 16, 2016
5ce7be0
merge from microsoft.master
KevinRansom Oct 20, 2016
560ba92
Fix merge issue
KevinRansom Oct 20, 2016
53adf55
fix merge error
KevinRansom Oct 20, 2016
7ed15e2
Fix ngen build error
KevinRansom Oct 22, 2016
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
3 changes: 2 additions & 1 deletion packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
<package id="BenchmarkDotNet" version="0.9.8"/>
<package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.8"/>
<package id="VisualCppTools" version="14.0.24519-Pre"/>
<package id="Newtonsoft.Json" version="6.0.8"/>

<!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute -->
<!-- Annoyingly the build of FSharp.Compiler.Server.Shared references a Visual Studio-specific attribute -->
<!-- That DLL is logically part of the F# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools -->
<package id="Microsoft.VisualStudio.Threading" version="14.1.131" targetFramework="net46" />
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net46" />
Expand Down
4 changes: 4 additions & 0 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 @@ -46,6 +46,10 @@
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0.dll" />
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
<HintPath>$(FSharpSourcesRoot)\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
Expand Down
4 changes: 4 additions & 0 deletions src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,10 @@
<Reference Include="Microsoft.Build.Tasks.Core, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
<HintPath>$(FSharpSourcesRoot)\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.DiaSymReader.PortablePdb"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.PortablePdb.1.1.0\lib\portable-net45+win8\Microsoft.DiaSymReader.PortablePdb.dll</HintPath></Reference>
<Reference Include="Microsoft.DiaSymReader"><HintPath>..\..\..\packages\Microsoft.DiaSymReader.1.0.8\lib\portable-net45+win8\Microsoft.DiaSymReader.dll</HintPath></Reference>
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
Expand Down
1 change: 1 addition & 0 deletions tests/fsharpqa/testenv/src/FSharp.Compiler.Hosted/FSharp.Compiler.Hosted.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
<FSharpCoreOptSigFiles Include="$(OpenDrop)\FSharp.Core.xml" />
</ItemGroup>

<Copy SourceFiles="@(FSharpCoreOptSigFiles)" DestinationFolder="$(OutputPath)" />
<Copy SourceFiles="@(FSharpCoreOptSigFiles)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" />
</Target>
</Project>
1 change: 1 addition & 0 deletions tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FSharp.Compiler.Hosted\FSharp.Compiler.Hosted.fsproj"/>
<ProjectReference Include="..\FSharp.Compiler.Hosted\FSharp.Compiler.Hosted.fsproj">
<Project>{4fae092e-5366-43f5-85fa-71eaf66fa4a8}</Project>
<Name>FSharp.Core</Name>
Expand Down