diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2013-06-16 15:45:15 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2013-06-16 15:45:15 -0700 |
| commit | 6616faa0d09dc0fd6f60bc5ce122476aefaec44c (patch) | |
| tree | a5f5519bc8a75489436719b7f3dc83daa26e7186 | |
| parent | 69bbeda7ad2923c1b3033f99e6d1b841a09fbe8a (diff) | |
| download | DotNetOpenAuth-6616faa0d09dc0fd6f60bc5ce122476aefaec44c.zip DotNetOpenAuth-6616faa0d09dc0fd6f60bc5ce122476aefaec44c.tar.gz DotNetOpenAuth-6616faa0d09dc0fd6f60bc5ce122476aefaec44c.tar.bz2 | |
Fixes build break from the signing change in the build.
Closes #288
26 files changed, 28 insertions, 27 deletions
diff --git a/nuget/DotNetOpenAuth.AspNet.nuspec b/nuget/DotNetOpenAuth.AspNet.nuspec index 28fb2fa..ff0db0d 100644 --- a/nuget/DotNetOpenAuth.AspNet.nuspec +++ b/nuget/DotNetOpenAuth.AspNet.nuspec @@ -21,7 +21,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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.UI.nuspec b/nuget/DotNetOpenAuth.Core.UI.nuspec index 886ea51..8faa36a 100644 --- a/nuget/DotNetOpenAuth.Core.UI.nuspec +++ b/nuget/DotNetOpenAuth.Core.UI.nuspec @@ -18,7 +18,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 2c8ef10..dee8c84 100644 --- a/nuget/DotNetOpenAuth.Core.nuspec +++ b/nuget/DotNetOpenAuth.Core.nuspec @@ -21,7 +21,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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.InfoCard.UI.nuspec b/nuget/DotNetOpenAuth.InfoCard.UI.nuspec index 32d092c..f22a52c 100644 --- a/nuget/DotNetOpenAuth.InfoCard.UI.nuspec +++ b/nuget/DotNetOpenAuth.InfoCard.UI.nuspec @@ -23,7 +23,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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.InfoCard.nuspec b/nuget/DotNetOpenAuth.InfoCard.nuspec index 8080e98..4cfcc17 100644 --- a/nuget/DotNetOpenAuth.InfoCard.nuspec +++ b/nuget/DotNetOpenAuth.InfoCard.nuspec @@ -21,7 +21,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 df01af6..cf2005d 100644 --- a/nuget/DotNetOpenAuth.OAuth.Common.nuspec +++ b/nuget/DotNetOpenAuth.OAuth.Common.nuspec @@ -17,7 +17,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 4531d1a..c9359f6 100644 --- a/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec +++ b/nuget/DotNetOpenAuth.OAuth.Consumer.nuspec @@ -20,7 +20,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 ac0b355..012d165 100644 --- a/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec +++ b/nuget/DotNetOpenAuth.OAuth.ServiceProvider.nuspec @@ -20,7 +20,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 d673d73..7f8755f 100644 --- a/nuget/DotNetOpenAuth.OAuth.nuspec +++ b/nuget/DotNetOpenAuth.OAuth.nuspec @@ -18,7 +18,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 0ab7256..57695f5 100644 --- a/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.AuthorizationServer.nuspec @@ -20,7 +20,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$signedSubPath$$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 bda6c93..78b3780 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$signed\$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$signedSubPath$$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 dc10461..5a230c0 100644 --- a/nuget/DotNetOpenAuth.OAuth2.Client.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.Client.nuspec @@ -21,7 +21,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$signedSubPath$$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 305fea3..aa9157a 100644 --- a/nuget/DotNetOpenAuth.OAuth2.ClientAuthorization.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.ClientAuthorization.nuspec @@ -16,7 +16,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\DotNetOpenAuth.OAuth2.ClientAuthorization.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$signedSubPath$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 6d1a8bc..b8a2695 100644 --- a/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.ResourceServer.nuspec @@ -21,7 +21,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$signedSubPath$$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 4969f7f..ebd175c 100644 --- a/nuget/DotNetOpenAuth.OAuth2.nuspec +++ b/nuget/DotNetOpenAuth.OAuth2.nuspec @@ -18,7 +18,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full" /> + <file src="$OutputPath45$$signedSubPath$$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 38b4b69..1a57d35 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$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 1ed02fa..ec137c8 100644 --- a/nuget/DotNetOpenAuth.OpenId.Provider.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.Provider.nuspec @@ -22,7 +22,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 47e6e8e..dadc73e 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$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 2c27006..68b5aab 100644 --- a/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.RelyingParty.nuspec @@ -20,7 +20,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 64f633e..6e69313 100644 --- a/nuget/DotNetOpenAuth.OpenId.UI.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.UI.nuspec @@ -17,7 +17,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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 7f3b135..4572689 100644 --- a/nuget/DotNetOpenAuth.OpenId.nuspec +++ b/nuget/DotNetOpenAuth.OpenId.nuspec @@ -21,15 +21,15 @@ </references> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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$signed\Org.Mentalis.Security.Cryptography.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$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$signed\Mono.Math.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$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.OpenIdInfoCard.UI.nuspec b/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec index f48e23f..33f8cbe 100644 --- a/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec +++ b/nuget/DotNetOpenAuth.OpenIdInfoCard.UI.nuspec @@ -22,7 +22,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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.OpenIdOAuth.nuspec b/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec index 80fecd7..1cd690a 100644 --- a/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec +++ b/nuget/DotNetOpenAuth.OpenIdOAuth.nuspec @@ -22,7 +22,7 @@ </dependencies> </metadata> <files> - <file src="$OutputPath45$signed\$identity$.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$$signedSubPath$$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.Ultimate.nuspec b/nuget/DotNetOpenAuth.Ultimate.nuspec index 079c002..006679f 100644 --- a/nuget/DotNetOpenAuth.Ultimate.nuspec +++ b/nuget/DotNetOpenAuth.Ultimate.nuspec @@ -18,7 +18,7 @@ <language>en-US</language> </metadata> <files> - <file src="$OutputPath45$unified\signed\DotNetOpenAuth.dll" target="lib\net45-full\" /> + <file src="$OutputPath45$unified\$signedSubPath$DotNetOpenAuth.dll" target="lib\net45-full\" /> <file src="$OutputPath45$unified\DotNetOpenAuth.pdb" target="lib\net45-full\" /> <file src="$OutputPath45$unified\DotNetOpenAuth.xml" target="lib\net45-full\" /> <file src="content\Ultimate\net45-full\web.config.transform" target="content\net45-full\web.config.transform" /> diff --git a/nuget/nuget.proj b/nuget/nuget.proj index 70ea43b..d2ebfc1 100644 --- a/nuget/nuget.proj +++ b/nuget/nuget.proj @@ -49,6 +49,7 @@ <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/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index 739c94b..e174169 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -25,7 +25,7 @@ <KeyPairContainer Condition="'$(KeyPairContainer)' == ''">DotNetOpenAuth</KeyPairContainer> <PublicKeyToken>d0acff3d13b42a9d</PublicKeyToken> <DelaySign>false</DelaySign> - <SignedSubPath>signed\</SignedSubPath> + <SignedSubPath Condition=" '$(DelaySign)' == 'true' ">signed\</SignedSubPath> <ILMergeOutputAssemblyDirectory>$(OutputPath)unified\</ILMergeOutputAssemblyDirectory> <ILMergeOutputAssembly45Directory>$(OutputPath45)unified\</ILMergeOutputAssembly45Directory> |