diff --git a/Directory.Build.props b/Directory.Build.props
index b935597fe9..0e070d36a3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -12,6 +12,7 @@
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <AssemblySigningCertName>Microsoft</AssemblySigningCertName>
 
     <!-- Generate full pdbs for desktop targeting projects on platforms that support generating full pdbs. -->
     <DebugType Condition="'$(OS)'=='Windows_NT' AND '$(TargetFramework)'=='net46'">full</DebugType>
diff --git a/build/MPack.targets b/build/MPack.targets
index fab409499e..9ace8e3e8d 100644
--- a/build/MPack.targets
+++ b/build/MPack.targets
@@ -29,6 +29,8 @@
         <Version>$(AddinVersion)</Version>
         <Category>$(MPackArtifactCategory)</Category>
       </ArtifactInfo>
+
+      <FilesToExcludeFromSigning Include="$(MPackOutputPath)" />
     </ItemGroup>
   </Target>
 
diff --git a/build/VSIX.targets b/build/VSIX.targets
index 92d9451853..7cd27381f2 100644
--- a/build/VSIX.targets
+++ b/build/VSIX.targets
@@ -34,6 +34,9 @@
         <PackageId>$(VSIXName)</PackageId>
       </ArtifactInfo>
 
+      <FilesToSign Include="$(VSIXOutputPath)" Certificate="Vsix" />
+      <FilesToExcludeFromSigning Include="$(VSIXManifestOutputPath)" />
+
     </ItemGroup>
   </Target>
 
diff --git a/build/repo.props b/build/repo.props
index 5368f8f2b0..a3a5fbdbc0 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -11,6 +11,7 @@
     <ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj" />
     <ExcludeSolutions Include="$(RepositoryRoot)Razor.Slim.sln" />
   </ItemGroup>
+
   <PropertyGroup>
     <!-- These properties are use by the automation that updates dependencies.props -->
     <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>