Skip to content

Add support for --pathmap #6609

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 11 commits into from
Apr 24, 2019
Merged

Add support for --pathmap #6609

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0755bd7
Merge pull request #1 from Microsoft/master
petera76 Oct 16, 2018
edc7e76
Add support for --pathmap
Oct 19, 2018
80b56c7
Merge branch 'master' into 3812-support-pathmap
saul Apr 22, 2019
fe2046c
Fix build
saul Apr 22, 2019
c8a4c40
Update FSharp.Compiler.Service.fsproj
saul Apr 22, 2019
dee635a
Merge remote-tracking branch 'upstream/master' into 3812-support-pathmap
saul Apr 23, 2019
d566379
Markup
saul Apr 23, 2019
9f7bcd6
Fix tests
saul Apr 23, 2019
ff0a960
Update help40.437.1033.bsl
saul Apr 23, 2019
f3553a4
Update help40-nologo.437.1033.bsl
saul Apr 23, 2019
718a6b0
Update help40.437.1033.bsl
saul Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Merge branch 'master' into 3812-support-pathmap
  • Loading branch information
@saul
saul committed Apr 22, 2019
commit 80b56c7f676cb1801d09fc4e785a9b36e7ccd966
19 changes: 7 additions & 12 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# Downloaded packages and build tools.
/lkg
/packages
/Tools
# output location
artifacts/

/tests/scripts/current
/release
/debug
/Proto
.dotnet/
.packages/
.tools/

# Patches that may have been generated by scripts.
# (These aren't generally useful to commit directly; if anything, they should be applied.)
Expand Down Expand Up @@ -82,10 +80,9 @@ lib/bootstrap/4.1/*.xml
lib/bootstrap/4.1/fsharpc
lib/bootstrap/4.1/fsharpi
lib/bootstrap/4.1/policy*
obj/
bin/
aclocal.m4
Debug
Release
Proto
sign_temp
.libs
configure
Expand All @@ -109,7 +106,6 @@ ossreadme*.txt
*.cto
*.vstman
project.lock.json
Tools/
Backup/
tests/fsharp/core/array/dont.run.peverify
tests/fsharp/core/innerpoly/dont.run.peverify
Expand All @@ -118,7 +114,6 @@ times
/tests/fsharpqa/testenv/bin/System.ValueTuple.dll
source_link.json
.vs/
/VSRelease/net40/bin
System.ValueTuple.dll
tests/fsharpqa/testenv/bin/System.ValueTuple.dll
*/.fake
Expand Down
Binary file removed .nuget/NuGet.exe
View file
Open in desktop
Binary file not shown.
138 changes: 0 additions & 138 deletions .nuget/NuGet.targets
View file
Open in desktop

This file was deleted.

Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.