Renamed SetupProject.csproj to just Setup.csproj. Added some more com…

…ments. Removed commented code.

Directory.Build.props

@@ -127,6 +127,7 @@
   </PropertyGroup>
 
   <!-- Implicit usings -->
+  <!-- See: https://learn.microsoft.com/dotnet/core/project-sdk/msbuild-props#using -->
   <ItemGroup>
     <!-- We use immutable collections extensively and expect no naming conflicts. -->
     <Using Include="System.Collections.Immutable" />

ProjectSystem.sln

@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Proj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.ProjectSystem.IntegrationTests", "tests\Microsoft.VisualStudio.ProjectSystem.IntegrationTests\Microsoft.VisualStudio.ProjectSystem.IntegrationTests.csproj", "{FB209C68-77C0-4EE9-BCA9-0B3D5721C436}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SetupProject", "setup\SetupManifest\SetupProject.csproj", "{CB213A0F-C4D7-4B12-A53B-1E946A2034ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Setup", "setup\SetupManifest\Setup.csproj", "{CB213A0F-C4D7-4B12-A53B-1E946A2034ED}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeployTestDependencies", "tests\DeployTestDependencies\DeployTestDependencies.csproj", "{892500A5-BF6B-4FD5-A7B9-5EEA20EB775F}"
 EndProject

eng/pipelines/templates/build-official-release.yml

@@ -72,6 +72,7 @@ jobs:
     env:
       # The Microsoft.VisualStudio.Internal.MicroBuild.SetupTooling.props assumes this value is set, which sets the ManifestPublishUrl property.
       # The ManifestPublishUrl property is used in the FinalizeManifest target in Microsoft.VisualStudio.Setup.Tools.targets to set the correct drop destination for the VSMan assets (VSIX and sbom.json).
+      # This is normally set via the MicroBuildSwixPlugin task as a pipeline variable. With modern setup authoring, we do not want to run this task prior to the build itself.
       VstsDropNames: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
 
   # Sets the PackageVersion variable for the job. This variable is not used by this job; instead, it is consumed by the Insertion job.

eng/pipelines/templates/generate-insertion.yml

@@ -62,7 +62,7 @@ jobs:
       # The ShortCommitId is parsed out of the payload name in tagger.yml for use in tagging the appropriate commit in our repo.
       # This tag is used in GetInsertionPRDescription.ps1 (task above) to create the description for this insertion.
       InsertionPayloadName: 'DotNet-Project-System ($(Build.SourceBranchName):$(Build.BuildNumber):$(ShortCommitId))'
-      # Note that the actual filename, SetupManifest.vsman, is different from the mapped value of Microsoft.VisualStudio.ProjectSystem.Managed.vsman, which is in dotnetprojectsystem-components.json.
+      # Note: The actual filename, SetupManifest.vsman, is different from the mapped value of Microsoft.VisualStudio.ProjectSystem.Managed.vsman, which is in dotnetprojectsystem-components.json.
       ComponentJsonValues: Microsoft.VisualStudio.ProjectSystem.Managed.vsman=https://vsdrop.corp.microsoft.com/file/v1/Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber);SetupManifest.vsman
       # Setting DefaultConfigValues also sets the PackagePropsValues.
       # See the bottom of the table here: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/635/Overview?anchor=**build-pipeline**

setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj

@@ -6,9 +6,6 @@
   <PropertyGroup>
     <!-- This allows passing in MSBuild properties for substitution in SWR files. -->
     <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);VisualStudioXamlRulesDir=$(VisualStudioXamlRulesDir)</PackagePreprocessorDefinitions>
-    <!-- An SBOM is not required for this project as code files are not contained within the resulting VSIX package. -->
-    <!-- However, VS insertion checks to see that every VSIX package has an associated _sbom.json along with the package. So, it is 'required'. -->
-    <!-- <GenerateSBOM>false</GenerateSBOM> -->
   </PropertyGroup>
 
   <ItemGroup>

setup/SetupManifest/SetupProject.csproj → setup/SetupManifest/Setup.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <!-- If ReferenceOutputAssembly is not set to false, it will attempt to compile the VSMAN file itself (somehow ends up in the list of Compile items). -->
-    <!-- CSC error CS0009: Metadata file 'C:\Code\project-system\artifacts\Release\VSSetup\Insertion\SetupManifest.vsman' could not be opened. Image is too small. [C:\Code\project-system\setup\SetupManifest\SetupProject.csproj] -->
+    <!-- CSC error CS0009: Metadata file 'C:\Code\project-system\artifacts\Release\VSSetup\Insertion\SetupManifest.vsman' could not be opened. Image is too small. [C:\Code\project-system\setup\SetupManifest\Setup.csproj] -->
     <!-- If Restore isn't explicitly sent, the Microsoft.VisualStudio.Internal.MicroBuild.Vsman PackageReference in the vsmanproj will not be restored. -->
     <ProjectReference Include="SetupManifest.vsmanproj" ReferenceOutputAssembly="false" Targets="Restore;Build" />
   </ItemGroup>

setup/SetupManifest/SetupManifest.vsmanproj

@@ -7,7 +7,7 @@
     <ProjectReference Include="..\ProjectSystemSetup\ProjectSystemSetup.csproj" />
     <ProjectReference Include="..\VisualStudioEditorsSetup\VisualStudioEditorsSetup.csproj" />
     <!-- If ReferenceOutputAssembly is not set to false, it will attempt to compile the non-existent DLL. -->
-    <!-- CSC error CS0006: Metadata file 'C:\Code\project-system\artifacts\Release\VSSetup\Insertion\Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.dll' could not be found [C:\Code\project-system\setup\SetupManifest\SetupProject.csproj] -->
+    <!-- CSC error CS0006: Metadata file 'C:\Code\project-system\artifacts\Release\VSSetup\Insertion\Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.dll' could not be found [C:\Code\project-system\setup\SetupManifest\Setup.csproj] -->
     <!-- The CollectManifestsToMerge task in Microsoft.VisualStudio.Internal.MicroBuild.Vsman.targets only specifies Build;Pack;GetVsixPrimaryOutputs to run. -->
     <!-- If Restore is not run, the Microsoft.VisualStudio.Internal.MicroBuild.Swix package will not be restored. -->
     <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles\Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj" ReferenceOutputAssembly="false" Targets="Restore;Build" />