From 29c45cf15014658d6fd0eb5da4e8e7204403e768 Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Tue, 7 Jun 2022 16:32:39 -0700
Subject: [PATCH 01/11] test

---
 .../VisualStudio.InsertionManifests.targets   | 20 +--------
 .../tools/VisualStudio.SetupPackage.vsmanproj | 44 +++++++++++++------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
index 4d5ffdd8501..9513ac49d28 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
@@ -11,23 +11,6 @@
     <GenerateSbom Condition="'$(GenerateSbom)' == ''">false</GenerateSbom>
   </PropertyGroup>
 
-  <Target Name ="GenerateSbomForVSInsertion" 
-          Condition="'$(GenerateSbom)' != 'false'">
-    <Message Text="Generating SBOM manifest" Importance="high"/>
-    <ItemGroup>
-     <VsixFile Include="$(ArtifactsDir)VSSetup\$(Configuration)\Insertion\*.vsix"></VsixFile>
-     <VsixFile Include="$(ArtifactsDir)VSSetup\$(Configuration)\Insertion\*.exe"></VsixFile>
-    </ItemGroup>
-     <MakeDir Directories="$(ArtifactsDir)sbom;$(ArtifactsDir)sbom\%(VsixFile.Filename);$(ArtifactsDir)Vsix;$(ArtifactsDir)Vsix\Unpacked\%(VsixFile.Filename)"/>
-     
-     <Unzip
-      SourceFiles="@(VsixFile)"
-      DestinationFolder="$(ArtifactsDir)Vsix\Unpacked\%(VsixFile.Filename)"
-      OverwriteReadOnlyFiles="true"/>
-
-    <Exec Command = "$(DotNetTool) $(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll generate -b $(ArtifactsDir)Vsix\Unpacked\%(VsixFile.Filename) -m $(ArtifactsDir)sbom\%(VsixFile.Filename) -pn VsInsertion -V Verbose"/>
-    <Message Text="Completed generating SBOM manifest for %(VsixFile.Filename)." Importance="high"/>
-  </Target>
   <!---
     This target is invoked in a separate phase after all input VSIX files are signed.
     This is important since the manifest contain hashes of the VSIX files.
@@ -35,8 +18,7 @@
   <Target Name="GenerateVisualStudioInsertionManifests"
           BeforeTargets="AfterPack"
           Outputs="%(_StubDirs.Identity)"
-          Condition="'@(_StubDirs)' != ''"
-          DependsOnTargets="GenerateSbomForVSInsertion">
+          Condition="'@(_StubDirs)' != ''">
     <PropertyGroup>
       <_ComponentDir>%(_StubDirs.Identity)</_ComponentDir>
       <_ComponentName>$(_ComponentDir.TrimEnd('\'))</_ComponentName>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index 3ad5f66ea1a..06d624b04aa 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -48,27 +48,21 @@
 
   <Import Project="$(SwixBuildPath)build\Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild.targets" />
 
-  <Target Name="_BuildManifest" DependsOnTargets="_SetManifestBuildVersion;GenerateSetupManifest" />
+  <Target Name="_BuildManifest" DependsOnTargets="_GetVsixFileVersions;GenerateSbomForVSInsertion;GenerateVSManifest;GenerateSetupManifest" />
 
-  <!--
-    Each stub file contains VSIX version of the respective VSIX file.
-    We require that all VSIXes included in a single VS insertion component have the same version.
-    This version will be set to ManifestBuildVersion.
-  -->
-  <Target Name="_SetManifestBuildVersion">
+  <Target Name="_GetVsixFileVersions">
 
     <ReadLinesFromFile File="%(_PackageStubFiles.Identity)">
       <Output TaskParameter="Lines" ItemName="_StubLine"/>
     </ReadLinesFromFile>
-
     <ItemGroup>
-      <_StubLineSplit Include="@(_StubLine)" 
-                      Name="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[0])" 
-                      Version="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[1])" />
-    </ItemGroup>
+      <_VsixFileInfo Include="@(_StubLine)"
+      Name="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[0])"
+      Version="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[1])" />
+     </ItemGroup>
 
     <ItemGroup>
-      <_VsixVersion Include="%(_StubLineSplit.Version)" Name="%(_StubLineSplit.Name)" />
+      <_VsixVersion Include="%(_VsixFileInfo.Version)" Name="%(_VsixFileInfo.Name)" />
     </ItemGroup>
 
     <RemoveDuplicates Inputs="@(_VsixVersion)">
@@ -77,7 +71,31 @@
 
     <Error Text="Visual Studio component '$(ComponentName)' contains multiple VSIX files with different versions: @(_VsixVersionNoDuplicates->'%(Name) (version %(Identity))', ', ')"
            Condition="@(_VsixVersionNoDuplicates->Count()) != 1"/>
+  </Target>
+
+  <Target Name="GenerateSbomForVSInsertion"
+        Inputs="@(_VsixFileInfo->'$(VisualStudioSetupInsertionPath)\%(Name)')"
+        Outputs="@(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\%(Name)')"
+        DependsOnTargets="_GetVsixFileVersions"
+        Condition="'$(GenerateSbom)' != 'false'">
+    <Message Text="Generating SBOM manifest" Importance="high"/>
+    <MakeDir Directories="$(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\Sbom"/>
+    <Unzip
+      SourceFiles="@(_VsixFileInfo->'$(VisualStudioSetupInsertionPath)\%(Name)')"
+      DestinationFolder="@(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\%(Name)')"
+      OverwriteReadOnlyFiles="true"/>
+
+    <Exec Command = "$(DotNetTool) $(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll generate -b @(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\%(Name)') -m $(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\Sbom -pn VsInsertion -V Verbose"/>
+    <Message Text="Completed generating SBOM manifest for %(VsixFile.Filename)." Importance="high"/>
+  </Target>
+
+  <!--
+    Each stub file contains VSIX version of the respective VSIX file.
+    We require that all VSIXes included in a single VS insertion component have the same version.
+    This version will be set to ManifestBuildVersion.
+  -->
 
+  <Target Name= "GenerateVSManifest" DependsOnTargets="GenerateSbomForVSInsertion">
     <PropertyGroup>
       <ManifestBuildVersion>@(_VsixVersionNoDuplicates)</ManifestBuildVersion>
       <ManifestVsixName>@(_VsixVersionNoDuplicates->'%(Name)')</ManifestVsixName>

From 76db1a669df47af6cfd299ee862c9d1925fcf7f3 Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Wed, 8 Jun 2022 11:38:31 -0700
Subject: [PATCH 02/11] Retry

---
 .../tools/VisualStudio.SetupPackage.vsmanproj             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index 06d624b04aa..9d9cc03c031 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -75,17 +75,17 @@
 
   <Target Name="GenerateSbomForVSInsertion"
         Inputs="@(_VsixFileInfo->'$(VisualStudioSetupInsertionPath)\%(Name)')"
-        Outputs="@(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\%(Name)')"
+        Outputs="@(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\%(Name)')"
         DependsOnTargets="_GetVsixFileVersions"
         Condition="'$(GenerateSbom)' != 'false'">
     <Message Text="Generating SBOM manifest" Importance="high"/>
-    <MakeDir Directories="$(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\Sbom"/>
+    <MakeDir Directories="$(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\Sbom"/>
     <Unzip
       SourceFiles="@(_VsixFileInfo->'$(VisualStudioSetupInsertionPath)\%(Name)')"
-      DestinationFolder="@(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\%(Name)')"
+      DestinationFolder="@(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\%(Name)')"
       OverwriteReadOnlyFiles="true"/>
 
-    <Exec Command = "$(DotNetTool) $(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll generate -b @(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\%(Name)') -m $(VisualStudioSetupIntermediateOutputPath\$(ComponentName)\Sbom -pn VsInsertion -V Verbose"/>
+    <Exec Command = "$(DotNetTool) $(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll generate -b @(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\%(Name)') -m $(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\Sbom -pn VsInsertion -V Verbose"/>
     <Message Text="Completed generating SBOM manifest for %(VsixFile.Filename)." Importance="high"/>
   </Target>
 

From 2b1c601becbbb0b2a5a116a71e8e50b3d08544ea Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Wed, 8 Jun 2022 11:40:38 -0700
Subject: [PATCH 03/11] test 2

---
 .../tools/VisualStudio.SetupPackage.vsmanproj          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index 9d9cc03c031..d46188ec2bc 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -74,18 +74,18 @@
   </Target>
 
   <Target Name="GenerateSbomForVSInsertion"
-        Inputs="@(_VsixFileInfo->'$(VisualStudioSetupInsertionPath)\%(Name)')"
-        Outputs="@(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\%(Name)')"
+        Inputs="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\%(Name)')"
+        Outputs="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\$(ComponentName)\%(Name)')"
         DependsOnTargets="_GetVsixFileVersions"
         Condition="'$(GenerateSbom)' != 'false'">
     <Message Text="Generating SBOM manifest" Importance="high"/>
-    <MakeDir Directories="$(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\Sbom"/>
+    <MakeDir Directories="$(ComponentIntermediateOutputPath)\$(ComponentName)\Sbom"/>
     <Unzip
       SourceFiles="@(_VsixFileInfo->'$(VisualStudioSetupInsertionPath)\%(Name)')"
-      DestinationFolder="@(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\%(Name)')"
+      DestinationFolder="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\$(ComponentName)\%(Name)')"
       OverwriteReadOnlyFiles="true"/>
 
-    <Exec Command = "$(DotNetTool) $(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll generate -b @(_VsixFileInfo->'$(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\%(Name)') -m $(VisualStudioSetupIntermediateOutputPath)\$(ComponentName)\Sbom -pn VsInsertion -V Verbose"/>
+    <Exec Command = "$(DotNetTool) $(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll generate -b @(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\$(ComponentName)\%(Name)') -m $(ComponentIntermediateOutputPath)\$(ComponentName)\Sbom -pn VsInsertion -V Verbose"/>
     <Message Text="Completed generating SBOM manifest for %(VsixFile.Filename)." Importance="high"/>
   </Target>
 

From 8b3d360c9229cdf826be03d0833c5fa597be1ee2 Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Wed, 8 Jun 2022 14:18:07 -0700
Subject: [PATCH 04/11] test

---
 .../tools/VisualStudio.SetupPackage.vsmanproj          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index d46188ec2bc..22ceb3b91ff 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -74,18 +74,18 @@
   </Target>
 
   <Target Name="GenerateSbomForVSInsertion"
-        Inputs="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\%(Name)')"
-        Outputs="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\$(ComponentName)\%(Name)')"
+        Inputs="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)%(Name)')"
+        Outputs="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)$(ComponentName)\%(Name)')"
         DependsOnTargets="_GetVsixFileVersions"
         Condition="'$(GenerateSbom)' != 'false'">
     <Message Text="Generating SBOM manifest" Importance="high"/>
-    <MakeDir Directories="$(ComponentIntermediateOutputPath)\$(ComponentName)\Sbom"/>
+    <MakeDir Directories="$(ComponentIntermediateOutputPath)$(ComponentName)\Sbom;$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"/>
     <Unzip
       SourceFiles="@(_VsixFileInfo->'$(VisualStudioSetupInsertionPath)\%(Name)')"
-      DestinationFolder="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\$(ComponentName)\%(Name)')"
+      DestinationFolder="$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"
       OverwriteReadOnlyFiles="true"/>
 
-    <Exec Command = "$(DotNetTool) $(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll generate -b @(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\$(ComponentName)\%(Name)') -m $(ComponentIntermediateOutputPath)\$(ComponentName)\Sbom -pn VsInsertion -V Verbose"/>
+    <Exec Command = "$(DotNetTool) $(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll generate -b $(ComponentIntermediateOutputPath)$(ComponentName)\unpacked -m $(ComponentIntermediateOutputPath)$(ComponentName)\Sbom -pn VsInsertion -V Verbose"/>
     <Message Text="Completed generating SBOM manifest for %(VsixFile.Filename)." Importance="high"/>
   </Target>
 

From ac896df25dad8d24fe85da36341e6a764153f05e Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Wed, 8 Jun 2022 16:35:47 -0700
Subject: [PATCH 05/11] test

---
 .../tools/VisualStudio.SetupPackage.vsmanproj                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index 22ceb3b91ff..d8aff662bdf 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -81,7 +81,7 @@
     <Message Text="Generating SBOM manifest" Importance="high"/>
     <MakeDir Directories="$(ComponentIntermediateOutputPath)$(ComponentName)\Sbom;$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"/>
     <Unzip
-      SourceFiles="@(_VsixFileInfo->'$(VisualStudioSetupInsertionPath)\%(Name)')"
+      SourceFiles="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\%(Name)')"
       DestinationFolder="$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"
       OverwriteReadOnlyFiles="true"/>
 

From 61a1301b63247f3dc9d2646f6b5c75f64d906391 Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Wed, 8 Jun 2022 19:32:48 -0700
Subject: [PATCH 06/11] test

---
 .../tools/VisualStudio.SetupPackage.vsmanproj                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index d8aff662bdf..54ce25e7c3f 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -81,7 +81,7 @@
     <Message Text="Generating SBOM manifest" Importance="high"/>
     <MakeDir Directories="$(ComponentIntermediateOutputPath)$(ComponentName)\Sbom;$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"/>
     <Unzip
-      SourceFiles="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)\%(Name)')"
+      SourceFiles="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)%(Name)')"
       DestinationFolder="$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"
       OverwriteReadOnlyFiles="true"/>
 

From 8ea8012f8846c97ea7c9f593345f358d134e7051 Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Thu, 9 Jun 2022 10:28:09 -0700
Subject: [PATCH 07/11] update

---
 .../tools/VisualStudio.SetupPackage.vsmanproj               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index 54ce25e7c3f..4fa7358d76d 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -74,14 +74,14 @@
   </Target>
 
   <Target Name="GenerateSbomForVSInsertion"
-        Inputs="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)%(Name)')"
-        Outputs="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)$(ComponentName)\%(Name)')"
+        Inputs="@(_VsixFileInfo->'$(ArtifactsDir)VSSetup\$(Configuration)\Insertion\%(Name)')"
+        Outputs="@(_VsixFileInfo->'$(ArtifactsDir)VSSetup\$(Configuration)\Insertion\$(ComponentName)\%(Name)')"
         DependsOnTargets="_GetVsixFileVersions"
         Condition="'$(GenerateSbom)' != 'false'">
     <Message Text="Generating SBOM manifest" Importance="high"/>
     <MakeDir Directories="$(ComponentIntermediateOutputPath)$(ComponentName)\Sbom;$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"/>
     <Unzip
-      SourceFiles="@(_VsixFileInfo->'$(ComponentIntermediateOutputPath)%(Name)')"
+      SourceFiles="@(_VsixFileInfo->'$(ArtifactsDir)VSSetup\$(Configuration)\Insertion\%(Name)')"
       DestinationFolder="$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"
       OverwriteReadOnlyFiles="true"/>
 

From ffc0d14ca46d045fce695aa50832aa48df7d727b Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Thu, 9 Jun 2022 15:24:17 -0700
Subject: [PATCH 08/11] test

---
 .../tools/VisualStudio.SetupPackage.vsmanproj | 88 +++++++++----------
 .../tools/VisualStudio.VsixBuild.targets      |  2 +-
 2 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index 4fa7358d76d..709736b8ba2 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -12,6 +12,8 @@
                                       "Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)"
                                       The manifest will be published with URI
                                       https://vsdrop.corp.microsoft.com/file/v1/$(VisualStudioDropName)
+      DotNetTool                      Path to dotnet.exe.
+      ManifestTool                    Path to Microsoft.ManifestTool.dll
   -->
 
   <PropertyGroup>
@@ -30,8 +32,6 @@
     <TargetName>$(ComponentName)</TargetName>
     <OutputPath>$(SetupOutputPath)</OutputPath>
     <IntermediateOutputPath>$(ComponentIntermediateOutputPath)</IntermediateOutputPath>
-    <ArtifactsDir>$(ArtifactsDir)</ArtifactsDir>
-    <GenerateSbom>$(GenerateSbom)</GenerateSbom>
 
     <!-- Note that the url is expected to end with ';' (%3B) -->
     <ManifestPublishUrl Condition="'$(VisualStudioDropName)' != ''">https://vsdrop.corp.microsoft.com/file/v1/$(VisualStudioDropName)%3B</ManifestPublishUrl>
@@ -42,68 +42,66 @@
     <_PackageStubFiles Include="$(ComponentIntermediateOutputPath)*.stub"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(GenerateSbom)' == 'false'">
-    <MergeManifest Include="@(_PackageStubFiles->'$(SetupOutputPath)%(Filename).json')"/>
-  </ItemGroup>
-
   <Import Project="$(SwixBuildPath)build\Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild.targets" />
 
-  <Target Name="_BuildManifest" DependsOnTargets="_GetVsixFileVersions;GenerateSbomForVSInsertion;GenerateVSManifest;GenerateSetupManifest" />
-
-  <Target Name="_GetVsixFileVersions">
+  <Target Name="_BuildManifest" DependsOnTargets="_GetVsixFileInfo;_GenerateSbomForVsixAndAddManifestItem;GenerateSetupManifest" />
 
+  <Target Name="_GetVsixFileInfo">
     <ReadLinesFromFile File="%(_PackageStubFiles.Identity)">
       <Output TaskParameter="Lines" ItemName="_StubLine"/>
     </ReadLinesFromFile>
+
     <ItemGroup>
-      <_VsixFileInfo Include="@(_StubLine)"
-      Name="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[0])"
-      Version="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[1])" />
-     </ItemGroup>
+      <_ParsedLine Include="@(_StubLine)"
+                   VsixId="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[0])"
+                   VsixFileName="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[1])"
+                   VsixVersion="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[2])" />
+
+      <_VsixFileInfo Include="@(_ParsedLine->'%(VsixFileName)')">
+        <ManifestJsonPath>$(SetupOutputPath)%(VsixId).json</ManifestJsonPath>
+        <VsixPath>$(SetupOutputPath)%(VsixFileName)</VsixPath>
+        <UnpackDir>$(ComponentIntermediateOutputPath)%(VsixFileName)\unpack</UnpackDir>
+        <SbomDir>$(ComponentIntermediateOutputPath)%(VsixFileName)\sbom</SbomDir>
+        <SbomJsonPath>$(ComponentIntermediateOutputPath)%(VsixFileName)\sbom\spdx_2.2\manifest.spdx.json</SbomJsonPath>
+      </_VsixFileInfo>
+    </ItemGroup>
 
     <ItemGroup>
-      <_VsixVersion Include="%(_VsixFileInfo.Version)" Name="%(_VsixFileInfo.Name)" />
+      <_VsixVersion Include="%(_VsixFileInfo.VsixVersion)" VsixFileName="%(_VsixFileInfo.Identity)" />
     </ItemGroup>
 
     <RemoveDuplicates Inputs="@(_VsixVersion)">
       <Output TaskParameter="Filtered" ItemName="_VsixVersionNoDuplicates"/>
     </RemoveDuplicates>
 
-    <Error Text="Visual Studio component '$(ComponentName)' contains multiple VSIX files with different versions: @(_VsixVersionNoDuplicates->'%(Name) (version %(Identity))', ', ')"
+    <!--
+      Each stub file contains VSIX version of the respective VSIX file.
+      We require that all VSIXes included in a single VS insertion component have the same version.
+      This version will be set to ManifestBuildVersion.
+    -->
+    <Error Text="Visual Studio component '$(ComponentName)' contains multiple VSIX files with different versions: @(_VsixVersionNoDuplicates->'%(VsixFileName) (version %(Identity))', ', ')"
            Condition="@(_VsixVersionNoDuplicates->Count()) != 1"/>
-  </Target>
-
-  <Target Name="GenerateSbomForVSInsertion"
-        Inputs="@(_VsixFileInfo->'$(ArtifactsDir)VSSetup\$(Configuration)\Insertion\%(Name)')"
-        Outputs="@(_VsixFileInfo->'$(ArtifactsDir)VSSetup\$(Configuration)\Insertion\$(ComponentName)\%(Name)')"
-        DependsOnTargets="_GetVsixFileVersions"
-        Condition="'$(GenerateSbom)' != 'false'">
-    <Message Text="Generating SBOM manifest" Importance="high"/>
-    <MakeDir Directories="$(ComponentIntermediateOutputPath)$(ComponentName)\Sbom;$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"/>
-    <Unzip
-      SourceFiles="@(_VsixFileInfo->'$(ArtifactsDir)VSSetup\$(Configuration)\Insertion\%(Name)')"
-      DestinationFolder="$(ComponentIntermediateOutputPath)$(ComponentName)\unpacked"
-      OverwriteReadOnlyFiles="true"/>
-
-    <Exec Command = "$(DotNetTool) $(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll generate -b $(ComponentIntermediateOutputPath)$(ComponentName)\unpacked -m $(ComponentIntermediateOutputPath)$(ComponentName)\Sbom -pn VsInsertion -V Verbose"/>
-    <Message Text="Completed generating SBOM manifest for %(VsixFile.Filename)." Importance="high"/>
-  </Target>
-
-  <!--
-    Each stub file contains VSIX version of the respective VSIX file.
-    We require that all VSIXes included in a single VS insertion component have the same version.
-    This version will be set to ManifestBuildVersion.
-  -->
 
-  <Target Name= "GenerateVSManifest" DependsOnTargets="GenerateSbomForVSInsertion">
     <PropertyGroup>
       <ManifestBuildVersion>@(_VsixVersionNoDuplicates)</ManifestBuildVersion>
-      <ManifestVsixName>@(_VsixVersionNoDuplicates->'%(Name)')</ManifestVsixName>
     </PropertyGroup>
-    <ItemGroup Condition= "'$(GenerateSbom)' == 'true'">
-    <MergeManifest Include="$(SetupOutputPath)$(ComponentName).json">
-      <SBOMFileLocation>$(ArtifactsDir)sbom\$(ManifestVsixName.Substring(0, $(ManifestVsixName.LastIndexOf('.'))))\spdx_2.2\manifest.spdx.json</SBOMFileLocation>
-      </MergeManifest>
-  </ItemGroup>
+  </Target>
+
+  <Target Name="_GenerateSbomForVsixAndAddManifestItem"
+          Inputs="@(_VsixFileInfo->'%(VsixPath)')"
+          Outputs="@(_VsixFileInfo->'%(SbomJsonPath)')"
+          DependsOnTargets="_GetVsixFileInfo">
+    <Message Text="Generating SBOM manifest for '%(_VsixFileInfo.Identity)'" Importance="high"/>
+
+    <MakeDir Directories="%(_VsixFileInfo.SbomDir);%(_VsixFileInfo.UnpackDir)"/>
+    <Unzip SourceFiles="%(_VsixFileInfo.VsixPath)" DestinationFolder="%(_VsixFileInfo.UnpackDir)"/>
+
+    <Exec Command='"$(DotNetTool)" "$(ManifestTool)" generate -BuildDropPath "%(_VsixFileInfo.UnpackDir)" -ManifestDirPath "%(_VsixFileInfo.SbomDir)" -PackageName "%(_VsixFileInfo.VsixFileName)" -PackageVersion "%(_VsixFileInfo.VsixVersion)" -Verbosity Verbose'/>
+
+    <ItemGroup>
+      <MergeManifest Include="%(_VsixFileInfo.ManifestJsonPath)" SBOMFileLocation="%(_VsixFileInfo.SbomJsonPath)" />
+    </ItemGroup>
+
+    <Message Text="Completed generating SBOM manifest for %(_VsixFileInfo.Identity)." Importance="high"/>
   </Target>
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
index 7f1b378b4a1..2d8421792d2 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
@@ -115,7 +115,7 @@
     <Error Text="VisualStudioInsertionComponent property must only be set for projects with extension.vsixmanifest or SWR files." Condition="'$(_PackageStubFile)' == ''"/>
 
     <MakeDir Directories="$(_ComponentIntermediateDir)" />
-    <WriteLinesToFile File="$(_PackageStubFile)" Lines="$(TargetVsixContainerName)/$(VsixVersion)" Overwrite="true" />
+    <WriteLinesToFile File="$(_PackageStubFile)" Lines="$(_VsixPackageId)/$(TargetVsixContainerName)/$(VsixVersion)" Overwrite="true" />
 
     <ItemGroup>
       <FileWrites Include="$(_PackageStubFile)"/>

From 3998fc6485666a308d4b1d0bacb3db17e58a22e0 Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Thu, 9 Jun 2022 16:04:40 -0700
Subject: [PATCH 09/11] Update

---
 .../tools/VisualStudio.InsertionManifests.targets    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
index 9513ac49d28..48ed82550c9 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
@@ -4,13 +4,7 @@
     <_StubFiles Include="$(VisualStudioSetupIntermediateOutputPath)**\*.stub"/>
     <_StubDirs Include="@(_StubFiles->'%(RecursiveDir)')"/>
   </ItemGroup>
-<!--
-  Before pack create the SBOM here
--->
- <PropertyGroup>
-    <GenerateSbom Condition="'$(GenerateSbom)' == ''">false</GenerateSbom>
-  </PropertyGroup>
-
+  
   <!---
     This target is invoked in a separate phase after all input VSIX files are signed.
     This is important since the manifest contain hashes of the VSIX files.
@@ -36,8 +30,8 @@
       <_Args Include="ComponentIntermediateOutputPath=$(VisualStudioSetupIntermediateOutputPath)$(_ComponentName)\"/>
       <_Args Include="SwixBuildPath=$(NuGetPackageRoot)microsoft.visualstudioeng.microbuild.plugins.swixbuild\$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)\"/>
       <_Args Include="VisualStudioDropName=$(VisualStudioDropName)" />
-      <_Args Include="ArtifactsDir=$(ArtifactsDir)" />
-      <_Args Include="GenerateSbom=$(GenerateSbom)" />
+      <_Args Include="DotNetTool=$(DotNetTool)" />
+      <_Args Include="ManifestTool=$(NUGET_PACKAGES)microsoft.manifesttool.crossplatform\$(MicrosoftManifestToolCrossPlatformVersion)\Content\Microsoft.ManifestTool.dll"/>
     </ItemGroup>
 
     <!--

From 0c3dea28d11dd3d00c4525d52e7d33b25af64709 Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Wed, 15 Jun 2022 12:29:27 -0700
Subject: [PATCH 10/11] Update comments

---
 .../tools/VisualStudio.SetupPackage.vsmanproj             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index 709736b8ba2..dca37ce72c1 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -50,13 +50,13 @@
     <ReadLinesFromFile File="%(_PackageStubFiles.Identity)">
       <Output TaskParameter="Lines" ItemName="_StubLine"/>
     </ReadLinesFromFile>
-
+   <!--Parse the stub file to get the details of VsixId, VsixFileName and VsxiVersion-->
     <ItemGroup>
       <_ParsedLine Include="@(_StubLine)"
                    VsixId="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[0])"
                    VsixFileName="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[1])"
                    VsixVersion="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[2])" />
-
+    <!--Set the VSmanifest name, Vsix path, Vsix unpacking path, Directory to generate SBOM and Path to generated SBOM manifest-->
       <_VsixFileInfo Include="@(_ParsedLine->'%(VsixFileName)')">
         <ManifestJsonPath>$(SetupOutputPath)%(VsixId).json</ManifestJsonPath>
         <VsixPath>$(SetupOutputPath)%(VsixFileName)</VsixPath>
@@ -95,9 +95,9 @@
 
     <MakeDir Directories="%(_VsixFileInfo.SbomDir);%(_VsixFileInfo.UnpackDir)"/>
     <Unzip SourceFiles="%(_VsixFileInfo.VsixPath)" DestinationFolder="%(_VsixFileInfo.UnpackDir)"/>
-
+    <!-- Generate SBOM -->
     <Exec Command='"$(DotNetTool)" "$(ManifestTool)" generate -BuildDropPath "%(_VsixFileInfo.UnpackDir)" -ManifestDirPath "%(_VsixFileInfo.SbomDir)" -PackageName "%(_VsixFileInfo.VsixFileName)" -PackageVersion "%(_VsixFileInfo.VsixVersion)" -Verbosity Verbose'/>
-
+    <!-- Generate VS manifest with link to the SBOM manifest-->
     <ItemGroup>
       <MergeManifest Include="%(_VsixFileInfo.ManifestJsonPath)" SBOMFileLocation="%(_VsixFileInfo.SbomJsonPath)" />
     </ItemGroup>

From 3f03acb1ccaf958a0fe0b87ce78025c2ae94a52c Mon Sep 17 00:00:00 2001
From: Epsitha Ananth <epananth@microsoft.com>
Date: Wed, 15 Jun 2022 12:38:16 -0700
Subject: [PATCH 11/11] Review comments

---
 .../tools/VisualStudio.SetupPackage.vsmanproj               | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
index dca37ce72c1..d1b1695e634 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.SetupPackage.vsmanproj
@@ -51,6 +51,10 @@
       <Output TaskParameter="Lines" ItemName="_StubLine"/>
     </ReadLinesFromFile>
    <!--Parse the stub file to get the details of VsixId, VsixFileName and VsxiVersion-->
+   <!--Eg: _StubLine = Microsoft.FSharp.VSIX.Templates/VisualFSharpTemplates.vsix/17.0.0.2231309
+          VsixId = Microsoft.FSharp.VSIX.Templates
+          VsixFileName = VisualFSharpTemplates.vsix
+          VsixVersion = 17.0.0.2231309-->
     <ItemGroup>
       <_ParsedLine Include="@(_StubLine)"
                    VsixId="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[0])"
@@ -79,7 +83,7 @@
       We require that all VSIXes included in a single VS insertion component have the same version.
       This version will be set to ManifestBuildVersion.
     -->
-    <Error Text="Visual Studio component '$(ComponentName)' contains multiple VSIX files with different versions: @(_VsixVersionNoDuplicates->'%(VsixFileName) (version %(Identity))', ', ')"
+    <Error Text="Cannot generate VS manifest because Visual Studio component '$(ComponentName)' contains multiple VSIX files with different versions: @(_VsixVersionNoDuplicates->'%(VsixFileName) (version %(Identity))', ', ')"
            Condition="@(_VsixVersionNoDuplicates->Count()) != 1"/>
 
     <PropertyGroup>