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

Fix microbuild signing configuration

This commit is contained in:
Nate McMaster 2018-09-28 10:36:24 -07:00
parent 689e439b94
commit 47ae0c15cc
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Directory.Build.props
View File

@ -14,9 +14,6 @@
<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>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

14
src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj
View File

@ -22,11 +22,17 @@
<PackageReference Update="Microsoft.NETCore.App" PrivateAssets="All" /> <PackageReference Update="Microsoft.NETCore.App" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<SignedPackageFile Include="$(TargetPath)" PackagePath="build/netstandard2.0/netcoreapp2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.dll" Certificate="$(AssemblySigningCertName)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<SignedPackageFile Include="$(TargetDir)\$(AssemblyName)-x86.exe" PackagePath="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.exe" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="$(TargetDir)\$(AssemblyName).exe" PackagePath="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.exe" Certificate="$(AssemblySigningCertName)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == ''"> <ItemGroup Condition="'$(TargetFramework)' == ''">
<SignedPackageFile Include="build/netstandard2.0/netcoreapp2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.dll" Certificate="$(AssemblySigningCertName)" /> <SignedPackageFile Include="$(TasksProjectDirectory)bin\$(Configuration)\netstandard2.0\$(AssemblyName).Tasks.dll;" PackagePath="build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.exe" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.exe" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll" Certificate="$(AssemblySigningCertName)" />
</ItemGroup> </ItemGroup>
<Target Name="BuildX86" AfterTargets="Build" Condition="'$(TargetFramework)'=='net461' AND '$(PlatformTarget)'!='x86'"> <Target Name="BuildX86" AfterTargets="Build" Condition="'$(TargetFramework)'=='net461' AND '$(PlatformTarget)'!='x86'">