Switch over to microbuild signing.

aspnet · May 21, 2018 · 4887033 · 4887033
1 parent 39e9081
commit 4887033
Show file tree

Hide file tree

Showing 13 changed files with 116 additions and 4 deletions.
diff --git a/MicrosoftConfigurationBuilders.msbuild b/MicrosoftConfigurationBuilders.msbuild
@@ -1,6 +1,4 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="tools\MicrosoftConfigurationBuilders.settings.targets"/>  
-
   <ItemGroup>
     <AssemblyProject Include="src\Base\Base.csproj" />
     <AssemblyProject Include="src\Environment\Environment.csproj" />

diff --git a/src/Azure/Azure.csproj b/src/Azure/Azure.csproj
@@ -87,4 +87,12 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets" Condition="Exists('..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets')" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/Base/Base.csproj b/src/Base/Base.csproj
@@ -47,4 +47,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/Environment/Environment.csproj b/src/Environment/Environment.csproj
@@ -51,4 +51,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/Json/Json.csproj b/src/Json/Json.csproj
@@ -57,4 +57,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/UserSecrets/UserSecrets.csproj b/src/UserSecrets/UserSecrets.csproj
@@ -51,4 +51,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/...figurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj b/...figurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj
@@ -36,4 +36,14 @@
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
diff --git a/...onfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj b/...onfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj
@@ -36,4 +36,14 @@
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
diff --git a/...ilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj b/...ilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj
@@ -36,4 +36,14 @@
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
diff --git a/...onfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj b/...onfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj
@@ -36,4 +36,14 @@
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
diff --git a/...ilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj b/...ilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj
@@ -43,9 +43,35 @@
         <NuGetContent Include="build\Net471\$(NuGetPackageId).targets">
           <Destination>build\Net471\$(NuGetPackageId).targets</Destination>
         </NuGetContent>
-        <NuGetContent Include="tools\Net471\*.ps1">
+        <NuGetContent Include="tools\Net471\*.ps1" Condition="'$(SignAssembly)' != 'true'">
+          <Destination>tools\Net471\</Destination>
+        </NuGetContent>
+        <NuGetContent Include="tools\Net471\signed\*.ps1" Condition="'$(SignAssembly)' == 'true'">
           <Destination>tools\Net471\</Destination>
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="SignPowerShellScript" Condition=" '$(SignAssembly)' == 'true' " AfterTargets="BeforeBuild">
+      <ItemGroup>
+        <OriginalScriptFiles Include="$(MSBuildThisFileDirectory)\tools\Net471\*.ps1" />
+      </ItemGroup>
+      <Copy SourceFiles="@(OriginalScriptFiles)" DestinationFolder="$(MSBuildThisFileDirectory)\tools\Net471\signed" SkipUnchangedFiles="true" />
+      <ItemGroup>
+        <ScriptFilesToSign Include="$(MSBuildThisFileDirectory)\tools\Net471\signed\*.ps1">
+          <Authenticode>Microsoft400</Authenticode>
+        </ScriptFilesToSign>
+      </ItemGroup>
+      <SignFiles Files="@(ScriptFilesToSign)" Type="$(SignType)" BinariesDirectory="$(MSBuildThisFileDirectory)\tools\Net471\signed"
+          IntermediatesDirectory="$(MSBuildThisFileDirectory)\tools\Net471" ESRPSigning="$(ESRPSigning)" UseBearerToken="$(UseBearerToken)" />
+  </Target>
+  <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
diff --git a/tools/MicrosoftConfigurationBuilders.settings.targets b/tools/MicrosoftConfigurationBuilders.settings.targets
@@ -1,7 +1,13 @@
 <Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CustomBeforeProjectTargets>$(MSBuildThisFileDirectory)MicrosoftConfigurationBuilders.Extensions.settings.targets</CustomBeforeProjectTargets>
+    <RepositoryRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'MicrosoftConfigurationBuilders.sln'))\</RepositoryRoot>
   </PropertyGroup>
+
+  <Import Project="$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.props"
+      Condition="Exists('$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.props')" />
+  <Import Project="$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.targets"
+      Condition="Exists('$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.targets')" />
   <Import Project="$(CustomBeforeProjectTargets)" Condition="Exists('$(CustomBeforeProjectTargets)')" Label="Pre-targets Build Extensibility Point"/>
 
   <!-- Configurable properties-->

diff --git a/tools/NuGetProj.targets b/tools/NuGetProj.targets
@@ -304,10 +304,12 @@ GetNuGetProjectOutputs: Reads build-generated files from outputs file.
   <Target Name="GetNuGetProjectOutputs">
     <PropertyGroup>
       <NuGetPackTargetFile>$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).nupkg</NuGetPackTargetFile>
-      <NuGetPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetPackTargetFile>
+      <NuGetSymbolPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetSymbolPackTargetFile>
     </PropertyGroup>
     <ItemGroup>
       <NuGetProjectOutput Include="$(NuGetPackTargetFile)" />
+      <NuGetProjectOutput Include="$(NuGetSymbolPackTargetFile)" Condition="'$(NuGetSymbolPackTargetFile)' != ''" />
+
       <NuGetProjectOutput Include="$(NuGetProjectOutputsFile)" />
     </ItemGroup>
   </Target>