Skip to content

Commit 4887033

Browse files
StephenMolloyStephenMolloy
committed
Switch over to microbuild signing.
1 parent 39e9081 commit 4887033

13 files changed

+116
-4
lines changed

‎MicrosoftConfigurationBuilders.msbuild

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="tools\MicrosoftConfigurationBuilders.settings.targets"/>
3-
42
<ItemGroup>
53
<AssemblyProject Include="src\Base\Base.csproj" />
64
<AssemblyProject Include="src\Environment\Environment.csproj" />

‎src/Azure/Azure.csproj

+8
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,12 @@
8787
<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'))" />
8888
</Target>
8989
<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')" />
90+
<Target Name="AfterBuild">
91+
<ItemGroup>
92+
<FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
93+
<Authenticode>Microsoft</Authenticode>
94+
<StrongName>MsSharedLib72</StrongName>
95+
</FilesToSign>
96+
</ItemGroup>
97+
</Target>
9098
</Project>

‎src/Base/Base.csproj

+8
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,12 @@
4747
</ItemGroup>
4848
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
4949
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
50+
<Target Name="AfterBuild">
51+
<ItemGroup>
52+
<FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
53+
<Authenticode>Microsoft</Authenticode>
54+
<StrongName>MsSharedLib72</StrongName>
55+
</FilesToSign>
56+
</ItemGroup>
57+
</Target>
5058
</Project>

‎src/Environment/Environment.csproj

+8
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,12 @@
5151
</ItemGroup>
5252
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5353
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
54+
<Target Name="AfterBuild">
55+
<ItemGroup>
56+
<FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
57+
<Authenticode>Microsoft</Authenticode>
58+
<StrongName>MsSharedLib72</StrongName>
59+
</FilesToSign>
60+
</ItemGroup>
61+
</Target>
5462
</Project>

‎src/Json/Json.csproj

+8
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,12 @@
5757
</ItemGroup>
5858
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5959
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
60+
<Target Name="AfterBuild">
61+
<ItemGroup>
62+
<FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
63+
<Authenticode>Microsoft</Authenticode>
64+
<StrongName>MsSharedLib72</StrongName>
65+
</FilesToSign>
66+
</ItemGroup>
67+
</Target>
6068
</Project>

‎src/UserSecrets/UserSecrets.csproj

+8
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,12 @@
5151
</ItemGroup>
5252
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5353
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
54+
<Target Name="AfterBuild">
55+
<ItemGroup>
56+
<FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
57+
<Authenticode>Microsoft</Authenticode>
58+
<StrongName>MsSharedLib72</StrongName>
59+
</FilesToSign>
60+
</ItemGroup>
61+
</Target>
5462
</Project>

‎src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj

+10
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,14 @@
3636
</NuGetContent>
3737
</ItemGroup>
3838
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
39+
<Target Name="AfterBuild">
40+
<PropertyGroup>
41+
<OutDir>$(PackageOutputDir)</OutDir>
42+
</PropertyGroup>
43+
<ItemGroup>
44+
<FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
45+
<Authenticode>NuGet</Authenticode>
46+
</FilesToSign>
47+
</ItemGroup>
48+
</Target>
3949
</Project>

‎src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj

+10
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,14 @@
3636
</NuGetContent>
3737
</ItemGroup>
3838
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
39+
<Target Name="AfterBuild">
40+
<PropertyGroup>
41+
<OutDir>$(PackageOutputDir)</OutDir>
42+
</PropertyGroup>
43+
<ItemGroup>
44+
<FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
45+
<Authenticode>NuGet</Authenticode>
46+
</FilesToSign>
47+
</ItemGroup>
48+
</Target>
3949
</Project>

‎src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj

+10
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,14 @@
3636
</NuGetContent>
3737
</ItemGroup>
3838
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
39+
<Target Name="AfterBuild">
40+
<PropertyGroup>
41+
<OutDir>$(PackageOutputDir)</OutDir>
42+
</PropertyGroup>
43+
<ItemGroup>
44+
<FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
45+
<Authenticode>NuGet</Authenticode>
46+
</FilesToSign>
47+
</ItemGroup>
48+
</Target>
3949
</Project>

‎src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj

+10
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,14 @@
3636
</NuGetContent>
3737
</ItemGroup>
3838
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
39+
<Target Name="AfterBuild">
40+
<PropertyGroup>
41+
<OutDir>$(PackageOutputDir)</OutDir>
42+
</PropertyGroup>
43+
<ItemGroup>
44+
<FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
45+
<Authenticode>NuGet</Authenticode>
46+
</FilesToSign>
47+
</ItemGroup>
48+
</Target>
3949
</Project>

‎src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj

+27-1
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,35 @@
4343
<NuGetContent Include="build\Net471\$(NuGetPackageId).targets">
4444
<Destination>build\Net471\$(NuGetPackageId).targets</Destination>
4545
</NuGetContent>
46-
<NuGetContent Include="tools\Net471\*.ps1">
46+
<NuGetContent Include="tools\Net471\*.ps1" Condition="'$(SignAssembly)' != 'true'">
47+
<Destination>tools\Net471\</Destination>
48+
</NuGetContent>
49+
<NuGetContent Include="tools\Net471\signed\*.ps1" Condition="'$(SignAssembly)' == 'true'">
4750
<Destination>tools\Net471\</Destination>
4851
</NuGetContent>
4952
</ItemGroup>
5053
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
54+
<Target Name="SignPowerShellScript" Condition=" '$(SignAssembly)' == 'true' " AfterTargets="BeforeBuild">
55+
<ItemGroup>
56+
<OriginalScriptFiles Include="$(MSBuildThisFileDirectory)\tools\Net471\*.ps1" />
57+
</ItemGroup>
58+
<Copy SourceFiles="@(OriginalScriptFiles)" DestinationFolder="$(MSBuildThisFileDirectory)\tools\Net471\signed" SkipUnchangedFiles="true" />
59+
<ItemGroup>
60+
<ScriptFilesToSign Include="$(MSBuildThisFileDirectory)\tools\Net471\signed\*.ps1">
61+
<Authenticode>Microsoft400</Authenticode>
62+
</ScriptFilesToSign>
63+
</ItemGroup>
64+
<SignFiles Files="@(ScriptFilesToSign)" Type="$(SignType)" BinariesDirectory="$(MSBuildThisFileDirectory)\tools\Net471\signed"
65+
IntermediatesDirectory="$(MSBuildThisFileDirectory)\tools\Net471" ESRPSigning="$(ESRPSigning)" UseBearerToken="$(UseBearerToken)" />
66+
</Target>
67+
<Target Name="AfterBuild">
68+
<PropertyGroup>
69+
<OutDir>$(PackageOutputDir)</OutDir>
70+
</PropertyGroup>
71+
<ItemGroup>
72+
<FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
73+
<Authenticode>NuGet</Authenticode>
74+
</FilesToSign>
75+
</ItemGroup>
76+
</Target>
5177
</Project>

‎tools/MicrosoftConfigurationBuilders.settings.targets

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<CustomBeforeProjectTargets>$(MSBuildThisFileDirectory)MicrosoftConfigurationBuilders.Extensions.settings.targets</CustomBeforeProjectTargets>
4+
<RepositoryRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'MicrosoftConfigurationBuilders.sln'))\</RepositoryRoot>
45
</PropertyGroup>
6+
7+
<Import Project="$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.props"
8+
Condition="Exists('$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.props')" />
9+
<Import Project="$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.targets"
10+
Condition="Exists('$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.targets')" />
511
<Import Project="$(CustomBeforeProjectTargets)" Condition="Exists('$(CustomBeforeProjectTargets)')" Label="Pre-targets Build Extensibility Point"/>
612

713
<!-- Configurable properties-->

‎tools/NuGetProj.targets

+3-1
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,12 @@ GetNuGetProjectOutputs: Reads build-generated files from outputs file.
304304
<Target Name="GetNuGetProjectOutputs">
305305
<PropertyGroup>
306306
<NuGetPackTargetFile>$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).nupkg</NuGetPackTargetFile>
307-
<NuGetPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetPackTargetFile>
307+
<NuGetSymbolPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetSymbolPackTargetFile>
308308
</PropertyGroup>
309309
<ItemGroup>
310310
<NuGetProjectOutput Include="$(NuGetPackTargetFile)" />
311+
<NuGetProjectOutput Include="$(NuGetSymbolPackTargetFile)" Condition="'$(NuGetSymbolPackTargetFile)' != ''" />
312+
311313
<NuGetProjectOutput Include="$(NuGetProjectOutputsFile)" />
312314
</ItemGroup>
313315
</Target>

0 commit comments

Comments
 (0)