From 9fa961dd345f7a0d3b5154d099634e0f011c213c Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 14 Jan 2019 20:18:52 -0800
Subject: [PATCH] Fix VSIX build by using arcade features

Our build isn't producing valid insertion payloads due to a missing
property. I'm passing that in from the build definition and also
removing some of our workarounds.
---
 azure-pipelines.yml      |  2 ++
 eng/AfterSigning.targets | 26 --------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 107d1cf28f..a63ce7c741 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -24,6 +24,8 @@ variables:
     _OfficialBuildIdArgs: /p:OfficialBuildId=$(Build.BuildNumber) 
       /p:ManifestBuildBranch=$(Build.SourceBranchName)
       /p:ManifestBuildNumber=$(Build.BuildNumber)
+      /p:VisualStudioDropName=Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
+
  
 resources:
   containers:
diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets
index f1fc7cea55..afa6be56dc 100644
--- a/eng/AfterSigning.targets
+++ b/eng/AfterSigning.targets
@@ -2,26 +2,7 @@
   <!-- Called when generating a VSIX manifest -->
   <Target Name="_SetManifestProperties" BeforeTargets="GenerateVisualStudioInsertionManifests">
 
-    <!-- 
-      We expect these to be set by the build arguments in the official build. Populating them here with reasonable defaults
-      so we can inspect the behavior during local builds.
-    -->
     <PropertyGroup>
-      <ManifestTeamProject Condition="'$(ManifestTeamProject)' == ''">AspNet</ManifestTeamProject>
-      <ManifestRepositoryName Condition="'$(ManifestRepositoryName)' == ''">AspNetCore-Tooling</ManifestRepositoryName>
-      <ManifestBuildBranch Condition="'$(ManifestBuildBranch)' == ''">local_build</ManifestBuildBranch>
-      <ManifestBuildNumber Condition="'$(ManifestBuildNumber)' == ''">4242424242</ManifestBuildNumber>
-
-      <!-- 
-        The %3B is not a mistake, it's an escaped semicolon.
-
-        The final manifest URL needs to look like:
-          https://vsdrop.corp.microsoft.com/file/v1/Products/AspNet/AspNetCore-Tooling/master/20180909.1;Microsoft.VisualStudio.RazorExtension.vsix
-
-        We are responsible for providing the semicolon for some reason. 
-      -->
-      <ManifestPublishUrl Condition="'$(ManifestPublishUrl)' == ''">https://vsdrop.corp.microsoft.com/file/v1/Products/$(ManifestTeamProject)/$(ManifestRepositoryName)/$(ManifestBuildBranch)/$(ManifestBuildNumber)%3B</ManifestPublishUrl>
-
       <!-- 
         The build-in VSIX manifest support will compute its own version before calling this target.
         Replace it with our versioning scheme.
@@ -36,12 +17,5 @@
       <VsixVersion Condition="'$(OfficialBuildId)' == ''">$(VsixVersion).42424242.42</VsixVersion>
     </PropertyGroup>
 
-    <ItemGroup>
-      <_Args Include="ManifestTeamProject=$(ManifestTeamProject)" />
-      <_Args Include="ManifestRepositoryName=$(ManifestRepositoryName)" />
-      <_Args Include="ManifestBuildBranch=$(ManifestBuildBranch)" />
-      <_Args Include="ManifestBuildNumber=$(ManifestBuildNumber)" />
-      <_Args Include="ManifestPublishUrl=$(ManifestPublishUrl)" />
-    </ItemGroup>
   </Target>
 </Project>
\ No newline at end of file