diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-12-28 10:13:08 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-12-28 10:13:08 -0800 |
| commit | f44b82d128498f8e4b34026f0d72ffe39ee43575 (patch) | |
| tree | 05555b3936290adf9cb60fa7d981dc2ad5baa620 | |
| parent | 8d8ee552e4145a4bd8a5fafc2f69e2e7daab1343 (diff) | |
| parent | 9ef84d521d3443355b538e2533e3aa9183704c34 (diff) | |
| download | DotNetOpenAuth-f44b82d128498f8e4b34026f0d72ffe39ee43575.zip DotNetOpenAuth-f44b82d128498f8e4b34026f0d72ffe39ee43575.tar.gz DotNetOpenAuth-f44b82d128498f8e4b34026f0d72ffe39ee43575.tar.bz2 | |
Merge branch 'v4.2'
Conflicts:
src/version.txt
| -rw-r--r-- | nuget/nuget.proj | 8 | ||||
| -rw-r--r-- | src/version.txt | 1 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.Versioning.targets | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/nuget/nuget.proj b/nuget/nuget.proj index 4d79d1f..9c26760 100644 --- a/nuget/nuget.proj +++ b/nuget/nuget.proj @@ -68,20 +68,16 @@ <Target Name="Build" DependsOnTargets="BuildIntermediates" Returns="@(NuGetPackages)"> <ItemGroup> <NuGetProperties Include="version=$(NuGetPackageVersion)" /> - <NuGetProperties Include="oauth2version=$(OAuth2PackagesVersion)" /> + <NuGetProperties Include="oauth2version=$(NuGetPackageVersion)" /> <NuGetProperties Include="OutputPath35=$(OutputPath35)" /> <NuGetProperties Include="OutputPath40=$(OutputPath40)" /> <NuGetProperties Include="OutputPath45=$(OutputPath45)" /> <NuGetProperties Include="IntermediatePath=$(IntermediatePath40)" /> - <NuGetSpecifications Include="*.nuspec" Exclude="*oauth2*.nuspec;DotNetOpenAuth.nuspec"> + <NuGetSpecifications Include="*.nuspec" Exclude="DotNetOpenAuth.nuspec"> <Symbols>true</Symbols> <PackageVersion>$(NuGetPackageVersion)</PackageVersion> </NuGetSpecifications> - <NuGetSpecifications Include="*oauth2*.nuspec" Exclude="DotNetOpenAuth.nuspec"> - <Symbols>true</Symbols> - <PackageVersion>$(OAuth2PackagesVersion)</PackageVersion> - </NuGetSpecifications> <NuGetSpecifications Include="DotNetOpenAuth.nuspec"> <PackageVersion>$(NuGetPackageVersion)</PackageVersion> </NuGetSpecifications> diff --git a/src/version.txt b/src/version.txt index d4cc3af..5759ac6 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1,3 +1,2 @@ 5.0.0 -beta -0.27.0-draft1 diff --git a/tools/DotNetOpenAuth.Versioning.targets b/tools/DotNetOpenAuth.Versioning.targets index 0412571..0105071 100644 --- a/tools/DotNetOpenAuth.Versioning.targets +++ b/tools/DotNetOpenAuth.Versioning.targets @@ -18,7 +18,6 @@ <Output TaskParameter="SimpleVersion" PropertyName="BuildVersionSimple" /> <Output TaskParameter="PrereleaseVersion" PropertyName="PrereleaseVersion" /> <Output TaskParameter="MajorMinorVersion" PropertyName="MajorMinorVersion" /> - <Output TaskParameter="OAuth2PackagesVersion" PropertyName="OAuth2PackagesVersion" /> <Output TaskParameter="GitCommitId" PropertyName="GitCommitId" /> <Output TaskParameter="BuildNumber" PropertyName="BuildNumber" /> </GetBuildVersion> |