rename unified settings file, add attribute

Adam Ratzman · Adam Ratzman · commit 3df23187f544 · 2024-03-19T14:34:25.000-04:00
diff --git a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/CommonFiles.swr
@@ -659,5 +659,5 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\Managed\zh-Hant"
   file source="$(VisualStudioXamlRulesDir)zh-Hant\ResolvedSdkReference.xaml"
   file source="$(VisualStudioXamlRulesDir)zh-Hant\SdkReference.xaml"
 
-  folder "Extensions\Microsoft\ManagedProjectSystem\UnifiedSettings"
-    file source="$(VisualStudioExtensionSetupDir)\ProjectSystemSetup\UnifiedSettings\ManagedProjectSystem.registration.json"
+  folder "Extensions\Microsoft\ManagedProjectSystem"
+    file source="$(VisualStudioExtensionSetupDir)\ProjectSystemSetup\UnifiedSettings\registration.json"
diff --git a/setup/ProjectSystemSetup/ProjectSystemSetup.csproj b/setup/ProjectSystemSetup/ProjectSystemSetup.csproj
@@ -27,7 +27,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="UnifiedSettings\ManagedProjectSystem.registration.json">
+    <Content Include="UnifiedSettings\registration.json">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     
diff --git a/setup/ProjectSystemSetup/UnifiedSettings/registration.json b/setup/ProjectSystemSetup/UnifiedSettings/registration.json
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Packaging/ManagedProjectSystemPackage.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Packaging/ManagedProjectSystemPackage.cs
@@ -20,6 +20,7 @@ namespace Microsoft.VisualStudio.Packaging
         termValues: new[] { "SolutionHasProjectCapability:.NET & CPS" }
         )]
     [ProvideMenuResource("Menus.ctmenu", 5)]
+    [ProvideSettingsManifest]
     internal sealed class ManagedProjectSystemPackage : AsyncPackage
     {
         public const string ActivationContextGuid = "E7DF1626-44DD-4E8C-A8A0-92EAB6DDC16E";
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Setup/PackageContentTests.cs
@@ -12,7 +12,7 @@ public sealed class PackageContentTests
     {
         // These files are only added as part of signing.
         private const string DigitalSignature = "package/services/digital-signature";
-        private const string SettingsRegistrationFileSuffix = "ManagedProjectSystem.registration.json";
+        private const string SettingsRegistrationFileSuffix = "registration.json";
         private const string Rels = "_rels/.rels";
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ namespace Microsoft.VisualStudio.Packaging`
`20`	`20`	`termValues: new[] { "SolutionHasProjectCapability:.NET & CPS" }`
`21`	`21`	`)]`
`22`	`22`	`[ProvideMenuResource("Menus.ctmenu", 5)]`
	`23`	`+ [ProvideSettingsManifest]`
`23`	`24`	`internal sealed class ManagedProjectSystemPackage : AsyncPackage`
`24`	`25`	`{`
`25`	`26`	`public const string ActivationContextGuid = "E7DF1626-44DD-4E8C-A8A0-92EAB6DDC16E";`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public sealed class PackageContentTests`
`12`	`12`	`{`
`13`	`13`	`// These files are only added as part of signing.`
`14`	`14`	`private const string DigitalSignature = "package/services/digital-signature";`
`15`		`- private const string SettingsRegistrationFileSuffix = "ManagedProjectSystem.registration.json";`
	`15`	`+ private const string SettingsRegistrationFileSuffix = "registration.json";`
`16`	`16`	`private const string Rels = "_rels/.rels";`
`17`	`17`
`18`	`18`	`[Fact]`