From d5824e56202664abcdf3ea0e510ab0627d51ef92 Mon Sep 17 00:00:00 2001 From: Jason Malinowski Date: Fri, 31 Jul 2015 16:34:07 -0700 Subject: [PATCH] Don't deploy extensions if they're already installed globally Rather than failing the build, if Roslyn is installed globally just don't try to deploy. Fixes #4189 (https://github.com/dotnet/roslyn/issues/4189) --- build/Targets/VSL.Settings.targets | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/build/Targets/VSL.Settings.targets b/build/Targets/VSL.Settings.targets index 898487eabd5..2e7020ac219 100644 --- a/build/Targets/VSL.Settings.targets +++ b/build/Targets/VSL.Settings.targets @@ -3,6 +3,13 @@ + + $(VSINSTALLDIR)\Common7\IDE + $(VS120COMNTOOLS)\..\IDE + $(VS140COMNTOOLS)\..\IDE + $([System.IO.Path]::GetFullPath('$(DevEnvDir)')) + + 12.0 $(VisualStudioVersion.Substring(0, $(VisualStudioVersion.IndexOf('.')))) @@ -33,6 +40,10 @@ 1.1.0-alpha1 $(NuGetCommandLineAssemblyVersion) $(MicrosoftCompositionAssemblyVersion) + + + false @@ -233,13 +244,6 @@ $(MSBuildThisFileDirectory)..\..\packages\FakeSign.0.9.2\tools\FakeSign.exe - - $(VSINSTALLDIR)\Common7\IDE - $(VS120COMNTOOLS)\..\IDE - $(VS140COMNTOOLS)\..\IDE - $([System.IO.Path]::GetFullPath('$(DevEnvDir)')) - -