From c816ea5b5d1f06b36bd0da55134a8f215cfafc86 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 13 Apr 2023 17:28:27 -0700 Subject: [PATCH] Renamed SetupProject.csproj to just Setup.csproj. Added some more comments. Removed commented code. --- Directory.Build.props | 1 + ProjectSystem.sln | 2 +- eng/pipelines/templates/build-official-release.yml | 1 + eng/pipelines/templates/generate-insertion.yml | 2 +- ...oft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj | 3 --- setup/SetupManifest/{SetupProject.csproj => Setup.csproj} | 2 +- setup/SetupManifest/SetupManifest.vsmanproj | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) rename setup/SetupManifest/{SetupProject.csproj => Setup.csproj} (97%) diff --git a/Directory.Build.props b/Directory.Build.props index 6cc7dce9ae2..6042348fff6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -127,6 +127,7 @@ + diff --git a/ProjectSystem.sln b/ProjectSystem.sln index a0ef409d1e2..28eca9a4a70 100644 --- a/ProjectSystem.sln +++ b/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 diff --git a/eng/pipelines/templates/build-official-release.yml b/eng/pipelines/templates/build-official-release.yml index d6013d46e11..cebed6c0c52 100644 --- a/eng/pipelines/templates/build-official-release.yml +++ b/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. diff --git a/eng/pipelines/templates/generate-insertion.yml b/eng/pipelines/templates/generate-insertion.yml index f0081d0e2f3..e17b328d552 100644 --- a/eng/pipelines/templates/generate-insertion.yml +++ b/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** diff --git a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj index 4f89041b8f0..84737929906 100644 --- a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj +++ b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.swixproj @@ -6,9 +6,6 @@ $(PackagePreprocessorDefinitions);VisualStudioXamlRulesDir=$(VisualStudioXamlRulesDir) - - - diff --git a/setup/SetupManifest/SetupProject.csproj b/setup/SetupManifest/Setup.csproj similarity index 97% rename from setup/SetupManifest/SetupProject.csproj rename to setup/SetupManifest/Setup.csproj index 585c91d14d1..1fb313a2f33 100644 --- a/setup/SetupManifest/SetupProject.csproj +++ b/setup/SetupManifest/Setup.csproj @@ -7,7 +7,7 @@ - + diff --git a/setup/SetupManifest/SetupManifest.vsmanproj b/setup/SetupManifest/SetupManifest.vsmanproj index 703a4847df2..f03d530ff04 100644 --- a/setup/SetupManifest/SetupManifest.vsmanproj +++ b/setup/SetupManifest/SetupManifest.vsmanproj @@ -7,7 +7,7 @@ - +