Skip to content

Commit d8adaee

Browse files
safernViktorHofer
safern
authored and
ViktorHofer
committed
Fix test build of test project that referenced corefx shared corelib directly and cleanup common path usages (#47)
* Fix test build break and update common path usages to use property * Use normalize directory for CommonPath and CommonTestPath * Update instances of CommonPath and CommonTestPath to not use trailing \
1 parent 0d566c2 commit d8adaee

241 files changed

Lines changed: 3266 additions & 3265 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/libraries/Common/tests/Common.Tests.csproj‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,103 +6,103 @@
66
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
77
</PropertyGroup>
88
<ItemGroup>
9-
<Compile Include="$(CommonTestPath)\System\Collections\DictionaryExtensions.cs">
9+
<Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs">
1010
<Link>Common\System\Collections\DictionaryExtensions.cs</Link>
1111
</Compile>
12-
<Compile Include="$(CommonTestPath)\System\Security\Cryptography\ByteUtils.cs">
12+
<Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
1313
<Link>Common\System\Security\Cryptography\ByteUtils.cs</Link>
1414
</Compile>
15-
<Compile Include="$(CommonPath)\Interop\Linux\cgroups\Interop.cgroups.cs">
15+
<Compile Include="$(CommonPath)Interop\Linux\cgroups\Interop.cgroups.cs">
1616
<Link>Common\Interop\Linux\cgroups\Interop.cgroups.cs</Link>
1717
</Compile>
18-
<Compile Include="$(CommonPath)\Interop\Linux\procfs\Interop.ProcFsStat.cs">
18+
<Compile Include="$(CommonPath)Interop\Linux\procfs\Interop.ProcFsStat.cs">
1919
<Link>Common\Interop\Linux\procfs\Interop.ProcFsStat.cs</Link>
2020
</Compile>
21-
<Compile Include="$(CommonPath)\System\CharArrayHelpers.cs">
21+
<Compile Include="$(CommonPath)System\CharArrayHelpers.cs">
2222
<Link>Common\System\CharArrayHelpers.cs</Link>
2323
</Compile>
24-
<Compile Include="$(CommonPath)\System\Marvin.cs">
24+
<Compile Include="$(CommonPath)System\Marvin.cs">
2525
<Link>Common\System\Marvin.cs</Link>
2626
</Compile>
27-
<Compile Include="$(CommonPath)\System\StringExtensions.cs">
27+
<Compile Include="$(CommonPath)System\StringExtensions.cs">
2828
<Link>Common\System\StringExtensions.cs</Link>
2929
</Compile>
30-
<Compile Include="$(CommonPath)\System\Collections\Generic\ArrayBuilder.cs">
30+
<Compile Include="$(CommonPath)System\Collections\Generic\ArrayBuilder.cs">
3131
<Link>Common\System\Collections\Generic\ArrayBuilder.cs</Link>
3232
</Compile>
33-
<Compile Include="$(CommonPath)\System\Collections\Generic\LargeArrayBuilder.cs">
33+
<Compile Include="$(CommonPath)System\Collections\Generic\LargeArrayBuilder.cs">
3434
<Link>Common\System\Collections\Generic\LargeArrayBuilder.cs</Link>
3535
</Compile>
36-
<Compile Include="$(CommonPath)\System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs">
36+
<Compile Include="$(CommonPath)System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs">
3737
<Link>Common\System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs</Link>
3838
</Compile>
39-
<Compile Include="$(CommonPath)\System\IO\PathInternal.CaseSensitivity.cs">
39+
<Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs">
4040
<Link>Common\System\IO\PathInternal.CaseSensitivity.cs</Link>
4141
</Compile>
42-
<Compile Include="$(CommonPath)\System\IO\RowConfigReader.cs">
42+
<Compile Include="$(CommonPath)System\IO\RowConfigReader.cs">
4343
<Link>Common\System\IO\RowConfigReader.cs</Link>
4444
</Compile>
45-
<Compile Include="$(CommonPath)\System\IO\StringParser.cs">
45+
<Compile Include="$(CommonPath)System\IO\StringParser.cs">
4646
<Link>Common\System\IO\StringParser.cs</Link>
4747
</Compile>
48-
<Compile Include="$(CommonPath)\System\Net\HttpDateParser.cs">
48+
<Compile Include="$(CommonPath)System\Net\HttpDateParser.cs">
4949
<Link>Common\System\Net\HttpDateParser.cs</Link>
5050
</Compile>
51-
<Compile Include="$(CommonPath)\System\Net\HttpKnownHeaderNames.cs">
51+
<Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
5252
<Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
5353
</Compile>
54-
<Compile Include="$(CommonPath)\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
54+
<Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
5555
<Link>Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs</Link>
5656
</Compile>
57-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\IHttpHeadersHandler.cs">
57+
<Compile Include="$(CommonPath)System\Net\Http\Http2\IHttpHeadersHandler.cs">
5858
<Link>Common\System\Net\Http\Http2\IHttpHeadersHandler.cs</Link>
5959
</Compile>
60-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\DynamicTable.cs">
60+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\DynamicTable.cs">
6161
<Link>Common\System\Net\Http\Http2\Hpack\DynamicTable.cs</Link>
6262
</Compile>
63-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\HeaderField.cs">
63+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\HeaderField.cs">
6464
<Link>Common\System\Net\Http\Http2\Hpack\HeaderField.cs</Link>
6565
</Compile>
66-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\HPackDecoder.cs">
66+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\HPackDecoder.cs">
6767
<Link>Common\System\Net\Http\Http2\Hpack\HPackDecoder.cs</Link>
6868
</Compile>
69-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\HPackDecodingException.cs">
69+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\HPackDecodingException.cs">
7070
<Link>Common\System\Net\Http\Http2\Hpack\HPackDecodingException.cs</Link>
7171
</Compile>
72-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\HPackEncoder.cs">
72+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\HPackEncoder.cs">
7373
<Link>Common\System\Net\Http\Http2\Hpack\HPackEncoder.cs</Link>
7474
</Compile>
75-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\HPackEncodingException.cs">
75+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\HPackEncodingException.cs">
7676
<Link>Common\System\Net\Http\Http2\Hpack\HPackEncodingException.cs</Link>
7777
</Compile>
78-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\Huffman.cs">
78+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\Huffman.cs">
7979
<Link>Common\System\Net\Http\Http2\Hpack\Huffman.cs</Link>
8080
</Compile>
81-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\HuffmanDecodingException.cs">
81+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\HuffmanDecodingException.cs">
8282
<Link>Common\System\Net\Http\Http2\Hpack\HuffmanDecodingException.cs</Link>
8383
</Compile>
84-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\IntegerDecoder.cs">
84+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\IntegerDecoder.cs">
8585
<Link>Common\System\Net\Http\Http2\Hpack\IntegerDecoder.cs</Link>
8686
</Compile>
87-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\IntegerEncoder.cs">
87+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\IntegerEncoder.cs">
8888
<Link>Common\System\Net\Http\Http2\Hpack\IntegerEncoder.cs</Link>
8989
</Compile>
90-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\StaticTable.cs">
90+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\StaticTable.cs">
9191
<Link>Common\System\Net\Http\Http2\Hpack\StaticTable.cs</Link>
9292
</Compile>
93-
<Compile Include="$(CommonPath)\System\Net\Http\Http2\Hpack\StatusCodes.cs">
93+
<Compile Include="$(CommonPath)System\Net\Http\Http2\Hpack\StatusCodes.cs">
9494
<Link>Common\System\Net\Http\Http2\Hpack\StatusCodes.cs</Link>
9595
</Compile>
96-
<Compile Include="$(CommonPath)\System\Text\ReusableTextReader.cs">
96+
<Compile Include="$(CommonPath)System\Text\ReusableTextReader.cs">
9797
<Link>Common\System\Text\ReusableTextReader.cs</Link>
9898
</Compile>
99-
<Compile Include="$(CommonPath)\System\Text\SimpleRegex.cs">
99+
<Compile Include="$(CommonPath)System\Text\SimpleRegex.cs">
100100
<Link>Common\System\Text\SimpleRegex.cs</Link>
101101
</Compile>
102102
<Compile Include="$(CoreLibSharedDir)System\Text\ValueStringBuilder.cs">
103103
<Link>System\Text\ValueStringBuilder.cs</Link>
104104
</Compile>
105-
<Compile Include="$(CommonPath)\System\Security\IdentityHelper.cs">
105+
<Compile Include="$(CommonPath)System\Security\IdentityHelper.cs">
106106
<Link>Common\System\Security\IdentityHelper.cs</Link>
107107
</Compile>
108108
<Compile Include="$(CoreLibSharedDir)System\PasteArguments.cs">
@@ -150,14 +150,14 @@
150150
<Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.Windows.cs">
151151
<Link>System\IO\PathInternal.Windows.cs</Link>
152152
</Compile>
153-
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
153+
<Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
154154
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
155155
</Compile>
156156
<Compile Include="Tests\System\IO\PathInternal.Windows.Tests.cs" />
157157
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
158158
<Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
159159
</Compile>
160-
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Errors.cs">
160+
<Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
161161
<Link>Common\Interop\Windows\Interop.Errors.cs</Link>
162162
</Compile>
163163
<Compile Include="$(CoreLibSharedDir)System\IO\Win32Marshal.cs">
@@ -176,7 +176,7 @@
176176
<Compile Include="$(CoreLibSharedDir)Interop\Unix\System.Native\Interop.PathConf.cs">
177177
<Link>Common\Interop\Unix\Interop.PathConf.cs</Link>
178178
</Compile>
179-
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
179+
<Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
180180
<Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
181181
</Compile>
182182
<Compile Include="$(CoreLibSharedDir)System\PasteArguments.Unix.cs">

‎src/libraries/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,28 @@
3535
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
3636
<Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs</Link>
3737
</Compile>
38-
<Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RTL_OSVERSIONINFOEX.cs">
38+
<Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.RTL_OSVERSIONINFOEX.cs">
3939
<Link>Common\Interop\Windows\NtDll\Interop.RTL_OSVERSIONINFOEX.cs</Link>
4040
</Compile>
41-
<Compile Include="$(CommonPath)\Interop\Windows\NtDll\Interop.RtlGetVersion.cs">
41+
<Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.RtlGetVersion.cs">
4242
<Link>Common\Interop\Windows\NtDll\Interop.RtlGetVersion.cs</Link>
4343
</Compile>
44-
<Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs">
44+
<Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs">
4545
<Link>Common\Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs</Link>
4646
</Compile>
47-
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
47+
<Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
4848
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
4949
</Compile>
5050
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
5151
<Link>Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
5252
</Compile>
53-
<Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
53+
<Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
5454
<Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs</Link>
5555
</Compile>
56-
<Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.GetTokenInformation_void.cs">
56+
<Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetTokenInformation_void.cs">
5757
<Link>Common\Interop\Windows\Advapi32\Interop.GetTokenInformation_void.cs</Link>
5858
</Compile>
59-
<Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs">
59+
<Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs">
6060
<Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs</Link>
6161
</Compile>
6262
<Compile Include="$(CoreLibSharedDir)Interop\Windows\Interop.BOOL.cs">
@@ -65,7 +65,7 @@
6565
</ItemGroup>
6666
<!-- Unix imports -->
6767
<ItemGroup>
68-
<Compile Include="$(CommonPath)\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
68+
<Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
6969
<Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs</Link>
7070
</Compile>
7171
<Compile Include="$(CoreLibSharedDir)Interop\Unix\System.Native\Interop.GetEUid.cs">

‎src/libraries/Directory.Build.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,9 @@
258258

259259
<!-- Set up some common paths -->
260260
<PropertyGroup>
261-
<CommonPath>$(LibrariesProjectRoot)Common\src</CommonPath>
262-
<CommonTestPath>$(LibrariesProjectRoot)Common\tests</CommonTestPath>
261+
<CommonPathRoot>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'Common'))</CommonPathRoot>
262+
<CommonPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'src'))</CommonPath>
263+
<CommonTestPath>$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests'))</CommonTestPath>
263264
</PropertyGroup>
264265

265266
<!-- Set up the default output and intermediate paths -->

0 commit comments

Comments
 (0)