diff --git a/lkg/fsc/project.json b/lkg/fsc/project.json index 436745b7464..ad35757cf9b 100644 --- a/lkg/fsc/project.json +++ b/lkg/fsc/project.json @@ -22,7 +22,6 @@ "version": "1.0.1" } }, - "imports": "dnxcore50" } }, "scripts": { diff --git a/lkg/fsi/project.json b/lkg/fsi/project.json index 965a0fd777f..36cc22a57d8 100644 --- a/lkg/fsi/project.json +++ b/lkg/fsi/project.json @@ -22,7 +22,6 @@ "version": "1.0.1" } }, - "imports": "dnxcore50" } }, "scripts": { diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index d8155f27f60..9a5155560bd 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -15,12 +15,13 @@ true - - $(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl - $(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).dll.lci - false - false - + + $(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl + $(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).dll.lci + false + false + + diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.Build.netcore.nuspec b/src/fsharp/FSharp.Build/Microsoft.FSharp.Build.netcore.nuspec new file mode 100644 index 00000000000..32b8752d5bf --- /dev/null +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.Build.netcore.nuspec @@ -0,0 +1,37 @@ + + + + Microsoft.FSharp.Build.netcore + + .NET Core compatible version of the fsharp build task FSharp.Build.dll + Supported Platforms: - .NET Core (netstandard1.6) + + en-US + true + $version$ + $authors$ + $licenseUrl$ + $projectUrl$ + $tags$ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/fsharp/FSharp.Build/project.json b/src/fsharp/FSharp.Build/project.json index cdec2ffe079..43a9e7b5405 100644 --- a/src/fsharp/FSharp.Build/project.json +++ b/src/fsharp/FSharp.Build/project.json @@ -14,6 +14,12 @@ "System.Reflection.Primitives": "4.0.1", "System.Resources.ResourceManager": "4.0.1" }, + "runtimes": { + "win7-x86": { }, + "win7-x64": { }, + "osx.10.11-x64": { }, + "ubuntu.14.04-x64": { } + }, "frameworks": { "netstandard1.6": { "imports": "portable-net45+win8" diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj index 2d7d51ee6f4..f2ba90c970f 100644 --- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj @@ -14,6 +14,9 @@ FSharp.Compiler.Interactive.Settings 512 + + + FSInteractiveSettings.txt diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/Microsoft.FSharp.Compiler.Interactive.Settings.netcore.nuspec b/src/fsharp/FSharp.Compiler.Interactive.Settings/Microsoft.FSharp.Compiler.Interactive.Settings.netcore.nuspec new file mode 100644 index 00000000000..21594158d55 --- /dev/null +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/Microsoft.FSharp.Compiler.Interactive.Settings.netcore.nuspec @@ -0,0 +1,29 @@ + + + + Microsoft.FSharp.Compiler.Interactive.Settings.netcore + + .NET Core compatible version of the fsharp compiler interactive settings dll + Supported Platforms: - .NET Core (netstandard1.6) + + en-US + true + $version$ + $authors$ + $licenseUrl$ + $projectUrl$ + $tags$ + + + + + + + + + + + + + + diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/project.json b/src/fsharp/FSharp.Compiler.Interactive.Settings/project.json index 4e1804794a8..02c0649bb73 100644 --- a/src/fsharp/FSharp.Compiler.Interactive.Settings/project.json +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", "NETStandard.Library": "1.6.0", "System.Linq.Expressions": "4.1.0", "System.Reflection.TypeExtensions": "4.1.0", diff --git a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj index eb36ef54f57..e67a8f1c3bb 100644 --- a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj +++ b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj @@ -29,6 +29,7 @@ false false + diff --git a/src/fsharp/FSharp.Compiler/Microsoft.FSharp.Compiler.netcore.nuspec b/src/fsharp/FSharp.Compiler/Microsoft.FSharp.Compiler.netcore.nuspec new file mode 100644 index 00000000000..1494509f37f --- /dev/null +++ b/src/fsharp/FSharp.Compiler/Microsoft.FSharp.Compiler.netcore.nuspec @@ -0,0 +1,43 @@ + + + + Microsoft.FSharp.Compiler.netcore + + .NET Core compatible version of the fsharp compiler dll + Supported Platforms: - .NET Core (netstandard1.6) + + en-US + true + $version$ + $authors$ + $licenseUrl$ + $projectUrl$ + $tags$ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/fsharp/FSharp.Compiler/project.json b/src/fsharp/FSharp.Compiler/project.json index 0f86db2be0a..a628e5ba15c 100644 --- a/src/fsharp/FSharp.Compiler/project.json +++ b/src/fsharp/FSharp.Compiler/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", "NETStandard.Library": "1.6.0", "System.Collections.Immutable":"1.2.0", "System.Diagnostics.Process": "4.1.0",