diff options
| author | Hugh Bellamy <hughbellars@gmail.com> | 2020-05-03 17:37:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 17:37:37 +0300 |
| commit | 77ce667069c49a61be6c2ed7b526f5fad7437992 (patch) | |
| tree | 6f75d66f158f5a452f824790fa59f8bc1311447c /eng/liveBuilds.targets | |
| parent | 32a74d73167df1c969b7f06681af5a4c7aef069d (diff) | |
Fix some incorrect warnings in LiveBuilds.targets (#35770)
Diffstat (limited to 'eng/liveBuilds.targets')
| -rw-r--r-- | eng/liveBuilds.targets | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 06136c1ec88..920392bae32 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -79,8 +79,8 @@ </PropertyGroup> <Target Name="ResolveRuntimeFilesFromLocalBuild"> - <Error Condition="!Exists('$(CoreCLRArtifactsPath)') and '$(RuntimeFlavor)' == 'CoreCLR'" Text="The CoreCLR artifacts path does not exist '$(CoreCLRArtifactsPath)'. The CoreCLR subset category must be built before building this project." /> - <Error Condition="!Exists('$(MonoArtifactsPath)') and '$(RuntimeFlavor)' == 'Mono'" Text="The Mono artifacts path does not exist '$(MonoArtifactsPath)'. The Mono subset category must be built before building this project." /> + <Error Condition="!Exists('$(CoreCLRArtifactsPath)') and '$(RuntimeFlavor)' == 'CoreCLR'" Text="The CoreCLR artifacts path does not exist '$(CoreCLRArtifactsPath)'. The 'clr' subset must be built before building this project." /> + <Error Condition="!Exists('$(MonoArtifactsPath)') and '$(RuntimeFlavor)' == 'Mono'" Text="The Mono artifacts path does not exist '$(MonoArtifactsPath)'. The 'mono' subset must be built before building this project." /> <PropertyGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR'"> <CoreCLRArtifactsPath>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)'))</CoreCLRArtifactsPath> @@ -139,12 +139,12 @@ Include="$(MonoArtifactsPath)\include\**\*.*" /> </ItemGroup> - <Error Condition="'@(RuntimeFiles)' == ''" Text="The $(RuntimeFlavor) subset category must be built before building this project." /> + <Error Condition="'@(RuntimeFiles)' == ''" Text="The '$(RuntimeFlavor)' subset must be built before building this project." /> </Target> <Target Name="EnsureLocalArtifactsExist"> - <Error Condition="!Exists('$(LibrariesSharedFrameworkRefArtifactsPath)')" Text="The libraries subset category must be built before building this project. Missing artifacts: $(LibrariesSharedFrameworkRefArtifactsPath)" /> - <Error Condition="'$(IncludeOOBLibraries)' == 'true' and !Exists('$(LibrariesAllRefArtifactsPath)')" Text="The libraries subset category must be built before building this project. Missing artifacts: $(LibrariesAllRefArtifactsPath)" /> + <Error Condition="!Exists('$(LibrariesSharedFrameworkRefArtifactsPath)')" Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesSharedFrameworkRefArtifactsPath)" /> + <Error Condition="'$(IncludeOOBLibraries)' == 'true' and !Exists('$(LibrariesAllRefArtifactsPath)')" Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesAllRefArtifactsPath)" /> </Target> <!-- @@ -153,9 +153,9 @@ --> <Target Name="EnsureLocalOSGroupConfigurationArchitectureSpecificArtifactsExist" Condition="'$(LibrariesTargetOSConfigurationArchitecture)' != '*'"> - <Error Condition="!Exists('$(LibrariesSharedFrameworkBinArtifactsPath)')" Text="The libraries subset category must be built before building this project. Missing artifacts: $(LibrariesSharedFrameworkBinArtifactsPath)" /> - <Error Condition="'$(IncludeOOBLibraries)' == 'true' and !Exists('$(LibrariesAllBinArtifactsPath)')" Text="The libraries subset category must be built before building this project. Missing artifacts: $(LibrariesAllBinArtifactsPath)" /> - <Error Condition="!Exists('$(LibrariesNativeArtifactsPath)')" Text="The libraries subset category must be built before building this project. Missing artifacts: $(LibrariesNativeArtifactsPath)" /> + <Error Condition="!Exists('$(LibrariesSharedFrameworkBinArtifactsPath)')" Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesSharedFrameworkBinArtifactsPath)" /> + <Error Condition="'$(IncludeOOBLibraries)' == 'true' and !Exists('$(LibrariesAllBinArtifactsPath)')" Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesAllBinArtifactsPath)" /> + <Error Condition="!Exists('$(LibrariesNativeArtifactsPath)')" Text="The 'libs' subset must be built before building this project. Missing artifacts: $(LibrariesNativeArtifactsPath)" /> </Target> <Target Name="ResolveLibrariesFromLocalBuild" @@ -184,8 +184,8 @@ IsNative="true" /> </ItemGroup> - <Error Condition="'@(LibrariesRefAssemblies)' == ''" Text="The libraries subset category must be built before building this project." /> - <Error Condition="'@(LibrariesRuntimeFiles)' == ''" Text="The libraries subset category must be built before building this project." /> + <Error Condition="'@(LibrariesRefAssemblies)' == ''" Text="The 'libs' subset must be built before building this project." /> + <Error Condition="'@(LibrariesRuntimeFiles)' == ''" Text="The 'libs' subset must be built before building this project." /> </Target> <PropertyGroup> |