Skip to content

[WIP] fix double-build of vsix packages #6232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettfo merged 1 commit into from
Feb 15, 2019
Merged

[WIP] fix double-build of vsix packages #6232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/config/AssemblySignToolData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"certificate": "VsixSHA2",
"strongName": null,
"values": [
"bin\\VisualFSharpFull\\*\\*VisualFSharpFull.vsix",
"bin\\VisualFSharpFull\\*\\*\\VisualFSharpFull.vsix",
"bin\\VisualFSharpTemplates\\*\\*\\VisualFSharpTemplate.vsix",
"VSSetup\\*\\Insertion\\Microsoft.FSharp.Dependencies.vsix",
"VSSetup\\*\\Insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
Expand Down
5 changes: 3 additions & 2 deletions fsharp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj" />
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-item-templates-build.proj" />
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-project-templates-build.proj" />
<VsixProjects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-vsix-build.proj" />
<VsixProjects Include="$(MSBuildThisFileDirectory)\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj" />
<VsixProjects Include="$(MSBuildThisFileDirectory)\vsintegration\Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(BuildCompiler)' == 'true' OR '$(BuildNuget)' == 'true' OR '$(BuildVS)' == 'true' OR '$(_RunningRestore)' == 'true'">
Expand All @@ -110,7 +111,7 @@
</ItemGroup>

<ItemGroup Condition="'$(BuildSetup)' == 'true' OR '$(_RunningRestore)' == 'true'">
<SetupProjects Include="$(MSBuildThisFileDirectory)setup\fsharp-setup-build.csproj" />
<SetupProjects Include="$(MSBuildThisFileDirectory)setup\fsharp-setup-build.csproj" />
</ItemGroup>

<!-- test binaries -->
Expand Down
8 changes: 4 additions & 4 deletions setup/Swix/Microsoft.FSharp.vsmanproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
</PropertyGroup>

<ItemGroup>
<InsertionItems Include="$(VsixBuildLocation)\VisualFSharpFull.vsix" />
<InsertionItems Include="$(VsixBuildLocation)\VisualFSharpTemplate.vsix" />
<InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Full.Core.json" />
<InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Templates.json" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpFull\$(Configuration)\net472\VisualFSharpFull.vsix" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpFull\$(Configuration)\net472\Microsoft.FSharp.VSIX.Full.Core.json" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpTemplates\$(Configuration)\net472\VisualFSharpTemplate.vsix" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpTemplates\$(Configuration)\net472\Microsoft.FSharp.VSIX.Templates.json" />
</ItemGroup>

<Target Name="CopyInsertionItems">
Expand Down
12 changes: 0 additions & 12 deletions setup/fsharp-setup-build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@
</ItemGroup>

<Target Name="CollectSetupProjects">
<ItemGroup>
<VsixProjects Include="VisualFSharpFull.csproj">
<ProjectPath>..\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj</ProjectPath>
</VsixProjects>
<VsixProjects Include="VisualFSharpTemplates.csproj">
<ProjectPath>..\vsintegration\Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj</ProjectPath>
</VsixProjects>
</ItemGroup>

<CreateItem Include="@(SetupLanguages)"
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj">
<Output ItemName="SwixSetupProjects" TaskParameter="Include" />
Expand Down Expand Up @@ -59,9 +50,6 @@
<PropertyGroup>
<CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
</PropertyGroup>
<MSBuild Projects="%(VsixProjects.ProjectPath)"
Targets="Build"
Properties="Configuration=$(Configuration);IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(VsixBuildLocation);DisableOutputPathCopying=true;$(CustomProps)" />
<MSBuild Projects="%(SwixSetupProjects.ProjectPath)"
Targets="Build"
Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentId=%(SwixSetupProjects.LocaleParentId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);VSGeneralVersion=$(VSGeneralVersion);TargetFramework=$(TargetFramework);$(CustomProps)"/>
Expand Down