diff --git a/build-everything.proj b/build-everything.proj index 7d2e4164c63..00979d30b4b 100644 --- a/build-everything.proj +++ b/build-everything.proj @@ -16,13 +16,11 @@ - - diff --git a/build.cmd b/build.cmd index ffb2ecece0e..94f089723dc 100644 --- a/build.cmd +++ b/build.cmd @@ -476,8 +476,8 @@ if '%BUILD_PROTO%' == '1' ( pushd .\lkg\fsc & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure pushd .\lkg\fsi & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure - pushd .\lkg\fsc & %_dotnetexe% publish project.json --no-build -o %~dp0\Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed & goto :failure - pushd .\lkg\fsi & %_dotnetexe% publish project.json --no-build -o %~dp0\Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed & goto :failure + pushd .\lkg\fsc & %_dotnetexe% publish project.json --no-build -o %~dp0Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed & goto :failure + pushd .\lkg\fsi & %_dotnetexe% publish project.json --no-build -o %~dp0Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed & goto :failure echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets index 93a6371980c..2e0a73856cc 100644 --- a/src/FSharpSource.Settings.targets +++ b/src/FSharpSource.Settings.targets @@ -18,6 +18,7 @@ Debug + true diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets index f614a315aa5..19e8bcf4d17 100644 --- a/src/FSharpSource.targets +++ b/src/FSharpSource.targets @@ -453,15 +453,25 @@ $(OutputPath)$(AssemblyName).xml - + + + https://github.com/Microsoft/visualfsharp/blob/master/License.txt + https://github.com/Microsoft/visualfsharp + $(NuGetPerBuildPreReleaseVersion) + Microsoft + Visual F# Compiler FSharp coreclr functional programming + + + $(CompileDependsOn);CopyAndSubstituteTextFiles + - + @@ -480,8 +490,16 @@ - - + + + + + + + -prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" + + diff --git a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj index 10dd468d8b9..1168fe02094 100644 --- a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj +++ b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/FSharp.Compiler.Host.proj @@ -7,17 +7,28 @@ - $(NuGetPerBuildPreReleaseVersion) - $(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin + https://github.com/Microsoft/visualfsharp/blob/master/License.txt + https://github.com/Microsoft/visualfsharp + $(NuGetPerBuildPreReleaseVersion) + Microsoft + Visual F# Compiler FSharp coreclr functional programming + $(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin - - - - - - + + + + + + + - + + + -prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" + + + diff --git a/src/fsharp/FSharp.Compiler.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec similarity index 100% rename from src/fsharp/FSharp.Compiler.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec rename to src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec diff --git a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/layoutfschostnuget.fsx b/src/fsharp/FSharp.Compiler.Host.netcore.nuget/layoutfschostnuget.fsx deleted file mode 100644 index 5b6589d899e..00000000000 --- a/src/fsharp/FSharp.Compiler.Host.netcore.nuget/layoutfschostnuget.fsx +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information, -// -// Layout the nuget host package for the fsharp compiler -//========================================================================================= -open System.IO - -#load "../../scripts/scriptlib.fsx" - -try - //========================================================================================= - // Command line arguments - - let usage = "usage: layoutfcsnhostnuget.fsx -nuspec: --binaries:" - - let verbose = getCmdLineArg "--verbosity:" "normal" - let nuspec = getCmdLineArg "--nuspec:" "" - let bindir = getCmdLineArg "--bindir:" "" - let nuspecTitle = getBasename nuspec - let layouts = getFullPath bindir ++ "layouts" ++ nuspecTitle - let isVerbose = verbose = "verbose" - - //========================================================================================= - // Layout nuget package - - //Clean intermediate directory - deleteDirectory layouts - makeDirectory layouts - exit 0 - -with e -> - printfn "Exception: %s" e.Message - printfn "Stacktrace: %s" e.StackTrace - exit 1 diff --git a/src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj b/src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj deleted file mode 100644 index 16784c34d7f..00000000000 --- a/src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj +++ /dev/null @@ -1,23 +0,0 @@ - - - $(MSBuildProjectDirectory)\..\.. - Debug - - - - - - $(NuGetPerBuildPreReleaseVersion) - $(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin - - - - - - - - - - - - diff --git a/src/fsharp/FSharp.Compiler.netcore.nuget/layoutfscnuget.fsx b/src/fsharp/FSharp.Compiler.netcore.nuget/layoutfscnuget.fsx deleted file mode 100644 index 8aeec7f486c..00000000000 --- a/src/fsharp/FSharp.Compiler.netcore.nuget/layoutfscnuget.fsx +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information, -// -// Layout the nuget package for the fsharp compiler -//========================================================================================= - -#load "../../scripts/scriptlib.fsx" - -try - //========================================================================================= - // Command line arguments - - let usage = "usage: layoutfcsnuget.fsx -nuspec: --binaries:" - - let verbose = getCmdLineArg "--verbosity:" "normal" - let nuspec = getCmdLineArg "--nuspec:" "" - let bindir = getCmdLineArg "--bindir:" "" - let nuspecTitle = getBasename nuspec - printfn ">>%s<<" bindir - printfn ">>%s<<" nuspecTitle - let layouts = getFullPath bindir ++ "layouts" ++ nuspecTitle - let isVerbose = verbose = "verbose" - - //========================================================================================= - // Layout nuget package - - let fsharpCompilerFiles = - [ bindir ++ "fsc.exe" - bindir ++ "FSharp.Compiler.dll" - bindir ++ "default.win32manifest" - bindir ++ "fsi.exe" - bindir ++ "FSharp.Compiler.Interactive.Settings.dll" - bindir ++ "FSharp.Build.dll" - bindir ++ "Microsoft.FSharp.targets" - bindir ++ "Microsoft.Portable.FSharp.targets" ] - - //Clean intermediate directoriy - deleteDirectory layouts - makeDirectory layouts - for source in fsharpCompilerFiles do - copyFile source layouts - exit 0 - -with e -> - printfn "Exception: %s" e.Message - printfn "Stacktrace: %s" e.StackTrace - exit 1 diff --git a/src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj b/src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj deleted file mode 100644 index bcc4797ea8f..00000000000 --- a/src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj +++ /dev/null @@ -1,23 +0,0 @@ - - - $(MSBuildProjectDirectory)\..\.. - Debug - - - - - - $(NuGetPerBuildPreReleaseVersion) - $(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin - - - - - - - - - - - - diff --git a/src/fsharp/FSharp.Core.netcore.nuget/layoutfscorenuget.fsx b/src/fsharp/FSharp.Core.netcore.nuget/layoutfscorenuget.fsx deleted file mode 100644 index 86c12e01731..00000000000 --- a/src/fsharp/FSharp.Core.netcore.nuget/layoutfscorenuget.fsx +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information, -// -// Layout the nuget package for the fsharp compiler -//========================================================================================= - -#load "../../scripts/scriptlib.fsx" - -try - - //========================================================================================= - // Command line arguments - - let usage = "usage: layoutfscorenuget.fsx -nuspec: --binaries:" - - let verbose = getCmdLineArg "--verbosity:" "normal" - let nuspec = getCmdLineArg "--nuspec:" "" - let bindir = getCmdLineArg "--bindir:" "" - let nuspecTitle = getBasename nuspec - let layouts = getFullPath bindir ++ "layouts" ++ nuspecTitle - let isVerbose = verbose = "verbose" - - //========================================================================================= - // Layout nuget package - - let fsharpCoreFiles = - [ bindir ++ "FSharp.Core.xml" - bindir ++ "FSharp.Core.dll" - bindir ++ "FSharp.Core.sigdata" - bindir ++ "FSharp.Core.optdata" - __SOURCE_DIRECTORY__ ++ "FSharp.Core.runtimeconfig.json" ] - - //Clean intermediate directory - deleteDirectory layouts - makeDirectory layouts - - for source in fsharpCoreFiles do - copyFile source layouts - - exit 0 - -with e -> - printfn "Exception: %s" e.Message - printfn "Stacktrace: %s" e.StackTrace - exit 1 diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index b04ab98a77f..1909f2ddfb6 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -23,6 +23,10 @@ $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint + + + PreserveNewest + $(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).dll.lcl diff --git a/src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.runtimeconfig.json b/src/fsharp/FSharp.Core/FSharp.Core.runtimeconfig.json similarity index 100% rename from src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.runtimeconfig.json rename to src/fsharp/FSharp.Core/FSharp.Core.runtimeconfig.json diff --git a/src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec b/src/fsharp/FSharp.Core/Microsoft.FSharp.Core.netcore.nuspec similarity index 100% rename from src/fsharp/FSharp.Core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec rename to src/fsharp/FSharp.Core/Microsoft.FSharp.Core.netcore.nuspec diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj index e44b4c178b3..29cc98ac26d 100644 --- a/src/fsharp/Fsc/Fsc.fsproj +++ b/src/fsharp/Fsc/Fsc.fsproj @@ -26,7 +26,7 @@ $(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(AssemblyName).exe.lcl $(FSharpSourcesRoot)\..\loc\lci\$(AssemblyName).exe.lci false - false + false @@ -66,7 +66,8 @@ - + + diff --git a/src/scripts/buildnugets.fsx b/src/scripts/buildnugets.fsx deleted file mode 100644 index 7725988b935..00000000000 --- a/src/scripts/buildnugets.fsx +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information, -// -// Build nuget package for the fsharp compiler -//========================================================================================= - -#load "scriptlib.fsx" - -try - - //========================================================================================= - // Command line arguments - - let usage = "usage: BuildNuGets.fsx --version: -nuspec: --binaries:" - - let verbose = getCmdLineArg "--verbosity:" "normal" - let version = getCmdLineArg "--version:" "" - let nuspec = getCmdLineArg "--nuspec:" "" - let bindir = getCmdLineArg "--bindir:" "" - let nuspecTitle = getBasename nuspec - let layouts = getFullPath bindir ++ "layouts" ++ nuspecTitle - let output = getFullPath bindir ++ "nuget" - let isVerbose = verbose = "verbose" - - //========================================================================================= - // Invoke nuget.exe to build nuget package - - let author = "Microsoft" - let licenseUrl = "https://github.com/Microsoft/visualfsharp/blob/master/License.txt" - let projectUrl = "https://github.com/Microsoft/visualfsharp" - let tags = "Visual F# Compiler FSharp coreclr functional programming" - - let nugetArgs = sprintf "pack %s -BasePath \"%s\" -OutputDirectory \"%s\" -ExcludeEmptyDirectories -prop licenseUrl=\"%s\" -prop version=\"%s\" -prop authors=\"%s\" -prop projectURL=\"%s\" -prop tags=\"%s\" -Verbosity detailed" - nuspec - layouts - output - licenseUrl - version - author - projectUrl - tags - - let nugetExePath = getFullPath (__SOURCE_DIRECTORY__ ++ "../../.nuget/nuget.exe") - makeDirectory output - exit (executeProcess nugetExePath nugetArgs) -with _ -> - exit 1 diff --git a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest index 27d9936e0ae..e9626701dd2 100644 --- a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest @@ -33,7 +33,6 @@ - @@ -47,8 +46,7 @@ - - + diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest index cb130c38b25..f66fb851750 100644 --- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest @@ -51,15 +51,14 @@ - - + - +