From 781bb0e827d4161628887f9d912c681632efe27a Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 7 Nov 2016 01:56:45 -0800 Subject: [PATCH 1/7] Simplify Nugets --- build-everything.proj | 2 - build.cmd | 4 +- src/FSharpSource.Settings.targets | 1 + src/FSharpSource.targets | 18 +++++++- src/buildtools/buildnugets.fsx | 46 ------------------- src/fsharp-library-build.proj | 1 - .../FSharp.Compiler.Host.proj | 29 ++++++++---- .../Microsoft.FSharp.Compiler.netcore.nuspec | 0 .../layoutfschostnuget.fsx | 33 ------------- .../FSharp.Compiler.nuget.proj | 23 ---------- .../layoutfscnuget.fsx | 46 ------------------- .../FSharp.Core.netcore.nuget.proj | 23 ---------- .../layoutfscorenuget.fsx | 44 ------------------ src/fsharp/FSharp.Core/FSharp.Core.fsproj | 4 ++ .../FSharp.Core.runtimeconfig.json | 0 .../Microsoft.FSharp.Core.netcore.nuspec | 0 src/fsharp/Fsc/Fsc.fsproj | 4 +- .../Source.extension.vsixmanifest | 3 ++ .../Source.extension.vsixmanifest | 3 ++ .../Source.extension.vsixmanifest | 3 ++ .../Source.extension.vsixmanifest | 3 ++ 21 files changed, 58 insertions(+), 232 deletions(-) delete mode 100644 src/buildtools/buildnugets.fsx rename src/fsharp/{FSharp.Compiler.netcore.nuget => FSharp.Compiler.Host.netcore.nuget}/Microsoft.FSharp.Compiler.netcore.nuspec (100%) delete mode 100644 src/fsharp/FSharp.Compiler.Host.netcore.nuget/layoutfschostnuget.fsx delete mode 100644 src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj delete mode 100644 src/fsharp/FSharp.Compiler.netcore.nuget/layoutfscnuget.fsx delete mode 100644 src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj delete mode 100644 src/fsharp/FSharp.Core.netcore.nuget/layoutfscorenuget.fsx rename src/fsharp/{FSharp.Core.netcore.nuget => FSharp.Core}/FSharp.Core.runtimeconfig.json (100%) rename src/fsharp/{FSharp.Core.netcore.nuget => FSharp.Core}/Microsoft.FSharp.Core.netcore.nuspec (100%) diff --git a/build-everything.proj b/build-everything.proj index 183525d8ebf..d2b47133cd1 100644 --- a/build-everything.proj +++ b/build-everything.proj @@ -16,13 +16,11 @@ - - diff --git a/build.cmd b/build.cmd index b1054cb3fff..0ce813b9385 100644 --- a/build.cmd +++ b/build.cmd @@ -481,8 +481,8 @@ if '%BUILD_PROTO%' == '1' ( echo on 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 f43eaf92ecd..5d172a708b8 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 2d8455c5dae..85b82f69bbf 100644 --- a/src/FSharpSource.targets +++ b/src/FSharpSource.targets @@ -502,6 +502,14 @@ false + + https://github.com/Microsoft/visualfsharp/blob/master/License.txt + https://github.com/Microsoft/visualfsharp + $(NuGetPerBuildPreReleaseVersion) + Microsoft + Visual F# Compiler FSharp coreclr functional programming + + - + + + + + + -prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" + + diff --git a/src/buildtools/buildnugets.fsx b/src/buildtools/buildnugets.fsx deleted file mode 100644 index 7725988b935..00000000000 --- a/src/buildtools/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/src/fsharp-library-build.proj b/src/fsharp-library-build.proj index a8bbca5d542..3eec2679762 100644 --- a/src/fsharp-library-build.proj +++ b/src/fsharp-library-build.proj @@ -9,7 +9,6 @@ - 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 b8ef39d90ec..b55576371be 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 642b39dcc5e..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 "../../buildtools/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 eb960b66dc1..00000000000 --- a/src/fsharp/FSharp.Compiler.netcore.nuget/FSharp.Compiler.nuget.proj +++ /dev/null @@ -1,23 +0,0 @@ - - - ..\.. - 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 071027ff96d..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 "../../buildtools/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 55d2754ce09..00000000000 --- a/src/fsharp/FSharp.Core.netcore.nuget/FSharp.Core.netcore.nuget.proj +++ /dev/null @@ -1,23 +0,0 @@ - - - ..\.. - 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 fb4293ef4ab..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 "../../buildtools/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 4ab65e83f4f..fe6e463e4af 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 c51cfd3d5ac..aa61cc41ec7 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,7 @@ - + diff --git a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest index 27d9936e0ae..841de06ff52 100644 --- a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest @@ -59,4 +59,7 @@ + + + \ No newline at end of file diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest index 6a934ab3b9b..a8b43fe0247 100644 --- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest @@ -62,4 +62,7 @@ + + + \ No newline at end of file diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest index cb130c38b25..241909992aa 100644 --- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest @@ -63,4 +63,7 @@ + + + \ No newline at end of file diff --git a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest index d19598c864e..f41ce096f36 100644 --- a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest @@ -57,4 +57,7 @@ + + + \ No newline at end of file From e88482ef30a834b13f4de7f8cfa89c678d7c0205 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 7 Nov 2016 12:27:54 -0800 Subject: [PATCH 2/7] Re-remove ValidateConfiguration --- src/FSharpSource.targets | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets index 51a21a19a7a..ecdc40b8701 100644 --- a/src/FSharpSource.targets +++ b/src/FSharpSource.targets @@ -462,27 +462,9 @@ Visual F# Compiler FSharp coreclr functional programming - - - - - - - - + $(CompileDependsOn);CopyAndSubstituteTextFiles @@ -491,7 +473,7 @@ Name="CopyAndSubstituteTextFiles" Inputs="@(CopyAndSubstituteText)" Outputs="@(CopyAndSubstituteText->'$(OutDir)%(TargetFilename)')" > - + From 2dc6cdb20e87383a18afda056fa3d3a5902df210 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 7 Nov 2016 12:29:17 -0800 Subject: [PATCH 3/7] Re-remove ValidateConfiguration --- src/FSharpSource.targets | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets index ecdc40b8701..19e8bcf4d17 100644 --- a/src/FSharpSource.targets +++ b/src/FSharpSource.targets @@ -462,9 +462,7 @@ Visual F# Compiler FSharp coreclr functional programming - - + $(CompileDependsOn);CopyAndSubstituteTextFiles From 11772ef71cb7be222b4845683b49cf967005b23c Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 7 Nov 2016 14:43:05 -0800 Subject: [PATCH 4/7] fsianycpu.config was inadvertently deleted --- src/fsharp/fsi/fsiAnyCpu.exe.config | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/fsharp/fsi/fsiAnyCpu.exe.config diff --git a/src/fsharp/fsi/fsiAnyCpu.exe.config b/src/fsharp/fsi/fsiAnyCpu.exe.config new file mode 100644 index 00000000000..e04b0a7caec --- /dev/null +++ b/src/fsharp/fsi/fsiAnyCpu.exe.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + From 520503a932255a34accb61f8e5aceb75a1a1c08b Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 7 Nov 2016 14:50:03 -0800 Subject: [PATCH 5/7] FSC.proj merge issue --- src/fsharp/Fsc/Fsc.fsproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj index f6e66c9583b..29cc98ac26d 100644 --- a/src/fsharp/Fsc/Fsc.fsproj +++ b/src/fsharp/Fsc/Fsc.fsproj @@ -67,8 +67,7 @@ - - + From 53dabfb44f3c49338d29a50aa17bcd1245fc1ccb Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 7 Nov 2016 15:35:07 -0800 Subject: [PATCH 6/7] fsharp.core.proj --- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index a3ac3c2715a..1909f2ddfb6 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -24,8 +24,8 @@ $(OtherFlags) --compiling-fslib-40 --compiling-fslib-nobigint - - PreserveNewest + + PreserveNewest From 35053b97565dbb2ec1090b0e9e7704bc1f320bc5 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 7 Nov 2016 16:38:00 -0800 Subject: [PATCH 7/7] Remove prerequisited from vsixmanifest --- .../VisualFSharpDesktop/Source.extension.vsixmanifest | 7 +------ .../Vsix/VisualFSharpFull/Source.extension.vsixmanifest | 3 --- .../VisualFSharpOpenSource/Source.extension.vsixmanifest | 8 ++------ .../Vsix/VisualFSharpWeb/Source.extension.vsixmanifest | 3 --- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest index 841de06ff52..e9626701dd2 100644 --- a/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest @@ -33,7 +33,6 @@ - @@ -47,8 +46,7 @@ - - + @@ -59,7 +57,4 @@ - - - \ No newline at end of file diff --git a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest index a8b43fe0247..6a934ab3b9b 100644 --- a/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest @@ -62,7 +62,4 @@ - - - \ No newline at end of file diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest index 241909992aa..f66fb851750 100644 --- a/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest @@ -51,19 +51,15 @@ - - + - + - - - \ No newline at end of file diff --git a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest index f41ce096f36..d19598c864e 100644 --- a/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest +++ b/vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest @@ -57,7 +57,4 @@ - - - \ No newline at end of file