[Pkg-cli-apps-commits] [fsharp] 11/60: Fix open source build of EnebleOpenSource VSIX (changeset 1296669)

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository fsharp.

commit adc8abc235d1f861b48dab47d02bed63d4a69785
Author: KevinRansom <kevinr at microsoft.com>
Date:   Sat Jul 12 13:34:44 2014 -0700

    Fix open source build of EnebleOpenSource VSIX (changeset 1296669)
---
 .../src/deployment/EnableOpenSource/EnableOpenSource.csproj         | 6 ++++--
 vsintegration/src/fsharp.common.props                               | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vsintegration/src/deployment/EnableOpenSource/EnableOpenSource.csproj b/vsintegration/src/deployment/EnableOpenSource/EnableOpenSource.csproj
index 6eb002b..79d1749 100644
--- a/vsintegration/src/deployment/EnableOpenSource/EnableOpenSource.csproj
+++ b/vsintegration/src/deployment/EnableOpenSource/EnableOpenSource.csproj
@@ -45,17 +45,19 @@
     <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
     <FSharpSourcesRoot Condition="'$(FSharpSourcesRoot)' == ''">..\..\..</FSharpSourcesRoot>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'VSDebug' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' or '$(Configuration)' == 'VSDebug' ">
     <StartAction>Program</StartAction>
     <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
     <StartArguments>/rootsuffix FSharp /log</StartArguments>
     <VSSDKTargetPlatformRegRootSuffix>FSharp</VSSDKTargetPlatformRegRootSuffix>
+    <CreateVsixContainer>true</CreateVsixContainer>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'VSRelease' ">
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'VSRelease' ">
     <StartAction>Program</StartAction>
     <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
     <StartArguments>/rootsuffix FSharp /log</StartArguments>
     <VSSDKTargetPlatformRegRootSuffix>FSharp</VSSDKTargetPlatformRegRootSuffix>
+    <CreateVsixContainer>true</CreateVsixContainer>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/vsintegration/src/fsharp.common.props b/vsintegration/src/fsharp.common.props
index 67c5d42..1a365f0 100644
--- a/vsintegration/src/fsharp.common.props
+++ b/vsintegration/src/fsharp.common.props
@@ -25,7 +25,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CreateVsixContainer>false</CreateVsixContainer>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'VSRelease'">
@@ -34,7 +33,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CreateVsixContainer>false</CreateVsixContainer>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git