Commit0dbb19b

committed

fix usage of <DeployExtension>

1 parenta98b806 commit0dbb19bCopy full SHA for 0dbb19b

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`<PropertyGroup>`
`6`	`6`	`<VSRootSuffix>RoslynDev</VSRootSuffix>`
`7`	`7`	`<GenerateAssemblyInfo>false</GenerateAssemblyInfo>`
`8`		`- <DeployExtensionCondition="'$(DeployExtension)' == '' and('$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '')">False</DeployExtension>`
`9`		`- <DeployExtensionCondition="'$(DeployExtension)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == ''">True</DeployExtension>`
	`8`	`+ <DeployExtensionCondition="'$(DeployExtension)' == '' and '$(CI)' != ''">false</DeployExtension>`
	`9`	`+ <DeployExtensionCondition="'$(DeployExtension)' == '' and '$(CI)' == ''">true</DeployExtension>`
`10`	`10`	`<VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>`
`11`	`11`	`<CreateVsixContainer>true</CreateVsixContainer>`
`12`	`12`	`<PublishUrl>publish\</PublishUrl>`
`@@ -32,7 +32,6 @@`
`32`	`32`	`<ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>`
`33`	`33`	`<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>`
`34`	`34`	`<IsPackage>true</IsPackage>`
`35`		`- <DeployExtension>false</DeployExtension>`
`36`	`35`	`<ImportVsSDK>true</ImportVsSDK>`
`37`	`36`	`</PropertyGroup>`
`38`	`37`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`<OutputType>Library</OutputType>`
`8`	`8`	`<ExtensionInstallationFolder>Microsoft\FSharp</ExtensionInstallationFolder>`
`9`	`9`	`<PackageTargetFallback>netcoreapp1.0</PackageTargetFallback>`
	`10`	`+ <DeployExtension>false</DeployExtension>`
`10`	`11`	`</PropertyGroup>`
`11`	`12`
`12`	`13`	`<ItemGroup>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`<TargetFramework>net46</TargetFramework>`
`8`	`8`	`<OutputType>Library</OutputType>`
`9`	`9`	`<ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>`
	`10`	`+ <DeployExtension>false</DeployExtension>`
`10`	`11`	`</PropertyGroup>`
`11`	`12`
`12`	`13`	`<ItemGroup>`

Comments

(0)