diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
index 4d5ffdd8501..48ed82550c9 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.InsertionManifests.targets
@@ -4,30 +4,7 @@
<_StubFiles Include="$(VisualStudioSetupIntermediateOutputPath)**\*.stub"/>
<_StubDirs Include="@(_StubFiles->'%(RecursiveDir)')"/>
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -30,8 +32,6 @@
$(ComponentName)
$(SetupOutputPath)
$(ComponentIntermediateOutputPath)
- $(ArtifactsDir)
- $(GenerateSbom)
https://vsdrop.corp.microsoft.com/file/v1/$(VisualStudioDropName)%3B
@@ -42,50 +42,70 @@
<_PackageStubFiles Include="$(ComponentIntermediateOutputPath)*.stub"/>
-
-
-
-
-
-
-
-
+
+
-
+
+
- <_StubLineSplit Include="@(_StubLine)"
- Name="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[0])"
- Version="$([MSBuild]::ValueOrDefault('%(_StubLine.Identity)', '').Split('/')[1])" />
+ <_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)')">
+ $(SetupOutputPath)%(VsixId).json
+ $(SetupOutputPath)%(VsixFileName)
+ $(ComponentIntermediateOutputPath)%(VsixFileName)\unpack
+ $(ComponentIntermediateOutputPath)%(VsixFileName)\sbom
+ $(ComponentIntermediateOutputPath)%(VsixFileName)\sbom\spdx_2.2\manifest.spdx.json
+
- <_VsixVersion Include="%(_StubLineSplit.Version)" Name="%(_StubLineSplit.Name)" />
+ <_VsixVersion Include="%(_VsixFileInfo.VsixVersion)" VsixFileName="%(_VsixFileInfo.Identity)" />
-
+
@(_VsixVersionNoDuplicates)
- @(_VsixVersionNoDuplicates->'%(Name)')
-
-
- $(ArtifactsDir)sbom\$(ManifestVsixName.Substring(0, $(ManifestVsixName.LastIndexOf('.'))))\spdx_2.2\manifest.spdx.json
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
+