Skip to content

Merge dev16.0 to dev16.1 #6199

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
13 commits merged into from
Feb 6, 2019
Merged

Merge dev16.0 to dev16.1 #6199

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
86d59b0
Update Dev16.0 to FSharp Core 461 (#6165)
KevinRansom Jan 31, 2019
5a5ca97
Do not store union case compiled name (#6163)
auduchinok Jan 31, 2019
041c643
Disable XMLDocCommandService due to UI delays (#6087)
cartermp Jan 31, 2019
7523db9
Fix missing completion items in constructors of inherited types (#6002)
auduchinok Jan 31, 2019
d745627
Cleanup some project stuff, and Ensure that Templates vsix contains n…
KevinRansom Jan 31, 2019
b5c01b8
Enable Archive Windows PDBs that match the Portable PDBs Symbols (#6171)
KevinRansom Feb 1, 2019
55cd1a8
MasterBranch version -- Convert PDBS for portable PDBS (#6172)
KevinRansom Feb 1, 2019
4852ea2
merge 16.1 into 16.0
KevinRansom Feb 4, 2019
2efd753
merge master
KevinRansom Feb 4, 2019
2ff0449
merge issue
KevinRansom Feb 4, 2019
4d5b017
Merge pull request #6192 from KevinRansom/dev16.0
KevinRansom Feb 5, 2019
caf462c
Fixed address issue on struct records (#6191)
TIHan Feb 5, 2019
da89b7f
Don't suggest names for errors in normal IDE usage (#6063)
cartermp Feb 5, 2019
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
Prev Previous commit
Next Next commit
MasterBranch version -- Convert PDBS for portable PDBS (#6172) 
* Convert PDBS for portable PDBS

* Typo

* Tweaks
  • Loading branch information
@KevinRansom
KevinRansom authored Feb 1, 2019
commit 55cd1a8f79c356f259abe6dc1e6bb61e4553174f
8 changes: 5 additions & 3 deletions build/targets/ConvertPortablePdbs.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@
<Target Name="ConvertPortablePdbs"
AfterTargets="AfterBuild"
Condition="'$(OS)' != 'Unix' AND
'$(SkipPDBConversion)' != 'true' AND
Exists('$(TargetPath)') AND
('$(DebugType)' == 'portable' OR '$(DebugType)' == 'embedded') AND
$(TargetFramework.StartsWith('net4')) AND
$(TargetFramework.StartsWith('net')) AND
'$(Configuration)' != 'Proto'">
<PropertyGroup>
<ConvertedPdbsDirectory>$(SymStoreDirectory)\$(TargetFramework)</ConvertedPdbsDirectory>
<PdbConverterExe>$(NuGetPackageRoot)Pdb2Pdb\$(Pdb2PdbPackageVersion)\tools\Pdb2Pdb.exe</PdbConverterExe>
<PdbConverterArgs>"$(TargetPath)" /out "$(SymStoreDirectory)\$(TargetName).pdb" /srcsvrvar SRC_INDEX=public</PdbConverterArgs>
<PdbConverterArgs>"$(TargetPath)" /out "$(ConvertedPdbsDirectory)\$(TargetName).pdb" /srcsvrvar SRC_INDEX=public</PdbConverterArgs>
</PropertyGroup>

<MakeDir Directories="$(SymStoreDirectory)" />
<MakeDir Directories="$(ConvertedPdbsDirectory)" />
<Exec Command='"$(PdbConverterExe)" $(PdbConverterArgs)' />
</Target>

Expand Down
1 change: 1 addition & 0 deletions src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<UseFSharpProductVersion>true</UseFSharpProductVersion>
<UseAssetTargetFallback>true</UseAssetTargetFallback>
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
<SkipPDBConversion>true</SkipPDBConversion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net46' AND '$(OS)' == 'Windows_NT'">
Expand Down