Skip to content

Commit 2eea7f7

Browse files
JinhuafeiJinhuafei
committed
update codesign task
1 parent 6ae0e99 commit 2eea7f7

File tree

6 files changed

+44
-58
lines changed

6 files changed

+44
-58
lines changed

‎MicrosoftAspNetSessionState.msbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<!-- Packages build -->
3131

32-
<Target Name="BuildPackages" DependsOnTargets="CopyInstallScripts;RestorePackages">
32+
<Target Name="BuildPackages" DependsOnTargets="RestorePackages">
3333
<MSBuild Targets="" Projects="@(PackageProject)" />
3434
</Target>
3535

‎src/SessionStateModule/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Microsoft.AspNet.SessionState.SessionStateModule")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
13+
[assembly: AssemblyCopyright("\x00a9 Microsoft Corporation. All rights reserved.")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

‎src/SqlSessionStateProviderAsync/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
13+
[assembly: AssemblyCopyright("\x00a9 Microsoft Corporation. All rights reserved.")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

‎tools/CI/CITask.targets

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Web.MsBuildTasks2.dll" TaskName="Microsoft.Web.MsBuildTasks.PoliCheck"/>
66

7-
<Target Name="BuildCI" DependsOnTargets="Clean;PoliCheck;Build;BinScope" />
8-
<Target Name="SignBinaries" DependsOnTargets="CopyInstallScripts;CodeSign" />
7+
<Target Name="BuildCI" DependsOnTargets="Clean;PoliCheck;BuildAssemblies;CodeSign;BuildPackages;BinScope" />
98
<Target Name="PoliCheck">
109
<ItemGroup>
1110
<ObjFiles Include="src\**\obj\**\*.*;test\**\obj\**\*.*;test\**\bin\**\*.*;"/>
@@ -41,5 +40,41 @@
4140
<BinScopeTargetFiles Include="$(OutputPath)Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.dll" />
4241
<BinScopeTargetFiles Include="$(OutputPath)Microsoft.AspNet.SessionState.SessionStateModule.dll" />
4342
</ItemGroup>
43+
44+
<!-- CodeSign definitions -->
45+
46+
<PropertyGroup>
47+
<!-- Unify codesign properties. -->
48+
<CodeSignEnabled Condition="'$(Sign)' == 'Sign'">true</CodeSignEnabled>
49+
<CodeSignEnabled Condition="'$(BuildingTestProject)' == 'true'">false</CodeSignEnabled>
50+
<CodeSignEnabled Condition="'$(CodeSignEnabled)' == ''">false</CodeSignEnabled>
51+
<CodeSignTest Condition="'$(TestCodeSign)' != ''">$(TestCodeSign)</CodeSignTest>
52+
</PropertyGroup>
53+
54+
<PropertyGroup Condition="'$(CodeSignEnabled)' == 'true'">
55+
<CodeSignSnCert Condition="'$(MSBuildProjectExtension)' == '.csproj'">72</CodeSignSnCert>
56+
<CodeSignDisplayName>Microsoft ASP.NET</CodeSignDisplayName>
57+
<CodeSignDisplayUrl>http://www.asp.net/</CodeSignDisplayUrl>
58+
<CodeSignDescription>Signing binaries for ASP.NET Async SessionState module</CodeSignDescription>
59+
<CodeSignApprovers Condition="'$(CodeSignApprovers)' == ''">hongli;joeloff;mattfei</CodeSignApprovers>
60+
<CodeSignOutputPath Condition="'$(CodeSignOutputPath)' == ''">$(BinPath)Signed\</CodeSignOutputPath>
61+
<CodeSignIntermediateOutputPath Condition="'$(CodeSignIntermediateOutputPath)' == ''">$(ObjPath)CodeSign\</CodeSignIntermediateOutputPath>
62+
</PropertyGroup>
63+
64+
<PropertyGroup>
65+
<AssemblyPath Condition="'$(CodeSignEnabled)' == 'true'">$(CodeSignOutputPath)</AssemblyPath>
66+
<AssemblyPath Condition="'$(AssemblyPath)' == ''">$(OutputPath)</AssemblyPath>
67+
</PropertyGroup>
68+
69+
<ItemGroup>
70+
<CodeSign Include="$(OutputPath)Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.dll">
71+
<AuthCodeCert>10006</AuthCodeCert>
72+
<StrongNameCert>72</StrongNameCert>
73+
</CodeSign>
74+
<CodeSign Include="$(OutputPath)Microsoft.AspNet.SessionState.SessionStateModule.dll">
75+
<AuthCodeCert>10006</AuthCodeCert>
76+
<StrongNameCert>72</StrongNameCert>
77+
</CodeSign>
78+
</ItemGroup>
4479

4580
</Project>

‎tools/MicrosoftAspNetSessionState.Extensions.settings.targets

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,55 +15,12 @@
1515
<TestRoot>$(RepositoryRoot)\test\Microsoft.AspNet.SessionState.AsyncProviders.SqlSessionStateProviderAsync.Test</TestRoot>
1616
<BuildingTestProject Condition="$(MSBuildProjectDirectory.ToLower().Contains($(TestRoot.ToLower())))">true</BuildingTestProject>
1717
</PropertyGroup>
18-
19-
20-
<!-- CodeSign definitions -->
21-
22-
<PropertyGroup>
23-
24-
<CodeSignEnabled Condition="'$(Sign)' == 'Sign'">true</CodeSignEnabled>
25-
<CodeSignEnabled Condition="'$(BuildingTestProject)' == 'true'">false</CodeSignEnabled>
26-
<CodeSignEnabled Condition="'$(CodeSignEnabled)' == ''">false</CodeSignEnabled>
27-
<CodeSignTest Condition="'$(TestCodeSign)' != ''">$(TestCodeSign)</CodeSignTest>
28-
</PropertyGroup>
29-
30-
<PropertyGroup Condition="'$(CodeSignEnabled)' == 'true'">
31-
<CodeSignSnCert Condition="'$(MSBuildProjectExtension)' == '.csproj'">72</CodeSignSnCert>
32-
<CodeSignDisplayName>Microsoft ASP.NET</CodeSignDisplayName>
33-
<CodeSignDisplayUrl>http://www.asp.net/</CodeSignDisplayUrl>
34-
<CodeSignDescription>Signing binaries for ASP.NET SessionState module and SqlSessionStateProviderAsync</CodeSignDescription>
35-
<CodeSignApprovers Condition="'$(CodeSignApprovers)' == ''">joeloff;elipton</CodeSignApprovers>
36-
<CodeSignOutputPath Condition="'$(CodeSignOutputPath)' == ''">$(BinPath)Signed\</CodeSignOutputPath>
37-
<CodeSignIntermediateOutputPath Condition="'$(CodeSignIntermediateOutputPath)' == ''">$(ObjPath)CodeSign\</CodeSignIntermediateOutputPath>
38-
</PropertyGroup>
39-
4018

4119
<PropertyGroup>
42-
<AssemblyPath Condition="'$(CodeSignEnabled)' == 'true'">$(CodeSignOutputPath)</AssemblyPath>
4320
<AssemblyPath Condition="'$(AssemblyPath)' == ''">$(OutputPath)</AssemblyPath>
4421
</PropertyGroup>
4522

46-
4723
<PropertyGroup>
4824
<CustomAfterProjectTargets>$(MSBuildThisFileDirectory)MicrosoftAspNetSessionState.Extensions.targets</CustomAfterProjectTargets>
4925
</PropertyGroup>
50-
51-
<!--
52-
<ItemGroup>
53-
<CodeSign Include="$(OutputPath)Microsoft.AspNet.SessionState.SessionStateModule.dll">
54-
<AuthCodeCert>10006</AuthCodeCert>
55-
<StrongNameCert>72</StrongNameCert>
56-
</CodeSign>
57-
<CodeSign Include="$(OutputPath)Microsoft.AspNet.SessionState.AsyncProviders.SqlSessionStateProviderAsync.dll">
58-
<AuthCodeCert>10006</AuthCodeCert>
59-
<StrongNameCert>72</StrongNameCert>
60-
</CodeSign>
61-
<CodeSign Include="$(RepositoryRootEx)src\Packages\SessionStateModule.nupkg\tools\*.ps1">
62-
<AuthCodeCert>10006</AuthCodeCert>
63-
</CodeSign>
64-
<CodeSign Include="$(RepositoryRootEx)src\Packages\SqlSessionStateProviderAsync.nupkg\tools\*.ps1">
65-
<AuthCodeCert>10006</AuthCodeCert>
66-
</CodeSign>
67-
</ItemGroup>
68-
-->
6926
</Project>

‎tools/MicrosoftAspNetSessionState.Extensions.targets

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
<Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

3-
<!-- Update NuGet Package version for nightly build-->
4-
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.nuproj'">
5-
<NuGetPackageVersion Condition="'$(UpdateNightlyPackages)' == 'true'">$(NuGetPackageVersion)-b$(VersionBuild)</NuGetPackageVersion>
6-
</PropertyGroup>
3+
<!-- Update NuGet Package version for nightly build-->
4+
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.nuproj'">
5+
<NuGetPackageVersion Condition="'$(UpdateNightlyPackages)' == 'true'">$(NuGetPackageVersion)-b$(VersionBuild)</NuGetPackageVersion>
6+
</PropertyGroup>
77

8-
<Target Name="CopyInstallScripts">
9-
<Copy SourceFiles="@(NuGetInstallScripts)"
10-
DestinationFolder="$(AssemblyPath)"
11-
/>
12-
</Target>
13-
148
</Project>

0 commit comments

Comments
 (0)