Switched drop.proj to generate drops based on .NET 4.0, and include .NET 3.5 components for the library.

Fixes up build breaks in the dropped samples.

6 files changed, 4 insertions, 29 deletions

diff --git a/samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj b/samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj
index 522a8ab..f97354d 100644
--- a/samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj
+++ b/samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DotNetOpenAuth.ApplicationBlock</RootNamespace>
     <AssemblyName>DotNetOpenAuth.ApplicationBlock</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
diff --git a/samples/InfoCardRelyingParty/Bin/DotNetOpenAuth.dll.refresh_ b/samples/InfoCardRelyingParty/Bin/DotNetOpenAuth.dll.refresh_
index 946bd4b..7734f0e 100644
--- a/samples/InfoCardRelyingParty/Bin/DotNetOpenAuth.dll.refresh_
+++ b/samples/InfoCardRelyingParty/Bin/DotNetOpenAuth.dll.refresh_
diff --git a/samples/InfoCardRelyingParty/Bin/log4net.dll.refresh_ b/samples/InfoCardRelyingParty/Bin/log4net.dll.refresh_
new file mode 100644
index 0000000..ede40da
--- /dev/null
+++ b/samples/InfoCardRelyingParty/Bin/log4net.dll.refresh_
diff --git a/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj b/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj
index 264a814..1879d92 100644
--- a/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj
+++ b/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj
@@ -71,10 +71,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Contracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL" Condition=" '$(TargetFrameworkVersion)' == 'v3.5' ">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Microsoft.Contracts.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core">
diff --git a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
index f13fd80..c489b0f 100644
--- a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
+++ b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
@@ -19,7 +19,7 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <UICulture>en-US</UICulture>
-    <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <OutputPath Condition=" '$(OutputPath)' == '' ">bin\$(TargetFrameworkVersion)\$(Configuration)\</OutputPath>
     <ApplicationIcon>openid.ico</ApplicationIcon>
     <FileUpgradeFlags>
@@ -99,7 +99,6 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" Condition=" '$(TargetFrameworkVersion)' == 'v3.5' " />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
@@ -213,15 +212,9 @@
   <!-- These items should never be visible.  In the project source tree, they're invisible because of an ItemDefinitionGroup
        in DotNetOpenAuth.props.  But in the shipping samples that file is not included, so we must still set Visible=false explicitly.. -->
   <ItemGroup>
-    <SignDependsOn Include="BuildUnified">
-      <Visible>false</Visible>
-    </SignDependsOn>
-    <DelaySignedAssemblies Include="$(ILMergeProjectOutputAssembly)">
+    <DelaySignedAssemblies Include="$(TargetPath)">
       <Visible>false</Visible>
     </DelaySignedAssemblies>
-    <ILMergeProjectInputAssemblies Include="$(TargetPath);&#xD;&#xA;                                            $(ProjectRoot)lib\Microsoft.Contracts.dll; ">
-      <Visible>false</Visible>
-    </ILMergeProjectInputAssemblies>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\DotNetOpenAuth.Core\DotNetOpenAuth.Core.csproj">
@@ -237,19 +230,6 @@
       <Name>DotNetOpenAuth.OpenId</Name>
     </ProjectReference>
   </ItemGroup>
-  <Target Name="BuildUnified" DependsOnTargets="Build" Inputs="@(ILMergeProjectInputAssemblies)" Outputs="$(ILMergeProjectOutputAssembly)">
-    <MakeDir Directories="$(ILMergeOutputAssemblyDirectory)" />
-    <ILMerge
-      ExcludeFile="$(ProjectRoot)ILMergeInternalizeExceptions.txt"
-      InputAssemblies="@(ILMergeProjectInputAssemblies)"
-      OutputFile="$(ILMergeProjectOutputAssembly)"
-      SearchDirectories="$(OutputPath);@(ILMergeSearchDirectories)"
-      ToolPath="$(ProjectRoot)tools\ILMerge"
-      KeyFile="$(PublicKeyFile)"
-      DelaySign="true" 
-      TargetPlatformVersion="$(ClrVersion).0"
-      TargetPlatformDirectory="$(ILMergeTargetPlatformDirectory)" />
-  </Target>
   <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/tools.proj b/samples/tools.proj
index d72e364..42a6a47 100644
--- a/samples/tools.proj
+++ b/samples/tools.proj
@@ -26,7 +26,6 @@
 											 Exclude="
 											 $(OutputPath)$(ProductName).dll;
 											 $(OutputPath)$(SignedSubPath)$(ProductName).dll;
-											 $(ProjectRoot)lib\Microsoft.Contracts.dll;
 											 $(OutputPath)System.Web.Mvc.dll;
 											 " />