diff options
| author | Stephen Toub <stoub@microsoft.com> | 2017-04-05 00:14:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 00:14:20 +0300 |
| commit | 611e3feabcbcf7f79673b351d3e7e156a55f98c2 (patch) | |
| tree | a5ecb91fd4eeac5ce92c4dae3bfbe3fdcffd6fba /Tools-Override | |
| parent | e89b10fafe67ee5b781422d32e1408c9a2c4d295 (diff) | |
| parent | 1413fb34a95ba068b8dec05c4ee143eb0990119f (diff) | |
Merge pull request #17893 from weshaggard/UpdateStandard
Update standard
Diffstat (limited to 'Tools-Override')
| -rw-r--r-- | Tools-Override/resolveContract.targets | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Tools-Override/resolveContract.targets b/Tools-Override/resolveContract.targets index f8f98711f1..9466e251ec 100644 --- a/Tools-Override/resolveContract.targets +++ b/Tools-Override/resolveContract.targets @@ -14,13 +14,16 @@ <Target Name="ResolveMatchingContract"> <PropertyGroup> - <ContractProject Condition="'$(ContractProject)' == ''">$(SourceDir)/$(AssemblyName)/ref/$(AssemblyName).csproj</ContractProject> + <ContractProject Condition="'$(ContractProject)' == ''">$(SourceDir)/$(MSBuildProjectName)/ref/$(MSBuildProjectName).csproj</ContractProject> <HasMatchingContract Condition="'$(HasMatchingContract)' == '' and Exists('$(ContractProject)')">true</HasMatchingContract> + <ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == ''">$(ContractOutputPath)/$(MSBuildProjectName).dll</ContractAssemblyPath> </PropertyGroup> <ItemGroup Condition="'$(HasMatchingContract)' == 'true'"> - <!-- add contract project as project reference to get target path --> - <ProjectReference Include="$(ContractProject)"> + <ResolvedMatchingContract Condition="'$(IsDesktopFacade)' != 'true' and Exists('$(ContractAssemblyPath)')" Include="$(ContractAssemblyPath)" /> + + <!-- If the contract doesn't exist in the default contract output path add a project reference to the contract project to resolve --> + <ProjectReference Condition="'@(ResolvedMatchingContract)' == ''" Include="$(ContractProject)"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> <OutputItemType>ResolvedMatchingContract</OutputItemType> </ProjectReference> @@ -30,4 +33,4 @@ <Target Name="VerifyMatchingContract"> <Error Condition="'$(HasMatchingContract)' == 'true' and !Exists('%(ResolvedMatchingContract.Identity)')" Text="ResolveMatchingContract could not find a matching contract '%(ResolvedMatchingContract.Identity)' not found." /> </Target> -</Project> +</Project>
\ No newline at end of file |