Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit a90d6fa

Browse files
stephentoubstephentoub
committed
Merge pull request #2364 from stephentoub/common_includes
Ensure all Common includes use a <Link/>
2 parents 82f5cef + 3df1073 commit a90d6fa

File tree

28 files changed

+361
-175
lines changed

28 files changed

+361
-175
lines changed

‎src/Common/tests/SystemXml/ModuleCore/ModuleCore.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
<Compile Include="ctestmodule.cs" />
2727
<Compile Include="cvariation.cs" />
2828
<Compile Include="interop.cs" />
29-
<Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
29+
<Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs">
30+
<Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link>
31+
</Compile>
3032
</ItemGroup>
3133
<ItemGroup>
3234
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎src/Common/tests/SystemXml/XmlCoreTest/XmlCoreTest.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
<Compile Include="UnicodeCharHelper.cs" />
2525
<Compile Include="WriterFactory.cs" />
2626
<Compile Include="TestData.g.cs" />
27-
<Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
27+
<Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs">
28+
<Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link>
29+
</Compile>
2830
</ItemGroup>
2931
<ItemGroup>
3032
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎src/System.Console/tests/System.Console.Tests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
<Compile Include="Timeout.cs" />
2727
<Compile Include="ThreadSafety.cs" />
2828
<Compile Include="XunitAssemblyAttributes.cs" />
29-
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs" />
29+
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs">
30+
<Link>Common\Interop\Interop.PlatformDetection.cs</Link>
31+
</Compile>
3032
</ItemGroup>
3133
<ItemGroup>
3234
<ProjectReference Include="..\src\System.Console.csproj">

‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
<ItemGroup>
3535
<Compile Include="FileVersionInfoTest.cs" />
3636
<Compile Include="Interop\Interop.Windows.cs" />
37-
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs" />
37+
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs">
38+
<Link>Common\Interop\Interop.PlatformDetection.cs</Link>
39+
</Compile>
3840
</ItemGroup>
3941
<!-- References used -->
4042
<ItemGroup>

‎src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/System.Diagnostics.Process.Tests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
<Compile Include="ProcessTests.cs" />
2222
<Compile Include="ProcessStandardConsoleTests.cs" />
2323
<Compile Include="ProcessStreamReadTests.cs" />
24-
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs" />
24+
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs">
25+
<Link>Common\Interop\Interop.PlatformDetection.cs</Link>
26+
</Compile>
2527
<Compile Include="ProcessTestBase.cs" />
2628
</ItemGroup>
2729
<ItemGroup>

‎src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,24 @@
2222
<Compile Include="ZipFileTests.cs" />
2323
<Compile Include="ZipFileInvalidFileTests.cs" />
2424
<Compile Include="ZipFileReadOpenUpdateTests.cs" />
25-
<Compile Include="$(CommonTestPath)\Compression\Utilities\CRC.cs" />
26-
<Compile Include="$(CommonTestPath)\Compression\Utilities\FileData.cs" />
27-
<Compile Include="$(CommonTestPath)\Compression\Utilities\LocalMemoryStream.cs" />
28-
<Compile Include="$(CommonTestPath)\Compression\Utilities\StreamHelpers.cs" />
29-
<Compile Include="$(CommonTestPath)\Compression\Utilities\ZipTestHelper.cs" />
30-
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs" />
25+
<Compile Include="$(CommonTestPath)\Compression\Utilities\CRC.cs">
26+
<Link>Common\Compression\Utilities\CRC.cs</Link>
27+
</Compile>
28+
<Compile Include="$(CommonTestPath)\Compression\Utilities\FileData.cs">
29+
<Link>Common\Compression\Utilities\FileData.cs</Link>
30+
</Compile>
31+
<Compile Include="$(CommonTestPath)\Compression\Utilities\LocalMemoryStream.cs">
32+
<Link>Common\Compression\Utilities\LocalMemoryStream.cs</Link>
33+
</Compile>
34+
<Compile Include="$(CommonTestPath)\Compression\Utilities\StreamHelpers.cs">
35+
<Link>Common\Compression\Utilities\StreamHelpers.cs</Link>
36+
</Compile>
37+
<Compile Include="$(CommonTestPath)\Compression\Utilities\ZipTestHelper.cs">
38+
<Link>Common\Compression\Utilities\ZipTestHelper.cs</Link>
39+
</Compile>
40+
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs">
41+
<Link>Common\Interop\Interop.PlatformDetection.cs</Link>
42+
</Compile>
3143
</ItemGroup>
3244
<ItemGroup>
3345
<None Include="project.json" />

‎src/System.IO.Compression/src/System.IO.Compression.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,16 @@
6262
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
6363
<Compile Include="System\IO\Compression\DeflateStream.Windows.cs" />
6464
<Compile Include="System\IO\Compression\ZLibNative.Windows.cs" />
65-
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs" />
65+
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
66+
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
67+
</Compile>
6668
</ItemGroup>
6769
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
6870
<Compile Include="System\IO\Compression\DeflateStream.Unix.cs" />
6971
<Compile Include="System\IO\Compression\ZLibNative.Unix.cs" />
70-
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs" />
72+
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
73+
<Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
74+
</Compile>
7175
</ItemGroup>
7276
<ItemGroup>
7377
<None Include="project.json" />

‎src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,24 @@
3232
<Compile Include="ZipArchive\zip_UpdateTests.cs" />
3333
<Compile Include="Utilities\StripHeaderAndFooter.cs" />
3434
<Compile Include="Utilities\WrappedStream.cs" />
35-
<Compile Include="$(CommonTestPath)\Compression\Utilities\CRC.cs" />
36-
<Compile Include="$(CommonTestPath)\Compression\Utilities\FileData.cs" />
37-
<Compile Include="$(CommonTestPath)\Compression\Utilities\LocalMemoryStream.cs" />
38-
<Compile Include="$(CommonTestPath)\Compression\Utilities\StreamHelpers.cs" />
39-
<Compile Include="$(CommonTestPath)\Compression\Utilities\ZipTestHelper.cs" />
40-
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs" />
35+
<Compile Include="$(CommonTestPath)\Compression\Utilities\CRC.cs">
36+
<Link>Common\Compression\Utilities\CRC.cs</Link>
37+
</Compile>
38+
<Compile Include="$(CommonTestPath)\Compression\Utilities\FileData.cs">
39+
<Link>Common\Compression\Utilities\FileData.cs</Link>
40+
</Compile>
41+
<Compile Include="$(CommonTestPath)\Compression\Utilities\LocalMemoryStream.cs">
42+
<Link>Common\Compression\Utilities\LocalMemoryStream.cs</Link>
43+
</Compile>
44+
<Compile Include="$(CommonTestPath)\Compression\Utilities\StreamHelpers.cs">
45+
<Link>Common\Compression\Utilities\StreamHelpers.cs</Link>
46+
</Compile>
47+
<Compile Include="$(CommonTestPath)\Compression\Utilities\ZipTestHelper.cs">
48+
<Link>Common\Compression\Utilities\ZipTestHelper.cs</Link>
49+
</Compile>
50+
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs">
51+
<Link>Common\Interop\Interop.PlatformDetection.cs</Link>
52+
</Compile>
4153
</ItemGroup>
4254
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
4355
<!-- Temporary until we have new work in build tools to

‎src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
<Compile Include="FileSystemEventArgs.unit.cs" />
3434
<Compile Include="FileSystemWatcher.unit.cs" />
3535
<Compile Include="RenamedEventArgs.unit.cs" />
36-
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs" />
36+
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs">
37+
<Link>Common\Interop\Interop.PlatformDetection.cs</Link>
38+
</Compile>
3739
</ItemGroup>
3840
<ItemGroup>
3941
<None Include="project.json" />

‎src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,9 @@
206206
<Compile Include="FileInfo\CopyTo_str.cs" />
207207
<Compile Include="FileInfo\CopyTo_str_b.cs" />
208208
<!-- Helpers -->
209-
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs" />
209+
<Compile Include="$(CommonPath)\Interop\Interop.PlatformDetection.cs">
210+
<Link>Common\Interop\Interop.PlatformDetection.cs</Link>
211+
</Compile>
210212
</ItemGroup>
211213
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
212214
</Project>

0 commit comments

Comments
 (0)