diff --git a/Directory.Build.props b/Directory.Build.props
index 1afa691c5f..29d623306f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -15,6 +15,7 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <AssemblySigningCertName>Microsoft</AssemblySigningCertName>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 
     <!-- Binary compatiblity is not a goal for command-line tools. -->
diff --git a/build/VSIX.targets b/build/VSIX.targets
index a22b83f020..eade7e4414 100644
--- a/build/VSIX.targets
+++ b/build/VSIX.targets
@@ -31,6 +31,9 @@
         <Dependencies>$(VSIXName).vsix</Dependencies>
         <PackageId>$(VSIXName)</PackageId>
       </ArtifactInfo>
+
+      <FilesToSign Include="$(VSIXOutputPath)" Certificate="Vsix" />
+      <FilesToExcludeFromSigning Include="$(VSIXManifestOutputPath)" />
     </ItemGroup>
   </Target>
 
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 51ae52c049..09bd77accb 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview1-15639
-commithash:231066d459f3c86a94b5bdcd197a3c2e4992a7ff
+version:2.1.0-preview1-15651
+commithash:ebf2365121c2c6a6a0fbfa9b0f37bb5effc89323