summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj2
-rw-r--r--samples/InfoCardRelyingParty/Bin/DotNetOpenAuth.dll.refresh_bin58 -> 72 bytes
-rw-r--r--samples/InfoCardRelyingParty/Bin/log4net.dll.refresh_bin0 -> 44 bytes
-rw-r--r--samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj4
-rw-r--r--samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj26
-rw-r--r--samples/tools.proj1
-rw-r--r--tools/DotNetOpenAuth.automated.props1
-rw-r--r--tools/DotNetOpenAuth.props18
-rw-r--r--tools/DotNetOpenAuth.targets8
-rw-r--r--tools/drop.proj63
10 files changed, 68 insertions, 55 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_
Binary files differ
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_
Binary files differ
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;
" />
diff --git a/tools/DotNetOpenAuth.automated.props b/tools/DotNetOpenAuth.automated.props
index a2dbe06..e73fa8c 100644
--- a/tools/DotNetOpenAuth.automated.props
+++ b/tools/DotNetOpenAuth.automated.props
@@ -10,5 +10,6 @@
even if we're not distributing the built bits (as is the case for project templates). -->
<Validation Condition=" '$(Validation)' == '' ">Full</Validation>
<NUnitToolPath Condition=" '$(NUnitToolPath)' == '' ">$(ProjectRoot)tools\NUnit\bin</NUnitToolPath>
+ <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</TargetFrameworkVersion>
</PropertyGroup>
</Project>
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
index 98685e4..1bb1139 100644
--- a/tools/DotNetOpenAuth.props
+++ b/tools/DotNetOpenAuth.props
@@ -3,10 +3,12 @@
<PropertyGroup>
<ProductName>DotNetOpenAuth</ProductName>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v4.0</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>
<DocOutputPath>$(ProjectRoot)doc\</DocOutputPath>
<IntermediatePath>$(ProjectRoot)obj\$(TargetFrameworkVersion)\$(Configuration)\</IntermediatePath>
<BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">obj\$(TargetFrameworkVersion)\</BaseIntermediateOutputPath>
@@ -28,6 +30,8 @@
<SignedSubPath>signed\</SignedSubPath>
<ILMergeOutputAssemblyDirectory>$(OutputPath)unified\</ILMergeOutputAssemblyDirectory>
+ <ILMergeOutputAssembly35Directory>$(OutputPath35)unified\</ILMergeOutputAssembly35Directory>
+ <ILMergeOutputAssembly40Directory>$(OutputPath40)unified\</ILMergeOutputAssembly40Directory>
<ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)$(ProductName).dll</ILMergeOutputAssembly>
<ILMergeOutputXmlDocs>$(ILMergeOutputAssemblyDirectory)$(ProductName).xml</ILMergeOutputXmlDocs>
<ILMergeOutputContractAssemblyDirectory>$(ILMergeOutputAssemblyDirectory)CodeContracts\</ILMergeOutputContractAssemblyDirectory>
@@ -85,9 +89,19 @@
<MergeIntoUnifiedAssembly Condition=" '$(IncludeOAuth2)' == 'false' ">false</MergeIntoUnifiedAssembly>
</ProductProjectNames>
<ProductProjects Include="@(ProductProjectNames->'$(ProjectRoot)src\%(Identity)\%(Identity).csproj')"/>
+ <DelaySignedProjects Include="
+ @(ProductProjects);
+ $(ProjectRoot)src\dotnetopenauth\dotnetopenauth.proj;
+ " />
+ <DelaySignedProjects Include="$(ProjectRoot)src\dotnetopenauth.test\dotnetopenauth.test.csproj">
+ <Nonshipping>true</Nonshipping>
+ </DelaySignedProjects>
+ <DelaySignedProjects Include="$(ProjectRoot)samples\openidofflineprovider\openidofflineprovider.csproj">
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ </DelaySignedProjects>
<ProjectReferencesToRemove Include="@(ProductProjectNames->'..\..\src\%(Identity)\%(Identity).csproj')" />
- <AssemblyReferencesToReplaceWith Include="@(ProjectReferencesToRemove->'..\..\Bin\$(ProductName).dll')" />
+ <AssemblyReferencesToReplaceWith Include="@(ProjectReferencesToRemove->'..\..\Bin-net4.0\$(ProductName).dll')" />
<SignDependsOn Include="Build" Condition=" '$(SuppressBuildTarget)' != 'true' " />
<ILMergeInputAssemblies Condition=" '$(ClrVersion)' == '2' "
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets
index 81ef2b1..bcf580f 100644
--- a/tools/DotNetOpenAuth.targets
+++ b/tools/DotNetOpenAuth.targets
@@ -110,14 +110,6 @@
</Target>
<Target Name="ResignDelaySignedAssemblies" Outputs="@(ResignedAssembliesOutputs)">
- <ItemGroup>
- <DelaySignedProjects Include="
- @(ProductProjects);
- $(ProjectRoot)src\dotnetopenauth\dotnetopenauth.proj;
- $(ProjectRoot)src\dotnetopenauth.test\dotnetopenauth.test.csproj;
- $(ProjectRoot)samples\openidofflineprovider\openidofflineprovider.csproj;
- " />
- </ItemGroup>
<MSBuild Projects="@(DelaySignedProjects)" Targets="Sign" BuildInParallel="$(BuildInParallel)">
<Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs"/>
</MSBuild>
diff --git a/tools/drop.proj b/tools/drop.proj
index f048b22..a29c2df 100644
--- a/tools/drop.proj
+++ b/tools/drop.proj
@@ -3,24 +3,44 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " />
<Import Project="$(MSBuildProjectDirectory)\DotNetOpenAuth.automated.props"/>
- <Target Name="Layout" DependsOnTargets="BuildUnifiedProduct;ReSignDelaySignedAssemblies">
+ <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="@(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' " />
+ </Target>
+
+ <Target Name="Layout" DependsOnTargets="LayoutDependencies">
<!-- Note that we use an MSBuild task for these dependencies rather than individual DependsOnTargets entries
so that these builds can be executed in parallel. -->
<ItemGroup>
<ProjectsToBuild Include="
$(ProjectRoot)vsix\vsix.proj;
$(ProjectRoot)samples\samples.proj;
- " Condition=" '$(TargetFrameworkVersion)' == 'v4.0' " />
- <ProjectsToBuild Include="
$(ProjectRoot)doc\doc.proj;
- " Condition=" '$(TargetFrameworkVersion)' == 'v3.5' " />
+ " />
</ItemGroup>
<MSBuild BuildInParallel="$(BuildInParallel)"
Projects="@(ProjectsToBuild)">
<Output TaskParameter="TargetOutputs" ItemName="DropLayoutDependencies"/>
</MSBuild>
<PropertyGroup>
- <DropBinDirectory>$(DropDirectory)Bin\</DropBinDirectory>
+ <DropBin35Directory>$(DropDirectory)Bin-net3.5\</DropBin35Directory>
+ <DropBin40Directory>$(DropDirectory)Bin-net4.0\</DropBin40Directory>
<DropLibDirectory>$(DropDirectory)Lib\</DropLibDirectory>
<DropProjectTemplatesDirectory>$(DropDirectory)Project Templates\</DropProjectTemplatesDirectory>
<DropSamplesDirectory>$(DropDirectory)Samples\</DropSamplesDirectory>
@@ -34,7 +54,8 @@
<ProjectTemplatesVsi Include="@(DropLayoutDependencies)" Condition=" '%(DropLayoutDependencies.MSBuildSourceProjectFile)' == '$(ProjectRoot)vsi\vsi.proj' " />
<DropDirectories Include="
$(DropDirectory);
- $(DropBinDirectory);
+ $(DropBin35Directory);
+ $(DropBin40Directory);
$(DropLibDirectory);
$(DropProjectTemplatesDirectory);
$(DropSamplesDirectory);
@@ -48,11 +69,19 @@
$(ProjectRoot)CONTRIB.txt;
"
Exclude="$(ProjectRoot)Doc\README.*.html;" />
- <DropBinSourceFiles Include="
- $(ILMergeOutputAssemblyDirectory)$(SignedSubPath)$(ProductName).dll;
- $(ILMergeOutputAssemblyDirectory)$(ProductName).pdb;
- $(ILMergeOutputAssemblyDirectory)$(ProductName).xml;
- $(OutputPath)CodeContracts\$(SignedSubPath)$(ProductName).Contracts.???;
+ <DropBin35SourceFiles Include="
+ $(ILMergeOutputAssembly35Directory)$(SignedSubPath)$(ProductName).dll;
+ $(ILMergeOutputAssembly35Directory)$(ProductName).pdb;
+ $(ILMergeOutputAssembly35Directory)$(ProductName).xml;
+ $(OutputPath35)CodeContracts\$(SignedSubPath)$(ProductName).Contracts.???;
+ $(ProjectRoot)Doc\README.Bin.html;
+ $(ProjectRoot)src\$(ProductName).Core\Configuration\$(ProductName).xsd;
+ " />
+ <DropBin40SourceFiles Include="
+ $(ILMergeOutputAssembly40Directory)$(SignedSubPath)$(ProductName).dll;
+ $(ILMergeOutputAssembly40Directory)$(ProductName).pdb;
+ $(ILMergeOutputAssembly40Directory)$(ProductName).xml;
+ $(OutputPath40)CodeContracts\$(SignedSubPath)$(ProductName).Contracts.???;
$(ProjectRoot)Doc\README.Bin.html;
$(ProjectRoot)src\$(ProductName).Core\Configuration\$(ProductName).xsd;
" />
@@ -96,7 +125,8 @@
<DropSpecsSourceFiles Include="$(ProjectRoot)Doc\specs\*.htm*" />
<DropFiles Include="@(DropSourceFiles->'$(DropDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/>
- <DropBinFiles Include="@(DropBinSourceFiles->'$(DropBinDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/>
+ <DropBin35Files Include="@(DropBin35SourceFiles->'$(DropBin35Directory)%(RecursiveDir)%(FileName)%(Extension)')"/>
+ <DropBin40Files Include="@(DropBin40SourceFiles->'$(DropBin40Directory)%(RecursiveDir)%(FileName)%(Extension)')"/>
<DropSatelliteFiles Include="@(DropSatelliteSourceFiles->'$(DropBinDirectory)%(CultureDir)%(FileName)%(Extension)')" />
<DropLibFiles Include="@(DropLibSourceFiles->'$(DropLibDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/>
<DropProjectTemplatesFiles Include="@(DropProjectTemplatesSourceFiles->'$(DropProjectTemplatesDirectory)%(FileName)%(Extension)')" />
@@ -108,7 +138,8 @@
<AllDropSources Include="
@(DropSourceFiles);
- @(DropBinSourceFiles);
+ @(DropBin35SourceFiles);
+ @(DropBin40SourceFiles);
@(DropSatelliteSourceFiles);
@(DropLibSourceFiles);
@(DropProjectTemplatesSourceFiles);
@@ -121,7 +152,8 @@
<AllDropTargets Include="
@(DropFiles);
- @(DropBinFiles);
+ @(DropBin35Files);
+ @(DropBin40Files);
@(DropSatelliteFiles);
@(DropLibFiles);
@(DropProjectTemplatesFiles);
@@ -156,8 +188,7 @@
<SampleSolutionTargets Include="$(DropSamplesDirectory)**\*.sln" />
</ItemGroup>
<FixupShippingToolSamples Projects="@(DropSamplesToolsProjects)"
- RemoveImportsStartingWith="%24(ProjectRoot)tools\"
- AddReferences="Microsoft.Contracts"/>
+ RemoveImportsStartingWith="%24(ProjectRoot)tools\" />
<ChangeProjectReferenceToAssemblyReference Projects="@(SampleProjectTargets)"
ProjectReferences="@(ProjectReferencesToRemove)" References="@(AssemblyReferencesToReplaceWith)" />
<RegexFileReplace
generated by cgit v1.1 at 2025-06-04 08:13:13 +0000