OAuth2 NuGet packages no longer version separately.

DotNetOpenAuth · Dec 27, 2012 · 9ef84d5 · 9ef84d5
1 parent 449d42c
commit 9ef84d5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -1,3 +1,2 @@
 4.2.0
 -beta
-0.26.0-draft1
diff --git 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>