Skip to content

Merge master to dev16.1 #6279

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

Merge master to dev16.1 #6279

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efb57cf
Re-add embed (#6277)
KevinRansom Feb 25, 2019
df4cf22
Fix Fcs/build when proto is built (#6276)
KevinRansom Feb 25, 2019
6122d6a
Minor cleanup (replace hats, add spaces) (#6278)
ncave Feb 25, 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
Next Next commit
Re-add embed (#6277)
  • Loading branch information
@KevinRansom
KevinRansom authored Feb 25, 2019
commit efb57cf56934bd28d3aa174d3c45a3eb4e7c1eb1
4 changes: 4 additions & 0 deletions src/fsharp/FSharp.Build/Fsc.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,10 @@ type public Fsc () as this =
with get() = embedAllSources
and set(s) = embedAllSources <- s

member fsc.Embed
with get() = embeddedFiles
and set(e) = embeddedFiles <- e

member fsc.EmbeddedFiles
with get() = embeddedFiles
and set(e) = embeddedFiles <- e
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Build/Microsoft.FSharp.Targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ this file.
DocumentationFile="$(DocumentationFile)"
DotnetFscCompilerPath="$(DotnetFscCompilerPath)"
EmbedAllSources="$(EmbedAllSources)"
EmbeddedFiles="@(EmbeddedFiles)"
Embed="@(EmbeddedFiles)"
GenerateInterfaceFile="$(GenerateInterfaceFile)"
HighEntropyVA="$(HighEntropyVA)"
KeyFile="$(KeyOriginatorFile)"
Expand Down