Target exclusively .NET Framework 4.5.

5 files changed, 11 insertions, 90 deletions

diff --git a/tools/DotNetOpenAuth.Product.props b/tools/DotNetOpenAuth.Product.props
index 5e6efba..dd3b142 100644
--- a/tools/DotNetOpenAuth.Product.props
+++ b/tools/DotNetOpenAuth.Product.props
@@ -61,7 +61,7 @@ http://opensource.org/licenses/ms-pl.html
 		<Reference Include="System.IdentityModel">
 			<RequiredTargetFramework>3.0</RequiredTargetFramework>
 		</Reference>
-		<Reference Include="System.IdentityModel.Selectors" Condition=" '$(ClrVersion)' == '4' ">
+		<Reference Include="System.IdentityModel.Selectors">
 			<RequiredTargetFramework>4.0</RequiredTargetFramework>
 		</Reference>
 		<Reference Include="System.Runtime.Serialization">
@@ -99,19 +99,7 @@ http://opensource.org/licenses/ms-pl.html
 		<Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(ClrVersion)' == '4' ">
+	<ItemGroup>
 		<Reference Include="System.Xaml" />
-		<Reference Include="System.Net.Http" />
-	</ItemGroup>
-	<ItemGroup Condition=" '$(ClrVersion)' != '4' ">
-		<Reference Include="System.Web.Mobile" />
-		<Reference Include="PresentationFramework">
-			<!-- For XamlReader, but we use System.Xaml.dll in .NET 4.0 -->
-			<RequiredTargetFramework>3.0</RequiredTargetFramework>
-		</Reference>
-		<Reference Include="WindowsBase">
-			<!-- ObservableCollection<T>, moved to System.dll in .NET 4.0 -->
-			<RequiredTargetFramework>3.0</RequiredTargetFramework>
-		</Reference>
 	</ItemGroup>
 </Project>
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
index 09d98bf..942a456 100644
--- a/tools/DotNetOpenAuth.props
+++ b/tools/DotNetOpenAuth.props
@@ -3,27 +3,21 @@
 	<PropertyGroup>
 		<ProductName>DotNetOpenAuth</ProductName>
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>
+		<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 		<DisableFastUpToDateCheck>false</DisableFastUpToDateCheck>
 		<DropsRoot>$(ProjectRoot)drops\$(TargetFrameworkVersion)\$(Configuration)\</DropsRoot>
 		<OutputPath>$(ProjectRoot)bin\$(TargetFrameworkVersion)\$(Configuration)\</OutputPath>
-		<OutputPath35>$(ProjectRoot)bin\v3.5\$(Configuration)\</OutputPath35>
-		<OutputPath40>$(ProjectRoot)bin\v4.0\$(Configuration)\</OutputPath40>
 		<OutputPath45>$(ProjectRoot)bin\v4.5\$(Configuration)\</OutputPath45>
 		<DocOutputPath>$(ProjectRoot)doc\</DocOutputPath>
 		<IntermediatePath>$(ProjectRoot)obj\$(TargetFrameworkVersion)\$(Configuration)\</IntermediatePath>
-		<IntermediatePath40>$(ProjectRoot)obj\v4.0\$(Configuration)\</IntermediatePath40>
+		<IntermediatePath45>$(ProjectRoot)obj\v4.5\$(Configuration)\</IntermediatePath45>
 		<BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">obj\$(TargetFrameworkVersion)\</BaseIntermediateOutputPath>
 		<ToolsDir>$(ProjectRoot)tools\</ToolsDir>
 		<ZipLevel>6</ZipLevel>
 		<Zip7ToolPath>$(ToolsDir)7-Zip.x86\</Zip7ToolPath>
 		<NuGetToolPath>$(ToolsDir)NuGet\</NuGetToolPath>
 		<ZipFormat Condition=" '$(ZipFormat)' == '' ">.7z</ZipFormat>
-		<ClrVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.0' or '$(TargetFrameworkVersion)' == 'v4.5' ">4</ClrVersion>
-		<ClrVersion Condition=" '$(ClrVersion)' == '' ">2</ClrVersion>
-		<ILMergeTargetPlatformVersion Condition=" '$(ClrVersion)' == '2' ">2.0</ILMergeTargetPlatformVersion>
-		<ILMergeTargetPlatformVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">4.0</ILMergeTargetPlatformVersion>
-		<ILMergeTargetPlatformVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.5' ">4.5</ILMergeTargetPlatformVersion>
+		<ILMergeTargetPlatformVersion>4.5</ILMergeTargetPlatformVersion>
 
 		<SignAssembly>true</SignAssembly>
 		<PublicKeyFile Condition="'$(PublicKeyFile)' == ''">$(ProjectRoot)src\official-build-key.pub</PublicKeyFile>
@@ -34,31 +28,21 @@
 		<SignedSubPath>signed\</SignedSubPath>
 
 		<ILMergeOutputAssemblyDirectory>$(OutputPath)unified\</ILMergeOutputAssemblyDirectory>
-		<ILMergeOutputAssembly35Directory>$(OutputPath35)unified\</ILMergeOutputAssembly35Directory>
-		<ILMergeOutputAssembly40Directory>$(OutputPath40)unified\</ILMergeOutputAssembly40Directory>
 		<ILMergeOutputAssembly45Directory>$(OutputPath45)unified\</ILMergeOutputAssembly45Directory>
 		<ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)$(ProductName).dll</ILMergeOutputAssembly>
 		<ILMergeOutputXmlDocs>$(ILMergeOutputAssemblyDirectory)$(ProductName).xml</ILMergeOutputXmlDocs>
 	</PropertyGroup>
 
-	<PropertyGroup Condition=" '$(ClrVersion)' == '4' ">
+	<PropertyGroup>
 		<ILMergeTargetPlatformDirectory>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\$(TargetFrameworkVersion)</ILMergeTargetPlatformDirectory>
 	</PropertyGroup>
 	<ItemGroup>
 		<ILMergeSearchDirectories Include="$(ProjectRoot)lib" />
-		<ILMergeSearchDirectories Include="$(ProjectRoot)lib\net-$(TargetFrameworkVersion)" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(ClrVersion)' == '4' ">
+	<ItemGroup>
 		<ILMergeSearchDirectories Include="$(ILMergeTargetPlatformDirectory)" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(ClrVersion)' != '4' ">
-		<ILMergeSearchDirectories Include="
-																$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\v3.0;
-																$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\v3.5;
-																" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProductProjectNames Include="
 									   DotNetOpenAuth.Core;
@@ -99,7 +83,7 @@
 			<Nonshipping>true</Nonshipping>
 		</DelaySignedProjects>
 		<DelaySignedProjects Include="$(ProjectRoot)samples\openidofflineprovider\openidofflineprovider.csproj">
-			<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+			<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 		</DelaySignedProjects>
 
 		<ProjectReferencesToRemove Include="@(ProductProjectNames->'..\..\src\%(Identity)\%(Identity).csproj')" />
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets
index acb631a..b09eb14 100644
--- a/tools/DotNetOpenAuth.targets
+++ b/tools/DotNetOpenAuth.targets
@@ -16,10 +16,7 @@
 
 	<PropertyGroup>
 		<DefineConstants Condition=" '$(SignAssembly)' == 'true' ">$(DefineConstants);StrongNameSigned</DefineConstants>
-		<DefineConstants Condition=" '$(ClrVersion)' == '4' ">$(DefineConstants);CLR4</DefineConstants>
-		<DefineConstants Condition=" '$(TargetFrameworkVersion)' == 'v4.5' ">$(DefineConstants);NetFx45</DefineConstants>
 		<AssemblySearchPaths>$(ProjectRoot)lib;$(AssemblySearchPaths)</AssemblySearchPaths>
-		<AssemblySearchPaths Condition="Exists('$(ProjectRoot)lib\net-$(TargetFrameworkVersion)')">$(ProjectRoot)lib\net-$(TargetFrameworkVersion);$(AssemblySearchPaths)</AssemblySearchPaths>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -38,7 +35,6 @@
 	<Target Name="CreatePublicAccessors">
 		<PropertyGroup>
 			<VSVersionForTargetFramework>v10.0</VSVersionForTargetFramework>
-			<VSVersionForTargetFramework Condition=" '$(ClrVersion)' != '4' ">v9.0</VSVersionForTargetFramework>
 		</PropertyGroup>
 		<Publicize
 			Condition=" '%(ReferencePath.Shadow)' == 'true' "
diff --git a/tools/drop.proj b/tools/drop.proj
index ba2400c..f194b52 100644
--- a/tools/drop.proj
+++ b/tools/drop.proj
@@ -5,28 +5,10 @@
 
 	<Target Name="LayoutDependencies">
 		<MSBuild Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).proj"
-		         Properties="TargetFrameworkVersion=v3.5"
-		         Targets="BuildUnifiedProduct"
-		         BuildInParallel="$(BuildInParallel)" />
-		<MSBuild Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).proj"
-		         Properties="TargetFrameworkVersion=v4.0"
-		         Targets="BuildUnifiedProduct"
-		         BuildInParallel="$(BuildInParallel)" />
-		<MSBuild Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).proj"
 		         Properties="TargetFrameworkVersion=v4.5"
 		         Targets="BuildUnifiedProduct"
 		         BuildInParallel="$(BuildInParallel)" />
 		<MSBuild Projects="@(DelaySignedProjects)"
-		         Properties="TargetFrameworkVersion=v3.5"
-		         Targets="Sign"
-		         BuildInParallel="$(BuildInParallel)"
-		         Condition=" '%(DelaySignedProjects.Nonshipping)' != 'true' and '%(DelaySignedProjects.TargetFrameworkVersion)' != 'v4.0' " />
-		<MSBuild Projects="@(DelaySignedProjects)"
-		         Properties="TargetFrameworkVersion=v4.0"
-		         Targets="Sign"
-		         BuildInParallel="$(BuildInParallel)"
-		         Condition=" '%(DelaySignedProjects.Nonshipping)' != 'true' " />
-		<MSBuild Projects="@(DelaySignedProjects)"
 		         Properties="TargetFrameworkVersion=v4.5"
 		         Targets="Sign"
 		         BuildInParallel="$(BuildInParallel)"
@@ -41,12 +23,12 @@
 							$(ProjectRoot)vsix\vsix.proj;
 							$(ProjectRoot)samples\samples.proj;
 							">
-				<Properties>TargetFrameworkVersion=v4.0</Properties>
+				<Properties>TargetFrameworkVersion=v4.5</Properties>
 			</ProjectsToBuild>
 
 			<!-- Sandcastle doesn't seem to be able to handle .NET 4.0 dependencies right now. -->
 			<ProjectsToBuild Include="$(ProjectRoot)doc\doc.proj">
-				<Properties>TargetFrameworkVersion=v3.5</Properties>
+				<Properties>TargetFrameworkVersion=v4.5</Properties>
 			</ProjectsToBuild>
 		</ItemGroup>
 		<MSBuild Projects="@(ProjectsToBuild)"
@@ -55,8 +37,6 @@
 			<Output TaskParameter="TargetOutputs" ItemName="DropLayoutDependencies"/>
 		</MSBuild>
 		<PropertyGroup>
-			<DropBin35Directory>$(DropDirectory)Bin-net3.5\</DropBin35Directory>
-			<DropBin40Directory>$(DropDirectory)Bin-net4.0\</DropBin40Directory>
 			<DropBin45Directory>$(DropDirectory)Bin-net4.5\</DropBin45Directory>
 			<DropLibDirectory>$(DropDirectory)Lib\</DropLibDirectory>
 			<DropProjectTemplatesDirectory>$(DropDirectory)Project Templates\</DropProjectTemplatesDirectory>
@@ -71,8 +51,6 @@
 			<ProjectTemplatesVsi Include="@(DropLayoutDependencies)" Condition=" '%(DropLayoutDependencies.MSBuildSourceProjectFile)' == '$(ProjectRoot)vsi\vsi.proj' " />
 			<DropDirectories Include="
 						 $(DropDirectory);
-						 $(DropBin35Directory);
-						 $(DropBin40Directory);
 						 $(DropBin45Directory);
 						 $(DropLibDirectory);
 						 $(DropProjectTemplatesDirectory);
@@ -87,20 +65,6 @@
 																$(ProjectRoot)CONTRIB.txt;
 																"
 											 Exclude="$(ProjectRoot)Doc\README.*.html;" />
-			<DropBin35SourceFiles Include="
-																$(ILMergeOutputAssembly35Directory)$(SignedSubPath)$(ProductName).dll;
-																$(ILMergeOutputAssembly35Directory)$(ProductName).pdb;
-																$(ILMergeOutputAssembly35Directory)$(ProductName).xml;
-																$(ProjectRoot)Doc\README.Bin.html;
-																$(ProjectRoot)src\$(ProductName).Core\Configuration\$(ProductName).xsd;
-													" />
-			<DropBin40SourceFiles Include="
-																$(ILMergeOutputAssembly40Directory)$(SignedSubPath)$(ProductName).dll;
-																$(ILMergeOutputAssembly40Directory)$(ProductName).pdb;
-																$(ILMergeOutputAssembly40Directory)$(ProductName).xml;
-																$(ProjectRoot)Doc\README.Bin.html;
-																$(ProjectRoot)src\$(ProductName).Core\Configuration\$(ProductName).xsd;
-													" />
 			<DropBin45SourceFiles Include="
 																$(ILMergeOutputAssembly45Directory)$(SignedSubPath)$(ProductName).dll;
 																$(ILMergeOutputAssembly45Directory)$(ProductName).pdb;
@@ -112,8 +76,6 @@
 			<DropSatelliteSourceFiles>
 				<CultureDir>$([System.IO.Path]::GetDirectoryName('$([System.IO.Path]::GetDirectoryName('%(RecursiveDir)'))'))\</CultureDir>
 			</DropSatelliteSourceFiles>
-			<_DropLibSourceFiles Include="$(ProjectRoot)Lib\**\*" />
-			<DropLibSourceFiles Include="@(_DropLibSourceFiles)" Condition=" '%(FileName)' == 'log4net' or '%(FileName)' == 'System.Net.Http' " />
 			<DropProjectTemplatesSourceFiles Include="@(ProjectTemplatesVsi)" />
 			<DropVsixSourceFiles Include="@(ExtensionVsix)" Condition=" '%(ExtensionVsix.IncludeInDrop)' == 'true' " />
 
@@ -147,11 +109,8 @@
 			<DropSpecsSourceFiles Include="$(ProjectRoot)Doc\specs\*.htm*" />
 
 			<DropFiles Include="@(DropSourceFiles->'$(DropDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/>
-			<DropBin35Files Include="@(DropBin35SourceFiles->'$(DropBin35Directory)%(RecursiveDir)%(FileName)%(Extension)')"/>
-			<DropBin40Files Include="@(DropBin40SourceFiles->'$(DropBin40Directory)%(RecursiveDir)%(FileName)%(Extension)')"/>
 			<DropBin45Files Include="@(DropBin45SourceFiles->'$(DropBin45Directory)%(RecursiveDir)%(FileName)%(Extension)')"/>
 			<DropSatelliteFiles Include="@(DropSatelliteSourceFiles->'$(DropBinDirectory)%(CultureDir)%(FileName)%(Extension)')" />
-			<DropLibFiles Include="@(DropLibSourceFiles->'$(DropLibDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/>
 			<DropProjectTemplatesFiles Include="@(DropProjectTemplatesSourceFiles->'$(DropProjectTemplatesDirectory)%(FileName)%(Extension)')" />
 			<DropVsixFiles Include="@(DropVsixSourceFiles->'$(DropProjectTemplatesDirectory)%(FileName)%(Extension)')" />
 			<DropSamplesFiles Include="@(DropSamplesSourceFiles->'$(DropSamplesDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/>
@@ -161,11 +120,8 @@
 
 			<AllDropSources Include="
 										@(DropSourceFiles);
-										@(DropBin35SourceFiles);
-										@(DropBin40SourceFiles);
 										@(DropBin45SourceFiles);
 										@(DropSatelliteSourceFiles);
-										@(DropLibSourceFiles);
 										@(DropProjectTemplatesSourceFiles);
 										@(DropVsixSourceFiles);
 										@(DropSamplesSourceFiles);
@@ -176,11 +132,8 @@
 
 			<AllDropTargets Include="
 										@(DropFiles);
-										@(DropBin35Files);
-										@(DropBin40Files);
 										@(DropBin45Files);
 										@(DropSatelliteFiles);
-										@(DropLibFiles);
 										@(DropProjectTemplatesFiles);
 										@(DropVsixFiles);
 										@(DropSamplesFiles);
diff --git a/tools/sandcastle.targets b/tools/sandcastle.targets
index 6bedf13..106f408 100644
--- a/tools/sandcastle.targets
+++ b/tools/sandcastle.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTarget="Build">
-	<UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="SetEnvironmentVariable" />
+	<UsingTask AssemblyFile="..\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="SetEnvironmentVariable" />
 	<PropertyGroup>
 		<PresentationStyle Condition="'$(PresentationStyle)' == ''">vs2005</PresentationStyle>
 		<!-- Environment -->