From fc764742873060a0c9382ab3ee63ba09cdfd721c Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 3 Mar 2017 15:13:23 -0800 Subject: [PATCH 01/11] Remove comment ifdefs --- src/fsharp/FSComp.txt | 1 - src/fsharp/ast.fs | 2 -- src/fsharp/lex.fsl | 33 ------------------- src/fsharp/pars.fsy | 1 - src/fsharp/vs/ServiceLexing.fs | 4 --- src/fsharp/vs/ServiceLexing.fsi | 1 - .../ConditionalCompilation/FSharp01.fs | 11 ------- .../ConditionalCompilation/FSharp02.fs | 12 ------- .../ConditionalCompilation/OCaml01.fs | 7 ---- 9 files changed, 72 deletions(-) delete mode 100644 tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/FSharp01.fs delete mode 100644 tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/FSharp02.fs delete mode 100644 tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/OCaml01.fs diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index 9d69cf6fcfe..643cd8eefc9 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -365,7 +365,6 @@ csSeeAvailableOverloads,"The available overloads are shown below (or in the Erro 516,parsEofInComment,"End of file in comment begun at or before here" 517,parsEofInStringInComment,"End of file in string embedded in comment begun at or before here" 518,parsEofInVerbatimStringInComment,"End of file in verbatim string embedded in comment begun at or before here" -519,parsEofInIfOcaml,"End of file in IF-OCAML section begun at or before here" 520,parsEofInDirective,"End of file in directive begun at or before here" 521,parsNoHashEndIfFound,"No #endif found for #if or #else" 522,parsAttributesIgnored,"Attributes have been ignored in this construct" diff --git a/src/fsharp/ast.fs b/src/fsharp/ast.fs index 010688fedce..5f0f3dbecf6 100644 --- a/src/fsharp/ast.fs +++ b/src/fsharp/ast.fs @@ -2119,7 +2119,6 @@ type LexerWhitespaceContinuation = | StringInComment of ifdef:LexerIfdefStackEntries * int * range:range | VerbatimStringInComment of ifdef:LexerIfdefStackEntries * int * range:range | TripleQuoteStringInComment of ifdef:LexerIfdefStackEntries * int * range:range - | MLOnly of ifdef:LexerIfdefStackEntries * range:range | EndLine of LexerEndlineContinuation member x.LexerIfdefStack = @@ -2134,7 +2133,6 @@ type LexerWhitespaceContinuation = | LexCont.StringInComment (ifdef=ifd) | LexCont.VerbatimStringInComment (ifdef=ifd) | LexCont.TripleQuoteStringInComment (ifdef=ifd) - | LexCont.MLOnly (ifdef=ifd) -> ifd | LexCont.EndLine endl -> endl.LexerIfdefStack and LexCont = LexerWhitespaceContinuation diff --git a/src/fsharp/lex.fsl b/src/fsharp/lex.fsl index 7820fd160c6..dc2c71d46f9 100644 --- a/src/fsharp/lex.fsl +++ b/src/fsharp/lex.fsl @@ -416,14 +416,6 @@ rule token args skip = parse { match unicodeGraphLong (lexemeTrimBoth lexbuf 3 1) with | SingleChar(c) -> CHAR (char c) | _ -> fail args lexbuf (FSComp.SR.lexThisUnicodeOnlyInStringLiterals()) (CHAR (char 0)) } - | "(*IF-FSHARP" - { if not skip then (COMMENT (LexCont.Token !args.ifdefStack)) else token args skip lexbuf } - | "(*F#" - { if not skip then (COMMENT (LexCont.Token !args.ifdefStack)) else token args skip lexbuf } - | "ENDIF-FSHARP*)" - { if not skip then (COMMENT (LexCont.Token !args.ifdefStack)) else token args skip lexbuf } - | "F#*)" - { if not skip then (COMMENT (LexCont.Token !args.ifdefStack)) else token args skip lexbuf } | "(*)" { LPAREN_STAR_RPAREN } @@ -432,10 +424,6 @@ rule token args skip = parse { let m = lexbuf.LexemeRange if not skip then (COMMENT (LexCont.Comment(!args.ifdefStack,1,m))) else comment (1,m,args) skip lexbuf } - | "(*IF-CAML*)" | "(*IF-OCAML*)" - { let m = lexbuf.LexemeRange - if not skip then (COMMENT (LexCont.MLOnly(!args.ifdefStack,m))) else mlOnly m args skip lexbuf } - | '"' { let buf,fin,m = startString args lexbuf if not skip then (STRING_TEXT (LexCont.String(!args.ifdefStack,m))) else string (buf,fin,m,args) skip lexbuf } @@ -1050,24 +1038,3 @@ and tripleQuoteStringInComment n m args skip = parse | surrogateChar surrogateChar | _ { if not skip then (COMMENT (LexCont.TripleQuoteStringInComment(!args.ifdefStack,n,m))) else tripleQuoteStringInComment n m args skip lexbuf } - - -and mlOnly m args skip = parse - | "\"" - { let buf = ByteBuffer.Create 100 - let m2 = lexbuf.LexemeRange - let _ = string (buf,defaultStringFinisher,m2,args) skip lexbuf - if not skip then (COMMENT (LexCont.MLOnly(!args.ifdefStack,m))) else mlOnly m args skip lexbuf } - | newline - { newline lexbuf; if not skip then (COMMENT (LexCont.MLOnly(!args.ifdefStack,m))) else mlOnly m args skip lexbuf } - | "(*ENDIF-CAML*)" - { if not skip then (COMMENT (LexCont.Token !args.ifdefStack)) else token args skip lexbuf } - | "(*ENDIF-OCAML*)" - { if not skip then (COMMENT (LexCont.Token !args.ifdefStack)) else token args skip lexbuf } - | [^ '(' '"' '\n' '\r' ]+ - { if not skip then (COMMENT (LexCont.MLOnly(!args.ifdefStack,m))) else mlOnly m args skip lexbuf } - | eof - { EOF (LexCont.MLOnly(!args.ifdefStack,m)) } - | surrogateChar surrogateChar - | _ - { if not skip then (COMMENT (LexCont.MLOnly(!args.ifdefStack,m))) else mlOnly m args skip lexbuf } diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy index 68a2b982c20..d039453a54e 100644 --- a/src/fsharp/pars.fsy +++ b/src/fsharp/pars.fsy @@ -94,7 +94,6 @@ let checkEndOfFileError t = | LexCont.StringInComment (_,_,m) -> reportParseErrorAt m (FSComp.SR.parsEofInStringInComment()) | LexCont.VerbatimStringInComment (_,_,m) -> reportParseErrorAt m (FSComp.SR.parsEofInVerbatimStringInComment()) | LexCont.TripleQuoteStringInComment (_,_,m) -> reportParseErrorAt m (FSComp.SR.parsEofInTripleQuoteStringInComment()) - | LexCont.MLOnly (_,m) -> reportParseErrorAt m (FSComp.SR.parsEofInIfOcaml()) | LexCont.EndLine(LexerEndlineContinuation.Skip(_,_,m)) -> reportParseErrorAt m (FSComp.SR.parsEofInDirective()) | LexCont.EndLine(LexerEndlineContinuation.Token(stack)) | LexCont.Token(stack) -> diff --git a/src/fsharp/vs/ServiceLexing.fs b/src/fsharp/vs/ServiceLexing.fs index ea7a4d7c248..9f6b394d5ef 100755 --- a/src/fsharp/vs/ServiceLexing.fs +++ b/src/fsharp/vs/ServiceLexing.fs @@ -304,7 +304,6 @@ type FSharpTokenizerColorState = | Comment = 5 | StringInComment = 6 | VerbatimStringInComment = 7 - | CamlOnly = 8 | VerbatimString = 9 | SingleLineComment = 10 | EndLineThenSkip = 11 @@ -415,7 +414,6 @@ module internal LexerStateEncoding = | LexCont.StringInComment (ifd,n,m) -> FSharpTokenizerColorState.StringInComment, resize32 n, m.Start, ifd | LexCont.VerbatimStringInComment (ifd,n,m) -> FSharpTokenizerColorState.VerbatimStringInComment, resize32 n, m.Start, ifd | LexCont.TripleQuoteStringInComment (ifd,n,m) -> FSharpTokenizerColorState.TripleQuoteStringInComment,resize32 n, m.Start, ifd - | LexCont.MLOnly (ifd,m) -> FSharpTokenizerColorState.CamlOnly, 0L, m.Start, ifd | LexCont.VerbatimString (ifd,m) -> FSharpTokenizerColorState.VerbatimString, 0L, m.Start, ifd | LexCont.TripleQuoteString (ifd,m) -> FSharpTokenizerColorState.TripleQuoteString, 0L, m.Start, ifd encodeLexCont tag n1 p1 ifd lightSyntaxStatus @@ -433,7 +431,6 @@ module internal LexerStateEncoding = | FSharpTokenizerColorState.StringInComment -> LexCont.StringInComment (ifd,n1,mkRange "file" p1 p1) | FSharpTokenizerColorState.VerbatimStringInComment -> LexCont.VerbatimStringInComment (ifd,n1,mkRange "file" p1 p1) | FSharpTokenizerColorState.TripleQuoteStringInComment -> LexCont.TripleQuoteStringInComment (ifd,n1,mkRange "file" p1 p1) - | FSharpTokenizerColorState.CamlOnly -> LexCont.MLOnly (ifd,mkRange "file" p1 p1) | FSharpTokenizerColorState.VerbatimString -> LexCont.VerbatimString (ifd,mkRange "file" p1 p1) | FSharpTokenizerColorState.TripleQuoteString -> LexCont.TripleQuoteString (ifd,mkRange "file" p1 p1) | FSharpTokenizerColorState.EndLineThenSkip -> LexCont.EndLine(LexerEndlineContinuation.Skip(ifd,n1,mkRange "file" p1 p1)) @@ -459,7 +456,6 @@ module internal LexerStateEncoding = | LexCont.StringInComment (ifd,n,m) -> Lexer.stringInComment n m (argsWithIfDefs ifd) skip lexbuf | LexCont.VerbatimStringInComment (ifd,n,m) -> Lexer.verbatimStringInComment n m (argsWithIfDefs ifd) skip lexbuf | LexCont.TripleQuoteStringInComment (ifd,n,m) -> Lexer.tripleQuoteStringInComment n m (argsWithIfDefs ifd) skip lexbuf - | LexCont.MLOnly (ifd,m) -> Lexer.mlOnly m (argsWithIfDefs ifd) skip lexbuf | LexCont.VerbatimString (ifd,m) -> Lexer.verbatimString (ByteBuffer.Create 100,defaultStringFinisher,m,(argsWithIfDefs ifd)) skip lexbuf | LexCont.TripleQuoteString (ifd,m) -> Lexer.tripleQuoteString (ByteBuffer.Create 100,defaultStringFinisher,m,(argsWithIfDefs ifd)) skip lexbuf diff --git a/src/fsharp/vs/ServiceLexing.fsi b/src/fsharp/vs/ServiceLexing.fsi index d921a8ab78b..3ed955442ee 100755 --- a/src/fsharp/vs/ServiceLexing.fsi +++ b/src/fsharp/vs/ServiceLexing.fsi @@ -29,7 +29,6 @@ type internal FSharpTokenizerColorState = | Comment = 5 | StringInComment = 6 | VerbatimStringInComment = 7 - | CamlOnly = 8 | VerbatimString = 9 | SingleLineComment = 10 | EndLineThenSkip = 11 diff --git a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/FSharp01.fs b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/FSharp01.fs deleted file mode 100644 index 0ac244d7023..00000000000 --- a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/FSharp01.fs +++ /dev/null @@ -1,11 +0,0 @@ -// #Conformance #LexicalAnalysis -#light - -(*IF-FSHARP - -let x = 0 - -ENDIF-FSHARP*) - -// If the 'IF-FSHARP' wasn't honored, x wouldn't be defined -exit x diff --git a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/FSharp02.fs b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/FSharp02.fs deleted file mode 100644 index ac29ca72b27..00000000000 --- a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/FSharp02.fs +++ /dev/null @@ -1,12 +0,0 @@ -// #Conformance #LexicalAnalysis -#light - -(*F# - -let x = 0 - -F#*) - -if 2 <> 0 (*F# + 2 F#*) then exit 1 - -exit x diff --git a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/OCaml01.fs b/tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/OCaml01.fs deleted file mode 100644 index 0d4018e646a..00000000000 --- a/tests/fsharpqa/Source/Conformance/LexicalAnalysis/ConditionalCompilation/OCaml01.fs +++ /dev/null @@ -1,7 +0,0 @@ -// #Conformance #LexicalAnalysis -#light - -let x = 0 (*IF-OCAML*) + 1 (*ENDIF-OCAML*) - -// should be = 0 since IF-OCAML is stripped out -exit x From 638a51ad08a196aa2f5bf59e602248b3797eb034 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Wed, 3 May 2017 16:49:53 -0700 Subject: [PATCH 02/11] Add Microsoft.NET.Sdk.FSharp.props --- .../component-groups/Compiler_Redist.wxs | 8 +++++- .../Microsoft.FSharp.Dependencies/Files.swr | 1 + .../Microsoft.NET.Sdk.FSharp.Shim.props | 5 ++++ .../FSharp.Build-proto.fsproj | 6 +++++ src/fsharp/FSharp.Build/FSharp.Build.fsproj | 5 ++++ .../FSharp.Build/FSharp.Build.netcore.nuspec | 1 + .../Microsoft.NET.Sdk.FSharp.props | 26 +++++++++++++++++++ .../Microsoft.FSharp.Compiler.netcore.nuspec | 3 ++- vsintegration/update-vsintegration.cmd | 1 + 9 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 setup/resources/Microsoft.NET.Sdk.FSharp.Shim.props create mode 100644 src/fsharp/FSharp.Build/Microsoft.NET.Sdk.FSharp.props diff --git a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs index d8fe5a003c9..25e30f6b111 100644 --- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs +++ b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs @@ -15,6 +15,7 @@ + @@ -116,6 +117,10 @@ + + + + @@ -126,8 +131,9 @@ - + + diff --git a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr index ed84bb5ed29..c1f9393771d 100644 --- a/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr +++ b/setup/Swix/Microsoft.FSharp.Dependencies/Files.swr @@ -6,6 +6,7 @@ package name=Microsoft.FSharp.Dependencies folder "InstallDir:MSBuild\Microsoft\VisualStudio\v15.0\FSharp" file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets" file "Microsoft.Portable.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets" + file "Microsoft.NET.Sdk.FSharp.props" source="$(BinariesFolder)\setup\resources\Microsoft.NET.Sdk.FSharp.Shim.props" folder "InstallDir:Common7\IDE\PublicAssemblies" file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll" vs.file.ngen=yes diff --git a/setup/resources/Microsoft.NET.Sdk.FSharp.Shim.props b/setup/resources/Microsoft.NET.Sdk.FSharp.Shim.props new file mode 100644 index 00000000000..e4ed4675706 --- /dev/null +++ b/setup/resources/Microsoft.NET.Sdk.FSharp.Shim.props @@ -0,0 +1,5 @@ + + + + + diff --git a/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj b/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj index 900b6d239f4..55524d6b3fe 100644 --- a/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj +++ b/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj @@ -46,6 +46,12 @@ {BuildSuffix} -proto + + Microsoft.NET.Sdk.FSharp-proto.props + Microsoft.NET.Sdk.FSharp-proto.props + {BuildSuffix} + -proto + diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 5d696c416be..47dca5d50c1 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -59,6 +59,11 @@ {BuildSuffix} + + Microsoft.NET.Sdk.FSharp.props + {BuildSuffix} + + diff --git a/src/fsharp/FSharp.Build/FSharp.Build.netcore.nuspec b/src/fsharp/FSharp.Build/FSharp.Build.netcore.nuspec index e280a5f032d..efb8331d664 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.netcore.nuspec +++ b/src/fsharp/FSharp.Build/FSharp.Build.netcore.nuspec @@ -33,5 +33,6 @@ + diff --git a/src/fsharp/FSharp.Build/Microsoft.NET.Sdk.FSharp.props b/src/fsharp/FSharp.Build/Microsoft.NET.Sdk.FSharp.props new file mode 100644 index 00000000000..94030026809 --- /dev/null +++ b/src/fsharp/FSharp.Build/Microsoft.NET.Sdk.FSharp.props @@ -0,0 +1,26 @@ + + + + + + + + false + + + + $(MSBuildThisFileDirectory) + RunFsc.cmd + RunFsc.sh + + + diff --git a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec index 159d05a26ab..26a5cfffc70 100644 --- a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec +++ b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec @@ -44,7 +44,8 @@ - + + diff --git a/vsintegration/update-vsintegration.cmd b/vsintegration/update-vsintegration.cmd index d65d578f001..d6614f4d202 100644 --- a/vsintegration/update-vsintegration.cmd +++ b/vsintegration/update-vsintegration.cmd @@ -55,6 +55,7 @@ copy /y "%BINDIR%\fsiAnyCpu.exe" "%COMPILERSDKPATH%" copy /y "%BINDIR%\fsiAnyCpu.exe.config" "%COMPILERSDKPATH%" copy /y "%BINDIR%\Microsoft.FSharp.targets" "%COMPILERSDKPATH%" copy /y "%BINDIR%\Microsoft.Portable.FSharp.targets" "%COMPILERSDKPATH%" +copy /y "%BINDIR%\Microsoft.NET.Sdk.FSharp.props" "%COMPILERSDKPATH%" copy /y "%TOPDIR%\vsintegration\src\SupportedRuntimes\SupportedRuntimes.xml" "%COMPILERSDKPATH%" set COMPILERMAINASSEMBLIESPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.%FSHARPVERSION%.0 From e47f4a97226ea476da48294384cda6a9e6c387dc Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 4 May 2017 22:11:33 -0700 Subject: [PATCH 03/11] Make TargetFrameworks work --- .../FSharp.Build/Microsoft.FSharp.targets | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.targets index 3f2f69c1ba4..e1b6caf5a24 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.targets +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.targets @@ -17,10 +17,10 @@ this file. - - + + - + true true @@ -270,8 +270,19 @@ this file. - - + + + + $(MSBuildBinPath)\Microsoft.Common.CurrentVersion.targets + + + + + $(MSBuildBinPath)\Microsoft.Common.targets + + + + + + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + true + true + true + true + + + + false + + + + mscorlib + netcore + $(OtherFlags) --simpleresolution --nocopyfsharpcore + + + + <_DebugSymbolsIntermediatePathTemporary Include="$(PdbFile)"/> + + <_DebugSymbolsIntermediatePath Include="@(_DebugSymbolsIntermediatePathTemporary->'%(RootDir)%(Directory)%(Filename).pdb')"/> + + + + + <_ExplicitReference Include="$(FrameworkPathOverride)\mscorlib.dll" Condition=" '$(NoStdLib)' != 'true' " /> + + + + + + $(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.FSharp.DesignTime.targets + + + + + + + + + $(MSBuildProjectFullPath) + + + + + + true + + + + + + + + + diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.targets index 51245247e4d..5467e945896 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.targets +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.targets @@ -17,6 +17,10 @@ this file. + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + @@ -28,7 +32,6 @@ this file. - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) .fs F# Managed diff --git a/src/fsharp/FSharp.Build/Microsoft.NET.Sdk.FSharp.props b/src/fsharp/FSharp.Build/Microsoft.NetSdk.FSharp.props similarity index 99% rename from src/fsharp/FSharp.Build/Microsoft.NET.Sdk.FSharp.props rename to src/fsharp/FSharp.Build/Microsoft.NetSdk.FSharp.props index 94030026809..9f77bbc776d 100644 --- a/src/fsharp/FSharp.Build/Microsoft.NET.Sdk.FSharp.props +++ b/src/fsharp/FSharp.Build/Microsoft.NetSdk.FSharp.props @@ -1,5 +1,4 @@ - diff --git a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec index 26a5cfffc70..e67ae19f8b6 100644 --- a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec +++ b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec @@ -33,19 +33,20 @@ - + - - - - + + + + - + + diff --git a/src/update.cmd b/src/update.cmd index a960748d7c7..455dcf7135f 100644 --- a/src/update.cmd +++ b/src/update.cmd @@ -93,7 +93,7 @@ if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" ( %SN64% -q -Vr VisualFSharp.Unittests,b03f5f7f11d50a3a %SN64% -q -Vr VisualFSharp.Salsa,b03f5f7f11d50a3a %SN64% -q -Vr FSharp.Compiler.Unittests,b03f5f7f11d50a3a - %SN32% -q -Vr Microsoft.VisualStudio.Shell.UI.Internal,b03f5f7f11d50a3a + %SN64% -q -Vr Microsoft.VisualStudio.Shell.UI.Internal,b03f5f7f11d50a3a ) if /i "%1" == "signonly" goto :eof diff --git a/vsintegration/update-vsintegration.cmd b/vsintegration/update-vsintegration.cmd index d6614f4d202..6c7987d5575 100644 --- a/vsintegration/update-vsintegration.cmd +++ b/vsintegration/update-vsintegration.cmd @@ -55,7 +55,8 @@ copy /y "%BINDIR%\fsiAnyCpu.exe" "%COMPILERSDKPATH%" copy /y "%BINDIR%\fsiAnyCpu.exe.config" "%COMPILERSDKPATH%" copy /y "%BINDIR%\Microsoft.FSharp.targets" "%COMPILERSDKPATH%" copy /y "%BINDIR%\Microsoft.Portable.FSharp.targets" "%COMPILERSDKPATH%" -copy /y "%BINDIR%\Microsoft.NET.Sdk.FSharp.props" "%COMPILERSDKPATH%" +copy /y "%BINDIR%\Microsoft.FSharp.NetSdk.props" "%COMPILERSDKPATH%" +copy /y "%BINDIR%\Microsoft.FSharp.NetSdk.targets" "%COMPILERSDKPATH%" copy /y "%TOPDIR%\vsintegration\src\SupportedRuntimes\SupportedRuntimes.xml" "%COMPILERSDKPATH%" set COMPILERMAINASSEMBLIESPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.%FSHARPVERSION%.0 From f253a7f7d49696b35c0a71bc37b512773ee462a4 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 5 May 2017 17:58:02 -0700 Subject: [PATCH 06/11] wrong name --- ...icrosoft.NetSdk.FSharp.props => Microsoft.FSharp.NetSdk.props} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/fsharp/FSharp.Build/{Microsoft.NetSdk.FSharp.props => Microsoft.FSharp.NetSdk.props} (100%) diff --git a/src/fsharp/FSharp.Build/Microsoft.NetSdk.FSharp.props b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props similarity index 100% rename from src/fsharp/FSharp.Build/Microsoft.NetSdk.FSharp.props rename to src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props From e52daea8ff22ec8f10402975a2434b4ee03b43bb Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 5 May 2017 20:13:40 -0700 Subject: [PATCH 07/11] Add automagic FSharp.Core reference for coreclr --- src/fsharp/FSharp.Build/FSharp.Build.fsproj | 4 +- .../FSharp.Build/FSharp.Build.netcore.nuspec | 3 +- .../Microsoft.FSharp.NetSdk.props | 2 +- .../Microsoft.FSharp.NetSdk.targets | 48 ++++++++++++++++--- 4 files changed, 46 insertions(+), 11 deletions(-) diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index f2a2ca7b7f9..95f2d52537a 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -64,8 +64,8 @@ {BuildSuffix} - - Microsoft.NET.Sdk.FSharp.props + + Microsoft.FSharp.NetSdk.targets {BuildSuffix} diff --git a/src/fsharp/FSharp.Build/FSharp.Build.netcore.nuspec b/src/fsharp/FSharp.Build/FSharp.Build.netcore.nuspec index efb8331d664..5d291f8b0aa 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.netcore.nuspec +++ b/src/fsharp/FSharp.Build/FSharp.Build.netcore.nuspec @@ -33,6 +33,7 @@ - + + diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props index 9f77bbc776d..106e83384cd 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props @@ -1,7 +1,7 @@ + + + + + + + Microsoft.FSharp.Core.netcore + + + + 1.0.0-* + 1.0.0-* + + + + + + + + + + @@ -72,4 +94,16 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and + + + + true + + + + + + + + From 2ceacace11121aaa50b987598798839182c8e86e Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Sat, 6 May 2017 00:23:33 -0700 Subject: [PATCH 08/11] Set - false + false + {F2A71F9B-5D33-465A-A702-920D77279786} diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets index 9c15b078b30..ed0e67dcc49 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets @@ -72,7 +72,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and 1.0.0-* 1.0.0-* - + From b04861d33f57bf08000304f0b821a510b05ccea6 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Sat, 6 May 2017 12:53:11 -0700 Subject: [PATCH 09/11] Fix setup --- setup/FSharp.SDK/component-groups/Compiler_Redist.wxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs index 4ce04b1dad2..1d28fe4596d 100644 --- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs +++ b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs @@ -119,11 +119,11 @@ - + - + From 360888941f9f96c65d76a3d9502874cb48636058 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 11 May 2017 00:05:04 -0700 Subject: [PATCH 10/11] Update sdk props --- .../Microsoft.FSharp.NetSdk.props | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props index fa4ed82c7fa..51fff7b4b7d 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props @@ -12,15 +12,27 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + $(DefineConstants);TRACE + 3 + + - false + false {F2A71F9B-5D33-465A-A702-920D77279786} - - $(MSBuildThisFileDirectory) - RunFsc.cmd - RunFsc.sh + + $(MSBuildThisFileDirectory) + RunFsc.cmd + + $(MSBuildThisFileDirectory) + RunFsc.sh + From 956086a9677e86660cd6ca787c90faa385ebb788 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 11 May 2017 01:04:02 -0700 Subject: [PATCH 11/11] Typo for net461 --- src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets index 4337379bdf2..d6fcf255ac7 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets @@ -77,7 +77,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and true - true + true