diff options
| author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2021-05-14 09:21:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-14 09:21:48 +0300 |
| commit | c53700bf8a265303f90e0b1f73be4f27c756f6b7 (patch) | |
| tree | 5eac9ac5ffc40bc14e03dd0bd4cbd48bc226fc76 /Directory.Build.props | |
| parent | 29e37521b7f1d4d1eb3c48b8942707b4809a41f6 (diff) | |
Clean up `$(RepoRoot)` consistently (#32664)
- don't override correct values but fix incorrect ones
- fix #32615
- also get SignalR pipeline working again
nits:
- don't use `$(MSBuildProjectDirectory)` in project files
- inconsistent w/ `$(MSBuildThisFileDirectory)` and harder to grok
- don't add unnecessary slashes after `$(MSBuildThisFileDirectory)`
- clean up Microsoft.AspNetCore.Testing.props
- used only from eng/targets/CSharp.Common.props but fallback settings may help
Diffstat (limited to 'Directory.Build.props')
| -rw-r--r-- | Directory.Build.props | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index ad7ced95c9..b6d0b7b7b7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,7 @@ <PropertyGroup> <!-- $(RepoRoot) is normally set globally and Arcade overrides it to ensure a trailing slash. --> - <RepoRoot Condition=" '$(RepoRoot)' == '' ">$([MSBuild]::EnsureTrailingSlash('$(MSBuildThisFileDirectory)'))</RepoRoot> + <RepoRoot Condition=" '$(RepoRoot)' == '' OR !HasTrailingSlash('$(RepoRoot)') ">$(MSBuildThisFileDirectory)</RepoRoot> <RepositoryUrl>https://github.com/dotnet/aspnetcore</RepositoryUrl> <RepositoryType>git</RepositoryType> |