diff --git a/.vsconfig b/.vsconfig index 0be88d0ab81..302d9808902 100644 --- a/.vsconfig +++ b/.vsconfig @@ -15,16 +15,13 @@ "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", "Microsoft.Component.MSBuild", "Microsoft.VisualStudio.Component.TextTemplating", - "Microsoft.VisualStudio.Component.SQL.CLR", "Microsoft.VisualStudio.Component.ManagedDesktop.Core", "Microsoft.Net.Component.4.6.TargetingPack", - "Component.Microsoft.VisualStudio.LiveShare", "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", - "Microsoft.VisualStudio.Component.Debugger.JustInTime", "Microsoft.VisualStudio.Component.FSharp.Desktop", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Component.VSSDK", "Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites", "Microsoft.VisualStudio.Workload.VisualStudioExtension" ] -} \ No newline at end of file +} diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets index 742f43fb3f5..d87d68d36c7 100644 --- a/FSharpBuild.Directory.Build.targets +++ b/FSharpBuild.Directory.Build.targets @@ -22,7 +22,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3e8ff5a8dc9..6e956cbed3f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,14 +2,12 @@ trigger: - master - dev16.1 -- fsharp47 -- fsharp5 +- feature/* - release/* pr: - master - dev16.1 -- fsharp47 -- fsharp5 +- feature/* - release/* variables: diff --git a/fcs/Directory.Build.targets b/fcs/Directory.Build.targets index ea3d9bd8c42..19b6fcd667d 100644 --- a/fcs/Directory.Build.targets +++ b/fcs/Directory.Build.targets @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - +