Fixed NuGet package to support both .NET 3.5 and 4.0.

DotNetOpenAuth · Jan 16, 2012 · 6977155 · 6977155
1 parent 522e1c9
commit 6977155
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/nuget/nuget.proj b/nuget/nuget.proj
@@ -16,8 +16,10 @@
 		<ItemGroup>
 			<NuGetSource Include="%(ResignedAssembliesOutputs.Identity)" Condition=" '%(FileName)%(Extension)' == 'DotNetOpenAuth.dll' "/>
 			<NuGetSource>
-				<TargetPath Condition=" '$(ClrVersion)' == '2' ">$(NuGetLayoutPath)lib\full\%(FileName)%(Extension)</TargetPath>
-				<TargetPath Condition=" '$(ClrVersion)' == '4' ">$(NuGetLayoutPath)lib\net40-full\%(FileName)%(Extension)</TargetPath>
+				<TargetPath>$(NuGetLayoutPath)lib\net40-full\%(FileName)%(Extension)</TargetPath>
+			</NuGetSource>
+			<NuGetSource Condition=" '$(ClrVersion)' == '2' " Include="@(NuGetSource)">
+				<TargetPath>$(NuGetLayoutPath)lib\full\%(FileName)%(Extension)</TargetPath>
 			</NuGetSource>
 		</ItemGroup>
 		<ItemGroup>
@@ -52,7 +54,7 @@
 
 		<Purge Directories="$(NuGetLayoutPath)" IntendedFiles="@(NuGetContentsTarget);@(NuSpecTarget)" />
 	</Target>
-	
+
 	<Target Name="Build" DependsOnTargets="Layout">
 		<NuGetPack
 			NuSpec="%(NuSpecTarget.Identity)"
@@ -63,4 +65,4 @@
 
 	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.automated.targets"/>
 	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-</Project>
+</Project>