From 57fc6833fe95f4be0053939eac70d4e99e10ff00 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 20 Dec 2017 12:54:47 -0800
Subject: [PATCH] Mark the SecretManager VSIX as IsProductComponent=true

 - Update extension to be per-machine, and make installation folder more-specific
 - Update the VSIX identity
 - Set the artifact category as shipoob
---
 build/VSIX.targets                                    | 11 +++++++++++
 build/repo.props                                      |  1 +
 .../Microsoft.VisualStudio.SecretManager.csproj       |  6 ++++++
 .../source.extension.vsixmanifest                     |  7 ++++---
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/build/VSIX.targets b/build/VSIX.targets
index b066b0a8de..d343689ae6 100644
--- a/build/VSIX.targets
+++ b/build/VSIX.targets
@@ -7,6 +7,8 @@
     <VSIXName>Microsoft.VisualStudio.SecretManager</VSIXName>
     <VSIXProject>$(RepositoryRoot)tooling\$(VSIXName)\$(VSIXName).csproj</VSIXProject>
     <VSIXOutputPath>$(BuildDir)$(VSIXName).vsix</VSIXOutputPath>
+    <VSIXManifestOutputPath>$(BuildDir)$(VSIXName).json</VSIXManifestOutputPath>
+    <VSIXArtifactCategory>shipoob</VSIXArtifactCategory>
   </PropertyGroup>
 
   <Target
@@ -19,6 +21,15 @@
       <ArtifactInfo Include="$(VSIXOutputPath)">
         <ArtifactType>VsixPackage</ArtifactType>
         <Version>$(PackageVersion)</Version>
+        <Category>$(VSIXArtifactCategory)</Category>
+        <PackageId>$(VSIXName)</PackageId>
+      </ArtifactInfo>
+
+      <ArtifactInfo Include="$(VSIXManifestOutputPath)">
+        <ArtifactType>JsonFile</ArtifactType>
+        <Category>$(VSIXArtifactCategory)</Category>
+        <Dependencies>$(VSIXName).json</Dependencies>
+        <PackageId>$(VSIXName)</PackageId>
       </ArtifactInfo>
     </ItemGroup>
   </Target>
diff --git a/build/repo.props b/build/repo.props
index 7e2917edef..1be3632130 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -6,6 +6,7 @@
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
   </ItemGroup>
+
   <PropertyGroup>
     <!-- These properties are use by the automation that updates dependencies.props -->
     <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
diff --git a/tooling/Microsoft.VisualStudio.SecretManager/Microsoft.VisualStudio.SecretManager.csproj b/tooling/Microsoft.VisualStudio.SecretManager/Microsoft.VisualStudio.SecretManager.csproj
index bfd99e46b7..dfe6fa36bd 100644
--- a/tooling/Microsoft.VisualStudio.SecretManager/Microsoft.VisualStudio.SecretManager.csproj
+++ b/tooling/Microsoft.VisualStudio.SecretManager/Microsoft.VisualStudio.SecretManager.csproj
@@ -3,6 +3,12 @@
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+
+    <!-- Required to place the vsix in the right location by WTE MSI -->
+    <ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
+    <ExtensionInstallationFolder>Microsoft\ASP.NET Core\UserSecrets</ExtensionInstallationFolder>
+    <IsProductComponent>true</IsProductComponent>
+
     <ImportDirectoryBuildProps>False</ImportDirectoryBuildProps>
     <ImportDirectoryBuildTargets>False</ImportDirectoryBuildTargets>
     <GenerateUserSecretsAttribute>False</GenerateUserSecretsAttribute>
diff --git a/tooling/Microsoft.VisualStudio.SecretManager/source.extension.vsixmanifest b/tooling/Microsoft.VisualStudio.SecretManager/source.extension.vsixmanifest
index 643914b606..7edf1295e0 100644
--- a/tooling/Microsoft.VisualStudio.SecretManager/source.extension.vsixmanifest
+++ b/tooling/Microsoft.VisualStudio.SecretManager/source.extension.vsixmanifest
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="Microsoft.VisualStudio.SecretManager.11eea7f6-8d34-4759-b618-b40f454266d4" Version="|%CurrentProject%;GetBuildVersion|" Language="en-US" Publisher="Microsoft" />
-        <DisplayName>Microsoft.VisualStudio.SecretManager</DisplayName>
+        <Identity Id="Microsoft.VisualStudio.SecretManager" Version="|%CurrentProject%;GetBuildVersion|" Language="en-US" Publisher="Microsoft" />
+        <DisplayName>ASP.NET Core User Secrets Extension</DisplayName>
+        <PackageId>Microsoft.VisualStudio.SecretManager</PackageId>
         <Description xml:space="preserve">Enables IVsProjectSecrets for ASP.NET Core projects that use Microsoft.Extensions.Configuration.UserSecrets.</Description>
     </Metadata>
-    <Installation>
+    <Installation AllUsers="true">
         <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.26228.04,)" />
     </Installation>
     <Dependencies>