diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2013-10-22 06:38:23 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2013-10-22 06:38:23 -0700 |
| commit | 5f12823a86c0cc6abbb7580054d7de969430ac7a (patch) | |
| tree | 733f2935e9ff96463cbbf1da95dacbbfc45a7a28 | |
| parent | e498061455d11f7d4bce5a4929b5ac79f3c68f71 (diff) | |
| download | DotNetOpenAuth-5f12823a86c0cc6abbb7580054d7de969430ac7a.zip DotNetOpenAuth-5f12823a86c0cc6abbb7580054d7de969430ac7a.tar.gz DotNetOpenAuth-5f12823a86c0cc6abbb7580054d7de969430ac7a.tar.bz2 | |
Removes delay-signing build authoring leftovers that was still breaking the build.v5.0.0-alpha2
29 files changed, 32 insertions, 139 deletions
@@ -52,15 +52,15 @@ </ProjectsToPublish> </ItemGroup> - <Target Name="BuildTests" DependsOnTargets="SkipVerification"> + <Target Name="BuildTests"> <MSBuild Projects="$(SolutionPath)" Targets="@(TestProjects)" BuildInParallel="$(BuildInParallel)" /> </Target> - <Target Name="Build" DependsOnTargets="SkipVerification"> + <Target Name="Build"> <MSBuild Projects="$(SolutionPath)" BuildInParallel="$(BuildInParallel)" /> </Target> - <Target Name="Rebuild" DependsOnTargets="SkipVerification"> + <Target Name="Rebuild"> <MSBuild Projects="$(SolutionPath)" Targets="Rebuild" BuildInParallel="$(BuildInParallel)" /> </Target> diff --git a/nuget/DotNetOpenAuth.Core.UI.nuspec b/nuget/DotNetOpenAuth.Core.UI.nuspec index 8faa36a..edb3a14 100644 --- a/nuget/DotNetOpenAuth.Core.UI.nuspec +++ b/nuget/DotNetOpenAuth.Core.UI.nuspec @@ -18,7 +18,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.Core.nuspec b/nuget/DotNetOpenAuth.Core.nuspec index dee8c84..133970e 100644 --- a/nuget/DotNetOpenAuth.Core.nuspec +++ b/nuget/DotNetOpenAuth.Core.nuspec @@ -21,7 +21,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.Mvc.nuspec b/nuget/DotNetOpenAuth.Mvc.nuspec index 1ee07a3..81a3842 100644 --- a/nuget/DotNetOpenAuth.Mvc.nuspec +++ b/nuget/DotNetOpenAuth.Mvc.nuspec @@ -25,7 +25,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OAuth.Common.nuspec b/nuget/DotNetOpenAuth.OAuth.Common.nuspec index cf2005d..959097e 100644 --- a/nuget/DotNetOpenAuth.OAuth.Common.nuspec +++ b/nuget/DotNetOpenAuth.OAuth.Common.nuspec @@ -17,7 +17,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec b/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec index c9359f6..a6c83ef 100644 --- a/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec +++ b/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec @@ -20,7 +20,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec b/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec index 012d165..c4b3b33 100644 --- a/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec +++ b/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec @@ -20,7 +20,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OAuth.nuspec b/nuget/DotNetOpenAuth.OAuth.nuspec index 7f8755f..1c42a77 100644 --- a/nuget/DotNetOpenAuth.OAuth.nuspec +++ b/nuget/DotNetOpenAuth.OAuth.nuspec @@ -18,7 +18,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec b/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec index 57695f5..5e5b336 100644 --- a/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec @@ -20,7 +20,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full" /> diff --git a/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec b/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec index 78b3780..aaf1edd 100644 --- a/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.Client.UI.nuspec @@ -20,7 +20,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full" /> diff --git a/nuget/DotNetOpenAuth.OAuth2.Client.nuspec b/nuget/DotNetOpenAuth.OAuth2.Client.nuspec index 5a230c0..452c172 100644 --- a/nuget/DotNetOpenAuth.OAuth2.Client.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.Client.nuspec @@ -21,7 +21,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full" /> diff --git a/nuget/DotNetOpenAuth.OAuth2.ClientAuthorization.nuspec b/nuget/DotNetOpenAuth.OAuth2.ClientAuthorization.nuspec index aa9157a..ec226da 100644 --- a/nuget/DotNetOpenAuth.OAuth2.ClientAuthorization.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.ClientAuthorization.nuspec @@ -16,7 +16,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$DotNetOpenAuth.OAuth2.ClientAuthorization.dll" target="lib\net45-full" /> + <file src="$OutputPath45$DotNetOpenAuth.OAuth2.ClientAuthorization.dll" target="lib\net45-full" /> <file src="$OutputPath45$DotNetOpenAuth.OAuth2.ClientAuthorization.pdb" target="lib\net45-full" /> <file src="$OutputPath45$DotNetOpenAuth.OAuth2.ClientAuthorization.xml" target="lib\net45-full" /> diff --git a/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec b/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec index b8a2695..fd9312a 100644 --- a/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec @@ -21,7 +21,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full" /> diff --git a/nuget/DotNetOpenAuth.OAuth2.nuspec b/nuget/DotNetOpenAuth.OAuth2.nuspec index ebd175c..35dd42c 100644 --- a/nuget/DotNetOpenAuth.OAuth2.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.nuspec @@ -18,7 +18,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full" /> diff --git a/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec index 1a57d35..6e5005d 100644 --- a/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.Provider.UI.nuspec @@ -23,7 +23,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OpenId.Provider.nuspec b/nuget/DotNetOpenAuth.OpenId.Provider.nuspec index ec137c8..645b370 100644 --- a/nuget/DotNetOpenAuth.OpenId.Provider.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.Provider.nuspec @@ -22,7 +22,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec index dadc73e..3d00fb0 100644 --- a/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.RelyingParty.UI.nuspec @@ -21,7 +21,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec b/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec index 68b5aab..c4004a3 100644 --- a/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec @@ -20,7 +20,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OpenId.UI.nuspec b/nuget/DotNetOpenAuth.OpenId.UI.nuspec index 6e69313..2d3aede 100644 --- a/nuget/DotNetOpenAuth.OpenId.UI.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.UI.nuspec @@ -17,7 +17,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OpenId.nuspec b/nuget/DotNetOpenAuth.OpenId.nuspec index 4572689..ff7ef6b 100644 --- a/nuget/DotNetOpenAuth.OpenId.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.nuspec @@ -21,15 +21,15 @@ </references> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> - <file src="$OutputPath45$$signedSubPath$Org.Mentalis.Security.Cryptography.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$Org.Mentalis.Security.Cryptography.dll" target="lib\net45-full\" /> <file src="$OutputPath45$Org.Mentalis.Security.Cryptography.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$Org.Mentalis.Security.Cryptography.xml" target="lib\net45-full\" /> - <file src="$OutputPath45$$signedSubPath$Mono.Math.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$Mono.Math.dll" target="lib\net45-full\" /> <file src="$OutputPath45$Mono.Math.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$Mono.Math.xml" target="lib\net45-full\" /> diff --git a/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec b/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec index 1cd690a..93db4e8 100644 --- a/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec +++ b/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec @@ -22,7 +22,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$$signedSubPath$$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$identity$.dll" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$$identity$.xml" target="lib\net45-full\" /> diff --git a/nuget/nuget.proj b/nuget/nuget.proj index e8f9c08..d3165bf 100644 --- a/nuget/nuget.proj +++ b/nuget/nuget.proj @@ -5,7 +5,6 @@ <Target Name="BuildIntermediates"> <ItemGroup> - <ProductTargets Include="ResignShippingDelaySignedAssemblies" Condition=" '$(SkipNugetDependenciesBuild)' != 'true' " /> <ProductTargets Include="Build;GetOutputPath" /> </ItemGroup> @@ -17,11 +16,6 @@ <Output TaskParameter="TargetOutputs" ItemName="TargetOutputs45"/> </MSBuild> - <ItemGroup> - <ResignedAssembliesOutputs Include="@(TargetOutputs45)" Condition=" '%(MSBuildSourceTargetName)' == 'Sign' "> - <TargetFramework>v4.5</TargetFramework> - </ResignedAssembliesOutputs> - </ItemGroup> <PropertyGroup> <OutputPath45 Condition=" '%(MSBuildSourceTargetName)' == 'GetOutputPath' ">@(TargetOutputs45)</OutputPath45> </PropertyGroup> @@ -33,7 +27,6 @@ <NuGetProperties Include="oauth2version=$(NuGetPackageVersion)" /> <NuGetProperties Include="OutputPath45=$(OutputPath45)" /> <NuGetProperties Include="IntermediatePath=$(IntermediatePath45)" /> - <NuGetProperties Include="signedSubPath=$(SignedSubPath)" /> <NuGetSpecifications Include="*.nuspec" Exclude="DotNetOpenAuth.nuspec"> <Symbols>true</Symbols> diff --git a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj index c0e6282..232cacd 100644 --- a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj +++ b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj @@ -200,18 +200,6 @@ </BootstrapperPackage> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <ILMergeProjectOutputAssembly>$(ILMergeOutputAssemblyDirectory)$(TargetName)$(TargetExt)</ILMergeProjectOutputAssembly> - <!-- Don't sign the non-unified version of the assembly. --> - <SuppressTargetPathDelaySignedAssembly>true</SuppressTargetPathDelaySignedAssembly> - </PropertyGroup> - <!-- These items should never be visible. In the project source tree, they're invisible because of an ItemDefinitionGroup - in DotNetOpenAuth.props. But in the shipping samples that file is not included, so we must still set Visible=false explicitly.. --> - <ItemGroup> - <DelaySignedAssemblies Include="$(TargetPath)"> - <Visible>false</Visible> - </DelaySignedAssemblies> - </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\src\DotNetOpenAuth.Core\DotNetOpenAuth.Core.csproj"> <Project>{60426312-6AE5-4835-8667-37EDEA670222}</Project> diff --git a/samples/Samples.proj b/samples/Samples.proj index 9c086ae..df3eb97 100644 --- a/samples/Samples.proj +++ b/samples/Samples.proj @@ -21,7 +21,7 @@ <PublishableWebSamples Include="@(_SampleWebConfigs->'%(RootDir)%(Directory)')" /> </ItemGroup> - <Target Name="Build" DependsOnTargets="SkipVerification"> + <Target Name="Build"> <ItemGroup> <SampleProjectsToBuild Include="@(SampleProjects)" /> </ItemGroup> diff --git a/samples/tools.proj b/samples/tools.proj index 42a6a47..60786e9 100644 --- a/samples/tools.proj +++ b/samples/tools.proj @@ -11,7 +11,7 @@ <ItemGroup> <ToolProjects Include="$(ProjectRoot)Samples\OpenIdOfflineProvider\OpenIdOfflineProvider.csproj"> - <Targets>Sign</Targets> + <Targets>Build</Targets> </ToolProjects> </ItemGroup> @@ -25,7 +25,6 @@ Condition=" '%(ToolProjectsOutputs.CopyLocal)' != 'false' " Exclude=" $(OutputPath)$(ProductName).dll; - $(OutputPath)$(SignedSubPath)$(ProductName).dll; $(OutputPath)System.Web.Mvc.dll; " /> diff --git a/tools/DotNetOpenAuth.automated.targets b/tools/DotNetOpenAuth.automated.targets index 5276327..1c4bc15 100644 --- a/tools/DotNetOpenAuth.automated.targets +++ b/tools/DotNetOpenAuth.automated.targets @@ -28,11 +28,7 @@ </PropertyGroup> </Target> - <Target Name="SkipVerification" Condition="'$(IsElevated)' == 'true'"> - <SignatureVerification SkipVerification="true" AssemblyName="*" PublicKeyToken="$(PublicKeyToken)" /> - </Target> - - <Target Name="BuildProduct" DependsOnTargets="SkipVerification"> + <Target Name="BuildProduct"> <MSBuild BuildInParallel="$(BuildInParallel)" Projects="@(ProductProjects)" /> </Target> diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index 3112b4f..e965c22 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -24,7 +24,6 @@ <KeyPairContainer Condition="'$(KeyPairContainer)' == ''">DotNetOpenAuth</KeyPairContainer> <PublicKeyToken>d0acff3d13b42a9d</PublicKeyToken> <DelaySign>false</DelaySign> - <SignedSubPath Condition=" '$(DelaySign)' == 'true' ">signed\</SignedSubPath> </PropertyGroup> <ItemGroup> @@ -56,20 +55,9 @@ "> </ProductProjectNames> <ProductProjects Include="@(ProductProjectNames->'$(ProjectRoot)src\%(Identity)\%(Identity).csproj')"/> - <DelaySignedProjects Include=" - @(ProductProjects); - " /> - <DelaySignedProjects Include="$(ProjectRoot)src\dotnetopenauth.test\dotnetopenauth.test.csproj"> - <Nonshipping>true</Nonshipping> - </DelaySignedProjects> - <DelaySignedProjects Include="$(ProjectRoot)samples\openidofflineprovider\openidofflineprovider.csproj"> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - </DelaySignedProjects> <ProjectReferencesToRemove Include="@(ProductProjectNames->'..\..\src\%(Identity)\%(Identity).csproj')" /> <AssemblyReferencesToReplaceWith Include="@(ProjectReferencesToRemove->'..\..\Bin-net4.0\$(ProductName).dll')" /> - - <SignDependsOn Include="Build" Condition=" '$(SuppressBuildTarget)' != 'true' " /> </ItemGroup> <Import Project="$(ProjectRoot)lib\DotNetOpenAuth.BuildTasks.targets" /> diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets index fdea759..6d0ebb0 100644 --- a/tools/DotNetOpenAuth.targets +++ b/tools/DotNetOpenAuth.targets @@ -3,25 +3,11 @@ <Import Project="DotNetOpenAuth.Versioning.targets" /> <Import Project="JavascriptPacker.targets" /> - <!-- Prevent our own item types from appearing in Solution Explorer. --> - <ItemDefinitionGroup> - <SignDependsOn> - <Visible>false</Visible> - </SignDependsOn> - <DelaySignedAssemblies> - <Visible>false</Visible> - </DelaySignedAssemblies> - </ItemDefinitionGroup> - <PropertyGroup> <DefineConstants Condition=" '$(SignAssembly)' == 'true' ">$(DefineConstants);StrongNameSigned</DefineConstants> <AssemblySearchPaths>$(ProjectRoot)lib;$(AssemblySearchPaths)</AssemblySearchPaths> </PropertyGroup> - <ItemGroup> - <DelaySignedAssemblies Include="$(TargetPath)" Condition=" '$(SuppressTargetPathDelaySignedAssembly)' != 'true' "/> - </ItemGroup> - <!-- This is our multi-targeting aware shadow assembly generator. --> <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="Publicize" /> <PropertyGroup> @@ -47,61 +33,5 @@ </Publicize> </Target> - <Target Name="Sign" DependsOnTargets="@(SignDependsOn)" Outputs="@(SignedDependencies);@(SignedAssemblyTargets)" Condition=" '@(DelaySignedAssemblies)' != '' and '$(DelaySign)' == 'true' "> - <!-- Make sure that all dependencies are also signed. --> - <MSBuild Projects="@(ProjectReference)" Targets="Sign" BuildInParallel="$(BuildInParallel)"> - <Output TaskParameter="TargetOutputs" ItemName="SignedDependencies"/> - </MSBuild> - - <!-- Add the resource assemblies. --> - <ItemGroup> - <!-- Make sure that we consider the TargetPath's satellites even if TargetPath itself was suppressed. --> - <DelaySignedAssembliesForSatellites Include="@(DelaySignedAssemblies)" /> - <DelaySignedAssembliesForSatellites Include="$(TargetPath)" Condition=" '$(SuppressTargetPathDelaySignedAssembly)' == 'true' "/> - </ItemGroup> - <PropertyGroup> - <DelaySignedSatelliteAssembliesPattern>@(DelaySignedAssembliesForSatellites->'%(RootDir)%(Directory)*\%(FileName).resources.*')</DelaySignedSatelliteAssembliesPattern> - </PropertyGroup> - <ItemGroup> - <DelaySignedSatelliteAssemblies Include="$(DelaySignedSatelliteAssembliesPattern)" /> - <DelaySignedSatelliteAssemblies> - <CultureDir>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName('%(Directory)'))))\</CultureDir> - </DelaySignedSatelliteAssemblies> - </ItemGroup> - - <!-- Don't sign assemblies in place. Lots of reasons for this, not the least of which is that - subsequent builds of web site projects will cause the satellite assemblies to be regenerated (bizarre) - and erase the signature. --> - <ItemGroup> - <AssembliesToSign Include="@(DelaySignedAssemblies);@(DelaySignedSatelliteAssemblies)" /> - <SignedAssemblyTargets Include="@(AssembliesToSign->'%(RootDir)%(Directory)$(SignedSubPath)%(FileName)%(Extension)')"> - <UnsignedAssemblyPath>%(AssembliesToSign.Identity)</UnsignedAssemblyPath> - <SymbolPath Condition="Exists('%(RootDir)%(Directory)%(FileName).pdb')">%(RootDir)%(Directory)%(FileName).pdb</SymbolPath> - <XmlDocumentationFile Condition="Exists('%(RootDir)%(Directory)%(FileName).xml')">%(RootDir)%(Directory)%(FileName).xml</XmlDocumentationFile> - </SignedAssemblyTargets> - </ItemGroup> - - <Message Text="Signing delay-signed assemblies using key pair container $(KeyPairContainer)." /> - <Copy SourceFiles="@(AssembliesToSign)" DestinationFiles="@(SignedAssemblyTargets)" /> - <ReSignDelaySignedAssemblies - KeyContainer="$(KeyPairContainer)" - Assemblies="@(SignedAssemblyTargets)" - Condition="Exists(%(Identity))" /> - </Target> - - <Target Name="ResignDelaySignedAssemblies" Outputs="@(ResignedAssembliesOutputs)"> - <MSBuild Projects="@(DelaySignedProjects)" Targets="Sign" BuildInParallel="$(BuildInParallel)" - Condition=" '%(DelaySignedProjects.TargetFrameworkVersion)' == '' or '%(DelaySignedProjects.TargetFrameworkVersion)' == '$(TargetFrameworkVersion)' "> - <Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs"/> - </MSBuild> - </Target> - - <Target Name="ResignShippingDelaySignedAssemblies" Outputs="@(ResignedAssembliesOutputs)"> - <MSBuild Projects="@(DelaySignedProjects)" Targets="Sign" BuildInParallel="$(BuildInParallel)" - Condition=" '%(DelaySignedProjects.Nonshipping)' != 'true' and ('%(DelaySignedProjects.TargetFrameworkVersion)' == '' or '%(DelaySignedProjects.TargetFrameworkVersion)' == '$(TargetFrameworkVersion)') "> - <Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs"/> - </MSBuild> - </Target> - <Target Name="GetOutputPath" Outputs="$(OutputPath)" /> </Project> diff --git a/tools/drop.proj b/tools/drop.proj index 469864a..d502381 100644 --- a/tools/drop.proj +++ b/tools/drop.proj @@ -4,11 +4,10 @@ <Import Project="$(MSBuildProjectDirectory)\DotNetOpenAuth.automated.props"/> <Target Name="LayoutDependencies"> - <MSBuild Projects="@(DelaySignedProjects)" + <MSBuild Projects="@(ProductProjects)" Properties="TargetFrameworkVersion=v4.5" - Targets="Sign" - BuildInParallel="$(BuildInParallel)" - Condition=" '%(DelaySignedProjects.Nonshipping)' != 'true' " /> + Targets="Build" + BuildInParallel="$(BuildInParallel)" /> </Target> <Target Name="Layout" DependsOnTargets="LayoutDependencies"> @@ -58,7 +57,7 @@ $(ProjectRoot)Doc\README.Bin.html; $(ProjectRoot)src\$(ProductName).Core\Configuration\$(ProductName).xsd; " /> - <DropSatelliteSourceFiles Include="$(OutputPath)**\$(SignedSubPath)$(ProductName).resources.dll" /> + <DropSatelliteSourceFiles Include="$(OutputPath)**\$(ProductName).resources.dll" /> <DropSatelliteSourceFiles> <CultureDir>$([System.IO.Path]::GetDirectoryName('$([System.IO.Path]::GetDirectoryName('%(RecursiveDir)'))'))\</CultureDir> </DropSatelliteSourceFiles> |