fix double-build of vsix packages (#6233)

* fix double-build of vsix packages (#6232)

* Update Microsoft.FSharp.vsmanproj

build/config/AssemblySignToolData.json

@@ -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"

fsharp.proj

@@ -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'">
@@ -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 -->

setup/Swix/Microsoft.FSharp.vsmanproj

@@ -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)\net46\VisualFSharpFull.vsix" />
+    <InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpFull\$(Configuration)\net46\Microsoft.FSharp.VSIX.Full.Core.json" />
+    <InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpTemplates\$(Configuration)\net46\VisualFSharpTemplate.vsix" />
+    <InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpTemplates\$(Configuration)\net46\Microsoft.FSharp.VSIX.Templates.json" />
   </ItemGroup>
 
   <Target Name="CopyInsertionItems">

setup/fsharp-setup-build.csproj

@@ -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" />
@@ -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)"/>