huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add certificate names for code signing (#889)

This commit is contained in:
Nate McMaster 2018-06-06 08:55:18 -07:00 committed by GitHub
parent 1822992354
commit 5ebf74fa32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Directory.Build.props
View File

@ -1,4 +1,4 @@
<Project> <Project>
<Import <Import
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props" Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " /> Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
@ -14,6 +14,8 @@
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot> <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
<PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>

49
build/repo.targets
View File

@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<PrepareDependsOn>InitializeComponents;$(PrepareDependsOn)</PrepareDependsOn> <PrepareDependsOn>InitializeComponents;$(PrepareDependsOn)</PrepareDependsOn>
<GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetNativeArtifactsInfo</GetArtifactInfoDependsOn>
<CompileDependsOn Condition="'$(OS)'=='Windows_NT'">BuildNativeAssets;$(CompileDependsOn)</CompileDependsOn> <CompileDependsOn Condition="'$(OS)'=='Windows_NT'">BuildNativeAssets;$(CompileDependsOn)</CompileDependsOn>
<PackageDependsOn Condition="'$(OS)'=='Windows_NT'">$(PackageDependsOn);PackageNativeProjects</PackageDependsOn> <PackageDependsOn Condition="'$(OS)'=='Windows_NT'">$(PackageDependsOn);PackageNativeProjects</PackageDependsOn>
<TestDependsOn>$(TestDependsOn);RunNativeTest</TestDependsOn> <TestDependsOn>$(TestDependsOn);RunNativeTest</TestDependsOn>
@ -61,33 +62,35 @@
Condition="'$(VisualStudioMSBuildx86Path)' != ''" /> Condition="'$(VisualStudioMSBuildx86Path)' != ''" />
</Target> </Target>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' "> <Target Name="GetNativeArtifactsInfo" DependsOnTargets="InitializeComponents">
<ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg"> <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<ArtifactType>NuGetPackage</ArtifactType> <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg">
<PackageId>Microsoft.AspNetCore.AspNetCoreModule</PackageId> <ArtifactType>NuGetPackage</ArtifactType>
<Version>$(PackageVersion)</Version> <PackageId>Microsoft.AspNetCore.AspNetCoreModule</PackageId>
<RepositoryRoot>$(RepositoryRoot)</RepositoryRoot> <Version>$(PackageVersion)</Version>
</ArtifactInfo> <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
<FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg" /> </ArtifactInfo>
<FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg" />
<ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg"> <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg">
<ArtifactType>NuGetPackage</ArtifactType> <ArtifactType>NuGetPackage</ArtifactType>
<PackageId>Microsoft.AspNetCore.AspNetCoreModuleV2</PackageId> <PackageId>Microsoft.AspNetCore.AspNetCoreModuleV2</PackageId>
<Version>$(PackageVersion)</Version> <Version>$(PackageVersion)</Version>
<RepositoryRoot>$(RepositoryRoot)</RepositoryRoot> <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
</ArtifactInfo> </ArtifactInfo>
<FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg" /> <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg" />
<ArtifactInfo Include="$(AncmZipOutputPath)"> <ArtifactInfo Include="$(AncmZipOutputPath)">
<ArtifactType>ZipArchive</ArtifactType> <ArtifactType>ZipArchive</ArtifactType>
<RepositoryRoot>$(RepositoryRoot)</RepositoryRoot> <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
<Category>shipoob</Category> <Category>shipoob</Category>
</ArtifactInfo> </ArtifactInfo>
<FilesToSign Include="$(AncmZipOutputPath)" IsContainer="true" /> <FilesToSign Include="$(AncmZipOutputPath)" IsContainer="true" />
<FilesToSign Include="%(Components.BaseOutputPath)/%(Components.Platform)/%(Components.NativeAsset).dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" /> <FilesToSign Include="@(Components->'%(BaseOutputPath)/%(Platform)/%(NativeAsset).dll')" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
</ItemGroup> </ItemGroup>
</Target>
<Target Name="PackageNativeProjects"> <Target Name="PackageNativeProjects">
<PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\AspNetCoreV1.nuspec" <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\AspNetCoreV1.nuspec"

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.2.0-preview1-17067 version:2.2.0-preview1-17075
commithash:2af0e2e3d02329b4f0290061ab9bd8c7ca1aa26f commithash:d9f07c7f313a0af1d49f003f5424b4dbbdd3e09f

5
src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
View File

@ -23,14 +23,11 @@
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<SignedPackageFile Include="$(TargetPath)" PackagePath="lib/netstandard2.0/Microsoft.AspNetCore.Server.IIS.dll" Certificate="Microsoft" />
</ItemGroup>
<ItemGroup Condition="$(PackNativeAssets) == 'true'"> <ItemGroup Condition="$(PackNativeAssets) == 'true'">
<SignedPackageFile Include="aspnetcorev2_inprocess_x86" PackagePath="runtimes/win-x86/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" Certificate="Microsoft" /> <SignedPackageFile Include="aspnetcorev2_inprocess_x86" PackagePath="runtimes/win-x86/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" Certificate="Microsoft" />
<SignedPackageFile Include="aspnetcorev2_inprocess_x64" PackagePath="runtimes/win-x64/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" Certificate="Microsoft" /> <SignedPackageFile Include="aspnetcorev2_inprocess_x64" PackagePath="runtimes/win-x64/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" Certificate="Microsoft" />
<Content Include="$(PackageId).targets" PackagePath="build/$(TargetFramework)/" />
<Content Include="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_inprocess.dll" PackagePath="runtimes/win-x86/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" /> <Content Include="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_inprocess.dll" PackagePath="runtimes/win-x86/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" />
<Content Include="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll" PackagePath="runtimes/win-x64/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" /> <Content Include="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll" PackagePath="runtimes/win-x64/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" />
</ItemGroup> </ItemGroup>

32
src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec
View File

@ -1,32 +0,0 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Microsoft.AspNetCore.Server.IIS</id>
<version>$version$</version>
<authors>$author$</authors>
<licenseUrl>$licenseUrl$</licenseUrl>
<copyright>$copyright$</copyright>
<projectUrl>$projectUrl$</projectUrl>
<iconUrl>$iconUrl$</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>$description$</description>
<language>en-US</language>
<tags>aspnetcore iis</tags>
<serviceable>$serviceable$</serviceable>
<repository type="$repositoryType$" url="$repositoryUrl$" commit="$repositoryCommit$" />
<dependencies>
<group targetFramework="$tfmGroup$">
<dependency id="Microsoft.AspNetCore.Server.IISIntegration" version="[$version$ , )" />
</group>
</dependencies>
</metadata>
<files>
<!-- The _._ placeholder file will instruct NuGet to treat this package as only being compatible with $tfm$ -->
<file src="_._" target="lib/$tfm$/" />
<file src="Microsoft.AspNetCore.Server.IIS.targets" target="build/$tfm$/Microsoft.AspNetCore.Server.IIS.targets" />
<file src="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$Configuration$\Win32\aspnetcorev2_inprocess.dll" target="runtimes\win-x86\nativeassets\$tfm$\aspnetcorev2_inprocess.dll" />
<file src="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$Configuration$\x64\aspnetcorev2_inprocess.dll" target="runtimes\win-x64\nativeassets\$tfm$\aspnetcorev2_inprocess.dll" />
</files>
</package>