diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/DotNetOpenAuth.automated.props | 1 | ||||
-rw-r--r-- | tools/DotNetOpenAuth.targets | 1 | ||||
-rw-r--r-- | tools/drop.proj | 7 |
3 files changed, 7 insertions, 2 deletions
diff --git a/tools/DotNetOpenAuth.automated.props b/tools/DotNetOpenAuth.automated.props index f66c1fe..6037967 100644 --- a/tools/DotNetOpenAuth.automated.props +++ b/tools/DotNetOpenAuth.automated.props @@ -6,6 +6,7 @@ <AutomatedBuild>true</AutomatedBuild> <SolutionPath>$(ProjectRoot)src\$(ProductName).sln</SolutionPath> <BuildInParallel Condition=" '$(BuildInParallel)' == '' ">true</BuildInParallel> + <DowngradeMvc2ToMvc1 Condition=" '$(DowngradeMvc2ToMvc1)' == '' ">false</DowngradeMvc2ToMvc1> <!-- Validation controls whether extra builds are done in order to fully validate what we're distributing, even if we're not distributing the built bits (as is the case for project templates). --> <Validation Condition=" '$(Validation)' == '' ">Full</Validation> diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets index cab4413..8469aa6 100644 --- a/tools/DotNetOpenAuth.targets +++ b/tools/DotNetOpenAuth.targets @@ -17,6 +17,7 @@ <PropertyGroup> <DefineConstants Condition=" '$(SignAssembly)' == 'true' ">$(DefineConstants);StrongNameSigned</DefineConstants> <DefineConstants Condition=" '$(ClrVersion)' == '4' ">$(DefineConstants);CLR4</DefineConstants> + <AssemblySearchPaths>$(AssemblySearchPaths);$(ProjectRoot)lib</AssemblySearchPaths> </PropertyGroup> <ItemGroup> diff --git a/tools/drop.proj b/tools/drop.proj index be5d3f9..317aba6 100644 --- a/tools/drop.proj +++ b/tools/drop.proj @@ -44,7 +44,7 @@ $(ILMergeOutputAssemblyDirectory)$(SignedSubPath)$(ProductName).dll; $(ILMergeOutputAssemblyDirectory)$(ProductName).pdb; $(OutputPath)$(ProductName).xml; - $(OutputPath)$(SignedSubPath)$(ProductName).Contracts.???; + $(OutputPath)CodeContracts\$(SignedSubPath)$(ProductName).Contracts.???; $(ProjectRoot)Doc\README.Bin.html; $(ProjectRoot)src\$(ProductName)\Configuration\$(ProductName).xsd; " /> @@ -133,7 +133,10 @@ AddReferences="Microsoft.Contracts"/> <ChangeProjectReferenceToAssemblyReference Projects="@(SampleProjectTargets)" ProjectReferences="..\..\src\$(ProductName)\$(ProductName).csproj" References="..\..\Bin\$(ProductName).dll" /> - <DowngradeProjects Projects="@(SampleProjectTargets);@(SampleSolutionTargets)" DowngradeMvc2ToMvc1="true" /> + <DowngradeProjects + Projects="@(SampleProjectTargets);@(SampleSolutionTargets)" + DowngradeMvc2ToMvc1="$(DowngradeMvc2ToMvc1)" + /> </Target> <Target Name="Build" DependsOnTargets="Layout"> |