diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index b0456f3825d1e..af33ed2a021ca 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -260,19 +260,19 @@
     <Compile Include="$(BclSourcesRoot)\System\WeakReference.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\WeakReference.T.CoreCLR.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetStdHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetStdHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetStdHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.HandleTypes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.HandleTypes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.HandleTypes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.CoTaskMemAlloc.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.SysAllocStringByteLen.cs">
-      <Link>Common\Interop\Windows\OleAut32\Interop.SysAllocStringByteLen.cs</Link>
+             Link="Common\Interop\Windows\OleAut32\Interop.SysAllocStringByteLen.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(FeatureUtf8String)' == 'true'">
@@ -283,16 +283,16 @@
   </ItemGroup>
   <ItemGroup Condition="'$(FeatureCominterop)' == 'true'">
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\IDispatch.cs">
-      <Link>Common\System\Runtime\InteropServices\IDispatch.cs</Link>
+             Link="Common\System\Runtime\InteropServices\IDispatch.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\ComEventsMethod.cs" Condition="'$(FeatureClassicCominterop)' == 'true'">
-      <Link>Common\System\Runtime\InteropServices\ComEventsMethod.cs</Link>
+             Link="Common\System\Runtime\InteropServices\ComEventsMethod.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\ComEventsSink.cs" Condition="'$(FeatureClassicCominterop)' == 'true'">
-      <Link>Common\System\Runtime\InteropServices\ComEventsSink.cs</Link>
+             Link="Common\System\Runtime\InteropServices\ComEventsSink.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\Variant.cs" Condition="'$(FeatureClassicCominterop)' == 'true'">
-      <Link>Common\System\Runtime\InteropServices\Variant.cs</Link>
+             Link="Common\System\Runtime\InteropServices\Variant.cs">
     </Compile>
     <Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\WindowsRuntime\ExceptionSupport.cs" />
     <Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\WindowsRuntime\ActivationFactoryLoader.cs" Condition="'$(FeatureCominteropWinRTManagedActivation)' == 'true'" />
@@ -366,7 +366,7 @@
     <Compile Include="$(BclSourcesRoot)\Internal\Runtime\InteropServices\InMemoryAssemblyLoader.cs" />
     <Compile Include="$(BclSourcesRoot)\System\DateTime.Windows.CoreCLR.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
-      <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
+             Link="Common\Interop\Windows\OleAut32\Interop.VariantClear.cs">
     </Compile>
     <Compile Include="$(BclSourcesRoot)\System\ApplicationModel.Windows.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Windows.cs" />
@@ -378,7 +378,7 @@
   <!-- Include additional sources shared files in the compilation -->
   <ItemGroup>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
   </ItemGroup>
   <Import Project="$(LibrariesProjectRoot)\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems" Label="Shared" />
diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
index f36eb5fd382cd..c7a4660ff1a4e 100644
--- a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
+++ b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
@@ -209,16 +209,16 @@
 
   <ItemGroup>
     <Compile Include="..\..\Common\Internal\Runtime\ModuleHeaders.cs">
-      <Link>Common\ModuleHeaders.cs</Link>
+             Link="Common\ModuleHeaders.cs">
     </Compile>
     <Compile Include="..\..\Common\Internal\Text\Utf8String.cs">
-      <Link>Common\Utf8String.cs</Link>
+             Link="Common\Utf8String.cs">
     </Compile>
     <Compile Include="..\..\Common\Internal\Text\Utf8StringBuilder.cs">
-      <Link>Common\Utf8StringBuilder.cs</Link>
+             Link="Common\Utf8StringBuilder.cs">
     </Compile>
     <Compile Include="..\..\Common\System\Collections\Generic\ArrayBuilder.cs">
-      <Link>Common\ArrayBuilder.cs</Link>
+             Link="Common\ArrayBuilder.cs">
     </Compile>
     <Compile Include="..\..\Common\TypeSystem\IL\HelperExtensions.cs">
       <Link>IL\HelperExtensions.cs</Link>
diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
index c034a83959686..44a584985e033 100644
--- a/src/coreclr/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
+++ b/src/coreclr/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
@@ -581,7 +581,7 @@
       <Link>TypeSystem\RuntimeDetermined\TypeSystemContext.RuntimeDetermined.cs</Link>
     </Compile>
     <Compile Include="..\..\Common\System\FormattingHelpers.cs">
-      <Link>Common\System\FormattingHelpers.cs</Link>
+             Link="Common\System\FormattingHelpers.cs">
     </Compile>
     <Compile Include="..\..\Common\TypeSystem\Sorting\ArrayType.Sorting.cs">
       <Link>TypeSystem\Sorting\ArrayType.Sorting.cs</Link>
diff --git a/src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets b/src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets
index 071432c841e84..f0bf12d0a2d03 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets
+++ b/src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)asn.xsd">
-      <Link>Common\System\Security\Cryptography\Asn1\asn.xsd</Link>
+             Link="Common\System\Security\Cryptography\Asn1\asn.xsd">
     </None>
   </ItemGroup>
 
@@ -35,9 +35,9 @@
 
     <Copy
       Condition="'@(_AsnXmlDiffCode)' != '0'"
-      SourceFiles="@(AsnXml -> '$(IntermediateOutputPath)asnxml\%(filename).cs')" 
+      SourceFiles="@(AsnXml -> '$(IntermediateOutputPath)asnxml\%(filename).cs')"
       DestinationFiles="@(AsnXml -> '%(Identity).cs')" />
-    
+
     <Warning Condition="'@(_AsnXmlDiffCode)' != '0'" Text="AsnXml regenerated files, be sure to check them in: @(AsnXml -> '%(Identity).cs')" />
   </Target>
-</Project>  
+</Project>
diff --git a/src/libraries/Common/src/System/Security/Cryptography/Asn1Reader/System.Security.Cryptography.Asn1Reader.Shared.projitems b/src/libraries/Common/src/System/Security/Cryptography/Asn1Reader/System.Security.Cryptography.Asn1Reader.Shared.projitems
index f495ac7aeb3bb..7c3743668ef48 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/Asn1Reader/System.Security.Cryptography.Asn1Reader.Shared.projitems
+++ b/src/libraries/Common/src/System/Security/Cryptography/Asn1Reader/System.Security.Cryptography.Asn1Reader.Shared.projitems
@@ -11,109 +11,109 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Asn1Tag.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\Asn1Tag.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\Asn1Tag.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Asn1Tag.Accelerators.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\Asn1Tag.Accelerators.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\Asn1Tag.Accelerators.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnCharacterStringEncodings.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnCharacterStringEncodings.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnCharacterStringEncodings.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnEncodingRules.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnEncodingRules.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnEncodingRules.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.BitString.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.BitString.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.BitString.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.Boolean.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.Boolean.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.Boolean.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.Enumerated.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.Enumerated.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.Enumerated.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.GeneralizedTime.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.GeneralizedTime.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.GeneralizedTime.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.Integer.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.Integer.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.Integer.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.NamedBitList.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.NamedBitList.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.NamedBitList.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.Null.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.Null.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.Null.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.OctetString.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.OctetString.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.OctetString.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.Oid.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.Oid.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.Oid.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.Sequence.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.Sequence.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.Sequence.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.SetOf.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.SetOf.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.SetOf.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.Text.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.Text.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.Text.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnReader.UtcTime.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnReader.UtcTime.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnReader.UtcTime.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.BitString.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.BitString.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.BitString.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.Boolean.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Boolean.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Boolean.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.Enumerated.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Enumerated.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Enumerated.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.GeneralizedTime.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.GeneralizedTime.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.GeneralizedTime.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.Integer.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Integer.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Integer.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.NamedBitList.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.NamedBitList.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.NamedBitList.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.Null.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Null.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Null.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.OctetString.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.OctetString.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.OctetString.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.Oid.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Oid.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Oid.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.Sequence.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Sequence.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Sequence.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.SetOf.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.SetOf.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.SetOf.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.Text.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Text.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.Text.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)AsnWriter.UtcTime.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\AsnWriter.UtcTime.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\AsnWriter.UtcTime.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)SetOfValueComparer.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\SetOfValueComparer.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\SetOfValueComparer.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)TagClass.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\TagClass.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\TagClass.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UniversalTagNumber.cs">
-      <Link>Common\System\Security\Cryptography\Asn1Reader\UniversalTagNumber.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1Reader\UniversalTagNumber.cs">
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/libraries/Common/tests/Common.Tests.csproj b/src/libraries/Common/tests/Common.Tests.csproj
index 18a311eb4c6d9..d7723b58d1576 100644
--- a/src/libraries/Common/tests/Common.Tests.csproj
+++ b/src/libraries/Common/tests/Common.Tests.csproj
@@ -8,208 +8,208 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs">
-      <Link>Common\System\Collections\DictionaryExtensions.cs</Link>
+             Link="Common\System\Collections\DictionaryExtensions.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>Common\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="Common\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Linux\cgroups\Interop.cgroups.cs">
-      <Link>Common\Interop\Linux\cgroups\Interop.cgroups.cs</Link>
+             Link="Common\Interop\Linux\cgroups\Interop.cgroups.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Linux\procfs\Interop.ProcFsStat.cs">
-      <Link>Common\Interop\Linux\procfs\Interop.ProcFsStat.cs</Link>
+             Link="Common\Interop\Linux\procfs\Interop.ProcFsStat.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\CharArrayHelpers.cs">
-      <Link>Common\System\CharArrayHelpers.cs</Link>
+             Link="Common\System\CharArrayHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Marvin.cs">
-      <Link>Common\System\Marvin.cs</Link>
+             Link="Common\System\Marvin.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\ArrayBuilder.cs">
-      <Link>Common\System\Collections\Generic\ArrayBuilder.cs</Link>
+             Link="Common\System\Collections\Generic\ArrayBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\LargeArrayBuilder.cs">
-      <Link>Common\System\Collections\Generic\LargeArrayBuilder.cs</Link>
+             Link="Common\System\Collections\Generic\LargeArrayBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs">
-      <Link>Common\System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs</Link>
+             Link="Common\System\Collections\Generic\LargeArrayBuilder.SpeedOpt.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs">
-      <Link>Common\System\IO\PathInternal.CaseSensitivity.cs</Link>
+             Link="Common\System\IO\PathInternal.CaseSensitivity.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\RowConfigReader.cs">
-      <Link>Common\System\IO\RowConfigReader.cs</Link>
+             Link="Common\System\IO\RowConfigReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\StringParser.cs">
-      <Link>Common\System\IO\StringParser.cs</Link>
+             Link="Common\System\IO\StringParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpDateParser.cs">
-      <Link>Common\System\Net\HttpDateParser.cs</Link>
+             Link="Common\System\Net\HttpDateParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\IHttpHeadersHandler.cs">
-      <Link>Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\NetEventSource.Quic.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\NetEventSource.Quic.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\NetEventSource.Quic.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicConnection.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicConnection.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicConnection.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicListener.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicListener.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicStream.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicStream.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ReusableTextReader.cs">
-      <Link>Common\System\Text\ReusableTextReader.cs</Link>
+             Link="Common\System\Text\ReusableTextReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\SimpleRegex.cs">
-      <Link>Common\System\Text\SimpleRegex.cs</Link>
+             Link="Common\System\Text\SimpleRegex.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\IdentityHelper.cs">
-      <Link>Common\System\Security\IdentityHelper.cs</Link>
+             Link="Common\System\Security\IdentityHelper.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\PasteArguments.cs">
       <Link>System\PasteArguments.cs</Link>
@@ -246,10 +246,10 @@
     <Compile Include="Tests\System\Net\VirtualNetworkTest.cs" />
     <Compile Include="Tests\System\Net\VirtualNetworkStreamTest.cs" />
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\IO\PathInternal.cs">
       <Link>System\IO\PathInternal.cs</Link>
@@ -260,17 +260,17 @@
       <Link>System\IO\PathInternal.Windows.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="Tests\System\IO\PathInternal.Windows.Tests.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\Win32Marshal.cs">
-      <Link>Common\System\IO\Win32Marshal.cs</Link>
+             Link="Common\System\IO\Win32Marshal.cs">
     </Compile>
     <Compile Include="Tests\System\IO\Win32Marshal.Tests.cs" />
     <Compile Include="$(CoreLibSharedDir)System\PasteArguments.Windows.cs">
@@ -283,10 +283,10 @@
       <Link>System\IO\PathInternal.Unix.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs">
-      <Link>Common\Interop\Unix\Interop.PathConf.cs</Link>
+             Link="Common\Interop\Unix\Interop.PathConf.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\PasteArguments.Unix.cs">
       <Link>System\PasteArguments.Unix.cs</Link>
@@ -295,13 +295,13 @@
   <!-- Linux specific files -->
   <ItemGroup Condition="'$(TargetsLinux)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\Linux\Interop.Libraries.cs">
-      <Link>Common\Interop\Linux\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Linux\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <!-- OSX specific files -->
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -310,4 +310,4 @@
     <Folder Include="System\Net\Sockets\" />
     <Folder Include="System\Net\VirtualNetwork\" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
index 559cca7f20346..c61592eccac62 100644
--- a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
+++ b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
@@ -24,7 +24,7 @@
     <Compile Include="System\PlatformDetection.cs" />
     <Compile Include="System\PlatformDetection.Unix.cs" />
     <Compile Include="System\PlatformDetection.Windows.cs" />
-    <!-- 
+    <!--
       Interop.Library is not designed to support runtime checks therefore we are picking the Windows
       variant from the Common folder and adding the missing members manually.
     -->
@@ -33,40 +33,40 @@
   <!-- Windows imports -->
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.RtlGetVersion.cs">
-      <Link>Common\Interop\Windows\NtDll\Interop.RtlGetVersion.cs</Link>
+             Link="Common\Interop\Windows\NtDll\Interop.RtlGetVersion.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetTokenInformation_void.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.GetTokenInformation_void.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.GetTokenInformation_void.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.TOKEN_ELEVATION.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
   </ItemGroup>
   <!-- Unix imports -->
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetEUid.cs">
-      <Link>Common\Interop\Unix\Interop.GetEUid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetEUid.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
index 1e0036d0e92c7..8b2020be7d2e9 100644
--- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
+++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
@@ -161,27 +161,27 @@
     <Compile Include="Microsoft\CSharp\RuntimeBinder\Syntax\TokenFacts.cs" />
     <Compile Include="Microsoft\CSharp\RuntimeBinder\Syntax\TokenKind.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Numerics\Hashing\HashHelpers.cs">
-      <Link>Common\System\Collections\HashHelpers.cs</Link>
+             Link="Common\System\Collections\HashHelpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(EnableComBinder)'=='true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.VariantClear.cs">
-      <Link>Common\Interop\Windows\OleAut32\Interop.VariantClear.cs</Link>
+             Link="Common\Interop\Windows\OleAut32\Interop.VariantClear.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\ComEventsSink.cs">
-      <Link>Common\System\Runtime\InteropServices\ComEventsSink.cs</Link>
+             Link="Common\System\Runtime\InteropServices\ComEventsSink.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\ComEventsMethod.cs">
-      <Link>Common\System\Runtime\InteropServices\ComEventsMethod.cs</Link>
+             Link="Common\System\Runtime\InteropServices\ComEventsMethod.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\IDispatch.cs">
-        <Link>Common\System\Runtime\InteropServices\IDispatch.cs</Link>
+               Link="Common\System\Runtime\InteropServices\IDispatch.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\Variant.cs">
-        <Link>Common\System\Runtime\InteropServices\Variant.cs</Link>
+               Link="Common\System\Runtime\InteropServices\Variant.cs">
     </Compile>
     <Compile Include="Microsoft\CSharp\RuntimeBinder\ComInterop\ArgBuilder.cs" />
     <Compile Include="Microsoft\CSharp\RuntimeBinder\ComInterop\BoolArgBuilder.cs" />
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj
index 723c7244522e1..94f4ae15854f8 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/tests/Microsoft.Extensions.Caching.Memory.Tests.csproj
@@ -7,10 +7,10 @@
 
   <ItemGroup>
     <Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs">
     </Compile>
     <Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs">
     </Compile>
     <ReferenceFromRuntime Include="Microsoft.Extensions.Caching.Memory" />
   </ItemGroup>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj
index df49f6059b501..25f03d0b8ec85 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Microsoft.Extensions.Configuration.Binder.Tests.csproj
@@ -7,10 +7,10 @@
 
   <ItemGroup>
     <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
-      <Link>Common\ConfigurationProviderExtensions.cs</Link>
+             Link="Common\ConfigurationProviderExtensions.cs">
     </Compile>
     <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
-      <Link>Common\TestStreamHelpers.cs</Link>
+             Link="Common\TestStreamHelpers.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj
index 4b9c4ed4aa1a4..28018e4e9d1e4 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/tests/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj
@@ -7,13 +7,13 @@
 
   <ItemGroup>
     <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
-      <Link>Common\ConfigurationProviderTestBase.cs</Link>
+             Link="Common\ConfigurationProviderTestBase.cs">
     </Compile>
     <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
-      <Link>Common\ConfigurationProviderExtensions.cs</Link>
+             Link="Common\ConfigurationProviderExtensions.cs">
     </Compile>
     <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
-      <Link>Common\TestStreamHelpers.cs</Link>
+             Link="Common\TestStreamHelpers.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj
index 74357f4d7bec5..bf24be8842666 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/tests/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj
@@ -7,18 +7,18 @@
 
   <ItemGroup>
     <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\ConfigurationProviderTestBase.cs">
-      <Link>Common\ConfigurationProviderTestBase.cs</Link>
+             Link="Common\ConfigurationProviderTestBase.cs">
     </Compile>
     <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
-      <Link>Common\ConfigurationProviderExtensions.cs</Link>
+             Link="Common\ConfigurationProviderExtensions.cs">
     </Compile>
     <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs">
-      <Link>Common\TestStreamHelpers.cs</Link>
+             Link="Common\TestStreamHelpers.cs">
     </Compile>
   </ItemGroup>
 
   <ItemGroup>
     <ReferenceFromRuntime Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj
index b65127b632667..2afcea677fa65 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/tests/Microsoft.Extensions.Configuration.Xml.Tests.csproj
@@ -16,22 +16,22 @@
       <Link>Microsoft.Extensions.Configuration\tests\Common\TestStreamHelpers.cs</Link>
     </Compile>
     <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ReplaceCulture.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ReplaceCulture.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ReplaceCulture.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\FrameworkSkipConditionAttribute.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\FrameworkSkipConditionAttribute.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\FrameworkSkipConditionAttribute.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\RuntimeFrameworks.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\RuntimeFrameworks.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\RuntimeFrameworks.cs">
     </Compile>
   </ItemGroup>
-  
+
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
     <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TestPlatformHelper.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TestPlatformHelper.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TestPlatformHelper.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj
index 38c800ff807a5..0444e70290f05 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Configuration/tests/FunctionalTests/Microsoft.Extensions.Configuration.Functional.Tests.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <Compile Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration\tests\Common\ConfigurationProviderExtensions.cs">
-      <Link>Common\ConfigurationProviderExtensions.cs</Link>
+             Link="Common\ConfigurationProviderExtensions.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
index a88b34d985e02..9299501de46df 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj
@@ -8,16 +8,16 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\ParameterDefaultValue\ParameterDefaultValue.cs">
-      <Link>Common\src\Extensions\ParameterDefaultValue\ParameterDefaultValue.cs</Link>
+             Link="Common\src\Extensions\ParameterDefaultValue\ParameterDefaultValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\ActivatorUtilities\ActivatorUtilities.cs">
-      <Link>Common\src\Extensions\ActivatorUtilities\ActivatorUtilities.cs</Link>
+             Link="Common\src\Extensions\ActivatorUtilities\ActivatorUtilities.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\ActivatorUtilities\ActivatorUtilitiesConstructorAttribute.cs">
-      <Link>Common\src\Extensions\ActivatorUtilities\ActivatorUtilitiesConstructorAttribute.cs</Link>
+             Link="Common\src\Extensions\ActivatorUtilities\ActivatorUtilitiesConstructorAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\ActivatorUtilities\ObjectFactory.cs">
-      <Link>Common\src\Extensions\ActivatorUtilities\ObjectFactory.cs</Link>
+             Link="Common\src\Extensions\ActivatorUtilities\ObjectFactory.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
index 80589409dba6b..4b93e144afb1d 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
@@ -49,10 +49,10 @@
     <Compile Condition="'$(ILEmitBackend)' == 'True'" Include="ServiceLookup\ILEmit\*.cs" />
 
     <Compile Include="$(CommonPath)Extensions\ParameterDefaultValue\ParameterDefaultValue.cs">
-      <Link>Common\src\Extensions\ParameterDefaultValue\ParameterDefaultValue.cs</Link>
+             Link="Common\src\Extensions\ParameterDefaultValue\ParameterDefaultValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\TypeNameHelper\TypeNameHelper.cs">
-      <Link>Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs</Link>
+             Link="Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
index 2ce3453a2d2ff..0588cd1aae76f 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
@@ -7,10 +7,10 @@
 
   <ItemGroup>
     <Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs">
     </Compile>
     <Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj
index 6f7344c8ff8cf..335942c765183 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\EmptyDisposable.cs">
-      <Link>Common\src\Extensions\EmptyDisposable.cs</Link>
+             Link="Common\src\Extensions\EmptyDisposable.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj
index 5f23ebcc600ad..27464e76e0638 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj
@@ -9,10 +9,10 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\EmptyDisposable.cs">
-      <Link>Common\src\Extensions\EmptyDisposable.cs</Link>
+             Link="Common\src\Extensions\EmptyDisposable.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\NonCapturingTimer\NonCapturingTimer.cs">
-      <Link>Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs</Link>
+             Link="Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj
index 8cb5229c139d3..379a853c8eab7 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/tests/Microsoft.Extensions.FileProviders.Physical.Tests.csproj
@@ -8,10 +8,10 @@
 
   <ItemGroup>
     <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\xunit\ITestCondition.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TaskExtensions.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TaskExtensions.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\TaskExtensions.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
index 00d510d0cede5..667bb756f1b65 100644
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\HashCodeCombiner\HashCodeCombiner.cs">
-      <Link>Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs</Link>
+             Link="Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj
index c8a0848f51066..4303f5ce1b6b5 100644
--- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj
+++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj
@@ -8,13 +8,13 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\NonCapturingTimer\NonCapturingTimer.cs">
-      <Link>Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs</Link>
+             Link="Common\src\Extensions\NonCapturingTimer\NonCapturingTimer.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\TypeNameHelper\TypeNameHelper.cs">
-      <Link>Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs</Link>
+             Link="Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\ValueStopwatch\ValueStopwatch.cs">
-      <Link>Common\src\Extensions\ValueStopwatch\ValueStopwatch.cs</Link>
+             Link="Common\src\Extensions\ValueStopwatch\ValueStopwatch.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
index 247ee6768e7a8..8fd0c413f7a72 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
@@ -8,13 +8,13 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\TypeNameHelper\TypeNameHelper.cs">
-      <Link>Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs</Link>
+             Link="Common\src\Extensions\TypeNameHelper\TypeNameHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\Logging\NullExternalScopeProvider.cs">
-      <Link>Common\src\Extensions\Logging\NullExternalScopeProvider.cs</Link>
+             Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\Logging\NullScope.cs">
-      <Link>Common\src\Extensions\Logging\NullScope.cs</Link>
+             Link="Common\src\Extensions\Logging\NullScope.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
index a3bb2b570f8ae..1d50b08ffc87a 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs">
-      <Link>Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs</Link>
+             Link="Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
index 9bf8ca6491ae0..8e21a65ecbb3b 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
@@ -16,10 +16,10 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\Logging\NullExternalScopeProvider.cs">
-      <Link>Common\src\Extensions\Logging\NullExternalScopeProvider.cs</Link>
+             Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\Logging\NullScope.cs">
-      <Link>Common\src\Extensions\Logging\NullScope.cs</Link>
+             Link="Common\src\Extensions\Logging\NullScope.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj
index 936305667687c..959d6b62bec38 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj
@@ -12,10 +12,10 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\Logging\NullExternalScopeProvider.cs">
-      <Link>Common\src\Extensions\Logging\NullExternalScopeProvider.cs</Link>
+             Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\Logging\NullScope.cs">
-      <Link>Common\src\Extensions\Logging\NullScope.cs</Link>
+             Link="Common\src\Extensions\Logging\NullScope.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj
index 930e42aeef452..da0000d4a0297 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj
@@ -18,15 +18,15 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
-    <Reference Include="System.Diagnostics.EventLog" /> 
+    <Reference Include="System.Diagnostics.EventLog" />
   </ItemGroup>
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\Logging\NullExternalScopeProvider.cs">
-      <Link>Common\src\Extensions\Logging\NullExternalScopeProvider.cs</Link>
+             Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\Logging\NullScope.cs">
-      <Link>Common\src\Extensions\Logging\NullScope.cs</Link>
+             Link="Common\src\Extensions\Logging\NullScope.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj
index 9458321aabdfb..dc74f5826d4be 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj
@@ -9,10 +9,10 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\Logging\NullExternalScopeProvider.cs">
-      <Link>Common\src\Extensions\Logging\NullExternalScopeProvider.cs</Link>
+             Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\Logging\NullScope.cs">
-      <Link>Common\src\Extensions\Logging\NullScope.cs</Link>
+             Link="Common\src\Extensions\Logging\NullScope.cs">
     </Compile>
 
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj
index b97b83142698c..21ce0c3b53bda 100644
--- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj
@@ -8,13 +8,13 @@
 
   <ItemGroup>
     <Compile Include="$(CommonPath)\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs">
-      <Link>Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs</Link>
+             Link="Common\Extensions\ProviderAliasUtilities\ProviderAliasUtilities.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\Logging\NullExternalScopeProvider.cs">
-      <Link>Common\src\Extensions\Logging\NullExternalScopeProvider.cs</Link>
+             Link="Common\src\Extensions\Logging\NullExternalScopeProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Extensions\Logging\NullScope.cs">
-      <Link>Common\src\Extensions\Logging\NullScope.cs</Link>
+             Link="Common\src\Extensions\Logging\NullScope.cs">
     </Compile>
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj
index 905b9a874c12d..ff3b64c09fdc2 100644
--- a/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/tests/Microsoft.Extensions.Logging.Testing.Tests.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <Compile Include="..\..\..\..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ShortClassNameAttribute.cs">
-      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ShortClassNameAttribute.cs</Link>
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ShortClassNameAttribute.cs">
     </Compile>
     <Compile Include="..\src\LogLevelAttribute.cs">
       <Link>tests\DI.Common\Common\src\LogLevelAttribute.cs</Link>
diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj
index 407d76de016d8..73e85fe0b4e72 100644
--- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj
+++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Extensions\HashCodeCombiner\HashCodeCombiner.cs">
-      <Link>Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs</Link>
+             Link="Common\src\Extensions\HashCodeCombiner\HashCodeCombiner.cs">
     </Compile>
     <Compile Include="CancellationChangeToken.cs" />
     <Compile Include="ChangeToken.cs" />
@@ -35,4 +35,4 @@
     <Reference Include="System.Memory" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
index 1114cc984bd05..8aa1db1a32765 100644
--- a/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
+++ b/src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj
@@ -9,24 +9,24 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="System\ComponentModel\Win32Exception.Windows.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
     <Compile Include="System\ComponentModel\Win32Exception.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.InteropServices" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
index c477714db0b9f..89c9e0aff2675 100644
--- a/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(TargetsAnyOS)' != 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegistryConstants.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegistryConstants.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegistryConstants.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs">
       <Link>Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs</Link>
@@ -31,55 +31,55 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegCloseKey.cs">
-      <Link>Common\Interop\Windows\Interop.RegCloseKey.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegCloseKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegConnectRegistry.cs">
-      <Link>Common\Interop\Windows\Interop.RegConnectRegistry.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegConnectRegistry.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegCreateKeyEx.cs">
-      <Link>Common\Interop\Windows\Interop.RegCreateKeyEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegCreateKeyEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegDeleteKeyEx.cs">
-      <Link>Common\Interop\Windows\Interop.RegDeleteKeyEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegDeleteKeyEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegDeleteValue.cs">
-      <Link>Common\Interop\Windows\Interop.RegDeleteValue.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegDeleteValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegEnumKeyEx.cs">
-      <Link>Common\Interop\Windows\Interop.RegEnumKeyEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegEnumKeyEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegEnumValue.cs">
-      <Link>Common\Interop\Windows\Interop.RegEnumValue.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegEnumValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegFlushKey.cs">
-      <Link>Common\Interop\Windows\Interop.RegFlushKey.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegFlushKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegOpenKeyEx.cs">
-      <Link>Common\Interop\Windows\Interop.RegOpenKeyEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegOpenKeyEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegQueryInfoKey.cs">
-      <Link>Common\Interop\Windows\Interop.RegQueryInfoKey.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegQueryInfoKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs">
-      <Link>Common\Interop\Windows\Interop.RegQueryValueEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegQueryValueEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegSetValueEx.cs">
-      <Link>Common\Interop\Windows\Interop.RegSetValueEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegSetValueEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="Microsoft\Win32\RegistryKey.Windows.cs" />
     <Compile Include="$(CoreLibSharedDir)Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs">
diff --git a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
index 0f007343e8522..28ac7d8d94941 100644
--- a/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.csproj
@@ -5,10 +5,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegSetValueEx.cs">
-      <Link>Common\Interop\Windows\Interop.RegSetValueEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegSetValueEx.cs">
     </Compile>
     <Compile Include="Helpers.cs" />
     <Compile Include="RegistryKey\RegistryKey_GetValue_CorruptData.cs" />
@@ -58,4 +58,4 @@
     <Compile Include="TestData.cs" />
     <Compile Include="XunitAssemblyAttributes.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
index 9305567a07479..830230afaaf61 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj
@@ -10,124 +10,124 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\User32\Interop.Constants.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.Constants.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.CreateWindowEx.cs">
-      <Link>Common\Interop\Windows\User32\Interop.CreateWindowEx.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.CreateWindowEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.DefWindowProc.cs">
-      <Link>Common\Interop\Windows\User32\Interop.DefWindowProc.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.DefWindowProc.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.DestroyWindow.cs">
-      <Link>Common\Interop\Windows\User32\Interop.DestroyWindow.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.DestroyWindow.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.DispatchMessage.cs">
-      <Link>Common\Interop\Windows\User32\Interop.DispatchMessage.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.DispatchMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetClassInfo.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetClassInfo.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetClassInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetProcessWindowStation.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetProcessWindowStation.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetProcessWindowStation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetUserObjectInformation.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetUserObjectInformation.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetUserObjectInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.IsWindow.cs">
-      <Link>Common\Interop\Windows\User32\Interop.IsWindow.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.IsWindow.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.KillTimer.cs">
-      <Link>Common\Interop\Windows\User32\Interop.KillTimer.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.KillTimer.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.MSG.cs">
-      <Link>Common\Interop\Windows\User32\Interop.MSG.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.MSG.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.MsgWaitForMultipleObjectsEx.cs">
-      <Link>Common\Interop\Windows\User32\Interop.MsgWaitForMultipleObjectsEx.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.MsgWaitForMultipleObjectsEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.PeekMessage.cs">
-      <Link>Common\Interop\Windows\User32\Interop.PeekMessage.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.PeekMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.PostMessage.cs">
-      <Link>Common\Interop\Windows\User32\Interop.PostMessage.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.PostMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.RegisterClass.cs">
-      <Link>Common\Interop\Windows\User32\Interop.RegisterClass.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.RegisterClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.RegisterWindowMessage.cs">
-      <Link>Common\Interop\Windows\User32\Interop.RegisterWindowMessage.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.RegisterWindowMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SendMessage.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SendMessage.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SendMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SetClassLong.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SetClassLong.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SetClassLong.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SetClassLongPtr.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SetClassLongPtr.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SetClassLongPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SetTimer.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SetTimer.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SetTimer.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SetWindowLong.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SetWindowLong.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SetWindowLong.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SetWindowLongPtr.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SetWindowLongPtr.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SetWindowLongPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.TranslateMessage.cs">
-      <Link>Common\Interop\Windows\User32\Interop.TranslateMessage.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.TranslateMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.UnregisterClass.cs">
-      <Link>Common\Interop\Windows\User32\Interop.UnregisterClass.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.UnregisterClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.USEROBJECTFLAGS.cs">
-      <Link>Common\Interop\Windows\User32\Interop.USEROBJECTFLAGS.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.USEROBJECTFLAGS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.WNDCLASS.cs">
-      <Link>Common\Interop\Windows\User32\Interop.WNDCLASS.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.WNDCLASS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.WndProc.cs">
-      <Link>Common\Interop\Windows\User32\Interop.WndProc.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.WndProc.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCurrentThreadId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetModuleHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LoadLibrary.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetConsoleCtrlHandler.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetConsoleCtrlHandler.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetConsoleCtrlHandler.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WtsApi32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\WtsApi32\Interop.Constants.cs</Link>
+             Link="Common\Interop\Windows\WtsApi32\Interop.Constants.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WtsApi32\Interop.WTSRegisterSessionNotification.cs">
-      <Link>Common\Interop\Windows\WtsApi32\Interop.WTSRegisterSessionNotification.cs</Link>
+             Link="Common\Interop\Windows\WtsApi32\Interop.WTSRegisterSessionNotification.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WtsApi32\Interop.WTSUnRegisterSessionNotification.cs">
-      <Link>Common\Interop\Windows\WtsApi32\Interop.WTSUnRegisterSessionNotification.cs</Link>
+             Link="Common\Interop\Windows\WtsApi32\Interop.WTSUnRegisterSessionNotification.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
     </Compile>
     <Compile Include="Microsoft\Win32\PowerModeChangedEventArgs.cs" />
     <Compile Include="Microsoft\Win32\PowerModeChangedEventHandler.cs" />
@@ -151,7 +151,7 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'">
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs">
-      <Link>Common\System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs</Link>
+             Link="Common\System\Runtime\InteropServices\SuppressGCTransitionAttribute.internal.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
@@ -174,4 +174,4 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
     <Reference Include="System.ComponentModel.TypeConverter" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
index c536995d9bf27..26ad97bb25d16 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
+++ b/src/libraries/Microsoft.Win32.SystemEvents/tests/Microsoft.Win32.SystemEvents.Tests.csproj
@@ -4,16 +4,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\User32\Interop.Constants.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.Constants.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.FindWindow.cs">
-      <Link>Common\Interop\Windows\User32\Interop.FindWindow.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.FindWindow.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SendMessage.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SendMessage.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SendMessage.cs">
     </Compile>
     <Compile Include="GenericEventTests.cs" />
     <Compile Include="SystemEvents.InvokeOnEventsThread.cs" />
@@ -33,4 +33,4 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj
index e30f1847fded3..f9890464309a4 100644
--- a/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj
+++ b/src/libraries/System.CodeDom/tests/System.CodeDom.Tests.csproj
@@ -98,22 +98,22 @@
     <Compile Include="System\CodeDom\Compiler\VBCodeGenerationTests.cs" />
     <Compile Include="System\CodeDom\Compiler\CSharpCodeGenerationTests.cs" />
     <Compile Include="$(CommonTestPath)System\Collections\IList.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IList.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IList.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\ICollection.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.NonGeneric.cs">
-      <Link>Common\System\Collections\TestBase.NonGeneric.cs</Link>
+             Link="Common\System\Collections\TestBase.NonGeneric.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
-      <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
+             Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
index 08891beb71dbc..0cc9ceb900e7c 100644
--- a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
+++ b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj
@@ -10,58 +10,58 @@
     </Compile>
     <!-- Common Collections tests -->
     <Compile Include="$(CommonTestPath)System\Collections\CollectionAsserts.cs">
-      <Link>Common\System\Collections\CollectionAsserts.cs</Link>
+             Link="Common\System\Collections\CollectionAsserts.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\ICollection.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.Generic.Tests.cs">
-      <Link>Common\System\Collections\ICollection.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IDictionary.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IDictionary.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.Generic.Tests.cs">
-      <Link>Common\System\Collections\IDictionary.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IDictionary.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.Generic.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IList.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IList.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IList.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IList.Generic.Tests.cs">
-      <Link>Common\System\Collections\IList.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IList.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IGenericSharedAPI.Tests.cs">
-      <Link>Common\System\Collections\IGenericSharedAPI.Tests.cs</Link>
+             Link="Common\System\Collections\IGenericSharedAPI.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ISet.Generic.Tests.cs">
-      <Link>Common\System\Collections\ISet.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\ISet.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.NonGeneric.cs">
-      <Link>Common\System\Collections\TestBase.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\TestBase.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.Generic.cs">
-      <Link>Common\System\Collections\TestBase.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\TestBase.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\DebugView.Tests.cs">
-      <Link>Common\System\Collections\DebugView.Tests.cs</Link>
+             Link="Common\System\Collections\DebugView.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestingTypes.cs">
-      <Link>Common\System\Collections\TestingTypes.cs</Link>
+             Link="Common\System\Collections\TestingTypes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\EnumTypes.cs">
-      <Link>Common\System\EnumTypes.cs</Link>
+             Link="Common\System\EnumTypes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
-      <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
+             Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
     </Compile>
     <Compile Include="BlockingCollectionCancellationTests.cs" />
     <Compile Include="BlockingCollectionTests.cs" />
@@ -81,15 +81,15 @@
     <Compile Include="ProducerConsumerCollectionTests.cs" />
     <Compile Include="RangePartitionerNegativeTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.Generic.Serialization.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj
index ed5c6b9cd674c..8df37a25a3b62 100644
--- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj
+++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj
@@ -84,7 +84,7 @@
     <Compile Include="Validation\Requires.cs" />
     <Compile Include="Validation\ValidatedNotNullAttribute.cs" />
     <Compile Include="$(CommonPath)System\Runtime\Versioning\NonVersionableAttribute.cs">
-      <Link>Common\System\Runtime\Versioning\NonVersionableAttribute.cs</Link>
+             Link="Common\System\Runtime\Versioning\NonVersionableAttribute.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0' or '$(TargetFramework)' == 'netstandard1.3'">
diff --git a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
index e1b74ff9bd515..492bcd830fb43 100644
--- a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
+++ b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs" Condition="'$(TargetsNetFx)' == 'true'">
-      <Link>Common\System\Collections\DictionaryExtensions.cs</Link>
+             Link="Common\System\Collections\DictionaryExtensions.cs">
     </Compile>
     <Compile Include="BadHasher.cs" />
     <Compile Include="EverythingEqual.cs" />
@@ -33,62 +33,62 @@
     <Compile Include="SimpleElementImmutablesTestBase.cs" />
     <Compile Include="TestExtensionsMethods.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <!-- Common Collections tests -->
     <Compile Include="$(CommonTestPath)System\Collections\CollectionAsserts.cs">
-      <Link>Common\System\Collections\CollectionAsserts.cs</Link>
+             Link="Common\System\Collections\CollectionAsserts.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\DelegateEqualityComparer.cs">
-      <Link>Common\System\Collections\DelegateEqualityComparer.cs</Link>
+             Link="Common\System\Collections\DelegateEqualityComparer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\ICollection.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.Generic.Tests.cs">
-      <Link>Common\System\Collections\ICollection.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IDictionary.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IDictionary.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.Generic.Tests.cs">
-      <Link>Common\System\Collections\IDictionary.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IDictionary.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.Generic.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IList.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IList.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IList.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IList.Generic.Tests.cs">
-      <Link>Common\System\Collections\IList.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IList.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IGenericSharedAPI.Tests.cs">
-      <Link>Common\System\Collections\IGenericSharedAPI.Tests.cs</Link>
+             Link="Common\System\Collections\IGenericSharedAPI.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ISet.Generic.Tests.cs">
-      <Link>Common\System\Collections\ISet.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\ISet.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.NonGeneric.cs">
-      <Link>Common\System\Collections\TestBase.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\TestBase.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.Generic.cs">
-      <Link>Common\System\Collections\TestBase.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\TestBase.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\DebugView.Tests.cs">
-      <Link>Common\System\Collections\DebugView.Tests.cs</Link>
+             Link="Common\System\Collections\DebugView.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestingTypes.cs">
-      <Link>Common\System\Collections\TestingTypes.cs</Link>
+             Link="Common\System\Collections\TestingTypes.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\SerializableAttribute.cs">
-      <Link>Common\System\SerializableAttribute.cs</Link>
+             Link="Common\System\SerializableAttribute.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -116,4 +116,4 @@
     <Compile Include="ImmutableSortedSetBuilderTest.nonnetstandard.cs" />
     <Compile Include="ImmutableSortedDictionaryTest.nonnetstandard.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
index 2e6adcbba08cf..e5a05f9c25e40 100644
--- a/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
+++ b/src/libraries/System.Collections.NonGeneric/src/System.Collections.NonGeneric.csproj
@@ -17,7 +17,7 @@
     <Compile Include="System\Collections\Stack.cs" />
     <Compile Include="System\Collections\Specialized\CollectionsUtil.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Collections\KeyValuePairs.cs">
-      <Link>Common\System\Collections\KeyValuePairs.cs</Link>
+             Link="Common\System\Collections\KeyValuePairs.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
index f5e98bb527524..53b436ad02f13 100644
--- a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
+++ b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
@@ -6,25 +6,25 @@
   <ItemGroup>
     <!-- Common Collections tests -->
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\ICollection.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IDictionary.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IDictionary.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IList.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IList.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IList.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.NonGeneric.cs">
-      <Link>Common\System\Collections\TestBase.NonGeneric.cs</Link>
+             Link="Common\System\Collections\TestBase.NonGeneric.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestingTypes.cs">
-      <Link>Common\System\Collections\TestingTypes.cs</Link>
+             Link="Common\System\Collections\TestingTypes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
-      <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
+             Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
     </Compile>
     <Compile Include="ArrayListTests.cs" />
     <Compile Include="ArrayList\ArrayList.IList.Tests.cs" />
@@ -43,11 +43,11 @@
     <Compile Include="SortedListTests.cs" />
     <Compile Include="StackTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
     <Compile Include="CaseInsensitiveHashCodeProviderTests.cs" />
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj
index f024aa1179130..ae80183ebba42 100644
--- a/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj
+++ b/src/libraries/System.Collections.Specialized/src/System.Collections.Specialized.csproj
@@ -16,7 +16,7 @@
     <Compile Include="System\Collections\Specialized\StringCollection.cs" />
     <Compile Include="System\Collections\Specialized\StringDictionary.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Collections\CompatibleComparer.cs">
-      <Link>Common\System\Collections\CompatibleComparer.cs</Link>
+             Link="Common\System\Collections\CompatibleComparer.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
index 1027ec603631a..27e41cfdd3647 100644
--- a/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
+++ b/src/libraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
@@ -5,28 +5,28 @@
   <ItemGroup>
     <!-- Common Collections tests -->
     <Compile Include="$(CommonTestPath)System\Collections\CollectionAsserts.cs">
-      <Link>Common\System\Collections\CollectionAsserts.cs</Link>
+             Link="Common\System\Collections\CollectionAsserts.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\ICollection.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IDictionary.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IDictionary.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.NonGeneric.cs">
-      <Link>Common\System\Collections\TestBase.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\TestBase.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestingTypes.cs">
-      <Link>Common\System\Collections\TestingTypes.cs</Link>
+             Link="Common\System\Collections\TestingTypes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
-      <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
+             Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
     </Compile>
     <Compile Include="BitVector32Tests.cs" />
     <Compile Include="Helpers.cs" />
@@ -82,8 +82,8 @@
     <Compile Include="StringDictionary\StringDictionary.ValuesTests.cs" />
     <Compile Include="StringDictionary\StringDictionaryClearTests.cs" />
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs">
     </Compile>
     <Compile Include="NameObjectCollectionBase\NameObjectCollectionBase.ConstructorTests.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Collections/src/System.Collections.csproj b/src/libraries/System.Collections/src/System.Collections.csproj
index ca99c1d7aed64..e689a41b8057d 100644
--- a/src/libraries/System.Collections/src/System.Collections.csproj
+++ b/src/libraries/System.Collections/src/System.Collections.csproj
@@ -14,10 +14,10 @@
     <Compile Include="System\Collections\Generic\BitHelper.cs" />
     <Compile Include="System\Collections\Generic\CollectionExtensions.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Collections\Generic\ICollectionDebugView.cs">
-      <Link>Common\System\Collections\Generic\ICollectionDebugView.cs</Link>
+             Link="Common\System\Collections\Generic\ICollectionDebugView.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\Collections\Generic\IDictionaryDebugView.cs">
-      <Link>Common\System\Collections\Generic\IDictionaryDebugView.cs</Link>
+             Link="Common\System\Collections\Generic\IDictionaryDebugView.cs">
     </Compile>
     <Compile Include="System\Collections\Generic\HashSet.cs" />
     <Compile Include="System\Collections\Generic\HashSetEqualityComparer.cs" />
@@ -34,10 +34,10 @@
     <Compile Include="System\Collections\StructuralComparisons.cs" />
     <!-- Shared Common -->
     <Compile Include="$(CoreLibSharedDir)System\Collections\HashHelpers.cs">
-      <Link>Common\System\Collections\HashHelpers.cs</Link>
+             Link="Common\System\Collections\HashHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\EnumerableHelpers.cs">
-      <Link>Common\System\Collections\Generic\EnumerableHelpers.cs</Link>
+             Link="Common\System\Collections\Generic\EnumerableHelpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
index 0614402205bbe..c5b5e3caa0fd9 100644
--- a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
+++ b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj
@@ -6,61 +6,61 @@
   <ItemGroup>
     <!-- Common Collections tests -->
     <Compile Include="$(CommonTestPath)System\Collections\CollectionAsserts.cs">
-      <Link>Common\System\Collections\CollectionAsserts.cs</Link>
+             Link="Common\System\Collections\CollectionAsserts.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\ICollection.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.Generic.Tests.cs">
-      <Link>Common\System\Collections\ICollection.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IDictionary.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IDictionary.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.Generic.Tests.cs">
-      <Link>Common\System\Collections\IDictionary.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IDictionary.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.Generic.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IList.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IList.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IList.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IList.Generic.Tests.cs">
-      <Link>Common\System\Collections\IList.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IList.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IGenericSharedAPI.Tests.cs">
-      <Link>Common\System\Collections\IGenericSharedAPI.Tests.cs</Link>
+             Link="Common\System\Collections\IGenericSharedAPI.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ISet.Generic.Tests.cs">
-      <Link>Common\System\Collections\ISet.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\ISet.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.NonGeneric.cs">
-      <Link>Common\System\Collections\TestBase.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\TestBase.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.Generic.cs">
-      <Link>Common\System\Collections\TestBase.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\TestBase.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\DebugView.Tests.cs">
-      <Link>Common\System\Collections\DebugView.Tests.cs</Link>
+             Link="Common\System\Collections\DebugView.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestingTypes.cs">
-      <Link>Common\System\Collections\TestingTypes.cs</Link>
+             Link="Common\System\Collections\TestingTypes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\EnumTypes.cs">
-      <Link>Common\System\EnumTypes.cs</Link>
+             Link="Common\System\EnumTypes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\ObjectCloner.cs">
-      <Link>Common\System\ObjectCloner.cs</Link>
+             Link="Common\System\ObjectCloner.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\RandomExtensions.cs">
-      <Link>Common\System\RandomExtensions.cs</Link>
+             Link="Common\System\RandomExtensions.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
-      <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
+             Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
     </Compile>
     <!-- Generic tests -->
     <Compile Include="Generic\SortedSet\SortedSet.TreeSubSet.Tests.cs" />
@@ -134,20 +134,20 @@
     <Compile Include="Generic\Stack\Stack.Generic.cs" />
     <Compile Include="Generic\Stack\Stack.Generic.Tests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
     <Compile Include="Generic\Comparers\EqualityComparer.Generic.Serialization.Tests.cs" />
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Serialization.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.Generic.Serialization.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.Generic.Tests.netcoreapp.cs">
-      <Link>Common\System\Collections\IDictionary.Generic.Tests.netcoreapp.cs</Link>
+             Link="Common\System\Collections\IDictionary.Generic.Tests.netcoreapp.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.NonGeneric.Tests.netcoreapp.cs">
-      <Link>Common\System\Collections\IDictionary.NonGeneric.Tests.netcoreapp.cs</Link>
+             Link="Common\System\Collections\IDictionary.NonGeneric.Tests.netcoreapp.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj
index e3898f5ee0da3..e692835ecdb82 100644
--- a/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj
+++ b/src/libraries/System.ComponentModel.Annotations/src/System.ComponentModel.Annotations.csproj
@@ -51,7 +51,7 @@
     <Compile Include="System\ComponentModel\DataAnnotations\ValidationResult.cs" />
     <Compile Include="System\ComponentModel\DataAnnotations\Validator.cs" />
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj
index a8442b7eedf76..8ff7dc1029a21 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj
+++ b/src/libraries/System.ComponentModel.Composition.Registration/src/System.ComponentModel.Composition.Registration.csproj
@@ -14,23 +14,23 @@
     <Compile Include="System\Threading\ReadLock.cs" />
     <Compile Include="System\Threading\WriteLock.cs" />
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\CompositionTrace.cs">
-      <Link>Common\System\Composition\Diagnostics\CompositionTrace.cs</Link>
+             Link="Common\System\Composition\Diagnostics\CompositionTrace.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\CompositionTraceId.cs">
-      <Link>Common\System\Composition\Diagnostics\CompositionTraceId.cs</Link>
+             Link="Common\System\Composition\Diagnostics\CompositionTraceId.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\CompositionTraceSource.cs">
-      <Link>Common\System\Composition\Diagnostics\CompositionTraceSource.cs</Link>
+             Link="Common\System\Composition\Diagnostics\CompositionTraceSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\DebuggerTraceWriter.cs">
-      <Link>Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs</Link>
+             Link="Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\TraceWriter.cs">
-      <Link>Common\System\Composition\Diagnostics\TraceWriter.cs</Link>
+             Link="Common\System\Composition\Diagnostics\TraceWriter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Reflection.Context" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
index bcd943cbd0b02..6a69ae0bcdf4e 100644
--- a/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
+++ b/src/libraries/System.ComponentModel.Composition/src/System.ComponentModel.Composition.csproj
@@ -177,16 +177,16 @@
     <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionType.cs" />
     <Compile Include="System\ComponentModel\Composition\ReflectionModel\ReflectionWritableMember.cs" />
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\CompositionTraceId.cs">
-      <Link>Common\System\Composition\Diagnostics\CompositionTraceId.cs</Link>
+             Link="Common\System\Composition\Diagnostics\CompositionTraceId.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\CompositionTraceSource.cs">
-      <Link>Common\System\Composition\Diagnostics\CompositionTraceSource.cs</Link>
+             Link="Common\System\Composition\Diagnostics\CompositionTraceSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\DebuggerTraceWriter.cs">
-      <Link>Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs</Link>
+             Link="Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\TraceWriter.cs">
-      <Link>Common\System\Composition\Diagnostics\TraceWriter.cs</Link>
+             Link="Common\System\Composition\Diagnostics\TraceWriter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' != 'true'">
@@ -218,4 +218,4 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Text.Encoding.Extensions" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
index 52d0ec7cfa644..a8ab735535cd1 100644
--- a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
+++ b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj
@@ -11,10 +11,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">
-      <Link>Common\System\IO\TempDirectory.cs</Link>
+             Link="Common\System\IO\TempDirectory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="IMetadataView.cs" />
@@ -179,4 +179,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
index 5285055594c6e..54d887b30ae81 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System.ComponentModel.TypeConverter.csproj
@@ -240,7 +240,7 @@
     <Compile Include="System\ComponentModel\ComponentResourceManager.cs" />
     <Compile Include="System\Security\Authentication\ExtendedProtection\ExtendedProtectionPolicyTypeConverter.cs" />
     <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+             Link="Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -266,4 +266,4 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Xml.XDocument" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj
index e83917a8d6803..8908517e62d9a 100644
--- a/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj
+++ b/src/libraries/System.Composition.Convention/src/System.Composition.Convention.csproj
@@ -14,22 +14,22 @@
     <Compile Include="System\Composition\Convention\PartConventionBuilder.cs" />
     <Compile Include="System\Composition\Convention\PartConventionBuilderOfT.cs" />
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\CompositionTrace.cs">
-      <Link>Common\System\Composition\Diagnostics\CompositionTrace.cs</Link>
+             Link="Common\System\Composition\Diagnostics\CompositionTrace.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\CompositionTraceId.cs">
-      <Link>Common\System\Composition\Diagnostics\CompositionTraceId.cs</Link>
+             Link="Common\System\Composition\Diagnostics\CompositionTraceId.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\CompositionTraceSource.cs">
-      <Link>Common\System\Composition\Diagnostics\CompositionTraceSource.cs</Link>
+             Link="Common\System\Composition\Diagnostics\CompositionTraceSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\DebuggerTraceWriter.cs">
-      <Link>Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs</Link>
+             Link="Common\System\Composition\Diagnostics\DebuggerTraceWriter.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Composition\Diagnostics\TraceWriter.cs">
-      <Link>Common\System\Composition\Diagnostics\TraceWriter.cs</Link>
+             Link="Common\System\Composition\Diagnostics\TraceWriter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
index 8fc187238cd06..5e78be0b6f2ec 100644
--- a/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
+++ b/src/libraries/System.Composition.TypedParts/src/System.Composition.TypedParts.csproj
@@ -27,7 +27,7 @@
     <Compile Include="System\Composition\TypedParts\TypedPartExportDescriptorProvider.cs" />
     <Compile Include="System\Composition\TypedParts\Util\DirectAttributeContext.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Numerics\Hashing\HashHelpers.cs">
-      <Link>Common\System\Numerics\Hashing\HashHelpers.cs</Link>
+             Link="Common\System\Numerics\Hashing\HashHelpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -35,4 +35,4 @@
     <ProjectReference Include="..\..\System.Composition.Hosting\src\System.Composition.Hosting.csproj" />
     <ProjectReference Include="..\..\System.Composition.Runtime\src\System.Composition.Runtime.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj
index d394da4cf09e9..e2e5ab4f833bc 100644
--- a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj
+++ b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj
@@ -5,8 +5,8 @@
   <ItemGroup>
     <Compile Include="ContainerConfigurationTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
     <Compile Include="ReflectionTests.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
index 6de345cee0625..bd91cbfe4cc51 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj
@@ -238,7 +238,7 @@
     <Compile Include="System\Configuration\XmlUtilWriter.cs" />
     <Compile Include="System\Drawing\Configuration\SystemDrawingSection.cs" />
     <Compile Include="$(CommonPath)System\Security\IdentityHelper.cs">
-      <Link>Common\System\Security\IdentityHelper.cs</Link>
+             Link="Common\System\Security\IdentityHelper.cs">
     </Compile>
     <Compile Include="System\Configuration\SettingsProperty.cs" />
     <Compile Include="System\Configuration\SettingsPropertyValue.cs" />
@@ -246,7 +246,7 @@
     <Compile Include="System\Configuration\NoSettingsVersionUpgradeAttribute.cs" />
     <Compile Include="System\UriIdnScope.cs" />
     <Compile Include="$(CommonPath)System\IO\TempFileCollection.cs">
-      <Link>Common\System\IO\TempFileCollection.cs</Link>
+             Link="Common\System\IO\TempFileCollection.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
@@ -261,4 +261,4 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
index ae774993387ff..deb898dd27067 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">
-      <Link>Common\System\IO\TempDirectory.cs</Link>
+             Link="Common\System\IO\TempDirectory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="..\src\System\Configuration\ConfigPathUtility.cs">
       <Link>Source\ConfigPathUtility.cs</Link>
@@ -112,4 +112,4 @@
     <Compile Include="System\Configuration\ValidatiorUtilsTests.cs" />
     <Compile Include="System\Drawing\Configuration\SystemDrawingSectionTests.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Console/src/System.Console.csproj b/src/libraries/System.Console/src/System.Console.csproj
index 1415fce320a6a..6238759d5ea77 100644
--- a/src/libraries/System.Console/src/System.Console.csproj
+++ b/src/libraries/System.Console/src/System.Console.csproj
@@ -18,159 +18,159 @@
     <Compile Include="System\IO\SyncTextReader.cs" />
     <Compile Include="System\IO\Error.cs" />
     <Compile Include="$(CommonPath)System\Text\ConsoleEncoding.cs">
-      <Link>Common\System\Text\ConsoleEncoding.cs</Link>
+             Link="Common\System\Text\ConsoleEncoding.cs">
     </Compile>
   </ItemGroup>
   <!-- iOS/tvOS -->
   <ItemGroup Condition="'$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="System\ConsolePal.iOS.cs" />
     <Compile Include="$(CommonPath)Interop\OSX\System.Native\Interop.Log.cs">
-      <Link>Common\Interop\OSX\Interop.Log.cs</Link>
+             Link="Common\Interop\OSX\Interop.Log.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <!-- Windows -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="System\ConsolePal.Windows.cs" />
     <Compile Include="$(CommonPath)System\Text\OSEncoding.Windows.cs">
-      <Link>Common\System\Text\OSEncoding.Windows.cs</Link>
+             Link="Common\System\Text\OSEncoding.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\OSEncoder.cs">
-      <Link>Common\System\Text\OSEncoder.cs</Link>
+             Link="Common\System\Text\OSEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\DBCSDecoder.cs">
-      <Link>Common\System\Text\DBCSDecoder.cs</Link>
+             Link="Common\System\Text\DBCSDecoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs">
-      <Link>Common\Interop\Windows\Interop.GetCPInfoEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetCPInfoEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MAX_PATH.cs">
-      <Link>Common\Interop\Windows\Interop.MAX_PATH.cs</Link>
+             Link="Common\Interop\Windows\Interop.MAX_PATH.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Beep.cs">
-      <Link>Common\Interop\Windows\Interop.Beep.cs</Link>
+             Link="Common\Interop\Windows\Interop.Beep.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ConsoleCursorInfo.cs">
-      <Link>Common\Interop\Windows\Interop.ConsoleCursorInfo.cs</Link>
+             Link="Common\Interop\Windows\Interop.ConsoleCursorInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ConsoleScreenBufferInfo.cs">
-      <Link>Common\Interop\Windows\Interop.ConsoleScreenBufferInfo.cs</Link>
+             Link="Common\Interop\Windows\Interop.ConsoleScreenBufferInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FillConsoleOutputAttribute.cs">
-      <Link>Common\Interop\Windows\Interop.FillConsoleOutputAttribute.cs</Link>
+             Link="Common\Interop\Windows\Interop.FillConsoleOutputAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FillConsoleOutputCharacter.cs">
-      <Link>Common\Interop\Windows\Interop.FillConsoleOutputCharacter.cs</Link>
+             Link="Common\Interop\Windows\Interop.FillConsoleOutputCharacter.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileTypes.cs">
-      <Link>Common\Interop\Windows\Interop.FileTypes.cs</Link>
+             Link="Common\Interop\Windows\Interop.FileTypes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetConsoleScreenBufferInfo.cs">
-      <Link>Common\Interop\Windows\Interop.GetConsoleScreenBufferInfo.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetConsoleScreenBufferInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetConsoleCP.cs">
-      <Link>Common\Interop\Windows\Interop.GetConsoleCP.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetConsoleCP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetConsoleTitle.cs">
-      <Link>Common\Interop\Windows\Interop.GetConsoleTitle.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetConsoleTitle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetConsoleMode.cs">
-      <Link>Common\Interop\Windows\Interop.GetConsoleMode.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetConsoleMode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetConsoleOutputCP.cs">
-      <Link>Common\Interop\Windows\Interop.GetConsoleOutputCP.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetConsoleOutputCP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetLargestConsoleWindowSize.cs">
-      <Link>Common\Interop\Windows\Interop.GetLargestConsoleWindowSize.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetLargestConsoleWindowSize.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetFileType_IntPtr.cs">
-      <Link>Common\Interop\Windows\Interop.GetFileType.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetFileType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetKeyState.cs">
-      <Link>Common\Interop\Windows\Interop.GetKeyState.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetKeyState.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetStdHandle.cs">
-      <Link>Common\Interop\Windows\Interop.GetStdHandle.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetStdHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.HandleTypes.cs">
-      <Link>Common\Interop\Windows\Interop.HandleTypes.cs</Link>
+             Link="Common\Interop\Windows\Interop.HandleTypes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs">
-      <Link>Common\Interop\Windows\Interop.MultiByteToWideChar.cs</Link>
+             Link="Common\Interop\Windows\Interop.MultiByteToWideChar.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.PeekConsoleInput.cs">
-      <Link>Common\Interop\Windows\Interop.PeekConsoleInput.cs</Link>
+             Link="Common\Interop\Windows\Interop.PeekConsoleInput.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadFile_IntPtr.cs">
-      <Link>Common\Interop\Windows\Interop.ReadFile.cs</Link>
+             Link="Common\Interop\Windows\Interop.ReadFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadConsole.cs">
-      <Link>Common\Interop\Windows\Interop.ReadConsole.cs</Link>
+             Link="Common\Interop\Windows\Interop.ReadConsole.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadConsoleInput.cs">
-      <Link>Common\Interop\Windows\Interop.ReadConsoleInput.cs</Link>
+             Link="Common\Interop\Windows\Interop.ReadConsoleInput.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadConsoleOutput.cs">
-      <Link>Common\Interop\Windows\Interop.ReadConsoleOutput.cs</Link>
+             Link="Common\Interop\Windows\Interop.ReadConsoleOutput.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetConsoleCP.cs">
-      <Link>Common\Interop\Windows\Interop.SetConsoleCP.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetConsoleCP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetConsoleCtrlHandler.cs">
-      <Link>Common\Interop\Windows\Interop.SetConsoleCtrlHandler.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetConsoleCtrlHandler.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetConsoleCursorPosition.cs">
-      <Link>Common\Interop\Windows\Interop.SetConsoleCursorPosition.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetConsoleCursorPosition.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetConsoleOutputCP.cs">
-      <Link>Common\Interop\Windows\Interop.SetConsoleOutputCP.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetConsoleOutputCP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetConsoleScreenBufferSize.cs">
-      <Link>Common\Interop\Windows\Interop.SetConsoleScreenBufferSize.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetConsoleScreenBufferSize.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetConsoleTextAttribute.cs">
-      <Link>Common\Interop\Windows\Interop.SetConsoleTextAttribute.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetConsoleTextAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetConsoleTitle.cs">
-      <Link>Common\Interop\Windows\Interop.SetConsoleTitle.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetConsoleTitle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetConsoleWindowInfo.cs">
-      <Link>Common\Interop\Windows\Interop.SetConsoleWindowInfo.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetConsoleWindowInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
-      <Link>Common\Interop\Windows\Interop.WideCharToMultiByte.cs</Link>
+             Link="Common\Interop\Windows\Interop.WideCharToMultiByte.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WriteFile_IntPtr.cs">
-      <Link>Common\Interop\Windows\Interop.WriteFile.cs</Link>
+             Link="Common\Interop\Windows\Interop.WriteFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WriteConsole.cs">
-      <Link>Common\Interop\Windows\Interop.WriteConsole.cs</Link>
+             Link="Common\Interop\Windows\Interop.WriteConsole.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WriteConsoleOutput.cs">
-      <Link>Common\Interop\Windows\Interop.WriteConsoleOutput.cs</Link>
+             Link="Common\Interop\Windows\Interop.WriteConsoleOutput.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\EncodingHelper.Windows.cs">
-      <Link>Common\System\IO\EncodingHelper.Windows.cs</Link>
+             Link="Common\System\IO\EncodingHelper.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\Win32Marshal.cs">
-      <Link>Common\System\IO\Win32Marshal.cs</Link>
+             Link="Common\System\IO\Win32Marshal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
   </ItemGroup>
   <!-- Unix -->
@@ -180,103 +180,103 @@
     <Compile Include="System\IO\StdInReader.cs" />
     <Compile Include="System\IO\SyncTextReader.Unix.cs" />
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeFileHandleHelper.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeFileHandleHelper.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeFileHandleHelper.Unix.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\IO\PersistedFiles.Unix.cs">
-      <Link>Common\System\IO\PersistedFiles.Unix.cs</Link>
+             Link="Common\System\IO\PersistedFiles.Unix.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\IO\PersistedFiles.Names.Unix.cs">
-      <Link>Common\System\IO\PersistedFiles.Names.Unix.cs</Link>
+             Link="Common\System\IO\PersistedFiles.Names.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\StringBuilderCache.cs">
-      <Link>Common\System\Text\StringBuilderCache.cs</Link>
+             Link="Common\System\Text\StringBuilderCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\EncodingHelper.Unix.cs">
-      <Link>Common\System\Text\EncodingHelper.Unix.cs</Link>
+             Link="Common\System\Text\EncodingHelper.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\StringOrCharArray.cs">
-      <Link>Common\System\Text\StringOrCharArray.cs</Link>
+             Link="Common\System\Text\StringOrCharArray.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs">
-      <Link>Common\Interop\Unix\Interop.IOErrors.cs</Link>
+             Link="Common\Interop\Unix\Interop.IOErrors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs">
-      <Link>Common\Interop\Unix\Interop.Close.cs</Link>
+             Link="Common\Interop\Unix\Interop.Close.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Dup.cs">
-      <Link>Common\Interop\Unix\Interop.Dup.cs</Link>
+             Link="Common\Interop\Unix\Interop.Dup.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.FileDescriptors.cs">
-      <Link>Common\Interop\Unix\Interop.FileDescriptors.cs</Link>
+             Link="Common\Interop\Unix\Interop.FileDescriptors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.FLock.cs">
-      <Link>Common\Interop\Unix\Interop.FLock.cs</Link>
+             Link="Common\Interop\Unix\Interop.FLock.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetControlCharacters.cs">
-      <Link>Common\Interop\Unix\Interop.GetControlCharacters.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetControlCharacters.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.IsATty.cs">
-      <Link>Common\Interop\Unix\Interop.IsATty.cs</Link>
+             Link="Common\Interop\Unix\Interop.IsATty.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.LSeek.cs">
-      <Link>Common\Interop\Unix\Interop.LSeek.cs</Link>
+             Link="Common\Interop\Unix\Interop.LSeek.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Open.cs">
-      <Link>Common\Interop\Unix\Interop.Open.cs</Link>
+             Link="Common\Interop\Unix\Interop.Open.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.OpenFlags.cs">
-      <Link>Common\Interop\Unix\Interop.OpenFlags.cs</Link>
+             Link="Common\Interop\Unix\Interop.OpenFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs">
-      <Link>Common\Interop\Unix\Interop.Poll.cs</Link>
+             Link="Common\Interop\Unix\Interop.Poll.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetEUid.cs">
-      <Link>Common\Interop\Unix\Interop.GetEUid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetEUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPwUid.cs">
-      <Link>Common\Interop\Unix\Interop.GetPwUid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetPwUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.RegisterForCtrlC.cs">
-      <Link>Common\Interop\Unix\Interop.RegisterForCtrlC.cs</Link>
+             Link="Common\Interop\Unix\Interop.RegisterForCtrlC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.RestoreAndHandleCtrl.cs">
-      <Link>Common\Interop\Unix\Interop.RestoreAndHandleCtrl.cs</Link>
+             Link="Common\Interop\Unix\Interop.RestoreAndHandleCtrl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SetTerminalInvalidationHandler.cs">
-      <Link>Common\Interop\Unix\Interop.SetTerminalInvalidationHandler.cs</Link>
+             Link="Common\Interop\Unix\Interop.SetTerminalInvalidationHandler.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SetSignalForBreak.cs">
-      <Link>Common\Interop\Unix\Interop.SetSignalForBreak.cs</Link>
+             Link="Common\Interop\Unix\Interop.SetSignalForBreak.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SNPrintF.cs">
-      <Link>Common\Interop\Unix\Interop.SNPrintF.cs</Link>
+             Link="Common\Interop\Unix\Interop.SNPrintF.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs">
-      <Link>Common\Interop\Unix\Interop.Stat.cs</Link>
+             Link="Common\Interop\Unix\Interop.Stat.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Read.cs">
-      <Link>Common\Interop\Unix\Interop.Read.cs</Link>
+             Link="Common\Interop\Unix\Interop.Read.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Write.cs">
-      <Link>Common\Interop\Unix\Interop.Write.cs</Link>
+             Link="Common\Interop\Unix\Interop.Write.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetWindowWidth.cs">
-      <Link>Common\Interop\Unix\Interop.GetWindowWidth.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetWindowWidth.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.InitializeTerminalAndSignalHandling.cs">
-      <Link>Common\Interop\Unix\Interop.InitializeTerminalAndSignalHandling.cs</Link>
+             Link="Common\Interop\Unix\Interop.InitializeTerminalAndSignalHandling.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ReadStdinUnbuffered.cs">
-      <Link>Common\Interop\Unix\Interop.ReadStdinUnbuffered.cs</Link>
+             Link="Common\Interop\Unix\Interop.ReadStdinUnbuffered.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.StdinReady.cs">
-      <Link>Common\Interop\Unix\Interop.StdinReady.cs</Link>
+             Link="Common\Interop\Unix\Interop.StdinReady.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj
index c16e3af1f24d3..a84388202b544 100644
--- a/src/libraries/System.Console/tests/System.Console.Tests.csproj
+++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj
@@ -24,10 +24,10 @@
     <Compile Include="RedirectedStream.cs" />
     <Compile Include="ReadKey.cs" />
     <Compile Include="$(CommonTestPath)System\IO\InterceptStreamWriter.cs">
-      <Link>Common\System\IO\InterceptStreamWriter.cs</Link>
+             Link="Common\System\IO\InterceptStreamWriter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <Compile Include="WindowAndCursorProps.cs" />
   </ItemGroup>
@@ -43,10 +43,10 @@
     <Compile Include="CancelKeyPress.Unix.cs" />
     <Compile Include="NonStandardConfiguration.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Fcntl.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Fcntl.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Fcntl.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Data.Common/src/System.Data.Common.csproj b/src/libraries/System.Data.Common/src/System.Data.Common.csproj
index 561674c584e34..e3d335dc0d5cb 100644
--- a/src/libraries/System.Data.Common/src/System.Data.Common.csproj
+++ b/src/libraries/System.Data.Common/src/System.Data.Common.csproj
@@ -301,7 +301,7 @@
     <Compile Include="System\Data\ProviderBase\DataReaderContainer.cs" />
     <Compile Include="System\Data\ProviderBase\SchemaMapping.cs" />
     <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+             Link="Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
index f82cb624c9c7d..02cd69204ac29 100644
--- a/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
+++ b/src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
@@ -114,10 +114,10 @@
     <Compile Include="System\Data\XmlDataReaderTest.cs" />
     <Compile Include="System\Xml\XmlDataDocumentTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
-      <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
+             Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
index 0712bcb677115..cf56a0f14073e 100644
--- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
+++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="$(CommonPath)System\Data\Common\AdapterUtil.cs">
-      <Link>Common\System\Data\Common\AdapterUtil.cs</Link>
+             Link="Common\System\Data\Common\AdapterUtil.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Data\Common\AdapterUtil.Drivers.cs">
       <Link>System\Data\Common\AdapterUtil.Drivers.cs</Link>
@@ -18,7 +18,7 @@
     <Compile Include="Common\System\Data\Common\AdapterUtil.Odbc.cs" />
     <Compile Include="Common\System\Data\Common\DbConnectionOptions.cs" />
     <Compile Include="$(CommonPath)System\Data\Common\DbConnectionOptions.Common.cs">
-      <Link>Common\System\Data\Common\DbConnectionOptions.Common.cs</Link>
+             Link="Common\System\Data\Common\DbConnectionOptions.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Data\Common\DbConnectionPoolKey.cs">
       <Link>System\Data\Common\DbConnectionPoolKey.cs</Link>
@@ -26,17 +26,17 @@
     <Compile Include="Common\System\Data\Common\DBConnectionString.cs" />
     <Compile Include="Common\System\Data\Common\DbConnectionStringCommon.cs" />
     <Compile Include="$(CommonPath)System\Data\Common\NameValuePair.cs">
-      <Link>Common\System\Data\Common\NameValuePair.cs</Link>
+             Link="Common\System\Data\Common\NameValuePair.cs">
     </Compile>
     <Compile Include="Common\System\Data\Common\NameValuePermission.cs" />
     <Compile Include="Common\System\Data\Common\SafeNativeMethods.cs" />
     <Compile Include="Common\System\Data\DataStorage.cs" />
     <Compile Include="Common\System\Data\ProviderBase\DbBuffer.cs" />
     <Compile Include="$(CommonPath)System\Data\Common\FieldNameLookup.cs">
-      <Link>Common\System\Data\ProviderBase\FieldNameLookup.cs</Link>
+             Link="Common\System\Data\ProviderBase\FieldNameLookup.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Data\Common\BasicFieldNameLookup.cs">
-      <Link>Common\System\Data\ProviderBase\BasicFieldNameLookup.cs</Link>
+             Link="Common\System\Data\ProviderBase\BasicFieldNameLookup.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Data\ProviderBase\DbConnectionInternal.cs">
       <Link>System\Data\ProviderBase\DbConnectionInternal.cs</Link>
@@ -113,29 +113,29 @@
     <Compile Include="System\Data\Odbc\OdbcType.cs" />
     <Compile Include="System\Data\Odbc\OdbcUtils.cs" />
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="Common\System\HResults.cs" />
     <Compile Include="$(CommonPath)System\Data\Common\MultipartIdentifier.cs">
-      <Link>Common\System\Data\Common\MultipartIdentifier.cs</Link>
+             Link="Common\System\Data\Common\MultipartIdentifier.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Odbc.cs">
-      <Link>Common\Interop\Interop.Odbc.cs</Link>
+             Link="Common\Interop\Interop.Odbc.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsLinux)' == 'true' or '$(TargetsFreeBSD)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Linux\Interop.Libraries.cs">
-      <Link>Common\Interop\Linux\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Linux\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'">
diff --git a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj
index 7136986e7836c..fe16b255bf096 100644
--- a/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj
+++ b/src/libraries/System.Data.Odbc/tests/System.Data.Odbc.Tests.csproj
@@ -17,27 +17,27 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsLinux)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Linux\Interop.Libraries.cs">
-      <Link>Common\Interop\Linux\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Linux\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsFreeBSD)' == 'true'">
     <Compile Include="$(CommonPath)Interop\FreeBSD\Interop.Libraries.cs">
-      <Link>Common\Interop\FreeBSD\Interop.Libraries.cs</Link>
+             Link="Common\Interop\FreeBSD\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="ConnectionStrings.Windows.cs" />
   </ItemGroup>
diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
index 9c2b886ca0671..a66ed284f4998 100644
--- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
+++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj
@@ -11,10 +11,10 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Data\Common\MultipartIdentifier.cs">
-      <Link>Common\System\Data\Common\MultipartIdentifier.cs</Link>
+             Link="Common\System\Data\Common\MultipartIdentifier.cs">
     </Compile>
     <Compile Include="AdapterSwitches.cs" />
     <Compile Include="ColumnBinding.cs" />
@@ -107,4 +107,4 @@
     <Reference Include="System.Diagnostics.PerformanceCounter" />
     <Reference Include="System.Security.Principal.Windows" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj
index 8da4908a1c08f..47079436a37a9 100644
--- a/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj
@@ -12,7 +12,7 @@
     <Compile Include="Utilities.cs" />
     <Compile Include="ValueTests.cs" />
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
index 803e147792dd6..e968e180371f3 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
@@ -23,13 +23,13 @@
     <Compile Include="System\Diagnostics\DiagnosticListener.cs" />
     <Compile Include="System\Diagnostics\DiagnosticSourceEventSource.cs" />
     <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+             Link="Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
     </Compile>
     <None Include="DiagnosticSourceUsersGuide.md" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.1'">
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
     <Compile Include="System\Diagnostics\Activity.cs" />
     <Compile Include="System\Diagnostics\ActivityContext.cs" />
@@ -83,4 +83,4 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
index 3d34832a280f1..99d4693f3c007 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj
@@ -15,10 +15,10 @@
     <Compile Include="HttpHandlerDiagnosticListenerTests.cs" />
     <Compile Include="ActivityDateTimeTests.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs">
-      <Link>Common\System\Net\Configuration.Http.cs</Link>
+             Link="Common\System\Net\Configuration.Http.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
index 7bf58b00f2954..6398a57703270 100644
--- a/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
+++ b/src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
@@ -54,67 +54,67 @@
     <Compile Include="System\Diagnostics\SafeEventLogReadHandle.cs" />
     <Compile Include="System\Diagnostics\SafeEventLogWriteHandle.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ClearEventLog.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.ClearEventLog.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.ClearEventLog.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CloseEventLog.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CloseEventLog.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CloseEventLog.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.DeregisterEventSource.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.DeregisterEventSource.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.DeregisterEventSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetNumberOfEventLogRecords.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.GetNumberOfEventLogRecords.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.GetNumberOfEventLogRecords.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetOldestEventLogRecord.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.GetOldestEventLogRecord.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.GetOldestEventLogRecord.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LookupAccountSid.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.NotifyChangeEventLog.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.NotifyChangeEventLog.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.NotifyChangeEventLog.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenEventLog.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.OpenEventLog.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.OpenEventLog.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ReadEventLog.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.ReadEventLog.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.ReadEventLog.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegisterEventSource.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegisterEventSource.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegisterEventSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ReportEvent.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.ReportEvent.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.ReportEvent.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.Constants.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.Constants.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage_SafeLibraryHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FormatMessage_SafeLibraryHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FormatMessage_SafeLibraryHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Diagnostics\NetFrameworkUtils.cs">
-      <Link>Common\System\Diagnostics\NetFrameworkUtils.cs</Link>
+             Link="Common\System\Diagnostics\NetFrameworkUtils.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
@@ -147,4 +147,4 @@
     <Reference Include="System.Threading.ThreadPool" />
     <Reference Include="System.Threading.Overlapped" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
index e2a81f05dd671..32658b32f95eb 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj
@@ -12,40 +12,40 @@
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="System\Diagnostics\FileVersionInfo.Windows.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Version\Interop.FileVersionInfo.cs">
-      <Link>Common\Interop\Windows\Interop.FileVersionInfo.cs</Link>
+             Link="Common\Interop\Windows\Interop.FileVersionInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Version\Interop.FileVersionInfoType.cs">
-      <Link>Common\Interop\Windows\Interop.FileVersionInfoType.cs</Link>
+             Link="Common\Interop\Windows\Interop.FileVersionInfoType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Version\Interop.GetFileVersionInfoEx.cs">
-      <Link>Common\Interop\Windows\Interop.GetFileVersionInfoEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetFileVersionInfoEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Version\Interop.GetFileVersionInfoSizeEx.cs">
-      <Link>Common\Interop\Windows\Interop.GetFileVersionInfoSizeEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetFileVersionInfoSizeEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.VerLanguageName.cs">
-      <Link>Common\Interop\Windows\Interop.VerLanguageName.cs</Link>
+             Link="Common\Interop\Windows\Interop.VerLanguageName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Version\Interop.VerQueryValue.cs">
-      <Link>Common\Interop\Windows\Interop.VerQueryValue.cs</Link>
+             Link="Common\Interop\Windows\Interop.VerQueryValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Version\Interop.VSFixedFileInfo.cs">
-      <Link>Common\Interop\Windows\Interop.VSFixedFileInfo.cs</Link>
+             Link="Common\Interop\Windows\Interop.VSFixedFileInfo.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="System\Diagnostics\FileVersionInfo.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs">
-      <Link>Common\Interop\Unix\Interop.Stat.cs</Link>
+             Link="Common\Interop\Unix\Interop.Stat.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -59,4 +59,4 @@
     <Reference Include="System.Collections.Immutable" />
     <Reference Include="System.Runtime.Extensions" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
index 2e1be8425bad8..937a18cb8cc46 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj
@@ -40,16 +40,16 @@
     <Compile Include="System\Diagnostics\PerformanceData\CounterType.cs" />
     <Compile Include="System\Diagnostics\PerformanceData\PerfProviderCollection.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegCloseKey.cs">
-      <Link>Common\Interop\Windows\Interop.RegCloseKey.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegCloseKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs">
       <Link>Microsoft\Win32\SafeHandles\SafeRegistryHandle.cs</Link>
@@ -58,106 +58,106 @@
       <Link>Microsoft\Win32\SafeHandles\SafeRegistryHandle.Windows.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.ConvertStringSecurityDescriptorToSecurityDescriptor.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetTokenInformation.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.GetTokenInformation.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.GetTokenInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.PERF_INFO.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.PERF_INFO.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.PERF_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ProcessOptions.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.ProcessOptions.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.ProcessOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegConnectRegistry.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegConnectRegistry.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegConnectRegistry.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.TOKEN_INFORMATION_CLASS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.Constants.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.Constants.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CreateFileMapping.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CreateFileMapping.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CreateFileMapping.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.DuplicateHandle_SafeProcessHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.DuplicateHandle.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.DuplicateHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetComputerName.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcess_SafeProcessHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentProcess.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.GetCurrentProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcessTimes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.HandleOptions.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.HandleOptions.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.HandleOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LoadLibrary.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MapViewOfFile.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MapViewOfFile.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MapViewOfFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MemOptions.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MemOptions.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MemOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.OpenFileMapping.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.OpenFileMapping.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.OpenFileMapping.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.OpenProcess.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.OpenProcess.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.OpenProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.PerformanceCounterOptions.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.PerformanceCounterOptions.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.PerformanceCounterOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.UnmapViewOfFile.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.UnmapViewOfFile.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.UnmapViewOfFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.VirtualQuery.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.VirtualQuery.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.VirtualQuery.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WaitForSingleObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\PerfCounter\Interop.FormatFromRawValue.cs">
-      <Link>Common\Interop\Windows\PerfCounter\Interop.FormatFromRawValue.cs</Link>
+             Link="Common\Interop\Windows\PerfCounter\Interop.FormatFromRawValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\PerfCounter\Interop.PerformanceData.cs">
-      <Link>Common\Interop\Windows\PerfCounter\Interop.PerformanceData.cs</Link>
+             Link="Common\Interop\Windows\PerfCounter\Interop.PerformanceData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafePerfProviderHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafePerfProviderHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafePerfProviderHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Diagnostics\NetFrameworkUtils.cs">
-      <Link>Common\System\Diagnostics\NetFrameworkUtils.cs</Link>
+             Link="Common\System\Diagnostics\NetFrameworkUtils.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
@@ -190,4 +190,4 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj
index a301f85bfc55a..7d633a1adce10 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/tests/System.Diagnostics.PerformanceCounter.Tests.csproj
@@ -14,7 +14,7 @@
     <Compile Include="InstanceDataTests.cs" />
     <Compile Include="Helpers.cs" />
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <Compile Include="PerformanceDataTests.cs" />
   </ItemGroup>
@@ -24,4 +24,4 @@
     </None>
     <None Include="provider.res" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
index 99e96c4d872d6..c2ccc5cacfab9 100644
--- a/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
+++ b/src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
@@ -34,63 +34,63 @@
     <Compile Include="System\Diagnostics\MonitoringDescriptionAttribute.cs" />
     <Compile Include="System\Collections\Specialized\StringDictionaryWrapper.cs" />
     <Compile Include="$(CommonPath)System\Runtime\Serialization\SerializationGuard.cs">
-      <Link>Common\System\Runtime\Serialization\SerializationGuard.cs</Link>
+             Link="Common\System\Runtime\Serialization\SerializationGuard.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\PasteArguments.cs">
       <Link>System\PasteArguments.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskCompletionSourceWithCancellation.cs">
-      <Link>Common\System\Threading\Tasks\TaskCompletionSourceWithCancellation.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskCompletionSourceWithCancellation.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.EnumProcessModules.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.EnumProcessModules.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.EnumProcessModules.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.NtQueryInformationProcess.cs">
-      <Link>Common\Interop\Windows\NtDll\Interop.NtQueryInformationProcess.cs</Link>
+             Link="Common\Interop\Windows\NtDll\Interop.NtQueryInformationProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.NtQuerySystemInformation.cs">
-      <Link>Common\Interop\Windows\NtDll\Interop.NtQuerySystemInformation.cs</Link>
+             Link="Common\Interop\Windows\NtDll\Interop.NtQuerySystemInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.PROCESS_BASIC_INFORMATION.cs">
-      <Link>Common\Interop\Windows\NtDll\Interop.PROCESS_BASIC_INFORMATION.cs</Link>
+             Link="Common\Interop\Windows\NtDll\Interop.PROCESS_BASIC_INFORMATION.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.SYSTEM_PROCESS_INFORMATION.cs">
-      <Link>Common\Interop\Windows\NtDll\Interop.SYSTEM_PROCESS_INFORMATION.cs</Link>
+             Link="Common\Interop\Windows\NtDll\Interop.SYSTEM_PROCESS_INFORMATION.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.EnumWindows.cs">
-      <Link>Common\Interop\Windows\User32\Interop.EnumWindows.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.EnumWindows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetWindow.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetWindow.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetWindow.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetWindowLong.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetWindowLong.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetWindowLong.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetWindowTextLengthW.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetWindowTextLengthW.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetWindowTextLengthW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetWindowTextW.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetWindowTextW.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetWindowTextW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetWindowThreadProcessId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.PostMessage.cs">
-      <Link>Common\Interop\Windows\User32\Interop.PostMessage.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.PostMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.IsWindowVisible.cs">
-      <Link>Common\Interop\Windows\User32\Interop.IsWindowVisible.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.IsWindowVisible.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SendMessageTimeout.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SendMessageTimeout.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SendMessageTimeout.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.WaitForInputIdle.cs">
-      <Link>Common\Interop\Windows\User32\Interop.WaitForInputIdle.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.WaitForInputIdle.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
@@ -98,196 +98,196 @@
       <Link>Microsoft\Win32\SafeHandles\SafeTokenHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.PERF_INFO.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.PERF_INFO.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.PERF_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.IsWow64Process_SafeProcessHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.IsWow64Process_SafeProcessHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.IsWow64Process_SafeProcessHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetExitCodeProcess.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetExitCodeProcess.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetExitCodeProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcessTimes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcessTimes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetThreadTimes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetThreadTimes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetThreadTimes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetStdHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetStdHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetStdHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CreateProcess.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CreateProcess.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CreateProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.TerminateProcess.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.TerminateProcess.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.TerminateProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcess_SafeProcessHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.GetCurrentProcess.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.GetCurrentProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.OpenProcess.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.OpenProcess.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.OpenProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.EnumProcesses.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.EnumProcesses.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.EnumProcesses.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetModuleInformation.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleInformation.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetModuleInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetModuleBaseName.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleBaseName.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetModuleBaseName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetModuleFileNameEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleFileNameEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetModuleFileNameEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetProcessWorkingSetSizeEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetProcessWorkingSetSizeEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetProcessWorkingSetSizeEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcessWorkingSetSizeEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessWorkingSetSizeEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcessWorkingSetSizeEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetProcessAffinityMask.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetProcessAffinityMask.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetProcessAffinityMask.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcessAffinityMask.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessAffinityMask.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcessAffinityMask.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcessId.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessId.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcessId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetThreadPriorityBoost.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetThreadPriorityBoost.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetThreadPriorityBoost.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetThreadPriorityBoost.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetThreadPriorityBoost.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetThreadPriorityBoost.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcessPriorityBoost.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessPriorityBoost.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcessPriorityBoost.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetProcessPriorityBoost.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetProcessPriorityBoost.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetProcessPriorityBoost.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.OpenThread.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.OpenThread.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.OpenThread.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetThreadPriority.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetThreadPriority.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetThreadPriority.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetThreadPriority.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetThreadPriority.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetThreadPriority.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetThreadAffinityMask.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetThreadAffinityMask.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetThreadAffinityMask.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetThreadIdealProcessor.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetThreadIdealProcessor.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetThreadIdealProcessor.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetPriorityClass.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetPriorityClass.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetPriorityClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetPriorityClass.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetPriorityClass.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetPriorityClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.DuplicateHandle_SafeProcessHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.DuplicateHandle.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.DuplicateHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ProcessWaitHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenProcessToken.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.OpenProcessToken.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.OpenProcessToken.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LookupPrivilegeValue.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.LookupPrivilegeValue.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.LookupPrivilegeValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetComputerName.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetConsoleCP.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetConsoleCP.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetConsoleCP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetConsoleOutputCP.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetConsoleOutputCP.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetConsoleOutputCP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CreateProcessWithLogon.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CreateProcessWithLogon.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CreateProcessWithLogon.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LUID.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.LUID.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.LUID.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LUID_AND_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.LUID_AND_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.LUID_AND_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.TOKEN_PRIVILEGE.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.TOKEN_PRIVILEGE.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.TOKEN_PRIVILEGE.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.Constants.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.Constants.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CreatePipe_SafeFileHandle.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.CreatePipe.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.CreatePipe.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ThreadOptions.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ThreadOptions.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ThreadOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.HandleTypes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.HandleTypes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.HandleTypes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ProcessOptions.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.ProcessOptions.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.ProcessOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.HandleOptions.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ProcessOptions.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.ProcessOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.UNICODE_STRING.cs">
-      <Link>Common\Interop\Interop.UNICODE_STRING.cs</Link>
+             Link="Common\Interop\Interop.UNICODE_STRING.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ConsoleEncoding.cs">
-      <Link>Common\System\Text\ConsoleEncoding.cs</Link>
+             Link="Common\System\Text\ConsoleEncoding.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\EncodingHelper.Windows.cs">
-      <Link>Common\System\Text\EncodingHelper.Windows.cs</Link>
+             Link="Common\System\Text\EncodingHelper.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\OSEncoding.Windows.cs">
-      <Link>Common\System\Text\OSEncoding.Windows.cs</Link>
+             Link="Common\System\Text\OSEncoding.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\OSEncoder.cs">
-      <Link>Common\System\Text\OSEncoder.cs</Link>
+             Link="Common\System\Text\OSEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\DBCSDecoder.cs">
-      <Link>Common\System\Text\DBCSDecoder.cs</Link>
+             Link="Common\System\Text\DBCSDecoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MAX_PATH.cs">
-      <Link>Common\Interop\Windows\Interop.MAX_PATH.cs</Link>
+             Link="Common\Interop\Windows\Interop.MAX_PATH.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HResults.cs">
-      <Link>Common\System\HResults.cs</Link>
+             Link="Common\System\HResults.cs">
     </Compile>
     <Compile Include="Microsoft\Win32\SafeHandles\SafeProcessHandle.Windows.cs" />
     <Compile Include="Microsoft\Win32\SafeHandles\SafeThreadHandle.cs" />
@@ -307,82 +307,82 @@
     <Compile Include="System\Diagnostics\ProcessWaitHandle.Unix.cs" />
     <Compile Include="System\Diagnostics\ProcessWaitState.Unix.cs" />
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\StringParser.cs">
-      <Link>Common\System\IO\StringParser.cs</Link>
+             Link="Common\System\IO\StringParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs">
-      <Link>Common\Interop\Unix\Interop.Close.cs</Link>
+             Link="Common\Interop\Unix\Interop.Close.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetHostName.cs">
-      <Link>Common\Interop\Unix\Interop.GetHostName.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetHostName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SysConf.cs">
-      <Link>Common\Interop\Unix\Interop.SysConf.cs</Link>
+             Link="Common\Interop\Unix\Interop.SysConf.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ConfigureTerminalForChildProcess.cs">
-      <Link>Common\Interop\Unix\Interop.ConfigureTerminalForChildProcess.cs</Link>
+             Link="Common\Interop\Unix\Interop.ConfigureTerminalForChildProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ForkAndExecProcess.cs">
-      <Link>Common\Interop\Unix\Interop.ForkAndExecProcess.cs</Link>
+             Link="Common\Interop\Unix\Interop.ForkAndExecProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetGroupList.cs">
-      <Link>Common\Interop\Unix\Interop.GetGroupList.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetGroupList.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetLine.cs">
-      <Link>Common\Interop\Unix\Interop.GetLine.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetLine.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPid.cs">
-      <Link>Common\Interop\Unix\Interop.GetPid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetPid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPwUid.cs">
-      <Link>Common\Interop\Unix\Interop.GetPwUid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetPwUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetSetPriority.cs">
-      <Link>Common\Interop\Unix\Interop.GetSetPriority.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetSetPriority.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetSid.cs">
-      <Link>Common\Interop\Unix\Interop.GetSid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetSid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetUid.cs">
-      <Link>Common\Interop\Unix\Interop.GetUid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.InitializeTerminalAndSignalHandling.cs">
-      <Link>Common\Interop\Unix\Interop.InitializeTerminalAndSignalHandling.cs</Link>
+             Link="Common\Interop\Unix\Interop.InitializeTerminalAndSignalHandling.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Kill.cs">
-      <Link>Common\Interop\Unix\Interop.Kill.cs</Link>
+             Link="Common\Interop\Unix\Interop.Kill.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ReadLink.cs">
-      <Link>Common\Interop\Unix\Interop.ReadLink.cs</Link>
+             Link="Common\Interop\Unix\Interop.ReadLink.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.RegisterForSigChld.cs">
-      <Link>Common\Interop\Unix\Interop.RegisterForRegisterForSigChld.cs</Link>
+             Link="Common\Interop\Unix\Interop.RegisterForRegisterForSigChld.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ResourceLimits.cs">
-      <Link>Common\Interop\Unix\Interop.ResourceLimits.cs</Link>
+             Link="Common\Interop\Unix\Interop.ResourceLimits.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs">
-      <Link>Common\Interop\Unix\Interop.PathConf.cs</Link>
+             Link="Common\Interop\Unix\Interop.PathConf.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.POpen.cs">
-      <Link>Common\Interop\Unix\Interop.POpen.cs</Link>
+             Link="Common\Interop\Unix\Interop.POpen.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.WaitId.cs">
-      <Link>Common\Interop\Unix\Interop.WaitId.cs</Link>
+             Link="Common\Interop\Unix\Interop.WaitId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.WaitPid.cs">
-      <Link>Common\Interop\Unix\Interop.WaitPid.cs</Link>
+             Link="Common\Interop\Unix\Interop.WaitPid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Access.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Access.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Access.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsLinux)' == 'true'">
@@ -390,16 +390,16 @@
     <Compile Include="System\Diagnostics\ProcessManager.Linux.cs" />
     <Compile Include="System\Diagnostics\ProcessThread.Linux.cs" />
     <Compile Include="$(CommonPath)Interop\Linux\cgroups\Interop.cgroups.cs">
-      <Link>Common\Interop\Linux\Interop.cgroups.cs</Link>
+             Link="Common\Interop\Linux\Interop.cgroups.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Linux\procfs\Interop.ProcFsStat.cs">
-      <Link>Common\Interop\Linux\Interop.ProcFsStat.cs</Link>
+             Link="Common\Interop\Linux\Interop.ProcFsStat.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SchedGetSetAffinity.cs">
-      <Link>Common\Interop\Linux\Interop.SchedGetSetAffinity.cs</Link>
+             Link="Common\Interop\Linux\Interop.SchedGetSetAffinity.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ReusableTextReader.cs">
-      <Link>Common\System\Text\ReusableTextReader.cs</Link>
+             Link="Common\System\Text\ReusableTextReader.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
@@ -409,15 +409,15 @@
     <Compile Include="System\Diagnostics\ProcessManager.OSX.cs" />
     <Compile Include="System\Diagnostics\ProcessThread.OSX.cs" />
     <Compile Include="$(CommonPath)Interop\OSX\Interop.libproc.cs">
-      <Link>Common\Interop\OSX\Interop.libproc.cs</Link>
+             Link="Common\Interop\OSX\Interop.libproc.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' and '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Shell32\Interop.ShellExecuteExW.cs">
-      <Link>Common\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs</Link>
+             Link="Common\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs">
     </Compile>
     <Compile Include="System\Diagnostics\Process.Win32.cs" />
     <Compile Include="System\Diagnostics\ProcessManager.Win32.cs" />
@@ -433,13 +433,13 @@
     <Compile Include="System\Diagnostics\ProcessManager.FreeBSD.cs" />
     <Compile Include="System\Diagnostics\ProcessThread.FreeBSD.cs" />
     <Compile Include="$(CommonPath)Interop\BSD\System.Native\Interop.Sysctl.cs">
-      <Link>Common\Interop\BSD\System.Native\Interop.Sysctl.cs</Link>
+             Link="Common\Interop\BSD\System.Native\Interop.Sysctl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\FreeBSD\Interop.Process.cs">
-      <Link>Common\Interop\FreeBSD\Interop.Process.cs</Link>
+             Link="Common\Interop\FreeBSD\Interop.Process.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs">
-      <Link>Common\Unix\System.Native\Interop.Stat.cs</Link>
+             Link="Common\Unix\System.Native\Interop.Stat.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnknownUnix)' == 'true'">
diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
index e2f3f7ad84f9f..32e50f3ed466e 100644
--- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
+++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj
@@ -10,13 +10,13 @@
       <Link>System\PasteArguments.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\IO\StringParser.cs">
-      <Link>Common\System\IO\StringParser.cs</Link>
+             Link="Common\System\IO\StringParser.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)Microsoft\Win32\TempRegistryKey.cs">
-      <Link>Common\Microsoft\Win32\TempRegistryKey.cs</Link>
+             Link="Common\Microsoft\Win32\TempRegistryKey.cs">
     </Compile>
     <Compile Include="Helpers.cs" />
     <Compile Include="Interop.cs" />
@@ -48,4 +48,4 @@
       <Link>System\PasteArguments.Unix.cs</Link>
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj
index f326d86901240..d86cae583a408 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/src/System.Diagnostics.TextWriterTraceListener.csproj
@@ -10,29 +10,29 @@
     <Compile Include="System\Diagnostics\TextWriterTraceListener.cs" />
     <Compile Include="System\Diagnostics\XmlWriterTraceListener.cs" />
     <Compile Include="$(CommonPath)System\Diagnostics\TraceListenerHelpers.cs">
-      <Link>Common\System\Diagnostics\TraceListenerHelpers.cs</Link>
+             Link="Common\System\Diagnostics\TraceListenerHelpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)System\Diagnostics\TraceListenerHelpers.Windows.cs">
-      <Link>Common\System\Diagnostics\TraceListenerHelpers.Windows.cs</Link>
+             Link="Common\System\Diagnostics\TraceListenerHelpers.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
-      <Link>Common\Interop\Windows\Interop.GetCurrentProcessId.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetCurrentProcessId.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPid.cs">
-      <Link>Common\Interop\Unix\Interop.GetPid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetPid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Diagnostics\TraceListenerHelpers.Unix.cs">
-      <Link>Common\System\Diagnostics\TraceListenerHelpers.Unix.cs</Link>
+             Link="Common\System\Diagnostics\TraceListenerHelpers.Unix.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
index ce6fa0f43970a..e612da8905338 100644
--- a/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
+++ b/src/libraries/System.Diagnostics.TraceSource/src/System.Diagnostics.TraceSource.csproj
@@ -30,29 +30,29 @@
     <Compile Include="System\Diagnostics\SwitchAttribute.cs" />
     <Compile Include="System\Diagnostics\SwitchLevelAttribute.cs" />
     <Compile Include="$(CommonPath)System\Diagnostics\TraceListenerHelpers.cs">
-      <Link>Common\System\Diagnostics\TraceListenerHelpers.cs</Link>
+             Link="Common\System\Diagnostics\TraceListenerHelpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)System\Diagnostics\TraceListenerHelpers.Windows.cs">
-      <Link>Common\System\Diagnostics\TraceListenerHelpers.Windows.cs</Link>
+             Link="Common\System\Diagnostics\TraceListenerHelpers.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
-      <Link>Common\Interop\Windows\Interop.GetCurrentProcessId.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetCurrentProcessId.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPid.cs">
-      <Link>Common\Interop\Unix\Interop.GetPid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetPid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Diagnostics\TraceListenerHelpers.Unix.cs">
-      <Link>Common\System\Diagnostics\TraceListenerHelpers.Unix.cs</Link>
+             Link="Common\System\Diagnostics\TraceListenerHelpers.Unix.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
index daf24a4408f6e..2b20fa1ea4a9d 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj
@@ -84,10 +84,10 @@
     <Compile Include="System\DirectoryServices\AccountManagement\IdentityReference.cs" />
     <Compile Include="System\DirectoryServices\AccountManagement\UnknownPrincipal.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LookupAccountSid.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.LookupAccountSid.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -122,4 +122,4 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
     <Reference Include="System.ComponentModel.TypeConverter" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
index f40b0251aabdb..d29e1da3456d9 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
+++ b/src/libraries/System.DirectoryServices.AccountManagement/tests/System.DirectoryServices.AccountManagement.Tests.csproj
@@ -11,7 +11,7 @@
     <Compile Include="UserPrincipalTest.cs" />
     <Compile Include="AccountManagementTests.cs" />
     <Compile Include="$(CommonTestPath)System\DirectoryServices\LdapConfiguration.cs">
-      <Link>Common\DirectoryServices\LdapConfiguration.cs</Link>
+             Link="Common\DirectoryServices\LdapConfiguration.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -19,4 +19,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj
index 45ee75557ac22..33c26adc08a7e 100644
--- a/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj
+++ b/src/libraries/System.DirectoryServices.Protocols/tests/System.DirectoryServices.Protocols.Tests.csproj
@@ -48,7 +48,7 @@
     <Compile Include="AddRequestTests.cs" />
     <Compile Include="DirectoryServicesProtocolsTests.cs" />
     <Compile Include="$(CommonTestPath)System\DirectoryServices\LdapConfiguration.cs">
-      <Link>Common\DirectoryServices\LdapConfiguration.cs</Link>
+             Link="Common\DirectoryServices\LdapConfiguration.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -56,4 +56,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
index c4df6bbeb60f5..526871339eeb6 100644
--- a/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
+++ b/src/libraries/System.DirectoryServices/tests/System.DirectoryServices.Tests.csproj
@@ -19,7 +19,7 @@
     <Compile Include="System\DirectoryServices\ActiveDirectory\ForestTests.cs" />
     <Compile Include="System\DirectoryServices\ActiveDirectory\ActiveDirectoryTests.cs" />
     <Compile Include="$(CommonTestPath)System\DirectoryServices\LdapConfiguration.cs">
-      <Link>Common\DirectoryServices\LdapConfiguration.cs</Link>
+             Link="Common\DirectoryServices\LdapConfiguration.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -31,4 +31,4 @@
     <Compile Include="System\DirectoryServices\DirectoryServicesTests.Windows.cs" />
     <Compile Include="System\DirectoryServices\ActiveDirectoryComInterop.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
index 7a6ca380042f9..6a8c3b859cfe9 100644
--- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
+++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
@@ -152,10 +152,10 @@
     <Compile Include="System\Drawing\Imaging\ImageCodecInfoPrivate.cs" />
     <Compile Include="System\Drawing\Imaging\MetafileFrameUnit.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.LOGFONT.cs">
-      <Link>Common\Interop\Windows\User32\Interop.LOGFONT.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.LOGFONT.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.RasterOp.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.RasterOp.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.RasterOp.cs">
     </Compile>
     <EmbeddedResource Include="Resources\System\Drawing\DefaultComponent.bmp">
       <LogicalName>System.Drawing.DefaultComponent.bmp</LogicalName>
@@ -225,112 +225,112 @@
       <Link>System\LocalAppContextSwitches.Common.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.CombineRgn.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.CombineRgn.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.CombineRgn.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.CreateCompatibleDC.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.CreateCompatibleDC.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.CreateCompatibleDC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.CreateDC.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.CreateDC.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.CreateDC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.CreateIC.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.CreateIC.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.CreateIC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.CreateFontIndirect.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.CreateFontIndirect.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.CreateFontIndirect.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.CreateRectRgn.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.CreateRectRgn.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.CreateRectRgn.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.DeleteDC.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.DeleteDC.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.DeleteDC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.DeleteObject.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.DeleteObject.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.DeleteObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.GetClipRgn.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.GetClipRgn.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.GetClipRgn.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.GetCurrentObject.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.GetCurrentObject.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.GetCurrentObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.GetDeviceCaps.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.GetDeviceCaps.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.GetDeviceCaps.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.GetObjectType.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.GetObjectType.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.GetObjectType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.GetRgnBox.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.GetRgnBox.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.GetRgnBox.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.GetStockObject.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.GetStockObject.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.GetStockObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.ObjectType.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.ObjectType.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.ObjectType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.OffsetViewportOrgEx.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.OffsetViewportOrgEx.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.OffsetViewportOrgEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.RECT.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.RECT.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.RECT.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.RegionType.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.RegionType.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.RegionType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.RestoreDC.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.RestoreDC.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.RestoreDC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.SaveDC.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.SaveDC.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.SaveDC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.SelectClipRgn.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.SelectClipRgn.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.SelectClipRgn.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GlobalFree.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GlobalFree.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GlobalFree.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GlobalLock.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GlobalLock.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GlobalLock.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Gdi32\Interop.BitBlt.cs">
-      <Link>Common\Interop\Windows\Gdi32\Interop.BitBlt.cs</Link>
+             Link="Common\Interop\Windows\Gdi32\Interop.BitBlt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.IStream.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.IStream.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.IStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.STATSTG.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.STATSTG.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.STATSTG.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.STGTY.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.STGTY.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.STGTY.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.STATFLAG.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.STATFLAG.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.STATFLAG.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.STGM.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.STGM.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.STGM.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetDC.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetDC.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetDC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.ReleaseDC.cs">
-      <Link>Common\Interop\Windows\User32\Interop.ReleaseDC.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.ReleaseDC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SystemParametersInfo.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SystemParametersInfo.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SystemParametersInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.NONCLIENTMETRICS.cs">
-      <Link>Common\Interop\Windows\User32\Interop.NONCLIENTMETRICS.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.NONCLIENTMETRICS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.WindowFromDC.cs">
-      <Link>Common\Interop\Windows\User32\Interop.WindowFromDC.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.WindowFromDC.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.HRESULT.cs">
-      <Link>Common\Interop\Windows\Interop.HRESULT.cs</Link>
+             Link="Common\Interop\Windows\Interop.HRESULT.cs">
     </Compile>
   </ItemGroup>
   <!-- Unix specific -->
@@ -378,7 +378,7 @@
     <Compile Include="System\Drawing\LibraryResolver.cs" />
     <Compile Include="misc\ExternDll.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <EmbeddedResource Include="Resources\System\Drawing\Error.ico">
       <LogicalName>placeholder.ico</LogicalName>
diff --git a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
index 610e7ec4b3962..1b299ab37bd8e 100644
--- a/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
+++ b/src/libraries/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj
@@ -80,17 +80,17 @@
     <Compile Include="Printing\PaperSourceTests.cs" />
     <Compile Include="Printing\PrinterUnitConvertTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Drawing\Helpers.cs">
-      <Link>Common\System\Drawing\Helpers.cs</Link>
+             Link="Common\System\Drawing\Helpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common.TestData" Version="$(SystemDrawingCommonTestDataVersion)" GeneratePathProperty="true" />    
+    <PackageReference Include="System.Drawing.Common.TestData" Version="$(SystemDrawingCommonTestDataVersion)" GeneratePathProperty="true" />
     <EmbeddedResource Include="$(PkgSystem_Drawing_Common_TestData)\contentFiles\any\any\bitmaps\48x48_multiple_entries_4bit.ico">
       <LogicalName>System.Drawing.Tests.48x48_multiple_entries_4bit.ico</LogicalName>
     </EmbeddedResource>
@@ -107,4 +107,4 @@
       <LogicalName>System.Drawing.Tests.Icon_toolboxBitmapAttributeTest</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
index 5a9c2609314a8..fcd4243720ea4 100644
--- a/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
+++ b/src/libraries/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
@@ -46,13 +46,13 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetSysColor.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetSysColor.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetSysColor.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.Win32SystemColors.cs">
-      <Link>Common\Interop\Windows\User32\Interop.Win32SystemColors.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.Win32SystemColors.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
index 1601346a37a00..34576d0c65fc1 100644
--- a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
+++ b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
@@ -13,13 +13,13 @@
     <Compile Include="SizeTests.cs" />
     <Compile Include="ColorTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\DataContractSerializerHelper.cs">
-      <Link>Common\System\Runtime\Serialization\DataContractSerializerHelper.cs</Link>
+             Link="Common\System\Runtime\Serialization\DataContractSerializerHelper.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Utils.cs">
-      <Link>Common\System\Runtime\Serialization\Utils.cs</Link>
+             Link="Common\System\Runtime\Serialization\Utils.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj b/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj
index 3266b52e575a2..5f306a92d5d03 100644
--- a/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj
+++ b/src/libraries/System.Globalization/tests/NlsTests/System.Globalization.Nls.Tests.csproj
@@ -324,7 +324,7 @@
     </Compile>
     <!-- Helpers -->
     <Compile Include="$(CommonTestPath)System\RandomDataGenerator.cs">
-      <Link>Common\System\RandomDataGenerator.cs</Link>
+             Link="Common\System\RandomDataGenerator.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
index a0a3271278c24..40a7f84c40774 100644
--- a/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
+++ b/src/libraries/System.Globalization/tests/System.Globalization.Tests.csproj
@@ -114,7 +114,7 @@
     <Compile Include="System\Globalization\UnicodeCategoryTests.cs" />
     <!-- Helpers -->
     <Compile Include="$(CommonTestPath)System\RandomDataGenerator.cs">
-      <Link>Common\System\RandomDataGenerator.cs</Link>
+             Link="Common\System\RandomDataGenerator.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
index 626ab0f48a792..867780f4374a0 100644
--- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
@@ -18,22 +18,22 @@
     <Compile Include="System\IO\Compression\enc\BrotliEncoderParameter.cs" />
     <Compile Include="System\IO\Compression\BrotliStream.cs" />
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBrotliHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBrotliHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBrotliHandle.cs">
     </Compile>
   </ItemGroup>
   <!-- Windows specific files -->
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <!-- Unix specific files -->
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
index 6cd5df420f23f..d992bc5a36351 100644
--- a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj
@@ -7,22 +7,22 @@
     <Compile Include="BrotliGoogleTestData.cs" />
     <Compile Include="CompressionStreamUnitTests.Brotli.cs" />
     <Compile Include="$(CommonTestPath)System\IO\Compression\CompressionStreamTestBase.cs">
-      <Link>Common\System\IO\Compression\CompressionStreamTestBase.cs</Link>
+             Link="Common\System\IO\Compression\CompressionStreamTestBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\CompressionStreamUnitTestBase.cs">
-      <Link>Common\System\IO\Compression\CompressionStreamUnitTestBase.cs</Link>
+             Link="Common\System\IO\Compression\CompressionStreamUnitTestBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\LocalMemoryStream.cs">
-      <Link>Common\System\IO\Compression\LocalMemoryStream.cs</Link>
+             Link="Common\System\IO\Compression\LocalMemoryStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\StreamHelpers.cs">
-      <Link>Common\System\IO\Compression\StreamHelpers.cs</Link>
+             Link="Common\System\IO\Compression\StreamHelpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
   </ItemGroup>
   <!--
@@ -33,4 +33,4 @@
     <PackageReference Include="System.IO.Compression.TestData" Version="$(SystemIOCompressionTestDataVersion)" ExcludeAssets="contentFiles" GeneratePathProperty="true" />
     <None Include="$(PkgSystem_IO_Compression_TestData)\contentFiles\any\any\**\*" CopyToOutputDirectory="PreserveNewest" Visible="false" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
index aa48a47795b5c..d65d46e9e034c 100644
--- a/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
+++ b/src/libraries/System.IO.Compression.ZipFile/src/System.IO.Compression.ZipFile.csproj
@@ -14,7 +14,7 @@
     <Compile Include="System\IO\Compression\ZipFileExtensions.ZipArchive.Extract.cs" />
     <Compile Include="System\IO\Compression\ZipFileExtensions.ZipArchiveEntry.Extract.cs" />
     <Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs">
-      <Link>Common\System\IO\PathInternal.CaseSensitivity.cs</Link>
+             Link="Common\System\IO\PathInternal.CaseSensitivity.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
index 64b0d45e75367..5235d65ebfd60 100644
--- a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
+++ b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj
@@ -9,25 +9,25 @@
     <Compile Include="ZipFileExtensions.ZipArchiveEntry.Extract.cs" />
     <Compile Include="ZipFileExtensions.ZipArchive.Extract.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">
-      <Link>Common\System\IO\TempDirectory.cs</Link>
+             Link="Common\System\IO\TempDirectory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\CRC.cs">
-      <Link>Common\System\IO\Compression\CRC.cs</Link>
+             Link="Common\System\IO\Compression\CRC.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\FileData.cs">
-      <Link>Common\System\IO\Compression\FileData.cs</Link>
+             Link="Common\System\IO\Compression\FileData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\LocalMemoryStream.cs">
-      <Link>Common\System\IO\Compression\LocalMemoryStream.cs</Link>
+             Link="Common\System\IO\Compression\LocalMemoryStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\StreamHelpers.cs">
-      <Link>Common\System\IO\Compression\StreamHelpers.cs</Link>
+             Link="Common\System\IO\Compression\StreamHelpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\ZipTestHelper.cs">
-      <Link>Common\System\IO\Compression\ZipTestHelper.cs</Link>
+             Link="Common\System\IO\Compression\ZipTestHelper.cs">
     </Compile>
   </ItemGroup>
   <!--
@@ -38,4 +38,4 @@
     <PackageReference Include="System.IO.Compression.TestData" Version="$(SystemIOCompressionTestDataVersion)" ExcludeAssets="contentFiles" GeneratePathProperty="true" />
     <None Include="$(PkgSystem_IO_Compression_TestData)\contentFiles\any\any\**\*" CopyToOutputDirectory="PreserveNewest" Visible="false" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
index 5efabca1ba8c2..50e67839ac794 100644
--- a/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
+++ b/src/libraries/System.IO.Compression/src/System.IO.Compression.csproj
@@ -36,33 +36,33 @@
     <Compile Include="System\IO\Compression\GZipStream.cs" />
     <Compile Include="System\IO\Compression\PositionPreservingWriteOnlyStreamWrapper.cs" />
     <Compile Include="$(CommonPath)System\IO\StreamHelpers.CopyValidation.cs">
-      <Link>Common\System\IO\StreamHelpers.CopyValidation.cs</Link>
+             Link="Common\System\IO\StreamHelpers.CopyValidation.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
   </ItemGroup>
   <!-- Windows specific files -->
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="System\IO\Compression\ZipArchiveEntry.Windows.cs" />
     <Compile Include="$(CommonPath)System\IO\PathInternal.Windows.cs">
-      <Link>Common\System\IO\PathInternal.Windows.cs</Link>
+             Link="Common\System\IO\PathInternal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <!-- Unix specific files -->
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <Compile Include="System\IO\Compression\ZipArchiveEntry.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\PathInternal.Unix.cs">
-      <Link>Common\System\IO\PathInternal.Unix.cs</Link>
+             Link="Common\System\IO\PathInternal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.PathConf.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.PathConf.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -73,4 +73,4 @@
     <Reference Include="System.Runtime.InteropServices" />
     <Reference Include="System.Threading" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
index 20bb882a1b962..853951b21557f 100644
--- a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
+++ b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj
@@ -15,34 +15,34 @@
     <Compile Include="ZipArchive\zip_ReadTests.cs" />
     <Compile Include="ZipArchive\zip_UpdateTests.cs" />
     <Compile Include="$(CommonTestPath)System\IO\PathFeatures.cs">
-      <Link>Common\System\IO\PathFeatures.cs</Link>
+             Link="Common\System\IO\PathFeatures.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\CRC.cs">
-      <Link>Common\System\IO\Compression\CRC.cs</Link>
+             Link="Common\System\IO\Compression\CRC.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\CompressionStreamTestBase.cs">
-      <Link>Common\System\IO\Compression\CompressionStreamTestBase.cs</Link>
+             Link="Common\System\IO\Compression\CompressionStreamTestBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\CompressionStreamUnitTestBase.cs">
-      <Link>Common\System\IO\Compression\CompressionStreamUnitTestBase.cs</Link>
+             Link="Common\System\IO\Compression\CompressionStreamUnitTestBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\FileData.cs">
-      <Link>Common\System\IO\Compression\FileData.cs</Link>
+             Link="Common\System\IO\Compression\FileData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\LocalMemoryStream.cs">
-      <Link>Common\System\IO\Compression\LocalMemoryStream.cs</Link>
+             Link="Common\System\IO\Compression\LocalMemoryStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\StreamHelpers.cs">
-      <Link>Common\System\IO\Compression\StreamHelpers.cs</Link>
+             Link="Common\System\IO\Compression\StreamHelpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\Compression\ZipTestHelper.cs">
-      <Link>Common\System\IO\Compression\ZipTestHelper.cs</Link>
+             Link="Common\System\IO\Compression\ZipTestHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
   </ItemGroup>
   <!--
@@ -53,4 +53,4 @@
     <PackageReference Include="System.IO.Compression.TestData" Version="$(SystemIOCompressionTestDataVersion)" ExcludeAssets="contentFiles" GeneratePathProperty="true" />
     <None Include="$(PkgSystem_IO_Compression_TestData)\contentFiles\any\any\**\*" CopyToOutputDirectory="PreserveNewest" Visible="false" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj
index 6041ad80240c7..68d2f47125e21 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj
@@ -7,13 +7,13 @@
     <Compile Include="FileSystemAccessRuleTests.cs" />
     <Compile Include="FileSystemAclExtensionsTests.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">
-      <Link>Common\System\IO\TempDirectory.cs</Link>
+             Link="Common\System\IO\TempDirectory.cs">
     </Compile>
     <Compile Include="FileSystemAuditRuleTests.cs" />
     <Compile Include="FileSystemSecurityTests.cs" />
     <Compile Include="Helpers.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
index 716da85edb803..f92610a4885ca 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/src/System.IO.FileSystem.DriveInfo.csproj
@@ -11,86 +11,86 @@
     <Compile Include="System\IO\DriveNotFoundException.cs" />
     <Compile Include="System\IO\DriveType.cs" />
     <Compile Include="$(CommonPath)System\HResults.cs">
-      <Link>Common\System\HResults.cs</Link>
+             Link="Common\System\HResults.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs">
-      <Link>Common\System\IO\PathInternal.CaseSensitivity.cs</Link>
+             Link="Common\System\IO\PathInternal.CaseSensitivity.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="System\IO\Error.cs" />
     <Compile Include="System\IO\DriveInfo.Windows.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetDriveType.cs">
-      <Link>Common\Interop\Windows\Interop.GetDriveType.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetDriveType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetVolumeInformation.cs">
-      <Link>Common\Interop\Windows\Interop.GetVolumeInformation.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetVolumeInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetLogicalDrives.cs">
-      <Link>Common\Interop\Windows\Interop.GetLogicalDrives.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetLogicalDrives.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetDiskFreeSpaceEx.cs">
-      <Link>Common\Interop\Windows\Interop.GetDiskFreeSpaceEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetDiskFreeSpaceEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MAX_PATH.cs">
-      <Link>Common\Interop\Windows\Interop.MAX_PATH.cs</Link>
+             Link="Common\Interop\Windows\Interop.MAX_PATH.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetVolumeLabel.cs">
-      <Link>Common\Interop\Windows\Interop.SetVolumeLabel.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetVolumeLabel.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs">
-      <Link>Common\Interop\Windows\Interop.SetThreadErrorMode.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetThreadErrorMode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SecurityOptions.cs">
-      <Link>Common\Interop\Windows\Interop.SecurityOptions.cs</Link>
+             Link="Common\Interop\Windows\Interop.SecurityOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileOperations.cs">
-      <Link>Common\Interop\Windows\Interop.FileOperations.cs</Link>
+             Link="Common\Interop\Windows\Interop.FileOperations.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\IO\DisableMediaInsertionPrompt.cs">
-      <Link>Common\System\IO\DisableMediaInsertionPrompt.cs</Link>
+             Link="Common\System\IO\DisableMediaInsertionPrompt.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\Win32Marshal.cs">
-      <Link>Common\System\IO\Win32Marshal.cs</Link>
+             Link="Common\System\IO\Win32Marshal.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\IO\DriveInfoInternal.Windows.cs">
-      <Link>Common\System\IO\DriveInfoInternal.Windows.cs</Link>
+             Link="Common\System\IO\DriveInfoInternal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\PathInternal.Windows.cs">
-      <Link>Common\System\IO\PathInternal.Windows.cs</Link>
+             Link="Common\System\IO\PathInternal.Windows.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' And '$(TargetFramework)' == '$(NetCoreAppCurrent)' ">
     <Compile Include="System\IO\DriveInfo.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs">
-      <Link>Common\Interop\Unix\Interop.IOErrors.cs</Link>
+             Link="Common\Interop\Unix\Interop.IOErrors.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\PathInternal.Unix.cs">
-      <Link>Common\System\IO\PathInternal.Unix.cs</Link>
+             Link="Common\System\IO\PathInternal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs">
-      <Link>Common\Interop\Unix\Interop.PathConf.cs</Link>
+             Link="Common\Interop\Unix\Interop.PathConf.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MountPoints.cs">
-      <Link>Common\Interop\Unix\Interop.MountPoints.cs</Link>
+             Link="Common\Interop\Unix\Interop.MountPoints.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MountPoints.FormatInfo.cs">
-      <Link>Common\Interop\Unix\Interop.MountPoints.FormatInfo.cs</Link>
+             Link="Common\Interop\Unix\Interop.MountPoints.FormatInfo.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -100,4 +100,4 @@
     <Reference Include="System.Runtime.Extensions" />
     <Reference Include="System.Runtime.InteropServices" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
index 6476f8cff3335..5e14b9ee839d2 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
@@ -20,71 +20,71 @@
     <Compile Include="System\IO\WatcherChangeTypes.cs" />
     <Compile Include="System\IO\WaitForChangedResult.cs" />
     <Compile Include="$(CommonPath)System\IO\PathInternal.CaseSensitivity.cs">
-      <Link>Common\System\IO\PathInternal.CaseSensitivity.cs</Link>
+             Link="Common\System\IO\PathInternal.CaseSensitivity.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)System\IO\PathInternal.Windows.cs">
-      <Link>Common\System\IO\PathInternal.Windows.cs</Link>
+             Link="Common\System\IO\PathInternal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileOperations.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FileOperations.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FileOperations.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadDirectoryChangesW.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ReadDirectoryChangesW.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ReadDirectoryChangesW.cs">
     </Compile>
     <Compile Include="System\IO\FileSystemWatcher.Win32.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Interop.CloseHandle.cs">
     </Compile>
   </ItemGroup>
   <!-- Windows : Win32 only -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CreateFile.cs">
-      <Link>Common\Interop\Windows\Interop.CreateFile.cs</Link>
+             Link="Common\Interop\Windows\Interop.CreateFile.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Read.cs">
-      <Link>Common\Interop\Unix\libc\Interop.Read.cs</Link>
+             Link="Common\Interop\Unix\libc\Interop.Read.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs">
-      <Link>Common\Interop\Unix\Interop.IOErrors.cs</Link>
+             Link="Common\Interop\Unix\Interop.IOErrors.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\PathInternal.Unix.cs">
-      <Link>Common\System\IO\PathInternal.Unix.cs</Link>
+             Link="Common\System\IO\PathInternal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs">
-      <Link>Common\Interop\Unix\Interop.PathConf.cs</Link>
+             Link="Common\Interop\Unix\Interop.PathConf.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsLinux)' == 'true' or '$(TargetsFreeBSD)' == 'true'">
     <Compile Include="System\IO\FileSystemWatcher.Linux.cs" />
     <Compile Include="$(CommonPath)Interop\Linux\System.Native\Interop.INotify.cs">
-      <Link>Common\Interop\Linux\Interop.inotify.cs</Link>
+             Link="Common\Interop\Linux\Interop.inotify.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs">
-      <Link>Common\Interop\Unix\Interop.Poll.cs</Link>
+             Link="Common\Interop\Unix\Interop.Poll.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs">
-      <Link>Common\Interop\Unix\Interop.Stat.cs</Link>
+             Link="Common\Interop\Unix\Interop.Stat.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
@@ -93,37 +93,37 @@
       <Link>System.IO.FileSystem\src\System\IO\FileSystem.Exists.Unix.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.EventStream.cs">
-      <Link>Common\Interop\OSX\Interop.EventStream.cs</Link>
+             Link="Common\Interop\OSX\Interop.EventStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.RunLoop.cs">
-      <Link>Common\Interop\OSX\Interop.RunLoop.cs</Link>
+             Link="Common\Interop\OSX\Interop.RunLoop.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.RealPath.cs">
-      <Link>Common\Interop\Unix\Interop.RealPath.cs</Link>
+             Link="Common\Interop\Unix\Interop.RealPath.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.Span.cs">
-      <Link>Common\Interop\Unix\Interop.Stat.Span.cs</Link>
+             Link="Common\Interop\Unix\Interop.Stat.Span.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs">
-      <Link>Common\Interop\Unix\Interop.Stat.cs</Link>
+             Link="Common\Interop\Unix\Interop.Stat.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Sync.cs">
-      <Link>Common\Interop\Unix\Interop.Sync.cs</Link>
+             Link="Common\Interop\Unix\Interop.Sync.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEventStreamHandle.OSX.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeEventStreamHandle.OSX.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeEventStreamHandle.OSX.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ValueUtf8Converter.cs">
-      <Link>Common\System\Text\ValueUtf8Converter.cs</Link>
+             Link="Common\System\Text\ValueUtf8Converter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnknownUnix)' == 'true'">
diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
index 589fb29ae2101..ab52666088ee2 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj
@@ -27,19 +27,19 @@
     <Compile Include="Utility\TestFileSystemWatcher.cs" />
     <Compile Include="Utility\FileSystemWatcherTest.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">
-      <Link>Common\System\IO\TempDirectory.cs</Link>
+             Link="Common\System\IO\TempDirectory.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsLinux)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="FileSystemWatcher.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ResourceLimits.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.ResourceLimits.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.ResourceLimits.cs">
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
index c36d099b980f2..4ac29bb8d4580 100644
--- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
+++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj
@@ -14,7 +14,7 @@
     <Compile Include="Base\StaticGetSetTimes.cs" />
     <Compile Include="Directory\EnumerableTests.cs" />
     <Compile Include="FileInfo\GetSetAttributesCommon.cs" />
-    <Compile Include="FileInfo\IsReadOnly.cs" />    
+    <Compile Include="FileInfo\IsReadOnly.cs" />
     <Compile Include="FileInfo\Replace.cs" />
     <Compile Include="FileStream\Handle.cs" />
     <Compile Include="Directory\GetLogicalDrives.cs" />
@@ -163,13 +163,13 @@
     <!-- Helpers -->
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GenericOperations.cs" Link="Interop\Windows\Interop.GenericOperations.cs" />
     <Compile Include="$(CommonTestPath)System\Buffers\NativeMemoryManager.cs">
-      <Link>Common\System\Buffers\NativeMemoryManager.cs</Link>
+             Link="Common\System\Buffers\NativeMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\PathFeatures.cs">
-      <Link>Common\System\IO\PathFeatures.cs</Link>
+             Link="Common\System\IO\PathFeatures.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
index 710b00e4b4c83..1718b69a71216 100644
--- a/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
+++ b/src/libraries/System.IO.IsolatedStorage/src/System.IO.IsolatedStorage.csproj
@@ -13,7 +13,7 @@
     <Compile Include="System\IO\IsolatedStorage\Helper.Win32Unix.cs" />
     <Compile Include="System\IO\IsolatedStorage\INormalizeForIsolatedStorage.cs" />
     <Compile Include="$(CommonPath)System\Security\IdentityHelper.cs">
-      <Link>Common\System\Security\IdentityHelper.cs</Link>
+             Link="Common\System\Security\IdentityHelper.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
index 0aaf3693233c2..1255cff942aa0 100644
--- a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
+++ b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj
@@ -25,16 +25,16 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">
-      <Link>Common\System\IO\TempDirectory.cs</Link>
+             Link="Common\System\IO\TempDirectory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="..\src\System\IO\IsolatedStorage\Helper.cs">
       <Link>Internals\Helper.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\IdentityHelper.cs">
-      <Link>Common\System\Security\IdentityHelper.cs</Link>
+             Link="Common\System\Security\IdentityHelper.cs">
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="StoreTestsFixture.cs" />
@@ -59,4 +59,4 @@
     <Compile Include="System\IO\IsolatedStorage\TestHelper.cs" />
     <Compile Include="System\IO\IsolatedStorage\RemoveTests.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
index c2dc86df1632e..d2894a92ff79c 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/src/System.IO.MemoryMappedFiles.csproj
@@ -19,82 +19,82 @@
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="System\IO\MemoryMappedFiles\Interop.Windows.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CreateFileMapping.cs">
-      <Link>Common\Interop\Windows\Interop.CreateFileMapping.cs</Link>
+             Link="Common\Interop\Windows\Interop.CreateFileMapping.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MapViewOfFile.cs">
-      <Link>Common\Interop\Windows\Interop.MapViewOfFile.cs</Link>
+             Link="Common\Interop\Windows\Interop.MapViewOfFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.OpenFileMapping.cs">
-      <Link>Common\Interop\Windows\Interop.OpenFileMapping.cs</Link>
+             Link="Common\Interop\Windows\Interop.OpenFileMapping.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.VirtualAlloc.cs">
-      <Link>Common\Interop\Windows\Interop.VirtualAlloc.cs</Link>
+             Link="Common\Interop\Windows\Interop.VirtualAlloc.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs">
-      <Link>Common\Interop\Windows\Interop.GlobalMemoryStatusEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.GlobalMemoryStatusEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileAttributes.cs">
-      <Link>Common\Interop\Windows\Interop.FileAttributes.cs</Link>
+             Link="Common\Interop\Windows\Interop.FileAttributes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileOperations.cs">
-      <Link>Common\Interop\Windows\Interop.FileOperations.cs</Link>
+             Link="Common\Interop\Windows\Interop.FileOperations.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FlushViewOfFile.cs">
-      <Link>Common\Interop\Windows\Interop.FlushViewOfFile.cs</Link>
+             Link="Common\Interop\Windows\Interop.FlushViewOfFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GenericOperations.cs">
-      <Link>Common\Interop\Windows\Interop.GenericOperations.cs</Link>
+             Link="Common\Interop\Windows\Interop.GenericOperations.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetSystemInfo.cs">
-      <Link>Common\Interop\Windows\Interop.GetSystemInfo.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetSystemInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs">
-      <Link>Common\Interop\Windows\Interop.SYSTEM_INFO.cs</Link>
+             Link="Common\Interop\Windows\Interop.SYSTEM_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.HandleOptions.cs">
-      <Link>Common\Interop\Windows\Interop.HandleOptions.cs</Link>
+             Link="Common\Interop\Windows\Interop.HandleOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFO.cs">
-      <Link>Common\Interop\Windows\Interop.MEMORY_BASIC_INFO.cs</Link>
+             Link="Common\Interop\Windows\Interop.MEMORY_BASIC_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MEMORYSTATUSEX.cs">
-      <Link>Common\Interop\Windows\Interop.MEMORYSTATUSEX.cs</Link>
+             Link="Common\Interop\Windows\Interop.MEMORYSTATUSEX.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MemOptions.cs">
-      <Link>Common\Interop\Windows\Interop.MemOptions.cs</Link>
+             Link="Common\Interop\Windows\Interop.MemOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.PipeOptions.cs">
-      <Link>Common\Interop\Windows\Interop.PipeOptions.cs</Link>
+             Link="Common\Interop\Windows\Interop.PipeOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SecurityOptions.cs">
-      <Link>Common\Interop\Windows\Interop.SecurityOptions.cs</Link>
+             Link="Common\Interop\Windows\Interop.SecurityOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.UnmapViewOfFile.cs">
-      <Link>Common\Interop\Windows\Interop.UnmapViewOfFile.cs</Link>
+             Link="Common\Interop\Windows\Interop.UnmapViewOfFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.VirtualQuery.cs">
-      <Link>Common\Interop\Windows\Interop.VirtualQuery.cs</Link>
+             Link="Common\Interop\Windows\Interop.VirtualQuery.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\Win32Marshal.cs">
-      <Link>Common\System\IO\Win32Marshal.cs</Link>
+             Link="Common\System\IO\Win32Marshal.cs">
     </Compile>
     <Compile Include="Microsoft\Win32\SafeMemoryMappedFileHandle.Windows.cs" />
     <Compile Include="Microsoft\Win32\SafeMemoryMappedViewHandle.Windows.cs" />
@@ -103,53 +103,53 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Fcntl.cs">
-      <Link>Common\Interop\Unix\Interop.Fcntl.cs</Link>
+             Link="Common\Interop\Unix\Interop.Fcntl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs">
-      <Link>Common\Interop\Unix\Interop.IOErrors.cs</Link>
+             Link="Common\Interop\Unix\Interop.IOErrors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MMap.cs">
-      <Link>Common\Interop\Unix\Interop.MMap.cs</Link>
+             Link="Common\Interop\Unix\Interop.MMap.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MUnmap.cs">
-      <Link>Common\Interop\Unix\Interop.MUnmap.cs</Link>
+             Link="Common\Interop\Unix\Interop.MUnmap.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MSync.cs">
-      <Link>Common\Interop\Unix\Interop.MSync.cs</Link>
+             Link="Common\Interop\Unix\Interop.MSync.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Open.cs">
-      <Link>Common\Interop\Unix\Interop.Open.cs</Link>
+             Link="Common\Interop\Unix\Interop.Open.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.OpenFlags.cs">
-      <Link>Common\Interop\Unix\Interop.OpenFlags.cs</Link>
+             Link="Common\Interop\Unix\Interop.OpenFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Permissions.cs">
-      <Link>Common\Interop\Unix\Interop.Permissions.cs</Link>
+             Link="Common\Interop\Unix\Interop.Permissions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SysConf.cs">
-      <Link>Common\Interop\Unix\Interop.SysConf.cs</Link>
+             Link="Common\Interop\Unix\Interop.SysConf.cs">
     </Compile>
     <Compile Include="Microsoft\Win32\SafeMemoryMappedFileHandle.Unix.cs" />
     <Compile Include="Microsoft\Win32\SafeMemoryMappedViewHandle.Unix.cs" />
     <Compile Include="System\IO\MemoryMappedFiles\MemoryMappedFile.Unix.cs" />
     <Compile Include="System\IO\MemoryMappedFiles\MemoryMappedView.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.FTruncate.cs">
-      <Link>Common\Interop\Unix\Interop.FTruncate.cs</Link>
+             Link="Common\Interop\Unix\Interop.FTruncate.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MAdvise.cs">
-      <Link>Common\Interop\Unix\Interop.MAdvise.cs</Link>
+             Link="Common\Interop\Unix\Interop.MAdvise.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ShmOpen.cs">
-      <Link>Common\Interop\Unix\Interop.ShmOpen.cs</Link>
+             Link="Common\Interop\Unix\Interop.ShmOpen.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Unlink.cs">
-      <Link>Common\Interop\Unix\Interop.Unlink.cs</Link>
+             Link="Common\Interop\Unix\Interop.Unlink.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -160,4 +160,4 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
index 830a1c5f73d84..372dd8846fd65 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
+++ b/src/libraries/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.csproj
@@ -16,8 +16,8 @@
     <Compile Include="MemoryMappedFilesTestsBase.Unix.cs" Condition="'$(TargetsUnix)' == 'true'" />
     <Compile Include="MemoryMappedFilesTestsBase.Windows.cs" Condition="'$(TargetsWindows)' == 'true'" />
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="XunitAssemblyAttributes.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
index c15a68ff5a26c..9a052a2f87ed9 100644
--- a/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
+++ b/src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Compile Include="Properties\InternalsVisibleTo.cs" />
     <Compile Include="System\IO\Pipelines\BufferSegment.cs" />
@@ -59,4 +59,4 @@
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Threading.ThreadPool" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
index c49e5d41a7b03..5d19e9f23052d 100644
--- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
+++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj
@@ -28,27 +28,27 @@
     <Compile Include="PipeTest.Write.cs" />
     <Compile Include="XunitAssemblyAttributes.cs" />
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CancelIoEx.cs">
-      <Link>Common\Interop\Windows\Interop.CancelIoEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.CancelIoEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LoadLibraryEx_IntPtr.cs">
-      <Link>Common\Interop\Windows\Interop.LoadLibraryEx_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Interop.LoadLibraryEx_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetNamedPipeHandleState.cs">
-      <Link>Common\Interop\Windows\Interop.GetNamedPipeHandleState.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetNamedPipeHandleState.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MaxLengths.cs">
-      <Link>Common\Interop\Windows\Interop.MaxLengths.cs</Link>
+             Link="Common\Interop\Windows\Interop.MaxLengths.cs">
     </Compile>
     <Compile Include="NamedPipeTests\NamedPipeTest.CurrentUserOnly.cs" />
     <Compile Include="NamedPipeTests\NamedPipeTest.CurrentUserOnly.Windows.cs" />
@@ -63,4 +63,4 @@
     <Compile Include="NamedPipeTests\NamedPipeTest.RunAsClient.Unix.cs" />
     <Compile Include="NativeOverlapped.unix.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
index 8b261f91ada34..58d794bd02d1c 100644
--- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
+++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
@@ -30,116 +30,116 @@
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(TargetsWindows)' == 'true'">
     <Compile Include="System\IO\Ports\SerialStream.Windows.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.DCB.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.DCB.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.DCB.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.COMMPROP.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.COMMPROP.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.COMMPROP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.COMMTIMEOUTS.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.COMMTIMEOUTS.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.COMMTIMEOUTS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.COMSTAT.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.COMSTAT.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.COMSTAT.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetCommState.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetCommState.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetCommState.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetCommBreak.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetCommBreak.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetCommBreak.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ClearCommBreak.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ClearCommBreak.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ClearCommBreak.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.EscapeCommFunction.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.EscapeCommFunction.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.EscapeCommFunction.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetCommTimeouts.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetCommTimeouts.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetCommTimeouts.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCommModemStatus.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCommModemStatus.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCommModemStatus.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ClearCommError.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ClearCommError.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ClearCommError.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCommProperties.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCommProperties.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCommProperties.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetCommMask.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetCommMask.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetCommMask.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.PurgeComm.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.PurgeComm.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.PurgeComm.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetupComm.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetupComm.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetupComm.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCommState.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCommState.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCommState.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WaitCommEvent.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WaitCommEvent.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WaitCommEvent.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetOverlappedResult.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetOverlappedResult.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetOverlappedResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GenericOperations.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GenericOperations.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GenericOperations.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Interop.SECURITY_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileTypes.cs">
-      <Link>Common\Interop\Windows\Interop.FileTypes.cs</Link>
+             Link="Common\Interop\Windows\Interop.FileTypes.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\PathInternal.Windows.cs">
-      <Link>Common\System\IO\PathInternal.Windows.cs</Link>
+             Link="Common\System\IO\PathInternal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\Win32Marshal.cs">
-      <Link>Common\System\IO\Win32Marshal.cs</Link>
+             Link="Common\System\IO\Win32Marshal.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\Interop.FormatMessage.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(TargetsWindows)' == 'true'">
     <Compile Include="System\IO\Ports\SerialPort.Win32.cs" />
     <Compile Include="System\IO\Ports\SerialStream.Win32.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CreateFile.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CreateFile.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CreateFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileOperations.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FileOperations.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FileOperations.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsLinux)' == 'true' ">
@@ -157,28 +157,28 @@
     <Compile Include="Interop\Unix\Interop.Termios.cs" />
     <Compile Include="Interop\Unix\Interop.Serial.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs">
-      <Link>Common\Interop\Unix\Interop.IOErrors.cs</Link>
+             Link="Common\Interop\Unix\Interop.IOErrors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Read.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Read.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Read.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Write.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Write.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Write.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Poll.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Poll.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Shutdown.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Shutdown.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Shutdown.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
@@ -205,4 +205,4 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.IO/tests/System.IO.Tests.csproj b/src/libraries/System.IO/tests/System.IO.Tests.csproj
index 3262bfa8bb501..5873e991199cc 100644
--- a/src/libraries/System.IO/tests/System.IO.Tests.csproj
+++ b/src/libraries/System.IO/tests/System.IO.Tests.csproj
@@ -47,16 +47,16 @@
     <Compile Include="StringReader\StringReader.CtorTests.cs" />
     <Compile Include="StringWriter\StringWriterTests.cs" />
     <Compile Include="$(CommonTestPath)System\Buffers\NativeMemoryManager.cs">
-      <Link>Common\System\Buffers\NativeMemoryManager.cs</Link>
+             Link="Common\System\Buffers\NativeMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\CallTrackingStream.cs">
-      <Link>Common\System\IO\CallTrackingStream.cs</Link>
+             Link="Common\System\IO\CallTrackingStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\DelegateStream.cs">
-      <Link>Common\System\IO\DelegateStream.cs</Link>
+             Link="Common\System\IO\DelegateStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\WrappedMemoryStream.cs">
-      <Link>Common\System\IO\WrappedMemoryStream.cs</Link>
+             Link="Common\System\IO\WrappedMemoryStream.cs">
     </Compile>
     <Compile Include="TestDataProvider\TestDataProvider.cs" />
     <Compile Include="TextReader\CharArrayTextReader.cs" />
@@ -64,4 +64,4 @@
     <Compile Include="TextWriter\CharArrayTextWriter.cs" />
     <Compile Include="TextWriter\TextWriterTests.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
index a88e5ca3b5e6a..c7707f51c90ad 100644
--- a/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
+++ b/src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj
@@ -14,10 +14,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Collections\Generic\ArrayBuilder.cs">
-      <Link>Common\System\Collections\Generic\ArrayBuilder.cs</Link>
+             Link="Common\System\Collections\Generic\ArrayBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+             Link="Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
     </Compile>
     <Compile Include="System\Dynamic\Utils\CacheDict.cs" />
     <Compile Include="System\Dynamic\Utils\ContractUtils.cs" />
diff --git a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
index 6ac48c2e3dca5..316e0e27d1968 100644
--- a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
+++ b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
@@ -225,7 +225,7 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(IsInterpreting)' != 'true' ">
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs">
-      <Link>Common\System\Collections\DictionaryExtensions.cs</Link>
+             Link="Common\System\Collections\DictionaryExtensions.cs">
     </Compile>
     <Compile Include="ILReader\DynamicMethodILProvider.cs" />
     <Compile Include="ILReader\DynamicScopeTokenResolver.cs" />
@@ -248,4 +248,4 @@
   <ItemGroup>
     <PackageReference Include="xunit.extensibility.execution" Version="$(XUnitVersion)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
index e7a85f6cc62c4..aa8ded1ad18d8 100644
--- a/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
+++ b/src/libraries/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj
@@ -5,13 +5,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\ThreadPoolHelpers.cs">
-      <Link>CommonTest\System\Threading\ThreadPoolHelpers.cs</Link>
+             Link="CommonTest\System\Threading\ThreadPoolHelpers.cs">
     </Compile>
     <Compile Include="Combinatorial\CancellationParallelQueryCombinationTests.cs" />
     <Compile Include="Combinatorial\FailingParallelQueryCombinationTests.cs" />
@@ -77,4 +77,4 @@
     <Compile Include="WithCancellationTests.cs" />
     <Compile Include="XunitAssemblyAttributes.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
index ad309e2f7319b..29f05cac23925 100644
--- a/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
+++ b/src/libraries/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.csproj
@@ -54,7 +54,7 @@
     <Compile Include="WhereTests.cs" />
     <Compile Include="ZipTests.cs" />
     <Compile Include="$(CommonTestPath)System\Linq\SkipTakeData.cs">
-      <Link>Common\System\Linq\SkipTakeData.cs</Link>
+             Link="Common\System\Linq\SkipTakeData.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
index fe5b68dc5b1eb..84c9128cd748a 100644
--- a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
+++ b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj
@@ -67,13 +67,13 @@
     <Compile Include="WhereTests.cs" />
     <Compile Include="ZipTests.cs" />
     <Compile Include="$(CommonTestPath)System\Linq\SkipTakeData.cs">
-      <Link>Common\System\Linq\SkipTakeData.cs</Link>
+             Link="Common\System\Linq\SkipTakeData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
     <Compile Include="GroupByTests.DebuggerAttributes.cs" />
     <Compile Include="ToLookupTests.DebuggerAttributes.cs" />
     <Compile Include="EnumerableDebugViewTests.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Management/src/System.Management.csproj b/src/libraries/System.Management/src/System.Management.csproj
index e3a79752a63d8..ec937e6149637 100644
--- a/src/libraries/System.Management/src/System.Management.csproj
+++ b/src/libraries/System.Management/src/System.Management.csproj
@@ -9,37 +9,37 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' != 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GlobalLock.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GlobalLock.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GlobalLock.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LoadLibrary.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.LoadLibrary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoGetObjectContext.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.CoGetObjectContext.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.CoGetObjectContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoMarshalInterface.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.CoMarshalInterface.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.CoMarshalInterface.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoUnmarshalInterface.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.CoUnmarshalInterface.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.CoUnmarshalInterface.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CreateStreamOnHGlobal.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.CreateStreamOnHGlobal.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.CreateStreamOnHGlobal.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.GetHGlobalFromStream.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.GetHGlobalFromStream.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.GetHGlobalFromStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
     </Compile>
     <Compile Include="System\Management\ManagementBaseObject.cs" />
     <Compile Include="System\Management\ManagementClass.cs" />
@@ -87,4 +87,4 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Threading.ThreadPool" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Memory/src/System.Memory.csproj b/src/libraries/System.Memory/src/System.Memory.csproj
index bada3e64b157c..071ea3df7eaa7 100644
--- a/src/libraries/System.Memory/src/System.Memory.csproj
+++ b/src/libraries/System.Memory/src/System.Memory.csproj
@@ -35,10 +35,10 @@
   <ItemGroup>
     <!-- Common or Common-branched source files -->
     <Compile Include="$(CommonPath)System\Buffers\ArrayBufferWriter.cs">
-      <Link>Common\System\Buffers\ArrayBufferWriter.cs</Link>
+             Link="Common\System\Buffers\ArrayBufferWriter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
index ce1cdff0d5c2b..2743ebe59cdf6 100644
--- a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
+++ b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj
@@ -261,10 +261,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Buffers\NativeMemoryManager.cs">
-      <Link>Common\System\Buffers\NativeMemoryManager.cs</Link>
+             Link="Common\System\Buffers\NativeMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\MutableDecimal.cs">
-      <Link>Common\System\MutableDecimal.cs</Link>
+             Link="Common\System\MutableDecimal.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj b/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj
index 278e36d4e102c..dad3fa4b2e92a 100644
--- a/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj
@@ -11,31 +11,31 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs">
-      <Link>Common\System\Net\Capability.Security.cs</Link>
+             Link="Common\System\Net\Capability.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs">
-      <Link>Common\System\Net\Configuration.Certificates.cs</Link>
+             Link="Common\System\Net\Configuration.Certificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs">
-      <Link>Common\System\Net\Configuration.Http.cs</Link>
+             Link="Common\System\Net\Configuration.Http.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs">
-      <Link>Common\System\Net\Configuration.Security.cs</Link>
+             Link="Common\System\Net\Configuration.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.AuthenticationHelpers.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs">
-      <Link>Common\System\Net\Http\GenericLoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\GenericLoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
index c402b8d09db8a..577c5765efbe1 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/src/System.Net.Http.WinHttpHandler.csproj
@@ -11,82 +11,82 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'" >
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates_types.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates_types.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates.cs</Link>
-    </Compile>	
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates.cs">
+    </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FormatMessage.cs</Link>
-    </Compile>	
+             Link="Common\Interop\Windows\Kernel32\Interop.FormatMessage.cs">
+    </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs">
-      <Link>Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs</Link>
+             Link="Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
-      <Link>Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs</Link>
+             Link="Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs">
-      <Link>Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs</Link>
+             Link="Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.winhttp_types.cs">
-      <Link>Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs</Link>
+             Link="Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.winhttp.cs">
-      <Link>Common\Interop\Windows\WinHttp\Interop.winhttp.cs</Link>
+             Link="Common\Interop\Windows\WinHttp\Interop.winhttp.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\CharArrayHelpers.cs">
-      <Link>Common\System\CharArrayHelpers.cs</Link>
+             Link="Common\System\CharArrayHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs</Link>
-    </Compile>		
+             Link="Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
+    </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpStatusDescription.cs">
-      <Link>Common\System\Net\Http\HttpStatusDescription.cs</Link>
+             Link="Common\System\Net\Http\HttpStatusDescription.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\SecurityProtocol.cs">
-      <Link>Common\System\Net\SecurityProtocol.cs</Link>
+             Link="Common\System\Net\SecurityProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\UriScheme.cs">
-      <Link>Common\System\Net\UriScheme.cs</Link>
+             Link="Common\System\Net\UriScheme.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Http\HttpHandlerDefaults.cs">
-      <Link>Common\System\Net\Http\HttpHandlerDefaults.cs</Link>
+             Link="Common\System\Net\Http\HttpHandlerDefaults.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Http\NoWriteNoSeekStreamContent.cs">
-      <Link>Common\System\Net\Http\NoWriteNoSeekStreamContent.cs</Link>
+             Link="Common\System\Net\Http\NoWriteNoSeekStreamContent.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Http\WinInetProxyHelper.cs">
-      <Link>Common\System\Net\Http\WinInetProxyHelper.cs</Link>
+             Link="Common\System\Net\Http\WinInetProxyHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Security\CertificateHelper.cs">
-      <Link>Common\System\Net\Security\CertificateHelper.cs</Link>
+             Link="Common\System\Net\Security\CertificateHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Security\CertificateHelper.Windows.cs">
-      <Link>Common\System\Net\Security\CertificateHelper.Windows.cs</Link>
+             Link="Common\System\Net\Security\CertificateHelper.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Runtime\ExceptionServices\ExceptionStackTrace.cs">
-      <Link>Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs</Link>
+             Link="Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Threading\Tasks\RendezvousAwaitable.cs">
-      <Link>Common\System\Threading\Tasks\RendezvousAwaitable.cs</Link>
-    </Compile>	
+             Link="Common\System\Threading\Tasks\RendezvousAwaitable.cs">
+    </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Compile Include="System\Net\Http\NetEventSource.WinHttpHandler.cs" />
     <Compile Include="System\Net\Http\WinHttpAuthHelper.cs" />
@@ -104,10 +104,10 @@
     <Compile Include="System\Net\Http\WinHttpTraceHelper.cs" />
     <Compile Include="System\Net\Http\WinHttpTransportContext.cs" />
     <Compile Include="$(CommonPath)System\IO\StreamHelpers.CopyValidation.cs">
-      <Link>Common\System\IO\StreamHelpers.CopyValidation.cs</Link>
+             Link="Common\System\IO\StreamHelpers.CopyValidation.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -120,4 +120,4 @@
     <Reference Include="System" />
     <Reference Include="System.Net.Http" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
index 66515bbd3e1bf..3f1798c2ad41c 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
@@ -7,192 +7,192 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs">
-      <Link>Common\System\Net\Configuration.Http.cs</Link>
+             Link="Common\System\Net\Configuration.Http.cs">
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="BaseCertificateTest.cs" />
     <Compile Include="ServerCertificateTest.cs" />
     <Compile Include="WinHttpHandlerTest.cs" />
-    <Compile Include="XunitTestAssemblyAtrributes.cs" /> 
+    <Compile Include="XunitTestAssemblyAtrributes.cs" />
     <Compile Include="$(CommonPath)\System\Net\Http\HttpHandlerDefaults.cs">
-      <Link>Common\System\Net\Http\HttpHandlerDefaults.cs</Link>
+             Link="Common\System\Net\Http\HttpHandlerDefaults.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\DelegateStream.cs">
-      <Link>Common\System\IO\DelegateStream.cs</Link>
-    </Compile>    
+             Link="Common\System\IO\DelegateStream.cs">
+    </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs">
-      <Link>Common\System\Net\Configuration.Certificates.cs</Link>
+             Link="Common\System\Net\Configuration.Certificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs">
-      <Link>Common\System\Net\Configuration.Security.cs</Link>
+             Link="Common\System\Net\Configuration.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs">
-      <Link>Common\System\Net\Configuration.Sockets.cs</Link>
+             Link="Common\System\Net\Configuration.Sockets.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs">
-      <Link>Common\System\Net\Capability.Security.cs</Link>
+             Link="Common\System\Net\Capability.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.Windows.cs">
-      <Link>Common\System\Net\Capability.Security.Windows.cs</Link>
+             Link="Common\System\Net\Capability.Security.Windows.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\EventSourceTestLogging.cs">
-      <Link>Common\System\Net\EventSourceTestLogging.cs</Link>
+             Link="Common\System\Net\EventSourceTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\HttpsTestServer.cs">
-      <Link>Common\System\Net\HttpsTestServer.cs</Link>
+             Link="Common\System\Net\HttpsTestServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs">
-      <Link>Common\System\Net\RemoteServerQuery.cs</Link>
+             Link="Common\System\Net\RemoteServerQuery.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\VerboseTestLogging.cs">
-      <Link>Common\System\Net\VerboseTestLogging.cs</Link>
+             Link="Common\System\Net\VerboseTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\TestWebProxies.cs">
-      <Link>Common\System\Net\TestWebProxies.cs</Link>
+             Link="Common\System\Net\TestWebProxies.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\StreamArrayExtensions.cs">
-      <Link>Common\System\Net\StreamArrayExtensions.cs</Link>
+             Link="Common\System\Net\StreamArrayExtensions.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\ByteAtATimeContent.cs">
-      <Link>Common\System\Net\Http\ByteAtATimeContent.cs</Link>
+             Link="Common\System\Net\Http\ByteAtATimeContent.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\ChannelBindingAwareContent.cs">
-      <Link>Common\System\Net\Http\ChannelBindingAwareContent.cs</Link>
+             Link="Common\System\Net\Http\ChannelBindingAwareContent.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\CustomContent.cs">
-      <Link>Common\System\Net\Http\CustomContent.cs</Link>
+             Link="Common\System\Net\Http\CustomContent.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\DefaultCredentialsTest.cs">
-      <Link>Common\System\Net\Http\DefaultCredentialsTest.cs</Link>
+             Link="Common\System\Net\Http\DefaultCredentialsTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\DribbleStream.cs">
-      <Link>Common\System\Net\Http\DribbleStream.cs</Link>
+             Link="Common\System\Net\Http\DribbleStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs">
-      <Link>Common\System\Net\Http\GenericLoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\GenericLoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTestBase.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTestBase.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTestBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\Http2Frames.cs">
-      <Link>Common\System\Net\Http\Http2Frames.cs</Link>
+             Link="Common\System\Net\Http\Http2Frames.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs">
-      <Link>Common\System\Net\Http\HPackEncoder.cs</Link>
+             Link="Common\System\Net\Http\HPackEncoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\Http2LoopbackServer.cs">
-      <Link>Common\System\Net\Http\Http2LoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\Http2LoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\Http2LoopbackConnection.cs">
-      <Link>Common\System\Net\Http\Http2LoopbackConnection.cs</Link>
+             Link="Common\System\Net\Http\Http2LoopbackConnection.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\QPackTestDecoder.cs">
-      <Link>Common\System\Net\Http\QPackTestDecoder.cs</Link>
+             Link="Common\System\Net\Http\QPackTestDecoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\QPackTestEncoder.cs">
-      <Link>Common\System\Net\Http\QPackTestEncoder.cs</Link>
+             Link="Common\System\Net\Http\QPackTestEncoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanDecoder.cs">
-      <Link>Common\System\Net\Http\HuffmanDecoder.cs</Link>
+             Link="Common\System\Net\Http\HuffmanDecoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs">
-      <Link>Common\System\Net\Http\HuffmanEncoder.cs</Link>
+             Link="Common\System\Net\Http\HuffmanEncoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.AcceptAllCerts.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.AcceptAllCerts.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.AcceptAllCerts.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Asynchrony.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Asynchrony.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Asynchrony.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Authentication.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Authentication.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Authentication.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.AutoRedirect.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.AutoRedirect.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.AutoRedirect.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Cancellation.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Cancellation.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Cancellation.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.ClientCertificates.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.ClientCertificates.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.ClientCertificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Cookies.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Cookies.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Cookies.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Decompression.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Decompression.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Decompression.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.DefaultProxyCredentials.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.DefaultProxyCredentials.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.DefaultProxyCredentials.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.MaxConnectionsPerServer.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.MaxConnectionsPerServer.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.MaxConnectionsPerServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.MaxResponseHeadersLength.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.MaxResponseHeadersLength.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.MaxResponseHeadersLength.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Proxy.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Proxy.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Proxy.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.ServerCertificates.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.ServerCertificates.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.ServerCertificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.SslProtocols.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.SslProtocols.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.SslProtocols.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpProtocolTests.cs">
-      <Link>Common\System\Net\Http\HttpProtocolTests.cs</Link>
+             Link="Common\System\Net\Http\HttpProtocolTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClient.SelectedSitesTest.cs">
-      <Link>Common\System\Net\Http\HttpClient.SelectedSitesTest.cs</Link>
+             Link="Common\System\Net\Http\HttpClient.SelectedSitesTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientEKUTest.cs">
-      <Link>Common\System\Net\Http\HttpClientEKUTest.cs</Link>
+             Link="Common\System\Net\Http\HttpClientEKUTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpRetryProtocolTests.cs">
-      <Link>Common\System\Net\Http\HttpRetryProtocolTests.cs</Link>
+             Link="Common\System\Net\Http\HttpRetryProtocolTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\IdnaProtocolTests.cs">
-      <Link>Common\System\Net\Http\IdnaProtocolTests.cs</Link>
+             Link="Common\System\Net\Http\IdnaProtocolTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackProxyServer.cs">
-      <Link>Common\System\Net\Http\LoopbackProxyServer.cs</Link>
+             Link="Common\System\Net\Http\LoopbackProxyServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.AuthenticationHelpers.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs">
-      <Link>Common\System\Net\Http\TestHelper.cs</Link>
+             Link="Common\System\Net\Http\TestHelper.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\PostScenarioTest.cs">
-      <Link>Common\System\Net\Http\PostScenarioTest.cs</Link>
+             Link="Common\System\Net\Http\PostScenarioTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\RepeatedFlushContent.cs">
-      <Link>Common\System\Net\Http\RepeatedFlushContent.cs</Link>
+             Link="Common\System\Net\Http\RepeatedFlushContent.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\ResponseStreamTest.cs">
-      <Link>Common\System\Net\Http\ResponseStreamTest.cs</Link>
-    </Compile>    
+             Link="Common\System\Net\Http\ResponseStreamTest.cs">
+    </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\SchSendAuxRecordHttpTest.cs">
-      <Link>Common\System\Net\Http\SchSendAuxRecordHttpTest.cs</Link>
+             Link="Common\System\Net\Http\SchSendAuxRecordHttpTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\SyncBlockingContent.cs">
-      <Link>Common\System\Net\Http\SyncBlockingContent.cs</Link>
+             Link="Common\System\Net\Http\SyncBlockingContent.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs">
-      <Link>Common\System\Threading\TrackingSynchronizationContext.cs</Link>
+             Link="Common\System\Threading\TrackingSynchronizationContext.cs">
     </Compile>
     <Compile Include="HttpClientHandlerTestBase.WinHttpHandler.cs" />
     <Compile Include="WinHttpClientHandler.cs" />
@@ -203,4 +203,4 @@
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="System.Net.TestData" Version="$(SystemNetTestDataVersion)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
index 9d1e3ba1e79cf..0b5595c094479 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj
@@ -12,82 +12,82 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
     <Compile Include="$(CommonTestPath)System\Net\SslProtocolSupport.cs">
-      <Link>CommonTest\System\Net\SslProtocolSupport.cs</Link>
+             Link="CommonTest\System\Net\SslProtocolSupport.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.certificates_types.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates_types.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.HRESULT_FROM_WIN32.cs">
-      <Link>Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs</Link>
+             Link="Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
-      <Link>Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs</Link>
+             Link="Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs">
-      <Link>Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs</Link>
+             Link="Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinHttp\Interop.winhttp_types.cs">
-      <Link>Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs</Link>
+             Link="Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\CharArrayHelpers.cs">
-      <Link>Common\System\CharArrayHelpers.cs</Link>
+             Link="Common\System\CharArrayHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\StreamHelpers.CopyValidation.cs">
-      <Link>Common\System\IO\StreamHelpers.CopyValidation.cs</Link>
+             Link="Common\System\IO\StreamHelpers.CopyValidation.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpStatusDescription.cs">
-      <Link>Common\System\Net\HttpStatusDescription.cs</Link>
+             Link="Common\System\Net\HttpStatusDescription.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\UriScheme.cs">
-      <Link>Common\System\Net\UriScheme.cs</Link>
+             Link="Common\System\Net\UriScheme.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityProtocol.cs">
-      <Link>Common\System\Net\SecurityProtocol.cs</Link>
+             Link="Common\System\Net\SecurityProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\HttpHandlerDefaults.cs">
-      <Link>Common\System\Net\Http\HttpHandlerDefaults.cs</Link>
+             Link="Common\System\Net\Http\HttpHandlerDefaults.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\NoWriteNoSeekStreamContent.cs">
-      <Link>Common\System\Net\Http\NoWriteNoSeekStreamContent.cs</Link>
+             Link="Common\System\Net\Http\NoWriteNoSeekStreamContent.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Http\WinInetProxyHelper.cs">
-      <Link>Common\System\Net\Http\WinInetProxyHelper.cs</Link>
+             Link="Common\System\Net\Http\WinInetProxyHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\CertificateHelper.cs">
-      <Link>Common\System\Net\Security\CertificateHelper.cs</Link>
+             Link="Common\System\Net\Security\CertificateHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\CertificateHelper.Windows.cs">
-      <Link>Common\System\Net\Security\CertificateHelper.Windows.cs</Link>
+             Link="Common\System\Net\Security\CertificateHelper.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\ExceptionServices\ExceptionStackTrace.cs">
-      <Link>Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs</Link>
+             Link="Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\SimpleRegex.cs">
-      <Link>Common\System\Text\SimpleRegex.cs</Link>
+             Link="Common\System\Text\SimpleRegex.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\RendezvousAwaitable.cs">
-      <Link>Common\System\Threading\Tasks\RendezvousAwaitable.cs</Link>
+             Link="Common\System\Threading\Tasks\RendezvousAwaitable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Compile Include="..\..\src\System\Net\Http\WinHttpAuthHelper.cs">
       <Link>ProductionCode\WinHttpAuthHelper.cs</Link>
diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
index cebece24f4e13..36cdd1ff17ff3 100644
--- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj
+++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
@@ -90,34 +90,34 @@
     <Compile Include="System\Net\Http\Headers\ViaHeaderValue.cs" />
     <Compile Include="System\Net\Http\Headers\WarningHeaderValue.cs" />
     <Compile Include="$(CommonPath)System\IO\StreamHelpers.CopyValidation.cs">
-      <Link>Common\System\IO\StreamHelpers.CopyValidation.cs</Link>
+             Link="Common\System\IO\StreamHelpers.CopyValidation.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SslClientAuthenticationOptionsExtensions.cs">
-      <Link>Common\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs</Link>
+             Link="Common\System\Net\Security\SslClientAuthenticationOptionsExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\DelegatingStream.cs">
-      <Link>Common\System\IO\DelegatingStream.cs</Link>
+             Link="Common\System\IO\DelegatingStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\ReadOnlyMemoryStream.cs">
-      <Link>Common\System\IO\ReadOnlyMemoryStream.cs</Link>
+             Link="Common\System\IO\ReadOnlyMemoryStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\StringBuilderCache.cs">
-      <Link>Common\System\Text\StringBuilderCache.cs</Link>
+             Link="Common\System\Text\StringBuilderCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpDateParser.cs">
-      <Link>Common\System\Net\HttpDateParser.cs</Link>
+             Link="Common\System\Net\HttpDateParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\SimpleRegex.cs">
-      <Link>Common\System\Text\SimpleRegex.cs</Link>
+             Link="Common\System\Text\SimpleRegex.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs">
-       <Link>Common\System\Net\ArrayBuffer.cs</Link>
+              Link="Common\System\Net\ArrayBuffer.cs">
      </Compile>
   </ItemGroup>
   <!-- SocketsHttpHandler implementation -->
@@ -170,232 +170,232 @@
     <Compile Include="System\Net\Http\SocketsHttpHandler\SocketsHttpHandler.cs" />
     <Compile Include="System\Net\Http\SocketsHttpHandler\SystemProxyInfo.cs" />
     <Compile Include="$(CommonPath)System\Net\NTAuthentication.Common.cs">
-      <Link>Common\System\Net\NTAuthentication.Common.cs</Link>
+             Link="Common\System\Net\NTAuthentication.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsPal.cs">
-      <Link>Common\System\Net\ContextFlagsPal.cs</Link>
+             Link="Common\System\Net\ContextFlagsPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\IHttpHeadersHandler.cs">
-      <Link>Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\Http3SettingType.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\Http3SettingType.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\Http3SettingType.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\Http3StreamType.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\Http3StreamType.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\Http3StreamType.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\Helpers\VariableLengthIntegerHelper.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\Helpers\VariableLengthIntegerHelper.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\Helpers\VariableLengthIntegerHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\Frames\Http3ErrorCode.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\Frames\Http3ErrorCode.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\Frames\Http3ErrorCode.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\Frames\Http3Frame.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\Frames\Http3Frame.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\Frames\Http3Frame.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\Frames\Http3FrameType.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\Frames\Http3FrameType.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\Frames\Http3FrameType.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\HeaderField.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\HeaderField.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\HeaderField.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\QPackDecoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\QPackDecoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\QPackDecoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\QPackDecodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\QPackDecodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\QPackDecodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\QPackEncoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\QPackEncodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\H3StaticTable.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\H3StaticTable.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\H3StaticTable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicConnection.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicConnection.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicConnection.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicListener.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicListener.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicStream.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicStream.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityStatusPal.cs">
-      <Link>Common\System\Net\SecurityStatusPal.cs</Link>
+             Link="Common\System\Net\SecurityStatusPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SSPIHandleCache.cs">
-      <Link>Common\System\Net\Security\SSPIHandleCache.cs</Link>
+             Link="Common\System\Net\Security\SSPIHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NetEventSource.Security.cs">
-      <Link>Common\System\Net\Security\NetEventSource.Security.cs</Link>
+             Link="Common\System\Net\Security\NetEventSource.Security.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ExceptionCheck.cs">
-      <Link>Common\System\Net\ExceptionCheck.cs</Link>
+             Link="Common\System\Net\ExceptionCheck.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\BidirectionalDictionary.cs">
-      <Link>Common\System\Collections\Generic\BidirectionalDictionary.cs</Link>
+             Link="Common\System\Collections\Generic\BidirectionalDictionary.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NegotiationInfoClass.cs">
-      <Link>Common\System\Net\NegotiationInfoClass.cs</Link>
+             Link="Common\System\Net\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\DebugThreadTracking.cs">
-      <Link>Common\System\Net\Logging\DebugThreadTracking.cs</Link>
+             Link="Common\System\Net\Logging\DebugThreadTracking.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs">
-      <Link>Common\System\Net\DebugSafeHandle.cs</Link>
+             Link="Common\System\Net\DebugSafeHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
   </ItemGroup>
   <!-- Linux specific files -->
   <ItemGroup Condition="'$(TargetsLinux)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\Linux\Interop.Libraries.cs">
-      <Link>Common\Interop\Linux\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Linux\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <!-- SocketsHttpHandler platform parts -->
@@ -404,40 +404,40 @@
     <Compile Include="System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.Unix.cs" />
     <Compile Include="System\Net\Http\SocketsHttpHandler\CurrentUserIdentityProvider.Unix.cs" />
     <Compile Include="$(CommonPath)System\Net\ContextFlagsAdapterPal.Unix.cs">
-      <Link>Common\System\Net\ContextFlagsAdapterPal.Unix.cs</Link>
+             Link="Common\System\Net\ContextFlagsAdapterPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeCredentials.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeCredentials.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeCredentials.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeDeleteContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeDeleteContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NegotiateStreamPal.Unix.cs">
-      <Link>Common\System\Net\Security\NegotiateStreamPal.Unix.cs</Link>
+             Link="Common\System\Net\Security\NegotiateStreamPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeNegoCredentials.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SecChannelBindings.cs">
-      <Link>Common\System\Net\Security\Unix\SecChannelBindings.cs</Link>
+             Link="Common\System\Net\Security\Unix\SecChannelBindings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteNegoContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetstvOS)' != 'true'">
@@ -448,45 +448,45 @@
     <Compile Include="System\Net\Http\SocketsHttpHandler\SystemProxyInfo.OSX.cs" />
     <Compile Include="System\Net\Http\SocketsHttpHandler\MacProxy.cs" />
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFArray.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFData.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFData.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFDictionary.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFDictionary.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFDictionary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFProxy.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFProxy.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFProxy.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFUrl.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFUrl.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFUrl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFString.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFString.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFNumber.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFString.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFError.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFError.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFError.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.RunLoop.cs">
-      <Link>Common\Interop\OSX\Interop.RunLoop.cs</Link>
+             Link="Common\Interop\OSX\Interop.RunLoop.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)\System\Net\HttpStatusDescription.cs">
-      <Link>Common\System\Net\HttpStatusDescription.cs</Link>
+             Link="Common\System\Net\HttpStatusDescription.cs">
     </Compile>
     <Compile Include="System\Net\Http\SocketsHttpHandler\SystemProxyInfo.Windows.cs" />
     <Compile Include="System\Net\Http\SocketsHttpHandler\HttpEnvironmentProxy.cs" />
@@ -495,160 +495,160 @@
     <Compile Include="System\Net\Http\SocketsHttpHandler\HttpWindowsProxy.cs" />
     <Compile Include="System\Net\Http\SocketsHttpHandler\CurrentUserIdentityProvider.Windows.cs" />
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates_types.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates_types.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetModuleHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs">
-      <Link>Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs</Link>
+             Link="Common\Interop\Windows\Interop.HRESULT_FROM_WIN32.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
-      <Link>Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs</Link>
+             Link="Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs">
-      <Link>Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs</Link>
+             Link="Common\Interop\Windows\WinHttp\Interop.SafeWinHttpHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.winhttp_types.cs">
-      <Link>Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs</Link>
+             Link="Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\WinHttp\Interop.winhttp.cs">
-      <Link>Common\Interop\Windows\WinHttp\Interop.winhttp.cs</Link>
+             Link="Common\Interop\Windows\WinHttp\Interop.winhttp.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\CharArrayHelpers.cs">
-      <Link>Common\System\CharArrayHelpers.cs</Link>
+             Link="Common\System\CharArrayHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\SecurityProtocol.cs">
-      <Link>Common\System\Net\SecurityProtocol.cs</Link>
+             Link="Common\System\Net\SecurityProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\UriScheme.cs">
-      <Link>Common\System\Net\UriScheme.cs</Link>
+             Link="Common\System\Net\UriScheme.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Http\HttpHandlerDefaults.cs">
-      <Link>Common\System\Net\Http\HttpHandlerDefaults.cs</Link>
+             Link="Common\System\Net\Http\HttpHandlerDefaults.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Http\NoWriteNoSeekStreamContent.cs">
-      <Link>Common\System\Net\Http\NoWriteNoSeekStreamContent.cs</Link>
+             Link="Common\System\Net\Http\NoWriteNoSeekStreamContent.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Http\WinInetProxyHelper.cs">
-      <Link>Common\System\Net\Http\WinInetProxyHelper.cs</Link>
+             Link="Common\System\Net\Http\WinInetProxyHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Security\CertificateHelper.cs">
-      <Link>Common\System\Net\Security\CertificateHelper.cs</Link>
+             Link="Common\System\Net\Security\CertificateHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Net\Security\CertificateHelper.Windows.cs">
-      <Link>Common\System\Net\Security\CertificateHelper.Windows.cs</Link>
+             Link="Common\System\Net\Security\CertificateHelper.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Runtime\ExceptionServices\ExceptionStackTrace.cs">
-      <Link>Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs</Link>
+             Link="Common\System\Runtime\ExceptionServices\ExceptionStackTrace.cs">
     </Compile>
     <Compile Include="$(CommonPath)\System\Threading\Tasks\RendezvousAwaitable.cs">
-      <Link>Common\System\Threading\Tasks\RendezvousAwaitable.cs</Link>
+             Link="Common\System\Threading\Tasks\RendezvousAwaitable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
       <Link>System\System\Threading\Tasks\TaskToApm.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBuffer.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBuffer.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBuffer.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBufferType.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBufferType.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBufferType.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityContextTokenHandle.cs">
-      <Link>Common\System\Net\Security\SecurityContextTokenHandle.cs</Link>
+             Link="Common\System\Net\Security\SecurityContextTokenHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityStatusAdapterPal.Windows.cs">
-      <Link>Common\System\Net\SecurityStatusAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\SecurityStatusAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsAdapterPal.Windows.cs">
-      <Link>Common\System\Net\ContextFlagsAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\ContextFlagsAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NegotiateStreamPal.Windows.cs">
-      <Link>Common\System\Net\Security\NegotiateStreamPal.Windows.cs</Link>
+             Link="Common\System\Net\Security\NegotiateStreamPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NetEventSource.Security.Windows.cs">
-      <Link>Common\System\Net\Security\NetEventSource.Security.Windows.cs</Link>
+             Link="Common\System\Net\Security\NetEventSource.Security.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\ISSPIInterface.cs">
-      <Link>Common\Interop\Windows\SspiCli\ISSPIInterface.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\ISSPIInterface.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIAuthType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SafeDeleteContext.cs">
-      <Link>Common\Interop\Windows\SspiCli\SafeDeleteContext.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SafeDeleteContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\GlobalSSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.SSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIWrapper.cs">
     </Compile>
   </ItemGroup>
   <!-- Common -->
@@ -656,173 +656,173 @@
     <Compile Include="System\Net\Http\DiagnosticsHandler.cs" />
     <Compile Include="System\Net\Http\DiagnosticsHandlerLoggingStrings.cs" />
     <Compile Include="$(CommonPath)System\Net\Mail\DomainLiteralReader.cs">
-      <Link>Common\System\Net\Mail\DomainLiteralReader.cs</Link>
+             Link="Common\System\Net\Mail\DomainLiteralReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\DotAtomReader.cs">
-      <Link>Common\System\Net\Mail\DotAtomReader.cs</Link>
+             Link="Common\System\Net\Mail\DotAtomReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\MailAddress.cs">
-      <Link>Common\System\Net\Mail\MailAddress.cs</Link>
+             Link="Common\System\Net\Mail\MailAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\MailAddressParser.cs">
-      <Link>Common\System\Net\Mail\MailAddressParser.cs</Link>
+             Link="Common\System\Net\Mail\MailAddressParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\MailBnfHelper.cs">
-      <Link>Common\System\Net\Mail\MailBnfHelper.cs</Link>
+             Link="Common\System\Net\Mail\MailBnfHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\QuotedPairReader.cs">
-      <Link>Common\System\Net\Mail\QuotedPairReader.cs</Link>
+             Link="Common\System\Net\Mail\QuotedPairReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\QuotedStringFormatReader.cs">
-      <Link>Common\System\Net\Mail\QuotedStringFormatReader.cs</Link>
+             Link="Common\System\Net\Mail\QuotedStringFormatReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\WhitespaceReader.cs">
-      <Link>Common\System\Net\Mail\WhitespaceReader.cs</Link>
+             Link="Common\System\Net\Mail\WhitespaceReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskCompletionSourceWithCancellation.cs">
-      <Link>Common\System\Threading\Tasks\TaskCompletionSourceWithCancellation.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskCompletionSourceWithCancellation.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <Compile Include="$(CommonPath)System\StrongToWeakReference.cs">
-      <Link>Common\Interop\Unix\StrongToWeakReference.cs</Link>
+             Link="Common\Interop\Unix\StrongToWeakReference.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityProtocol.cs">
-      <Link>Common\System\Net\SecurityProtocol.cs</Link>
+             Link="Common\System\Net\SecurityProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\UriScheme.cs">
-      <Link>Common\System\Net\UriScheme.cs</Link>
+             Link="Common\System\Net\UriScheme.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs">
-      <Link>Common\Interop\Unix\Interop.IOErrors.cs</Link>
+             Link="Common\Interop\Unix\Interop.IOErrors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Close.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Close.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Open.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Open.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Open.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.OpenFlags.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.OpenFlags.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.OpenFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Pipe.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Pipe.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Pipe.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs">
-      <Link>Common\Interop\Unix\libc\Interop.Poll.cs</Link>
+             Link="Common\Interop\Unix\libc\Interop.Poll.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Read.cs">
-      <Link>Common\Interop\Unix\libc\Interop.Read.cs</Link>
+             Link="Common\Interop\Unix\libc\Interop.Read.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Write.cs">
-      <Link>Common\Interop\Unix\libc\Interop.Write.cs</Link>
+             Link="Common\Interop\Unix\libc\Interop.Write.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\CharArrayHelpers.cs">
-      <Link>Common\System\CharArrayHelpers.cs</Link>
+             Link="Common\System\CharArrayHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.TryGetHeaderName.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpStatusDescription.cs">
-      <Link>Common\System\Net\HttpStatusDescription.cs</Link>
+             Link="Common\System\Net\HttpStatusDescription.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\HttpHandlerDefaults.cs">
-      <Link>Common\System\Net\Http\HttpHandlerDefaults.cs</Link>
+             Link="Common\System\Net\Http\HttpHandlerDefaults.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\NoWriteNoSeekStreamContent.cs">
-      <Link>Common\System\Net\Http\NoWriteNoSeekStreamContent.cs</Link>
+             Link="Common\System\Net\Http\NoWriteNoSeekStreamContent.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\TlsCertificateExtensions.cs">
-      <Link>Common\System\Net\Http\TlsCertificateExtensions</Link>
+             Link="Common\System\Net\Http\TlsCertificateExtensions">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\CertificateHelper.cs">
-      <Link>Common\System\Net\Security\CertificateHelper.cs</Link>
+             Link="Common\System\Net\Security\CertificateHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\CertificateHelper.Unix.cs">
-      <Link>Common\System\Net\Security\CertificateHelper.Unix.cs</Link>
+             Link="Common\System\Net\Security\CertificateHelper.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetstvOS)' != 'true'">
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Ssl.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Ssl.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Ssl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtx.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtx.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.SetProtocolOptions.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SetProtocolOptions.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SetProtocolOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.Initialization.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.Initialization.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.Initialization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\CertificateValidation.Unix.cs">
-      <Link>Common\System\Net\Security\CertificateValidation.Unix.cs</Link>
+             Link="Common\System\Net\Security\CertificateValidation.Unix.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj b/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj
index 38385b5d780a7..bb7785887c3bf 100644
--- a/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/EnterpriseTests/System.Net.Http.Enterprise.Tests.csproj
@@ -6,7 +6,7 @@
     <Compile Include="HttpClientAuthenticationTest.cs" />
 
     <Compile Include="$(CommonTestPath)System\Net\EnterpriseTests\EnterpriseTestConfiguration.cs">
-      <Link>Common\System\Net\EnterpriseTests\EnterpriseTestConfiguration.cs</Link>
+             Link="Common\System\Net\EnterpriseTests\EnterpriseTestConfiguration.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
index 6aa7ae56441b3..958bc46c229a8 100644
--- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
@@ -9,283 +9,283 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs" Condition="'$(TargetsUnix)' == 'true'">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Http\aspnetcore\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicAddressHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicApi.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicParameterHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSecurityConfig.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\MsQuicSession.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\QuicExceptionHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\Internal\ResettableCompletionSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicConnection.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicImplementationProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\MsQuic\MsQuicStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicImplementationProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicListenerProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicConnectionProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\QuicStreamProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockImplementationProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockConnection.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Implementations\Mock\MockStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicStatusHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\NetEventSource.Quic.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\NetEventSource.Quic.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\NetEventSource.Quic.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicClientConnectionOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicImplementationProviders.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicConnection.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicConnection.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicConnection.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicListener.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicListener.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicListenerOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicOperationAbortedException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicStream.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicStream.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicException.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicConnectionAbortedException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\QuicStreamAbortedException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\Interop.MsQuic.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicEnums.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs" >
-      <Link>Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Quic\Interop\MsQuicNativeMethods.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
       <Link>System\System\Threading\Tasks\TaskToApm.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs" Condition="'$(TargetsUnix)' == 'true'">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Buffers\NativeMemoryManager.cs">
-      <Link>Common\System\Buffers\NativeMemoryManager.cs</Link>
+             Link="Common\System\Buffers\NativeMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\ConsoleEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\ConsoleEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\ConsoleEventListener.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\DelegateStream.cs">
-      <Link>Common\System\IO\DelegateStream.cs</Link>
+             Link="Common\System\IO\DelegateStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs">
-      <Link>Common\System\Net\RemoteServerQuery.cs</Link>
+             Link="Common\System\Net\RemoteServerQuery.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs">
-      <Link>Common\System\Net\Configuration.Certificates.cs</Link>
+             Link="Common\System\Net\Configuration.Certificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\EventSourceTestLogging.cs">
-      <Link>Common\System\Net\EventSourceTestLogging.cs</Link>
+             Link="Common\System\Net\EventSourceTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\HttpsTestServer.cs">
-      <Link>Common\System\Net\HttpsTestServer.cs</Link>
+             Link="Common\System\Net\HttpsTestServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs">
-      <Link>Common\System\Net\Capability.Security.cs</Link>
+             Link="Common\System\Net\Capability.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.Windows.cs" Condition="'$(TargetsWindows)' == 'true'">
-      <Link>Common\System\Net\Capability.Security.Windows.cs</Link>
+             Link="Common\System\Net\Capability.Security.Windows.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.Unix.cs" Condition="'$(TargetsUnix)' == 'true'">
-      <Link>Common\System\Net\Capability.Security.Unix.cs</Link>
+             Link="Common\System\Net\Capability.Security.Unix.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs">
-      <Link>Common\System\Net\Configuration.Http.cs</Link>
+             Link="Common\System\Net\Configuration.Http.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs">
-      <Link>Common\System\Net\Configuration.Security.cs</Link>
+             Link="Common\System\Net\Configuration.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs">
-      <Link>Common\System\Net\Configuration.Sockets.cs</Link>
+             Link="Common\System\Net\Configuration.Sockets.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\TestWebProxies.cs">
-      <Link>Common\System\Net\TestWebProxies.cs</Link>
+             Link="Common\System\Net\TestWebProxies.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\VerboseTestLogging.cs">
-      <Link>Common\System\Net\VerboseTestLogging.cs</Link>
+             Link="Common\System\Net\VerboseTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackProxyServer.cs">
-      <Link>Common\System\Net\Http\LoopbackProxyServer.cs</Link>
+             Link="Common\System\Net\Http\LoopbackProxyServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.AuthenticationHelpers.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs">
-      <Link>Common\System\Net\Http\GenericLoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\GenericLoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTestBase.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTestBase.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTestBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs">
-      <Link>Common\System\Net\Http\TestHelper.cs</Link>
+             Link="Common\System\Net\Http\TestHelper.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs">
-      <Link>Common\System\Threading\TrackingSynchronizationContext.cs</Link>
+             Link="Common\System\Threading\TrackingSynchronizationContext.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\GetStateMachineData.cs">
-      <Link>Common\System\Threading\Tasks\GetStateMachineData.cs</Link>
+             Link="Common\System\Threading\Tasks\GetStateMachineData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="ByteArrayContentTest.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\ChannelBindingAwareContent.cs">
-      <Link>Common\System\Net\Http\ChannelBindingAwareContent.cs</Link>
+             Link="Common\System\Net\Http\ChannelBindingAwareContent.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\DribbleStream.cs">
-      <Link>Common\System\Net\Http\DribbleStream.cs</Link>
+             Link="Common\System\Net\Http\DribbleStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\CustomContent.cs">
-      <Link>Common\System\Net\Http\CustomContent.cs</Link>
+             Link="Common\System\Net\Http\CustomContent.cs">
     </Compile>
     <Compile Include="DelegatingHandlerTest.cs" />
     <Compile Include="FakeDiagnosticSourceListenerObserver.cs" />
     <Compile Include="FormUrlEncodedContentTest.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\ByteAtATimeContent.cs">
-      <Link>Common\System\Net\Http\ByteAtATimeContent.cs</Link>
+             Link="Common\System\Net\Http\ByteAtATimeContent.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Asynchrony.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Asynchrony.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Asynchrony.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Authentication.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Authentication.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Authentication.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.AutoRedirect.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.AutoRedirect.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.AutoRedirect.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Cancellation.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Cancellation.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Cancellation.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.ClientCertificates.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.ClientCertificates.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.ClientCertificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Cookies.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Cookies.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Cookies.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.DefaultProxyCredentials.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.DefaultProxyCredentials.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.DefaultProxyCredentials.cs">
     </Compile>
     <Compile Include="HttpClientHandlerTest.AltSvc.cs" />
     <Compile Include="HttpClientHandlerTest.Finalization.cs" />
     <Compile Include="HttpClientHandlerTest.Headers.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.MaxConnectionsPerServer.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.MaxConnectionsPerServer.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.MaxConnectionsPerServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.MaxResponseHeadersLength.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.MaxResponseHeadersLength.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.MaxResponseHeadersLength.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Proxy.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Proxy.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Proxy.cs">
     </Compile>
     <Compile Include="HttpClientHandlerTest.Http3.cs" />
 
     <Compile Include="HttpClientHandlerTest.ResponseDrain.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.ServerCertificates.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.ServerCertificates.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.ServerCertificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.SslProtocols.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.SslProtocols.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.SslProtocols.cs">
     </Compile>
     <Compile Include="HttpClientHandlerTestBase.SocketsHttpHandler.cs" />
     <Compile Include="DiagnosticsTests.cs" />
     <Compile Include="HttpClientTest.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientEKUTest.cs">
-      <Link>Common\System\Net\Http\HttpClientEKUTest.cs</Link>
+             Link="Common\System\Net\Http\HttpClientEKUTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClient.SelectedSitesTest.cs">
-      <Link>Common\System\Net\Http\HttpClient.SelectedSitesTest.cs</Link>
+             Link="Common\System\Net\Http\HttpClient.SelectedSitesTest.cs">
     </Compile>
     <Compile Include="HttpConnectionKeyTest.cs" />
     <Compile Include="HttpContentTest.cs" />
     <Compile Include="HttpMessageInvokerTest.cs" />
     <Compile Include="HttpMethodTest.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpRetryProtocolTests.cs">
-      <Link>Common\System\Net\Http\HttpRetryProtocolTests.cs</Link>
+             Link="Common\System\Net\Http\HttpRetryProtocolTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\IdnaProtocolTests.cs">
-      <Link>Common\System\Net\Http\IdnaProtocolTests.cs</Link>
+             Link="Common\System\Net\Http\IdnaProtocolTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpProtocolTests.cs">
-      <Link>Common\System\Net\Http\HttpProtocolTests.cs</Link>
+             Link="Common\System\Net\Http\HttpProtocolTests.cs">
     </Compile>
     <Compile Include="HttpRequestMessageTest.cs" />
     <Compile Include="HttpResponseMessageTest.cs" />
@@ -295,27 +295,27 @@
     <Compile Include="MultipartContentTest.cs" />
     <Compile Include="MultipartFormDataContentTest.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\PostScenarioTest.cs">
-      <Link>Common\System\Net\Http\PostScenarioTest.cs</Link>
+             Link="Common\System\Net\Http\PostScenarioTest.cs">
     </Compile>
     <Compile Include="QuicConnectionTests.cs" />
     <Compile Include="QuicListenerTests.cs" />
     <Compile Include="QuicStreamTests.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\RepeatedFlushContent.cs">
-      <Link>Common\System\Net\Http\RepeatedFlushContent.cs</Link>
+             Link="Common\System\Net\Http\RepeatedFlushContent.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\ResponseStreamTest.cs">
-      <Link>Common\System\Net\Http\ResponseStreamTest.cs</Link>
+             Link="Common\System\Net\Http\ResponseStreamTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\SchSendAuxRecordHttpTest.cs">
-      <Link>Common\System\Net\Http\SchSendAuxRecordHttpTest.cs</Link>
+             Link="Common\System\Net\Http\SchSendAuxRecordHttpTest.cs">
     </Compile>
     <Compile Include="StreamContentTest.cs" />
     <Compile Include="StringContentTest.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\SyncBlockingContent.cs">
-      <Link>Common\System\Net\Http\SyncBlockingContent.cs</Link>
+             Link="Common\System\Net\Http\SyncBlockingContent.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\DefaultCredentialsTest.cs">
-      <Link>Common\System\Net\Http\DefaultCredentialsTest.cs</Link>
+             Link="Common\System\Net\Http\DefaultCredentialsTest.cs">
     </Compile>
     <Compile Include="ThrowingContent.cs" />
     <Compile Include="Watchdog.cs" />
@@ -323,19 +323,19 @@
   <!-- Windows specific files -->
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <!-- Linux specific files -->
   <ItemGroup Condition="'$(TargetsLinux)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\Linux\Interop.Libraries.cs">
-      <Link>Common\Interop\Linux\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Linux\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <!-- OSX specific files -->
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -344,47 +344,47 @@
     <Compile Include="HttpClientHandlerTest.Http1.cs" />
     <Compile Include="HttpClientHandlerTest.Http2.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.AcceptAllCerts.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.AcceptAllCerts.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.AcceptAllCerts.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HttpClientHandlerTest.Decompression.cs">
-      <Link>Common\System\Net\Http\HttpClientHandlerTest.Decompression.cs</Link>
+             Link="Common\System\Net\Http\HttpClientHandlerTest.Decompression.cs">
     </Compile>
     <Compile Include="HttpClientMiniStressTest.cs" />
     <Compile Include="NtAuthTests.cs" />
     <Compile Include="ReadOnlyMemoryContentTest.cs" />
     <Compile Include="SocketsHttpHandlerTest.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Http\Http2Frames.cs">
-      <Link>Common\System\Net\Http\Http2Frames.cs</Link>
+             Link="Common\System\Net\Http\Http2Frames.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs">
-      <Link>Common\System\Net\Http\HPackEncoder.cs</Link>
+             Link="Common\System\Net\Http\HPackEncoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\QPackTestDecoder.cs">
-      <Link>Common\System\Net\Http\QPackTestDecoder.cs</Link>
+             Link="Common\System\Net\Http\QPackTestDecoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\QPackTestEncoder.cs">
-      <Link>Common\System\Net\Http\QPackTestEncoder.cs</Link>
+             Link="Common\System\Net\Http\QPackTestEncoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\Http2LoopbackServer.cs">
-      <Link>Common\System\Net\Http\Http2LoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\Http2LoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\Http2LoopbackConnection.cs">
-      <Link>Common\System\Net\Http\Http2LoopbackConnection.cs</Link>
+             Link="Common\System\Net\Http\Http2LoopbackConnection.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\Http3LoopbackServer.cs">
-      <Link>Common\System\Net\Http\Http3LoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\Http3LoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\Http3LoopbackConnection.cs">
-      <Link>Common\System\Net\Http\Http3LoopbackConnection.cs</Link>
+             Link="Common\System\Net\Http\Http3LoopbackConnection.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\Http3LoopbackStream.cs">
-      <Link>Common\System\Net\Http\Http3LoopbackStream.cs</Link>
+             Link="Common\System\Net\Http\Http3LoopbackStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanDecoder.cs">
-      <Link>Common\System\Net\Http\HuffmanDecoder.cs</Link>
+             Link="Common\System\Net\Http\HuffmanDecoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs">
-      <Link>Common\System\Net\Http\HuffmanEncoder.cs</Link>
+             Link="Common\System\Net\Http\HuffmanEncoder.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -395,4 +395,4 @@
       <Link>SelectedSitesTest.txt</Link>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index f8dc22a02beda..da6c817624c7c 100644
--- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
       <Link>ProductionCode\Common\System\NotImplemented.cs</Link>
@@ -31,7 +31,7 @@
       <Link>ProductionCode\Common\System\IO\StreamHelpers.CopyValidation.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs">
-      <Link>Common\System\Net\ArrayBuffer.cs</Link>
+             Link="Common\System\Net\ArrayBuffer.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
       <Link>ProductionCode\Common\System\Net\InternalException.cs</Link>
@@ -58,16 +58,16 @@
       <Link>ProductionCode\Common\System\Net\UriScheme.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Text\SimpleRegex.cs">
-      <Link>Common\System\Text\SimpleRegex.cs</Link>
+             Link="Common\System\Text\SimpleRegex.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs">
-      <Link>Common\System\Net\Http\HPackEncoder.cs</Link>
+             Link="Common\System\Net\Http\HPackEncoder.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs">
-      <Link>Common\System\Net\Http\HuffmanEncoder.cs</Link>
+             Link="Common\System\Net\Http\HuffmanEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\MailAddress.cs">
       <Link>ProductionCode\Common\src\System\Net\Mail\MailAddress.cs</Link>
@@ -463,61 +463,61 @@
       <Link>ProductionCode\Common\Interop\Windows\WinHttp\Interop.winhttp_types.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\WinInetProxyHelper.cs">
-      <Link>Common\System\Net\Http\WinInetProxyHelper.cs</Link>
+             Link="Common\System\Net\Http\WinInetProxyHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\IHttpHeadersHandler.cs">
-      <Link>Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\IHttpHeadersHandler.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\DynamicTable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HeaderField.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackDecodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HPackEncodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\Huffman.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\HuffmanDecodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerDecoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\IntegerEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\H2StaticTable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http2\Hpack\StatusCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\H3StaticTable.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\H3StaticTable.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\H3StaticTable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\HeaderField.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\HeaderField.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\HeaderField.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\QPackEncoder.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncoder.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncoder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\aspnetcore\Http3\QPack\QPackEncodingException.cs">
-      <Link>Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncodingException.cs</Link>
+             Link="Common\System\Net\Http\aspnetcore\Http3\QPack\QPackEncodingException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
     <Compile Include="..\..\..\System.Net.Http.WinHttpHandler\tests\UnitTests\FakeInterop.cs">
       <Link>WinHttpHandler\UnitTests\FakeInterop.cs</Link>
diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
index d88ccb13f9678..e15aae46f7b74 100644
--- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
+++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
@@ -57,47 +57,47 @@
     <Compile Include="System\Net\WebSockets\HttpListenerWebSocketContext.cs" />
     <Compile Include="System\Net\WebSockets\HttpWebSocket.cs" />
     <Compile Include="$(CommonPath)System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CookieComparer.cs">
-      <Link>Common\System\Net\CookieComparer.cs</Link>
+             Link="Common\System\Net\CookieComparer.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CookieFields.cs">
-      <Link>Common\System\Net\CookieFields.cs</Link>
+             Link="Common\System\Net\CookieFields.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CookieParser.cs">
-      <Link>Common\System\Net\CookieParser.cs</Link>
+             Link="Common\System\Net\CookieParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CaseInsensitiveAscii.cs">
-      <Link>Common\System\Net\CaseInsensitiveAscii.cs</Link>
+             Link="Common\System\Net\CaseInsensitiveAscii.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ExceptionCheck.cs">
-      <Link>Common\System\Net\ExceptionCheck.cs</Link>
+             Link="Common\System\Net\ExceptionCheck.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpStatusDescription.cs">
-      <Link>Common\System\Net\HttpStatusDescription.cs</Link>
+             Link="Common\System\Net\HttpStatusDescription.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\LazyAsyncResult.cs">
-      <Link>Common\System\Net\LazyAsyncResult.cs</Link>
+             Link="Common\System\Net\LazyAsyncResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\UriScheme.cs">
-      <Link>Common\System\Net\UriScheme.cs</Link>
+             Link="Common\System\Net\UriScheme.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\WebHeaderEncoding.cs">
-      <Link>Common\System\Net\WebHeaderEncoding.cs</Link>
+             Link="Common\System\Net\WebHeaderEncoding.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\WebSockets\WebSocketValidate.cs">
-      <Link>Common\System\Net\WebSockets\WebSocketValidate.cs</Link>
+             Link="Common\System\Net\WebSockets\WebSocketValidate.cs">
     </Compile>
     <Compile Include="System\Net\Windows\CookieExtensions.cs" />
     <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+             Link="Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(ForceManagedImplementation)' != 'true'">
@@ -115,10 +115,10 @@
     <Compile Include="System\Net\Windows\SyncRequestContext.cs" />
     <Compile Include="System\Net\Windows\ListenerAsyncResult.Windows.cs" />
     <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs">
-      <Link>Common\System\Net\DebugSafeHandle.cs</Link>
+             Link="Common\System\Net\DebugSafeHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <Compile Include="System\Net\Windows\HttpResponseStream.Windows.cs" />
     <Compile Include="System\Net\Windows\HttpResponseStreamAsyncResult.cs" />
@@ -131,189 +131,189 @@
     <Compile Include="System\Net\Windows\WebSockets\WebSocketHttpListenerDuplexStream.cs" />
     <Compile Include="System\Net\Windows\WebSockets\WebSocketProtocolComponent.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.Structs.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.Structs.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.Structs.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketAbortHandle.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketAbortHandle.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketAbortHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketBeginClientHandshake.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketBeginClientHandshake.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketBeginClientHandshake.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketBeginServerHandshake.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketBeginServerHandshake.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketBeginServerHandshake.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketCompleteAction.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketCompleteAction.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketCompleteAction.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketCreateClientHandle.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketCreateClientHandle.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketCreateClientHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketCreateServerHandle.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketCreateServerHandle.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketCreateServerHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketDeleteHandle.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketDeleteHandle.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketDeleteHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketEndServerHandshake.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketEndServerHandshake.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketEndServerHandshake.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketGetAction.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketGetAction.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketGetAction.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketReceive.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketReceive.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketReceive.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WebSocket\Interop.WebSocketSend.cs">
-      <Link>Common\Interop\Windows\WebSocket\Interop.WebSocketSend.cs</Link>
+             Link="Common\Interop\Windows\WebSocket\Interop.WebSocketSend.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\HttpApi\Interop.ErrorCodes.cs">
-      <Link>Common\Interop\Windows\HttpApi\Interop.ErrorCodes.cs</Link>
+             Link="Common\Interop\Windows\HttpApi\Interop.ErrorCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\HttpApi\Interop.HttpApi.cs">
-      <Link>Common\Interop\Windows\HttpApi\Interop.HttpApi.cs</Link>
+             Link="Common\Interop\Windows\HttpApi\Interop.HttpApi.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CancelIoEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CancelIoEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CancelIoEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LoadLibraryEx_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
     </Compile>
     <!-- Add NTAuthentication -->
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\BidirectionalDictionary.cs">
-      <Link>Common\System\Collections\Generic\BidirectionalDictionary.cs</Link>
+             Link="Common\System\Collections\Generic\BidirectionalDictionary.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\DebugThreadTracking.cs">
-      <Link>Common\System\Net\Logging\DebugThreadTracking.cs</Link>
+             Link="Common\System\Net\Logging\DebugThreadTracking.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsPal.cs">
-      <Link>Common\System\Net\ContextFlagsPal.cs</Link>
+             Link="Common\System\Net\ContextFlagsPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NegotiationInfoClass.cs">
-      <Link>Common\System\Net\NegotiationInfoClass.cs</Link>
+             Link="Common\System\Net\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NTAuthentication.Common.cs">
-      <Link>Common\System\Net\NTAuthentication.Common.cs</Link>
+             Link="Common\System\Net\NTAuthentication.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityStatusPal.cs">
-      <Link>Common\System\Net\SecurityStatusPal.cs</Link>
+             Link="Common\System\Net\SecurityStatusPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBuffer.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBuffer.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBuffer.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBufferType.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBufferType.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBufferType.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SSPIHandleCache.cs">
-      <Link>Common\System\Net\Security\SSPIHandleCache.cs</Link>
+             Link="Common\System\Net\Security\SSPIHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NetEventSource.Security.cs">
-      <Link>Common\System\Net\Security\NetEventSource.Security.cs</Link>
+             Link="Common\System\Net\Security\NetEventSource.Security.cs">
     </Compile>
     <!-- Windows specific NTAuthentication -->
     <Compile Include="$(CommonPath)System\Net\Security\SecurityContextTokenHandle.cs">
-      <Link>Common\System\Net\Security\SecurityContextTokenHandle.cs</Link>
+             Link="Common\System\Net\Security\SecurityContextTokenHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityStatusAdapterPal.Windows.cs">
-      <Link>Common\System\Net\SecurityStatusAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\SecurityStatusAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsAdapterPal.Windows.cs">
-      <Link>Common\System\Net\ContextFlagsAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\ContextFlagsAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NegotiateStreamPal.Windows.cs">
-      <Link>Common\System\Net\Security\NegotiateStreamPal.Windows.cs</Link>
+             Link="Common\System\Net\Security\NegotiateStreamPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NetEventSource.Security.Windows.cs">
-      <Link>Common\System\Net\Security\NetEventSource.Security.Windows.cs</Link>
+             Link="Common\System\Net\Security\NetEventSource.Security.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.certificates_types.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates_types.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.certificates.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\ISSPIInterface.cs">
-      <Link>Common\Interop\Windows\SspiCli\ISSPIInterface.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\ISSPIInterface.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIAuthType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SafeDeleteContext.cs">
-      <Link>Common\Interop\Windows\SspiCli\SafeDeleteContext.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SafeDeleteContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\GlobalSSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.SSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIWrapper.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true' or '$(ForceManagedImplementation)' == 'true'">
@@ -336,10 +336,10 @@
     <Compile Include="System\Net\Managed\HttpResponseStream.Managed.cs" />
     <Compile Include="System\Net\Managed\WebSockets\HttpWebSocket.Managed.cs" />
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Reference Include="System.Net.Sockets" />
     <Reference Include="System.Net.ServicePoint" />
     <Reference Include="System.Threading.ThreadPool" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
index fb2211a525809..41c6b4ff64fe3 100644
--- a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
+++ b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
@@ -24,10 +24,10 @@
     <Compile Include="WebSocketTests.cs" />
     <Compile Include="XUnitAssemblyAttributes.cs" />
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsOSX)'=='true'">
     <TestCommandLines Include="ulimit -n 7000" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
index babcb1dc6f115..5c4dd23946c61 100644
--- a/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
+++ b/src/libraries/System.Net.Mail/src/System.Net.Mail.csproj
@@ -64,229 +64,229 @@
     <Compile Include="System\Net\Mail\SmtpNtlmAuthenticationModule.cs" />
     <Compile Include="System\Net\DelegatedStream.cs" />
     <Compile Include="$(CommonPath)System\Net\TlsStream.cs">
-      <Link>Common\System\Net\TlsStream.cs</Link>
+             Link="Common\System\Net\TlsStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\LazyAsyncResult.cs">
-      <Link>Common\System\Net\LazyAsyncResult.cs</Link>
+             Link="Common\System\Net\LazyAsyncResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.cs">
-      <Link>Common\System\Net\ContextAwareResult.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\MailBnfHelper.cs">
-      <Link>Common\System\Net\Mail\MailBnfHelper.cs</Link>
+             Link="Common\System\Net\Mail\MailBnfHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\DotAtomReader.cs">
-      <Link>Common\System\Net\Mail\DotAtomReader.cs</Link>
+             Link="Common\System\Net\Mail\DotAtomReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\MailAddressParser.cs">
-      <Link>Common\System\Net\Mail\MailAddressParser.cs</Link>
+             Link="Common\System\Net\Mail\MailAddressParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\QuotedStringFormatReader.cs">
-      <Link>Common\System\Net\Mail\QuotedStringFormatReader.cs</Link>
+             Link="Common\System\Net\Mail\QuotedStringFormatReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\WhitespaceReader.cs">
-      <Link>Common\System\Net\Mail\WhitespaceReader.cs</Link>
+             Link="Common\System\Net\Mail\WhitespaceReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\QuotedPairReader.cs">
-      <Link>Common\System\Net\Mail\QuotedPairReader.cs</Link>
+             Link="Common\System\Net\Mail\QuotedPairReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\DomainLiteralReader.cs">
-      <Link>Common\System\Net\Mail\DomainLiteralReader.cs</Link>
+             Link="Common\System\Net\Mail\DomainLiteralReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityProtocol.cs">
-      <Link>Common\System\Net\SecurityProtocol.cs</Link>
+             Link="Common\System\Net\SecurityProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs">
-      <Link>Common\System\Net\DebugSafeHandle.cs</Link>
+             Link="Common\System\Net\DebugSafeHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ExceptionCheck.cs">
-      <Link>Common\System\Net\ExceptionCheck.cs</Link>
+             Link="Common\System\Net\ExceptionCheck.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\BidirectionalDictionary.cs">
-      <Link>Common\System\Collections\Generic\BidirectionalDictionary.cs</Link>
+             Link="Common\System\Collections\Generic\BidirectionalDictionary.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\DebugThreadTracking.cs">
-      <Link>Common\System\Net\Logging\DebugThreadTracking.cs</Link>
+             Link="Common\System\Net\Logging\DebugThreadTracking.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsPal.cs">
-      <Link>Common\System\Net\ContextFlagsPal.cs</Link>
+             Link="Common\System\Net\ContextFlagsPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NegotiationInfoClass.cs">
-      <Link>Common\System\Net\NegotiationInfoClass.cs</Link>
+             Link="Common\System\Net\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NTAuthentication.Common.cs">
-      <Link>Common\System\Net\NTAuthentication.Common.cs</Link>
+             Link="Common\System\Net\NTAuthentication.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityStatusPal.cs">
-      <Link>Common\System\Net\SecurityStatusPal.cs</Link>
+             Link="Common\System\Net\SecurityStatusPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SSPIHandleCache.cs">
-      <Link>Common\System\Net\Security\SSPIHandleCache.cs</Link>
+             Link="Common\System\Net\Security\SSPIHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NetEventSource.Security.cs">
-      <Link>Common\System\Net\Security\NetEventSource.Security.cs</Link>
+             Link="Common\System\Net\Security\NetEventSource.Security.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <!-- Unix specific files -->
   <ItemGroup Condition="'$(TargetsUnix)'=='true'">
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.Unix.cs">
-      <Link>Common\System\Net\ContextAwareResult.Unix.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsAdapterPal.Unix.cs">
-      <Link>Common\System\Net\ContextFlagsAdapterPal.Unix.cs</Link>
+             Link="Common\System\Net\ContextFlagsAdapterPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteNegoContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeCredentials.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeCredentials.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeCredentials.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeDeleteContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeDeleteContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NegotiateStreamPal.Unix.cs">
-      <Link>Common\System\Net\Security\NegotiateStreamPal.Unix.cs</Link>
+             Link="Common\System\Net\Security\NegotiateStreamPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeNegoCredentials.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SecChannelBindings.cs">
-      <Link>Common\System\Net\Security\Unix\SecChannelBindings.cs</Link>
+             Link="Common\System\Net\Security\Unix\SecChannelBindings.cs">
     </Compile>
   </ItemGroup>
   <!-- Windows specific files -->
   <ItemGroup Condition="'$(TargetsWindows)'=='true'">
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBuffer.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBuffer.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBuffer.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBufferType.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBufferType.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBufferType.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityContextTokenHandle.cs">
-      <Link>Common\System\Net\Security\SecurityContextTokenHandle.cs</Link>
+             Link="Common\System\Net\Security\SecurityContextTokenHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.Windows.cs">
-      <Link>Common\System\Net\ContextAwareResult.Windows.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityStatusAdapterPal.Windows.cs">
-      <Link>Common\System\Net\SecurityStatusAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\SecurityStatusAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsAdapterPal.Windows.cs">
-      <Link>Common\System\Net\ContextFlagsAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\ContextFlagsAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NegotiateStreamPal.Windows.cs">
-      <Link>Common\System\Net\Security\NegotiateStreamPal.Windows.cs</Link>
+             Link="Common\System\Net\Security\NegotiateStreamPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NetEventSource.Security.Windows.cs">
-      <Link>Common\System\Net\Security\NetEventSource.Security.Windows.cs</Link>
+             Link="Common\System\Net\Security\NetEventSource.Security.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.certificates_types.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates_types.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.certificates.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\ISSPIInterface.cs">
-      <Link>Common\Interop\Windows\SspiCli\ISSPIInterface.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\ISSPIInterface.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIAuthType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SafeDeleteContext.cs">
-      <Link>Common\Interop\Windows\SspiCli\SafeDeleteContext.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SafeDeleteContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\GlobalSSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.SSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIWrapper.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -315,4 +315,4 @@
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Reference Include="System.Memory" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
index a11dcc181d3e5..9a3568fd810de 100644
--- a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
@@ -23,16 +23,16 @@
     <Compile Include="SmtpExceptionTest.cs" />
     <Compile Include="LoopbackSmtpServer.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Net.NetworkInformation" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
index 6750ab32a4ec4..1b86e4b43a0b2 100644
--- a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj
@@ -140,229 +140,229 @@
     </Compile>
 
     <Compile Include="$(CommonPath)System\Net\TlsStream.cs">
-      <Link>Common\System\Net\TlsStream.cs</Link>
+             Link="Common\System\Net\TlsStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\LazyAsyncResult.cs">
-      <Link>Common\System\Net\LazyAsyncResult.cs</Link>
+             Link="Common\System\Net\LazyAsyncResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.cs">
-      <Link>Common\System\Net\ContextAwareResult.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\MailBnfHelper.cs">
-      <Link>Common\System\Net\Mail\MailBnfHelper.cs</Link>
+             Link="Common\System\Net\Mail\MailBnfHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\DotAtomReader.cs">
-      <Link>Common\System\Net\Mail\DotAtomReader.cs</Link>
+             Link="Common\System\Net\Mail\DotAtomReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\MailAddressParser.cs">
-      <Link>Common\System\Net\Mail\MailAddressParser.cs</Link>
+             Link="Common\System\Net\Mail\MailAddressParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\QuotedStringFormatReader.cs">
-      <Link>Common\System\Net\Mail\QuotedStringFormatReader.cs</Link>
+             Link="Common\System\Net\Mail\QuotedStringFormatReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\WhitespaceReader.cs">
-      <Link>Common\System\Net\Mail\WhitespaceReader.cs</Link>
+             Link="Common\System\Net\Mail\WhitespaceReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\QuotedPairReader.cs">
-      <Link>Common\System\Net\Mail\QuotedPairReader.cs</Link>
+             Link="Common\System\Net\Mail\QuotedPairReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Mail\DomainLiteralReader.cs">
-      <Link>Common\System\Net\Mail\DomainLiteralReader.cs</Link>
+             Link="Common\System\Net\Mail\DomainLiteralReader.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityProtocol.cs">
-      <Link>Common\System\Net\SecurityProtocol.cs</Link>
+             Link="Common\System\Net\SecurityProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs">
-      <Link>Common\System\Net\DebugSafeHandle.cs</Link>
+             Link="Common\System\Net\DebugSafeHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ExceptionCheck.cs">
-      <Link>Common\System\Net\ExceptionCheck.cs</Link>
+             Link="Common\System\Net\ExceptionCheck.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\BidirectionalDictionary.cs">
-      <Link>Common\System\Collections\Generic\BidirectionalDictionary.cs</Link>
+             Link="Common\System\Collections\Generic\BidirectionalDictionary.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\DebugThreadTracking.cs">
-      <Link>Common\System\Net\Logging\DebugThreadTracking.cs</Link>
+             Link="Common\System\Net\Logging\DebugThreadTracking.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsPal.cs">
-      <Link>Common\System\Net\ContextFlagsPal.cs</Link>
+             Link="Common\System\Net\ContextFlagsPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NegotiationInfoClass.cs">
-      <Link>Common\System\Net\NegotiationInfoClass.cs</Link>
+             Link="Common\System\Net\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NTAuthentication.Common.cs">
-      <Link>Common\System\Net\NTAuthentication.Common.cs</Link>
+             Link="Common\System\Net\NTAuthentication.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityStatusPal.cs">
-      <Link>Common\System\Net\SecurityStatusPal.cs</Link>
+             Link="Common\System\Net\SecurityStatusPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SSPIHandleCache.cs">
-      <Link>Common\System\Net\Security\SSPIHandleCache.cs</Link>
+             Link="Common\System\Net\Security\SSPIHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NetEventSource.Security.cs">
-      <Link>Common\System\Net\Security\NetEventSource.Security.cs</Link>
+             Link="Common\System\Net\Security\NetEventSource.Security.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <!-- Unix specific files -->
   <ItemGroup Condition="'$(TargetsUnix)'=='true'">
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.Unix.cs">
-      <Link>Common\System\Net\ContextAwareResult.Unix.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsAdapterPal.Unix.cs">
-      <Link>Common\System\Net\ContextFlagsAdapterPal.Unix.cs</Link>
+             Link="Common\System\Net\ContextFlagsAdapterPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteNegoContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeCredentials.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeCredentials.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeCredentials.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeDeleteContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeDeleteContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NegotiateStreamPal.Unix.cs">
-      <Link>Common\System\Net\Security\NegotiateStreamPal.Unix.cs</Link>
+             Link="Common\System\Net\Security\NegotiateStreamPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeNegoCredentials.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SecChannelBindings.cs">
-      <Link>Common\System\Net\Security\Unix\SecChannelBindings.cs</Link>
+             Link="Common\System\Net\Security\Unix\SecChannelBindings.cs">
     </Compile>
   </ItemGroup>
   <!-- Windows specific files -->
   <ItemGroup Condition="'$(TargetsWindows)'=='true'">
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBuffer.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBuffer.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBuffer.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBufferType.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBufferType.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBufferType.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityContextTokenHandle.cs">
-      <Link>Common\System\Net\Security\SecurityContextTokenHandle.cs</Link>
+             Link="Common\System\Net\Security\SecurityContextTokenHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.Windows.cs">
-      <Link>Common\System\Net\ContextAwareResult.Windows.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityStatusAdapterPal.Windows.cs">
-      <Link>Common\System\Net\SecurityStatusAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\SecurityStatusAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsAdapterPal.Windows.cs">
-      <Link>Common\System\Net\ContextFlagsAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\ContextFlagsAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NegotiateStreamPal.Windows.cs">
-      <Link>Common\System\Net\Security\NegotiateStreamPal.Windows.cs</Link>
+             Link="Common\System\Net\Security\NegotiateStreamPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NetEventSource.Security.Windows.cs">
-      <Link>Common\System\Net\Security\NetEventSource.Security.Windows.cs</Link>
+             Link="Common\System\Net\Security\NetEventSource.Security.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.certificates_types.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates_types.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.certificates.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\ISSPIInterface.cs">
-      <Link>Common\Interop\Windows\SspiCli\ISSPIInterface.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\ISSPIInterface.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIAuthType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SafeDeleteContext.cs">
-      <Link>Common\Interop\Windows\SspiCli\SafeDeleteContext.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SafeDeleteContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\GlobalSSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.SSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIWrapper.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
index e4107a9b1a329..ad4068311c28c 100644
--- a/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
+++ b/src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
@@ -11,32 +11,32 @@
     <Compile Include="System\Net\NetEventSource.NameResolution.cs" />
     <!-- Logging -->
     <Compile Include="$(CommonPath)System\Net\Logging\DebugThreadTracking.cs">
-      <Link>Common\System\Net\Logging\DebugThreadTracking.cs</Link>
+             Link="Common\System\Net\Logging\DebugThreadTracking.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <!-- System.Net common -->
     <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs">
-      <Link>Common\System\Net\Sockets\ProtocolType.cs</Link>
+             Link="Common\System\Net\Sockets\ProtocolType.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs">
-      <Link>Common\System\Net\Sockets\SocketType.cs</Link>
+             Link="Common\System\Net\Sockets\SocketType.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs">
-      <Link>Common\System\Net\IPAddressParserStatics.cs</Link>
+             Link="Common\System\Net\IPAddressParserStatics.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs">
-      <Link>Common\System\Net\IPEndPointStatics.cs</Link>
+             Link="Common\System\Net\IPEndPointStatics.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ByteOrder.cs">
-      <Link>Common\System\Net\ByteOrder.cs</Link>
+             Link="Common\System\Net\ByteOrder.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
@@ -44,105 +44,105 @@
     <Compile Include="System\Net\NameResolutionPal.Win32.cs" />
     <!-- Debug only -->
     <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs">
-      <Link>Common\System\Net\DebugSafeHandle.cs</Link>
+             Link="Common\System\Net\DebugSafeHandle.cs">
     </Compile>
     <!-- System.Net.Internals -->
     <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs">
-      <Link>Common\System\Net\Internals\IPAddressExtensions.cs</Link>
+             Link="Common\System\Net\Internals\IPAddressExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Internals\SocketExceptionFactory.Windows.cs">
-      <Link>Common\System\Net\Internals\SocketExceptionFactory.Windows.cs</Link>
+             Link="Common\System\Net\Internals\SocketExceptionFactory.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs">
-      <Link>Common\System\Net\SocketProtocolSupportPal.Windows</Link>
+             Link="Common\System\Net\SocketProtocolSupportPal.Windows">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs">
-      <Link>Common\System\Net\SocketAddressPal.Windows</Link>
+             Link="Common\System\Net\SocketAddressPal.Windows">
     </Compile>
     <!-- Interop -->
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\AddressInfoHints.cs">
-      <Link>Common\Interop\Windows\WinSock\AddressInfoHints.cs</Link>
+             Link="Common\Interop\Windows\WinSock\AddressInfoHints.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\hostent.cs">
-      <Link>Common\Interop\Windows\WinSock\hostent.cs</Link>
+             Link="Common\Interop\Windows\WinSock\hostent.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.closesocket.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.closesocket.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.closesocket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.gethostname.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.gethostname.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.gethostname.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.GetNameInfoW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.GetNameInfoW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.GetNameInfoW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.GetAddrInfoW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.GetAddrInfoW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.GetAddrInfoW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSAStartup.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSAStartup.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSAStartup.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSASocketW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSASocketW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSASocketW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolFamily.cs">
-      <Link>Common\System\Net\Sockets\ProtocolFamily.cs</Link>
+             Link="Common\System\Net\Sockets\ProtocolFamily.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <Compile Include="System\Net\NameResolutionPal.Unix.cs" />
     <Compile Include="$(CommonPath)System\Net\InteropIPAddressExtensions.Unix.cs">
-      <Link>Common\System\Net\InteropIPAddressExtensions.Unix.cs</Link>
+             Link="Common\System\Net\InteropIPAddressExtensions.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs">
-      <Link>Common\System\Net\Internals\SocketAddressPal.Unix.cs</Link>
+             Link="Common\System\Net\Internals\SocketAddressPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs">
-      <Link>Common\System\Net\SocketProtocolSupportPal.Unix</Link>
+             Link="Common\System\Net\SocketProtocolSupportPal.Unix">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Internals\SocketExceptionFactory.cs">
-      <Link>Common\System\Net\Internals\SocketExceptionFactory.cs</Link>
+             Link="Common\System\Net\Internals\SocketExceptionFactory.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Internals\SocketExceptionFactory.Unix.cs">
-      <Link>Common\System\Net\Internals\SocketExceptionFactory.Unix.cs</Link>
+             Link="Common\System\Net\Internals\SocketExceptionFactory.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.CheckedAccess.cs">
-      <Link>Common\System\Net\Internals\Interop.CheckedAccess.cs</Link>
+             Link="Common\System\Net\Internals\Interop.CheckedAccess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\CoreLib\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\CoreLib\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Close.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Close.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetHostName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetHostName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetHostName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetNameInfo.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.HostEntry.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.HostEntries.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.HostEntries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.IPAddress.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.IPAddress.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.IPAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Socket.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Socket.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Socket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SocketAddress.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SocketAddress.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -161,4 +161,4 @@
     <Reference Include="System.Threading.Overlapped" />
     <Reference Include="System.Threading.ThreadPool" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
index 48b39fe617940..92b8db28ec5cc 100644
--- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
@@ -13,16 +13,16 @@
     <Compile Include="TestSettings.cs" />
     <!-- Common test files -->
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs">
-      <Link>Common\System\Net\Configuration.Sockets.cs</Link>
+             Link="Common\System\Net\Configuration.Sockets.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
index 7fcacc540d25d..1ffe06b0ec74c 100644
--- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj
@@ -19,28 +19,28 @@
     <Compile Include="Fakes\DnsFake.cs" />
     <Compile Include="Fakes\IPAddressFakeExtensions.cs" />
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs" Condition="'$(TargetsWindows)' == 'true'">
-      <Link>Common\System\Net\Sockets\ProtocolType.cs</Link>
+             Link="Common\System\Net\Sockets\ProtocolType.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs" Condition="'$(TargetsWindows)' == 'true'">
-      <Link>Common\System\Net\Sockets\SocketType.cs</Link>
+             Link="Common\System\Net\Sockets\SocketType.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs">
-      <Link>Common\System\Net\IPEndPointStatics.cs</Link>
+             Link="Common\System\Net\IPEndPointStatics.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs">
-      <Link>Common\System\Net\IPAddressParserStatics.cs</Link>
+             Link="Common\System\Net\IPAddressParserStatics.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs">
-      <Link>Common\System\Net\Configuration.Http.cs</Link>
+             Link="Common\System\Net\Configuration.Http.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ByteOrder.cs">
-      <Link>Common\System\Net\ByteOrder.cs</Link>
+             Link="Common\System\Net\ByteOrder.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
@@ -51,65 +51,65 @@
       <Link>ProductionCode\System\Net\NameResolutionPal.Win32.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs">
       <Link>System\Net\SocketProtocolSupportPal.Windows</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs">
-      <Link>Common\System\Net\SocketAddressPal.Windows</Link>
+             Link="Common\System\Net\SocketAddressPal.Windows">
     </Compile>
     <!-- Debug only -->
     <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs">
-      <Link>Common\System\Net\DebugSafeHandle.cs</Link>
+             Link="Common\System\Net\DebugSafeHandle.cs">
     </Compile>
     <!-- Interop -->
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\AddressInfoHints.cs">
-      <Link>Common\Interop\Windows\WinSock\AddressInfoHints.cs</Link>
+             Link="Common\Interop\Windows\WinSock\AddressInfoHints.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\hostent.cs">
-      <Link>Common\Interop\Windows\WinSock\hostent.cs</Link>
+             Link="Common\Interop\Windows\WinSock\hostent.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.closesocket.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.closesocket.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.closesocket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.gethostname.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.gethostname.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.gethostname.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.GetNameInfoW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.GetNameInfoW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.GetNameInfoW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.GetAddrInfoW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.GetAddrInfoW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.GetAddrInfoW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSAStartup.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSAStartup.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSAStartup.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSASocketW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSASocketW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSASocketW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolFamily.cs">
-      <Link>Common\System\Net\Sockets\ProtocolFamily.cs</Link>
+             Link="Common\System\Net\Sockets\ProtocolFamily.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.GetAddrInfoExW.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs">
-      <Link>Common\System\Net\Internals\SocketAddressPal.Unix.cs</Link>
+             Link="Common\System\Net\Internals\SocketAddressPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.CheckedAccess.cs">
-      <Link>Common\System\Net\Internals\Interop.CheckedAccess.cs</Link>
+             Link="Common\System\Net\Internals\Interop.CheckedAccess.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InteropIPAddressExtensions.Unix.cs">
-      <Link>Common\System\Net\InteropIPAddressExtensions.Unix.cs</Link>
+             Link="Common\System\Net\InteropIPAddressExtensions.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Internals\SocketExceptionFactory.cs">
       <Link>ProductionCode\Common\System\Net\Internals\SocketExceptionFactory.cs</Link>
@@ -124,31 +124,31 @@
       <Link>System\Net\SocketProtocolSupportPal.Unix.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\CoreLib\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\CoreLib\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Close.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Close.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetHostName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetHostName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetHostName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetNameInfo.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.HostEntry.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.HostEntry.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.HostEntry.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.IPAddress.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.IPAddress.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.IPAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Socket.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Socket.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Socket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SocketAddress.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SocketAddress.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
index ff5ea142ae7ac..3aab2489660d2 100644
--- a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj
@@ -36,13 +36,13 @@
       <Link>ProductionCode\Common\System\Net\Internals\SocketExceptionFactory.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
index 1dafbcc8a6694..eff72b3dbe41e 100644
--- a/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
+++ b/src/libraries/System.Net.NetworkInformation/src/System.Net.NetworkInformation.csproj
@@ -45,29 +45,29 @@
     <Compile Include="System\Net\NetworkInformation\UnicastIPAddressInformationCollection.cs" />
     <Compile Include="System\Net\NetworkInformation\InternalIPAddressCollection.cs" />
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\HostInformation.cs">
-      <Link>Common\System\Net\NetworkInformation\HostInformation.cs</Link>
+             Link="Common\System\Net\NetworkInformation\HostInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\NetworkInformationException.cs">
-      <Link>Common\System\Net\NetworkInformation\NetworkInformationException.cs</Link>
+             Link="Common\System\Net\NetworkInformation\NetworkInformationException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <!-- Logging -->
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <!-- Interop -->
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs">
     </Compile>
     <Compile Include="System\Net\NetworkInformation\IPGlobalPropertiesPal.Windows.cs" />
     <Compile Include="System\Net\NetworkInformation\NetworkAddressChange.Windows.cs" />
@@ -94,53 +94,53 @@
     <Compile Include="System\Net\NetworkInformation\TeredoHelper.cs" />
     <!-- System.Net common -->
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.cs">
-      <Link>Common\System\Net\ContextAwareResult.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.Windows.cs">
-      <Link>Common\System\Net\ContextAwareResult.Windows.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\LazyAsyncResult.cs">
-      <Link>Common\System\Net\LazyAsyncResult.cs</Link>
+             Link="Common\System\Net\LazyAsyncResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ByteOrder.cs">
-      <Link>Common\System\Net\ByteOrder.cs</Link>
+             Link="Common\System\Net\ByteOrder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs">
-      <Link>Common\System\Net\IPAddressParserStatics.cs</Link>
+             Link="Common\System\Net\IPAddressParserStatics.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddress.cs">
-      <Link>Common\System\Net\SocketAddress.cs</Link>
+             Link="Common\System\Net\SocketAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs">
-      <Link>Common\System\Net\SocketAddressPal.Windows.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\StartIPOptions.cs">
-      <Link>Common\System\Net\NetworkInformation\StartIPOptions.cs</Link>
+             Link="Common\System\Net\NetworkInformation\StartIPOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\HostInformationPal.Windows.cs">
-      <Link>Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs</Link>
+             Link="Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs">
     </Compile>
     <!-- Interop -->
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.NetworkInformation.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.NetworkInformation.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.NetworkInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WinsockBSD.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WinsockBSD.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WinsockBSD.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSAEventSelect.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSAEventSelect.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSAEventSelect.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSAIoctl.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSAIoctl.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSAIoctl.cs">
     </Compile>
   </ItemGroup>
   <!-- Unix -->
@@ -159,31 +159,31 @@
     <Compile Include="System\Net\NetworkInformation\UnixUnicastIPAddressInformation.cs" />
     <!-- Unix Common -->
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.EnumerateInterfaceAddresses.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.EnumerateInterfaceAddresses.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.EnumerateInterfaceAddresses.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\HostInformationPal.Unix.cs">
       <Link>System\Net\NetworkInformation\HostInformationPal.Unix.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetDomainName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetDomainName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetDomainName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetHostName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetHostName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetHostName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MapTcpState.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.MapTcpState.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.MapTcpState.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\CoreLib\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\CoreLib\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\RowConfigReader.cs">
-      <Link>Common\System\IO\RowConfigReader.cs</Link>
+             Link="Common\System\IO\RowConfigReader.cs">
     </Compile>
   </ItemGroup>
   <!-- Linux -->
@@ -210,10 +210,10 @@
     <Compile Include="System\Net\NetworkInformation\StringParsingHelpers.Statistics.cs" />
     <!-- Linux Common -->
     <Compile Include="$(CommonPath)System\IO\StringParser.cs">
-      <Link>Common\System\IO\StringParser.cs</Link>
+             Link="Common\System\IO\StringParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Linux\Interop.LinuxNetDeviceFlags.cs">
-      <Link>Common\Interop\Linux\Interop.LinuxNetDeviceFlags.cs</Link>
+             Link="Common\Interop\Linux\Interop.LinuxNetDeviceFlags.cs">
     </Compile>
   </ItemGroup>
   <!-- OSX -->
@@ -234,40 +234,40 @@
     <Compile Include="System\Net\NetworkInformation\BsdUdpStatistics.cs" />
     <!-- BSD Common -->
     <Compile Include="$(CommonPath)Interop\BSD\System.Native\Interop.ProtocolStatistics.cs">
-      <Link>Common\Interop\BSD\System.Native\Interop.ProtocolStatistics.cs</Link>
+             Link="Common\Interop\BSD\System.Native\Interop.ProtocolStatistics.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\BSD\System.Native\Interop.TcpConnectionInfo.cs">
-      <Link>Common\Interop\BSD\System.Native\Interop.TcpConnectionInfo.cs</Link>
+             Link="Common\Interop\BSD\System.Native\Interop.TcpConnectionInfo.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="System\Net\NetworkInformation\NetworkAddressChange.OSX.cs" />
     <!-- OSX Common -->
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.RunLoop.cs">
-      <Link>Common\Interop\OSX\Interop.RunLoop.cs</Link>
+             Link="Common\Interop\OSX\Interop.RunLoop.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.SystemConfiguration.cs">
-      <Link>Common\Interop\OSX\Interop.SystemConfiguration.cs</Link>
+             Link="Common\Interop\OSX\Interop.SystemConfiguration.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsFreeBSD)' == 'true'">
     <Compile Include="$(CommonPath)Interop\FreeBSD\Interop.Libraries.cs">
-      <Link>Common\Interop\FreeBSD\Interop.Libraries.cs</Link>
+             Link="Common\Interop\FreeBSD\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsLinux)' == 'true' OR '$(TargetsFreeBSD)' == 'true'">
     <Compile Include="System\Net\NetworkInformation\NetworkAddressChange.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.NetworkChange.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.NetworkChange.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.NetworkChange.cs">
     </Compile>
   </ItemGroup>
   <!-- Unknown Unix -->
diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
index 4e5a858b2fb43..151fb8ca9f34b 100644
--- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
+++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj
@@ -48,22 +48,22 @@
     <Compile Include="StatisticsParsingTests.cs" />
     <!-- Common test files -->
     <Compile Include="$(CommonTestPath)System\Net\TestLogging.cs">
-      <Link>Common\System\Net\TestLogging.cs</Link>
+             Link="Common\System\Net\TestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\VerboseTestLogging.cs">
-      <Link>Common\System\Net\VerboseTestLogging.cs</Link>
+             Link="Common\System\Net\VerboseTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\EventSourceTestLogging.cs">
-      <Link>Common\System\Net\EventSourceTestLogging.cs</Link>
+             Link="Common\System\Net\EventSourceTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Sockets.cs">
-      <Link>Common\System\Net\Capability.Sockets.cs</Link>
+             Link="Common\System\Net\Capability.Sockets.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\StringParser.cs">
-      <Link>Common\System\IO\StringParser.cs</Link>
+             Link="Common\System\IO\StringParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\RowConfigReader.cs">
-      <Link>Common\System\IO\RowConfigReader.cs</Link>
+             Link="Common\System\IO\RowConfigReader.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -76,4 +76,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
index 36d2f01f06dd8..23432a7715340 100644
--- a/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
+++ b/src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
@@ -18,31 +18,31 @@
   <!-- System.Net Common -->
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Net\ByteOrder.cs">
-      <Link>Common\System\Net\ByteOrder.cs</Link>
+             Link="Common\System\Net\ByteOrder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs">
-      <Link>Common\System\Net\IPAddressParserStatics.cs</Link>
+             Link="Common\System\Net\IPAddressParserStatics.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddress.cs">
-      <Link>Common\System\Net\SocketAddress.cs</Link>
+             Link="Common\System\Net\SocketAddress.cs">
     </Compile>
   </ItemGroup>
   <!-- Logging -->
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
   </ItemGroup>
   <!-- System.Net.Internals -->
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs">
-      <Link>Common\System\Net\Internals\IPAddressExtensions.cs</Link>
+             Link="Common\System\Net\Internals\IPAddressExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Internals\IPEndPointExtensions.cs">
-      <Link>Common\System\Net\Internals\IPEndPointExtensions.cs</Link>
+             Link="Common\System\Net\Internals\IPEndPointExtensions.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
@@ -51,35 +51,35 @@
     <Compile Include="System\Net\NetworkInformation\Ping.Unix.cs" />
     <!-- System.Net Common -->
     <Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs">
-      <Link>Common\System\Net\RawSocketPermissions.cs</Link>
+             Link="Common\System\Net\RawSocketPermissions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs">
-      <Link>Common\System\Net\SocketAddressPal.Unix.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs">
-      <Link>Common\System\Net\SocketProtocolSupportPal.Unix.cs</Link>
+             Link="Common\System\Net\SocketProtocolSupportPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs">
-      <Link>Common\System\Net\NetworkInformation\UnixCommandLinePing.cs</Link>
+             Link="Common\System\Net\NetworkInformation\UnixCommandLinePing.cs">
     </Compile>
     <!-- Interop -->
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Close.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Close.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ReadLink.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.ReadLink.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.ReadLink.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Socket.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Socket.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Socket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SocketAddress.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SocketAddress.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
@@ -88,36 +88,36 @@
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <!-- System.Net Common -->
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs">
-      <Link>Common\System\Net\SocketAddressPal.Windows.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs">
-      <Link>Common\System\Net\SocketProtocolSupportPal.Windows.cs</Link>
+             Link="Common\System\Net\SocketProtocolSupportPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
     </Compile>
     <!-- Interop -->
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.ICMP.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.ICMP.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.ICMP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.closesocket.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.closesocket.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.closesocket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSASocketW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSASocketW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSASocketW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
     </Compile>
     <!-- System.Net.Internals -->
     <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs">
-      <Link>Common\System\Net\Sockets\SocketType.cs</Link>
+             Link="Common\System\Net\Sockets\SocketType.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -140,4 +140,4 @@
     <Reference Include="System.IO.FileSystem" />
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
index 87cbbaf4c6139..23b7204771c6b 100644
--- a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj
@@ -20,19 +20,19 @@
       <Link>SocketCommon\Configuration.Ping.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs">
-      <Link>Common\System\Net\RawSocketPermissions.cs</Link>
+             Link="Common\System\Net\RawSocketPermissions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ReadLink.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.ReadLink.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.ReadLink.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs">
-      <Link>Common\System\Net\NetworkInformation\UnixCommandLinePing.cs</Link>
+             Link="Common\System\Net\NetworkInformation\UnixCommandLinePing.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Capability.RawSocketPermissions.cs">
-      <Link>Common\System\Net\Capability.RawSocketPermissions.cs</Link>
+             Link="Common\System\Net\Capability.RawSocketPermissions.cs">
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
index 4d6d6413db52f..5366a5e5605ab 100644
--- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
+++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj
@@ -51,143 +51,143 @@
     <Compile Include="System\Security\Authentication\ExtendedProtection\ChannelBinding.cs" />
     <Compile Include="System\Security\Authentication\ExtendedProtection\ChannelBindingKind.cs" />
     <Compile Include="$(CommonPath)System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ByteOrder.cs">
-      <Link>Common\System\Net\ByteOrder.cs</Link>
+             Link="Common\System\Net\ByteOrder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CookieComparer.cs">
       <Link>ProductionCode\System\Net\CookieComparer.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CookieFields.cs">
-      <Link>Common\System\Net\CookieFields.cs</Link>
+             Link="Common\System\Net\CookieFields.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CookieParser.cs">
-      <Link>Common\System\Net\CookieParser.cs</Link>
+             Link="Common\System\Net\CookieParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs">
-      <Link>Common\System\Net\IPAddressParserStatics.cs</Link>
+             Link="Common\System\Net\IPAddressParserStatics.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\TcpValidationHelpers.cs">
-      <Link>Common\System\Net\TcpValidationHelpers.cs</Link>
+             Link="Common\System\Net\TcpValidationHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\UriScheme.cs">
-      <Link>Common\System\Net\UriScheme.cs</Link>
+             Link="Common\System\Net\UriScheme.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddress.cs">
-      <Link>Common\System\Net\SocketAddress.cs</Link>
+             Link="Common\System\Net\SocketAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NegotiationInfoClass.cs">
-      <Link>Common\System\Net\NegotiationInfoClass.cs</Link>
+             Link="Common\System\Net\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\HostInformation.cs">
-      <Link>Common\System\Net\NetworkInformation\HostInformation.cs</Link>
+             Link="Common\System\Net\NetworkInformation\HostInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Marvin.cs">
-      <Link>Common\System\Marvin.cs</Link>
+             Link="Common\System\Marvin.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\StringBuilderCache.cs">
-      <Link>Common\System\Text\StringBuilderCache.cs</Link>
+             Link="Common\System\Text\StringBuilderCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+             Link="Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
     <!-- Logging -->
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.Alg.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.Alg.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.Alg.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SchProtocols.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SchProtocols.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SchProtocols.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.ErrorCodes.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.ErrorCodes.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.ErrorCodes.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="System\Net\SocketException.Windows.cs" />
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs">
-      <Link>Common\System\Net\SocketAddressPal.Windows.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\HostInformationPal.Windows.cs">
-      <Link>Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs</Link>
+             Link="Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.LocalAlloc.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.LocalAlloc.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\InterfaceInfoPal.Windows.cs">
-      <Link>Common\System\Net\NetworkInformation\InterfaceInfoPal.Windows.cs</Link>
+             Link="Common\System\Net\NetworkInformation\InterfaceInfoPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.if_nametoindex.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.if_nametoindex.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.if_nametoindex.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
     <Compile Include="System\Net\SocketException.Unix.cs" />
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs">
-      <Link>Common\System\Net\SocketAddressPal.Unix.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\HostInformationPal.Unix.cs">
-      <Link>Common\System\Net\NetworkInformation\HostInformationPal.Unix.cs</Link>
+             Link="Common\System\Net\NetworkInformation\HostInformationPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\SocketErrorPal.Unix.cs">
-      <Link>Common\System\Net\Sockets\SocketErrorPal.Unix.cs</Link>
+             Link="Common\System\Net\Sockets\SocketErrorPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetDomainName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetDomainName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetDomainName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetHostName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetHostName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetHostName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetNameInfo.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetNameInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.HostEntry.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.HostEntry.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.HostEntry.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.IPAddress.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.IPAddress.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.IPAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\InterfaceInfoPal.Unix.cs">
-      <Link>Common\System\Net\NetworkInformation\InterfaceInfoPal.Unix.cs</Link>
+             Link="Common\System\Net\NetworkInformation\InterfaceInfoPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SocketAddress.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SocketAddress.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
index 57187bfa326d0..6eb2711d1f96b 100644
--- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/System.Net.Primitives.Functional.Tests.csproj
@@ -25,10 +25,10 @@
     <Compile Include="RequestCachePolicyTest.cs" />
     <Compile Include="CookieContainerAddTest.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Memory" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
index 2cf3d34ae653c..4d40cd264fd72 100644
--- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj
@@ -5,7 +5,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
-    <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the 
+    <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the
          System.Net.Internals namespace. -->
     <DefineConstants>$(DefineConstants);SYSTEM_NET_PRIMITIVES_DLL</DefineConstants>
   </PropertyGroup>
@@ -36,7 +36,7 @@
       <Link>ProductionCode\System\Net\IPEndPoint.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddress.cs">
-      <Link>Common\System\Net\SocketAddress.cs</Link>
+             Link="Common\System\Net\SocketAddress.cs">
     </Compile>
     <Compile Include="..\..\src\System\Net\EndPoint.cs">
       <Link>ProductionCode\System\Net\EndPoint.cs</Link>
@@ -48,7 +48,7 @@
       <Link>ProductionCode\Common\System\Text\StringBuilderCache.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -82,22 +82,22 @@
       <Link>ProductionCode\System\Net\SocketException.Windows.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs">
-      <Link>Common\System\Net\SocketAddressPal.Windows.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\HostInformationPal.Windows.cs">
-      <Link>Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs</Link>
+             Link="Common\System\Net\NetworkInformation\HostInformationPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.ErrorCodes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.FIXED_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.GetNetworkParams.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs">
-      <Link>Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs</Link>
+             Link="Common\Interop\Windows\IpHlpApi\Interop.IP_ADDR_STRING.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
       <Link>ProductionCode\Common\Interop\Windows\Interop.Libraries.cs</Link>
@@ -117,13 +117,13 @@
       <Link>ProductionCode\System\Net\SocketException.Unix.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\HostInformationPal.Unix.cs">
-      <Link>Common\System\Net\NetworkInformation\HostInformationPal.Unix.cs</Link>
+             Link="Common\System\Net\NetworkInformation\HostInformationPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs">
-      <Link>Common\System\Net\SocketAddressPal.Unix.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\SocketErrorPal.Unix.cs">
-      <Link>Common\System\Net\Sockets\SocketErrorPal.Unix.cs</Link>
+             Link="Common\System\Net\Sockets\SocketErrorPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.CheckedAccess.cs">
       <Link>ProductionCode\Common\Interop\Interop.CheckedAccess.cs</Link>
@@ -159,4 +159,4 @@
       <Link>ProductionCode\Common\Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs</Link>
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
index 23430eac94c22..38af6a61a9592 100644
--- a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
+++ b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj
@@ -6,7 +6,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
-    <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the 
+    <!-- SYSTEM_NET_PRIMITIVES_DLL is required to allow source-level code sharing for types defined within the
          System.Net.Internals namespace. -->
     <DefineConstants>$(DefineConstants);SYSTEM_NET_PRIMITIVES_DLL</DefineConstants>
   </PropertyGroup>
@@ -42,7 +42,7 @@
       <Link>ProductionCode\System\Net\CookieComparer.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CookieFields.cs">
-      <Link>Common\System\Net\CookieFields.cs</Link>
+             Link="Common\System\Net\CookieFields.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CookieParser.cs">
       <Link>ProductionCode\System\Net\CookieParser.cs</Link>
@@ -60,10 +60,10 @@
       <Link>ProductionCode\System\Net\IPAddressParser.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+             Link="Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -73,7 +73,7 @@
     <Compile Include="Fakes\IPv4AddressHelper.cs" />
     <Compile Include="Fakes\IPv6AddressHelper.cs" />
     <Compile Include="$(CommonPath)System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ByteOrder.cs">
       <Link>ProductionCode\Common\System\Net\ByteOrder.cs</Link>
@@ -91,10 +91,10 @@
       <Link>ProductionCode\Common\System\Net\UriScheme.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Marvin.cs">
-      <Link>Common\System\Marvin.cs</Link>
+             Link="Common\System\Marvin.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\StringBuilderCache.cs">
-      <Link>Common\System\Text\StringBuilderCache.cs</Link>
+             Link="Common\System\Text\StringBuilderCache.cs">
     </Compile>
     <!-- Logging -->
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
@@ -115,7 +115,7 @@
       <Link>ProductionCode\System\Net\SocketException.Unix.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs">
-      <Link>Common\System\Net\SocketAddressPal.Windows.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NetworkInformation\InterfaceInfoPal.Windows.cs">
       <Link>ProductionCode\System\Net\NetworkInformation\InterfaceInfoPal.Windows.cs</Link>
@@ -135,7 +135,7 @@
       <Link>ProductionCode\System\Net\NetworkInformation\InterfaceInfoPal.Unix.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs">
-      <Link>Common\System\Net\SocketAddressPal.Unix.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\SocketErrorPal.Unix.cs">
       <Link>ProductionCode\Common\System\Net\Sockets\SocketErrorPal.Unix.cs</Link>
@@ -153,4 +153,4 @@
       <Link>ProductionCode\Common\Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs</Link>
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
index 63f1a99366765..295f3613d3274 100644
--- a/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
+++ b/src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
@@ -44,60 +44,60 @@
     <Compile Include="System\Net\Cache\HttpRequestCachePolicy.cs" />
     <Compile Include="System\Net\NetEventSource.Requests.cs" />
     <Compile Include="$(CommonPath)System\Net\Http\HttpHandlerDefaults.cs">
-      <Link>Common\System\Net\Http\HttpHandlerDefaults.cs</Link>
+             Link="Common\System\Net\Http\HttpHandlerDefaults.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\DebugThreadTracking.cs">
-      <Link>Common\System\Net\Logging\DebugThreadTracking.cs</Link>
+             Link="Common\System\Net\Logging\DebugThreadTracking.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpDateParser.cs">
-      <Link>Common\System\Net\HttpDateParser.cs</Link>
+             Link="Common\System\Net\HttpDateParser.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpValidationHelpers.cs">
-      <Link>Common\System\Net\HttpValidationHelpers.cs</Link>
+             Link="Common\System\Net\HttpValidationHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\LazyAsyncResult.cs">
-      <Link>Common\System\Net\LazyAsyncResult.cs</Link>
+             Link="Common\System\Net\LazyAsyncResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.cs">
-      <Link>Common\System\Net\ContextAwareResult.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ExceptionCheck.cs">
-      <Link>Common\System\Net\ExceptionCheck.cs</Link>
+             Link="Common\System\Net\ExceptionCheck.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\TlsStream.cs">
-      <Link>Common\System\Net\TlsStream.cs</Link>
+             Link="Common\System\Net\TlsStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityProtocol.cs">
-      <Link>Common\System\Net\SecurityProtocol.cs</Link>
+             Link="Common\System\Net\SecurityProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\WinInet\Interop.wininet_errors.cs">
-      <Link>Common\Interop\Windows\WinInet\Interop.wininet_errors.cs</Link>
+             Link="Common\Interop\Windows\WinInet\Interop.wininet_errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.Windows.cs">
-      <Link>Common\System\Net\ContextAwareResult.Windows.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.Windows.cs">
     </Compile>
     <Compile Include="System\Net\WebExceptionPal.Windows.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.Unix.cs">
-      <Link>Common\System\Net\ContextAwareResult.Unix.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.Unix.cs">
     </Compile>
     <Compile Include="System\Net\WebExceptionPal.Unix.cs" />
   </ItemGroup>
@@ -124,4 +124,4 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
index d10fd19dfe020..268f9017666e6 100644
--- a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
+++ b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
@@ -12,31 +12,31 @@
     <Compile Include="RequestStreamTest.cs" />
     <Compile Include="WebRequestTest.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs">
-      <Link>Common\System\Net\Capability.Security.cs</Link>
+             Link="Common\System\Net\Capability.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs">
-      <Link>Common\System\Net\Configuration.Certificates.cs</Link>
+             Link="Common\System\Net\Configuration.Certificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs">
-      <Link>Common\System\Net\Configuration.Http.cs</Link>
+             Link="Common\System\Net\Configuration.Http.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs">
-      <Link>Common\System\Net\Configuration.Security.cs</Link>
+             Link="Common\System\Net\Configuration.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.AuthenticationHelpers.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.AuthenticationHelpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs">
-      <Link>Common\System\Net\Http\GenericLoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\GenericLoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -52,4 +52,4 @@
   <ItemGroup>
     <PackageReference Include="System.Net.TestData" Version="$(SystemNetTestDataVersion)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Security/src/System.Net.Security.csproj b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
index dbf541c0f4a3d..70e8f25f214d5 100644
--- a/src/libraries/System.Net.Security/src/System.Net.Security.csproj
+++ b/src/libraries/System.Net.Security/src/System.Net.Security.csproj
@@ -48,64 +48,64 @@
     <Compile Include="System\Security\Authentication\ExtendedProtection\ServiceNameCollection.cs" />
     <!-- Logging -->
     <Compile Include="$(CommonPath)System\Net\Logging\DebugThreadTracking.cs">
-      <Link>Common\System\Net\Logging\DebugThreadTracking.cs</Link>
+             Link="Common\System\Net\Logging\DebugThreadTracking.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <!-- Debug only -->
     <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs">
-      <Link>Common\System\Net\DebugSafeHandle.cs</Link>
+             Link="Common\System\Net\DebugSafeHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
     </Compile>
     <!-- System.Net common -->
     <Compile Include="$(CommonPath)System\Net\ArrayBuffer.cs">
-       <Link>Common\System\Net\ArrayBuffer.cs</Link>
+              Link="Common\System\Net\ArrayBuffer.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ExceptionCheck.cs">
-      <Link>Common\System\Net\ExceptionCheck.cs</Link>
+             Link="Common\System\Net\ExceptionCheck.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\LazyAsyncResult.cs">
-      <Link>Common\System\Net\LazyAsyncResult.cs</Link>
+             Link="Common\System\Net\LazyAsyncResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityProtocol.cs">
-      <Link>Common\System\Net\SecurityProtocol.cs</Link>
+             Link="Common\System\Net\SecurityProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\UriScheme.cs">
-      <Link>Common\System\Net\UriScheme.cs</Link>
+             Link="Common\System\Net\UriScheme.cs">
     </Compile>
     <!-- Common -->
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SSPIHandleCache.cs">
-      <Link>Common\System\Net\Security\SSPIHandleCache.cs</Link>
+             Link="Common\System\Net\Security\SSPIHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsPal.cs">
-      <Link>Common\System\Net\ContextFlagsPal.cs</Link>
+             Link="Common\System\Net\ContextFlagsPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NegotiationInfoClass.cs">
-      <Link>Common\System\Net\NegotiationInfoClass.cs</Link>
+             Link="Common\System\Net\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\NTAuthentication.Common.cs">
-      <Link>Common\System\Net\NTAuthentication.Common.cs</Link>
+             Link="Common\System\Net\NTAuthentication.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityStatusPal.cs">
-      <Link>Common\System\Net\SecurityStatusPal.cs</Link>
+             Link="Common\System\Net\SecurityStatusPal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <!-- This file depends on IANA registry. We do not want anyone's build to break after the update -->
@@ -156,164 +156,164 @@
     <Compile Include="System\Net\Security\SslConnectionInfo.Windows.cs" />
     <Compile Include="System\Net\Security\StreamSizes.Windows.cs" />
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBuffer.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBuffer.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBuffer.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityBufferType.Windows.cs">
-      <Link>Common\System\Net\Security\SecurityBufferType.Windows.cs</Link>
+             Link="Common\System\Net\Security\SecurityBufferType.Windows.cs">
     </Compile>
     <!-- NegotiateStream -->
     <Compile Include="$(CommonPath)System\Net\SecurityStatusAdapterPal.Windows.cs">
-      <Link>Common\System\Net\SecurityStatusAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\SecurityStatusAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsAdapterPal.Windows.cs">
-      <Link>Common\System\Net\ContextFlagsAdapterPal.Windows.cs</Link>
+             Link="Common\System\Net\ContextFlagsAdapterPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NegotiateStreamPal.Windows.cs">
-      <Link>Common\System\Net\Security\NegotiateStreamPal.Windows.cs</Link>
+             Link="Common\System\Net\Security\NegotiateStreamPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\SecurityContextTokenHandle.cs">
-      <Link>Common\System\Net\Security\SecurityContextTokenHandle.cs</Link>
+             Link="Common\System\Net\Security\SecurityContextTokenHandle.cs">
     </Compile>
     <!-- Interop -->
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.certificates.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.certificates_types.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.certificates_types.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.certificates_types.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.Alerts.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.Alerts.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.Alerts.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SchProtocols.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SchProtocols.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SchProtocols.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
-      <Link>Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs</Link>
+             Link="Common\Interop\Windows\SChannel\SecPkgContext_CipherInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.SecPkgContext_ApplicationProtocol.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.Sec_Application_Protocols.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.Sec_Application_Protocols.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.Sec_Application_Protocols.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\UnmanagedCertificateContext.cs">
-      <Link>Common\Interop\Windows\SChannel\UnmanagedCertificateContext.cs</Link>
+             Link="Common\Interop\Windows\SChannel\UnmanagedCertificateContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
-      <Link>Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs</Link>
+             Link="Common\Interop\Windows\SChannel\UnmanagedCertificateContext.IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Bindings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\GlobalSSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\GlobalSSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\GlobalSSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.SSPI.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.SSPI.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.SSPI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_NegotiationInfoW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\NegotiationInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\NegotiationInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_Sizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\BidirectionalDictionary.cs">
-      <Link>Common\System\Collections\Generic\BidirectionalDictionary.cs</Link>
+             Link="Common\System\Collections\Generic\BidirectionalDictionary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SafeDeleteContext.cs">
-      <Link>Common\Interop\Windows\SspiCli\SafeDeleteContext.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SafeDeleteContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfo.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecurityPackageInfoClass.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecuritySafeHandles.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecuritySafeHandles.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIAuthType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIAuthType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIAuthType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\ISSPIInterface.cs">
-      <Link>Common\Interop\Windows\SspiCli\ISSPIInterface.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\ISSPIInterface.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPISecureChannelType.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPISecureChannelType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIWrapper.cs">
-      <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SSPIWrapper.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
-      <Link>Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\SecPkgContext_StreamSizes.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.Initialization.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.Initialization.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.Initialization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ContextFlagsAdapterPal.Unix.cs">
-      <Link>Common\System\Net\ContextFlagsAdapterPal.Unix.cs</Link>
+             Link="Common\System\Net\ContextFlagsAdapterPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Http\TlsCertificateExtensions.cs">
-      <Link>Common\System\Net\Http\TlsCertificateExtensions.cs</Link>
+             Link="Common\System\Net\Http\TlsCertificateExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\NegotiateStreamPal.Unix.cs">
-      <Link>Common\System\Net\Security\NegotiateStreamPal.Unix.cs</Link>
+             Link="Common\System\Net\Security\NegotiateStreamPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeDeleteContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeDeleteContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteNegoContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeCredentials.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeCredentials.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeCredentials.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeNegoCredentials.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SecChannelBindings.cs">
-      <Link>Common\System\Net\Security\Unix\SecChannelBindings.cs</Link>
+             Link="Common\System\Net\Security\Unix\SecChannelBindings.cs">
     </Compile>
     <Compile Include="System\Net\Security\NegotiateStreamPal.Unix.cs" />
     <Compile Include="System\Net\Security\Pal.Managed\EndpointChannelBindingToken.cs" />
@@ -328,117 +328,117 @@
     <Compile Include="System\Net\Security\SslConnectionInfo.Linux.cs" />
     <Compile Include="System\Net\Security\StreamSizes.Unix.cs" />
     <Compile Include="$(CommonPath)System\Net\Security\CertificateValidation.Unix.cs">
-      <Link>Common\System\Net\Security\CertificateValidation.Unix.cs</Link>
+             Link="Common\System\Net\Security\CertificateValidation.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSsl.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSsl.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Ssl.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Ssl.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Ssl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtx.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtx.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.SetProtocolOptions.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SetProtocolOptions.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SetProtocolOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtxOptions.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtxOptions.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.SslCtxOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeDeleteSslContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeDeleteSslContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeDeleteSslContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeCertContext.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeCertContext.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeCertContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Security\Unix\SafeFreeSslCredentials.cs">
-      <Link>Common\System\Net\Security\Unix\SafeFreeSslCredentials.cs</Link>
+             Link="Common\System\Net\Security\Unix\SafeFreeSslCredentials.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFArray.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFData.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFData.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFDate.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFDate.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFDate.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFError.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFError.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFError.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFString.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFString.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SslErr.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SslErr.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SslErr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ssl.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ssl.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ssl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Chain.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Chain.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Chain.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
     </Compile>
     <Compile Include="System\Net\CertificateValidationPal.OSX.cs" />
     <Compile Include="System\Net\Security\Pal.OSX\SafeDeleteSslContext.cs" />
diff --git a/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj b/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj
index 81eb118f1cc59..8f295d0849b2a 100644
--- a/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/EnterpriseTests/System.Net.Security.Enterprise.Tests.csproj
@@ -8,19 +8,19 @@
 
     <!-- Common test files -->
     <Compile Include="$(CommonTestPath)System\Net\EnterpriseTests\EnterpriseTestConfiguration.cs">
-      <Link>Common\System\Net\EnterpriseTests\EnterpriseTestConfiguration.cs</Link>
+             Link="Common\System\Net\EnterpriseTests\EnterpriseTestConfiguration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\VirtualNetwork\VirtualNetwork.cs">
-      <Link>Common\System\Net\VirtualNetwork\VirtualNetwork.cs</Link>
+             Link="Common\System\Net\VirtualNetwork\VirtualNetwork.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\VirtualNetwork\VirtualNetworkStream.cs">
-      <Link>Common\System\Net\VirtualNetwork\VirtualNetworkStream.cs</Link>
+             Link="Common\System\Net\VirtualNetwork\VirtualNetworkStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
       <Link>ProductionCode\Common\System\Threading\Tasks\TaskToApm.cs</Link>
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
index 1717a98df4cc8..e029170a61d71 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
@@ -31,52 +31,52 @@
     <Compile Include="NegotiateStreamKerberosTest.cs" />
     <!-- Common test files -->
     <Compile Include="$(CommonTestPath)System\IO\DelegateStream.cs">
-      <Link>Common\System\IO\DelegateStream.cs</Link>
+             Link="Common\System\IO\DelegateStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs">
-      <Link>Common\System\Net\Capability.Security.cs</Link>
+             Link="Common\System\Net\Capability.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\SslStreamCertificatePolicy.cs">
-      <Link>Common\System\Net\SslStreamCertificatePolicy.cs</Link>
+             Link="Common\System\Net\SslStreamCertificatePolicy.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs">
-      <Link>Common\System\Net\Configuration.Security.cs</Link>
+             Link="Common\System\Net\Configuration.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs">
-      <Link>Common\System\Net\Configuration.Certificates.cs</Link>
+             Link="Common\System\Net\Configuration.Certificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs">
-      <Link>Common\System\Net\Configuration.Http.cs</Link>
+             Link="Common\System\Net\Configuration.Http.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\HttpsTestClient.cs">
-      <Link>Common\System\Net\HttpsTestClient.cs</Link>
+             Link="Common\System\Net\HttpsTestClient.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\HttpsTestServer.cs">
-      <Link>Common\System\Net\HttpsTestServer.cs</Link>
+             Link="Common\System\Net\HttpsTestServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\SslProtocolSupport.cs">
-      <Link>Common\System\Net\SslProtocolSupport.cs</Link>
+             Link="Common\System\Net\SslProtocolSupport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\TestLogging.cs">
-      <Link>Common\System\Net\TestLogging.cs</Link>
+             Link="Common\System\Net\TestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\VerboseTestLogging.cs">
-      <Link>Common\System\Net\VerboseTestLogging.cs</Link>
+             Link="Common\System\Net\VerboseTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\EventSourceTestLogging.cs">
-      <Link>Common\System\Net\EventSourceTestLogging.cs</Link>
+             Link="Common\System\Net\EventSourceTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\VirtualNetwork\VirtualNetwork.cs">
-      <Link>Common\System\Net\VirtualNetwork\VirtualNetwork.cs</Link>
+             Link="Common\System\Net\VirtualNetwork\VirtualNetwork.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\VirtualNetwork\VirtualNetworkStream.cs">
-      <Link>Common\System\Net\VirtualNetwork\VirtualNetworkStream.cs</Link>
+             Link="Common\System\Net\VirtualNetwork\VirtualNetworkStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
       <Link>ProductionCode\Common\System\Threading\Tasks\TaskToApm.cs</Link>
@@ -102,25 +102,25 @@
   <ItemGroup>
     <Compile Include="LoggingTest.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="IdentityValidator.Windows.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.Windows.cs">
-      <Link>Common\System\Net\Capability.Security.Windows.cs</Link>
+             Link="Common\System\Net\Capability.Security.Windows.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="IdentityValidator.Unix.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.Unix.cs">
-      <Link>Common\System\Net\Capability.Security.Unix.cs</Link>
+             Link="Common\System\Net\Capability.Security.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
-      <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs</Link>
+             Link="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.IsNtlmInstalled.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
index d61c5a7777595..ac2090feb4d29 100644
--- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj
@@ -27,10 +27,10 @@
     <Compile Include="Fakes\FakeLazyAsyncResult.cs" />
     <!-- Common test files -->
     <Compile Include="$(CommonTestPath)System\Net\SslProtocolSupport.cs">
-      <Link>CommonTest\System\Net\SslProtocolSupport.cs</Link>
+             Link="CommonTest\System\Net\SslProtocolSupport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -69,10 +69,10 @@
       <Link>ProductionCode\Common\System\Net\TlsAlertMessage.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SChannel\Interop.Alerts.cs">
-      <Link>Common\Interop\Windows\SChannel\Interop.Alerts.cs</Link>
+             Link="Common\Interop\Windows\SChannel\Interop.Alerts.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <!-- Logging -->
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
@@ -89,4 +89,4 @@
     <Reference Include="System.Runtime.InteropServices" />
     <Reference Include="System.Threading" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
index 3d74a78391235..26d4181551d25 100644
--- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -49,68 +49,68 @@
     <Compile Include="System\Net\Sockets\ReceiveMessageOverlappedAsyncResult.cs" />
     <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.cs" />
     <Compile Include="$(CommonPath)System\IO\StreamHelpers.CopyValidation.cs">
-      <Link>Common\System\IO\StreamHelpers.CopyValidation.cs</Link>
+             Link="Common\System\IO\StreamHelpers.CopyValidation.cs">
     </Compile>
     <!-- Logging -->
     <Compile Include="$(CommonPath)System\Net\Logging\DebugThreadTracking.cs">
-      <Link>Common\System\Net\Logging\DebugThreadTracking.cs</Link>
+             Link="Common\System\Net\Logging\DebugThreadTracking.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InternalException.cs">
-      <Link>Common\System\Net\InternalException.cs</Link>
+             Link="Common\System\Net\InternalException.cs">
     </Compile>
     <!-- Debug only -->
     <Compile Include="$(CommonPath)System\Net\DebugSafeHandleMinusOneIsInvalid.cs">
-      <Link>Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs</Link>
+             Link="Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs">
     </Compile>
     <!-- System.Net common -->
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.cs">
-      <Link>Common\System\Net\ContextAwareResult.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\LazyAsyncResult.cs">
-      <Link>Common\System\Net\LazyAsyncResult.cs</Link>
+             Link="Common\System\Net\LazyAsyncResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ByteOrder.cs">
-      <Link>Common\System\Net\ByteOrder.cs</Link>
+             Link="Common\System\Net\ByteOrder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs">
-      <Link>Common\System\Net\IPEndPointStatics.cs</Link>
+             Link="Common\System\Net\IPEndPointStatics.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs">
-      <Link>Common\System\Net\IPAddressParserStatics.cs</Link>
+             Link="Common\System\Net\IPAddressParserStatics.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\ExceptionCheck.cs">
-      <Link>Common\System\Net\ExceptionCheck.cs</Link>
+             Link="Common\System\Net\ExceptionCheck.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\RangeValidationHelpers.cs">
-      <Link>Common\System\Net\RangeValidationHelpers.cs</Link>
+             Link="Common\System\Net\RangeValidationHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddress.cs">
-      <Link>Common\System\Net\SocketAddress.cs</Link>
+             Link="Common\System\Net\SocketAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\TcpValidationHelpers.cs">
-      <Link>Common\System\Net\TcpValidationHelpers.cs</Link>
+             Link="Common\System\Net\TcpValidationHelpers.cs">
     </Compile>
     <!-- System.Net.Internals -->
     <Compile Include="$(CommonPath)System\Net\Internals\IPEndPointExtensions.cs">
-      <Link>Common\System\Net\Internals\IPEndPointExtensions.cs</Link>
+             Link="Common\System\Net\Internals\IPEndPointExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs">
-      <Link>Common\System\Net\Internals\IPAddressExtensions.cs</Link>
+             Link="Common\System\Net\Internals\IPAddressExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Internals\SocketExceptionFactory.cs">
-      <Link>Common\System\Net\Internals\SocketExceptionFactory.cs</Link>
+             Link="Common\System\Net\Internals\SocketExceptionFactory.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolFamily.cs">
-      <Link>Common\System\Net\Sockets\ProtocolFamily.cs</Link>
+             Link="Common\System\Net\Sockets\ProtocolFamily.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs">
-      <Link>Common\System\Net\Sockets\ProtocolType.cs</Link>
+             Link="Common\System\Net\Sockets\ProtocolType.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs">
-      <Link>Common\System\Net\Sockets\SocketType.cs</Link>
+             Link="Common\System\Net\Sockets\SocketType.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
@@ -129,125 +129,125 @@
     <Compile Include="System\Net\Sockets\TransmitFileAsyncResult.Windows.cs" />
     <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.Windows.cs" />
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.Windows.cs">
-      <Link>Common\System\Net\ContextAwareResult.Windows.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs">
-      <Link>Common\System\Net\SocketAddressPal.Windows.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Windows.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs">
-      <Link>Common\System\Net\SocketProtocolSupportPal.Windows</Link>
+             Link="Common\System\Net\SocketProtocolSupportPal.Windows">
     </Compile>
     <!-- Interop -->
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.accept.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.accept.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.accept.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.bind.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.bind.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.bind.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.closesocket.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.closesocket.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.closesocket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.getpeername.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.getpeername.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.getpeername.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.getsockname.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.getsockname.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.getsockname.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.getsockopt.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.getsockopt.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.getsockopt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.ioctlsocket.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.ioctlsocket.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.ioctlsocket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.listen.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.listen.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.listen.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.recv.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.recv.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.recv.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.recvfrom.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.recvfrom.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.recvfrom.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.select.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.select.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.select.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.send.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.send.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.send.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.sendto.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.sendto.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.sendto.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.setsockopt.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.setsockopt.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.setsockopt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.shutdown.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.shutdown.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.shutdown.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.TransmitFile.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.TransmitFile.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.TransmitFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WinsockBSD.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WinsockBSD.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WinsockBSD.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WinsockAsync.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WinsockAsync.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WinsockAsync.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSAConnect.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSAConnect.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSAConnect.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSADuplicateSocket.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSADuplicateSocket.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSADuplicateSocket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSAGetOverlappedResult.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSAGetOverlappedResult.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSAGetOverlappedResult.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSAIoctl.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSAIoctl.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSAIoctl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSARecv.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSARecv.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSARecv.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSARecvFrom.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSARecvFrom.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSARecvFrom.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSASend.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSASend.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSASend.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSASendTo.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSASendTo.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSASendTo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSASocketW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSASocketW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSASocketW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSASocketW.SafeCloseSocket.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSASocketW.SafeCloseSocket.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSASocketW.SafeCloseSocket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.SocketConstructorFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\SafeNativeOverlapped.cs">
-      <Link>Common\Interop\Windows\WinSock\SafeNativeOverlapped.cs</Link>
+             Link="Common\Interop\Windows\WinSock\SafeNativeOverlapped.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\WSABuffer.cs">
-      <Link>Common\Interop\Windows\WinSock\WSABuffer.cs</Link>
+             Link="Common\Interop\Windows\WinSock\WSABuffer.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinSock\Interop.WSAPROTOCOL_INFOW.cs">
-      <Link>Common\Interop\Windows\WinSock\Interop.WSAPROTOCOL_INFOW.cs</Link>
+             Link="Common\Interop\Windows\WinSock\Interop.WSAPROTOCOL_INFOW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CancelIoEx.cs">
-      <Link>Common\Interop\Windows\Interop.CancelIoEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.CancelIoEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetFileCompletionNotificationModes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.HandleInformation.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.HandleInformation.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.HandleInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\CompletionPortHelper.Windows.cs">
-      <Link>Common\System\Net\CompletionPortHelper.Windows.cs</Link>
+             Link="Common\System\Net\CompletionPortHelper.Windows.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
@@ -265,133 +265,133 @@
     <Compile Include="System\Net\Sockets\SocketPal.Unix.cs" />
     <Compile Include="System\Net\Sockets\UnixDomainSocketEndPoint.Unix.cs" />
     <Compile Include="$(CommonPath)System\Net\ContextAwareResult.Unix.cs">
-      <Link>Common\System\Net\ContextAwareResult.Unix.cs</Link>
+             Link="Common\System\Net\ContextAwareResult.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\InteropIPAddressExtensions.Unix.cs">
-      <Link>Common\System\Net\InteropIPAddressExtensions.Unix.cs</Link>
+             Link="Common\System\Net\InteropIPAddressExtensions.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs">
-      <Link>Common\System\Net\SocketAddressPal.Unix.cs</Link>
+             Link="Common\System\Net\SocketAddressPal.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs">
-      <Link>Common\System\Net\SocketProtocolSupportPal.Unix</Link>
+             Link="Common\System\Net\SocketProtocolSupportPal.Unix">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Sockets\SocketErrorPal.Unix.cs">
-      <Link>Common\System\Net\Sockets\SocketErrorPal.Unix</Link>
+             Link="Common\System\Net\Sockets\SocketErrorPal.Unix">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Accept.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Accept.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Accept.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Bind.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Bind.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Bind.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Close.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Close.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Connect.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Connect.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Connect.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Fcntl.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Fcntl.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Fcntl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Disconnect.cs">
-      <Link>Common\Interop\Unix\Interop.Disconnect.cs</Link>
+             Link="Common\Interop\Unix\Interop.Disconnect.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetBytesAvailable.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetBytesAvailable.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetBytesAvailable.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetDomainSocketSizes.cs">
-      <Link>Common\Interop\Unix\Interop.GetDomainSocketSizes.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetDomainSocketSizes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPeerName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetPeerName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetPeerName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetSocketErrorOption.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetSocketErrorOption.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetSocketErrorOption.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetSocketType.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetSocketType.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetSocketType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetSockName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetSockName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetSockName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetSockOpt.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetSockOpt.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetSockOpt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.IPAddress.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.IPAddress.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.IPAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.IPPacketInformation.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.IPPacketInformation.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.IPPacketInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.LingerOption.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.LingerOption.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.LingerOption.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SendFile.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SendFile.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SendFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SetSendTimeout.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SetSendTimeout.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SetSendTimeout.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SetReceiveTimeout.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SetReceiveTimeout.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SetReceiveTimeout.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs">
-      <Link>Common\Interop\Unix\Interop.Stat.cs</Link>
+             Link="Common\Interop\Unix\Interop.Stat.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Listen.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Listen.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Listen.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MemSet.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.MemSet.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.MemSet.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MessageHeader.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.MessageHeader.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.MessageHeader.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MulticastOption.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.MulticastOption.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.MulticastOption.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Poll.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Poll.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PlatformSocketSupport.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.PlatformSocketSupport.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.PlatformSocketSupport.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ReceiveMessage.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.ReceiveMessage.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.ReceiveMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SendMessage.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SendMessage.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SendMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SetSockOpt.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SetSockOpt.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SetSockOpt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Shutdown.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Shutdown.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Shutdown.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Socket.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Socket.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Socket.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SocketEvent.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SocketEvent.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SocketEvent.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SocketAddress.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SocketAddress.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SocketAddress.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Pipe.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Pipe.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Pipe.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Write.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Write.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Write.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -413,4 +413,4 @@
     <Reference Include="System.Threading.Overlapped" />
     <Reference Include="System.Threading.ThreadPool" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
index 7d1142099157c..c939cdbfb869e 100644
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
@@ -76,34 +76,34 @@
     </Compile>
     <!-- Common test files -->
     <Compile Include="$(CommonTestPath)System\Net\TestLogging.cs">
-      <Link>Common\System\Net\TestLogging.cs</Link>
+             Link="Common\System\Net\TestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\VerboseTestLogging.cs">
-      <Link>Common\System\Net\VerboseTestLogging.cs</Link>
+             Link="Common\System\Net\VerboseTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\EventSourceTestLogging.cs">
-      <Link>Common\System\Net\EventSourceTestLogging.cs</Link>
+             Link="Common\System\Net\EventSourceTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Sockets.cs">
-      <Link>Common\System\Net\Capability.Sockets.cs</Link>
+             Link="Common\System\Net\Capability.Sockets.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Buffers\NativeMemoryManager.cs">
-      <Link>Common\System\Buffers\NativeMemoryManager.cs</Link>
+             Link="Common\System\Buffers\NativeMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj
index 282b766f7fcb3..21113f206299b 100644
--- a/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj
+++ b/src/libraries/System.Net.WebClient/src/System.Net.WebClient.csproj
@@ -7,22 +7,22 @@
   <ItemGroup>
     <Compile Include="System\Net\WebClient.cs" />
     <Compile Include="$(CommonPath)System\IO\DelegatingStream.cs">
-      <Link>Common\System\IO\DelegatingStream.cs</Link>
+             Link="Common\System\IO\DelegatingStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\ChunkedMemoryStream.cs">
-      <Link>Common\System\IO\ChunkedMemoryStream.cs</Link>
+             Link="Common\System\IO\ChunkedMemoryStream.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\BeginEndAwaitableAdapter.cs">
-      <Link>Common\System\Threading\Tasks\BeginEndAwaitableAdapter.cs</Link>
+             Link="Common\System\Threading\Tasks\BeginEndAwaitableAdapter.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\RendezvousAwaitable.cs">
-      <Link>Common\System\Threading\Tasks\RendezvousAwaitable.cs</Link>
+             Link="Common\System\Threading\Tasks\RendezvousAwaitable.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
index b011f8361e954..301aefa62b2a3 100644
--- a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
+++ b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
@@ -7,28 +7,28 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="WebClientTest.cs" />
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs">
-      <Link>Common\System\Net\Capability.Security.cs</Link>
+             Link="Common\System\Net\Capability.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs">
-      <Link>Common\System\Net\Configuration.Certificates.cs</Link>
+             Link="Common\System\Net\Configuration.Certificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs">
-      <Link>Common\System\Net\Configuration.Http.cs</Link>
+             Link="Common\System\Net\Configuration.Http.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs">
-      <Link>Common\System\Net\Configuration.Security.cs</Link>
+             Link="Common\System\Net\Configuration.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs">
-      <Link>Common\System\Net\Http\GenericLoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\GenericLoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
index e7d45fd91bcca..2f708d251af29 100644
--- a/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
+++ b/src/libraries/System.Net.WebHeaderCollection/src/System.Net.WebHeaderCollection.csproj
@@ -13,19 +13,19 @@
     <Compile Include="System\Net\HeaderInfoTable.cs" />
     <Compile Include="System\Net\NetEventSource.WebHeaderCollection.cs" />
     <Compile Include="$(CommonPath)System\Net\CaseInsensitiveAscii.cs">
-      <Link>Common\System\Net\CaseInsensitiveAscii.cs</Link>
+             Link="Common\System\Net\CaseInsensitiveAscii.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\StringExtensions.cs">
-      <Link>Common\System\StringExtensions.cs</Link>
+             Link="Common\System\StringExtensions.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpValidationHelpers.cs">
-      <Link>Common\System\Net\HttpValidationHelpers.cs</Link>
+             Link="Common\System\Net\HttpValidationHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
index 60ee641776b69..ca142bdd3e9f9 100644
--- a/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
+++ b/src/libraries/System.Net.WebSockets.Client/src/System.Net.WebSockets.Client.csproj
@@ -11,20 +11,20 @@
     <Compile Include="System\Net\WebSockets\NetEventSource.WebSockets.cs" />
     <!-- Common -->
     <Compile Include="$(CommonPath)System\Net\Logging\NetEventSource.Common.cs">
-      <Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
+             Link="Common\System\Net\Logging\NetEventSource.Common.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\UriScheme.cs">
-      <Link>Common\System\Net\UriScheme.cs</Link>
+             Link="Common\System\Net\UriScheme.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\WebSockets\WebSocketValidate.cs">
-      <Link>Common\System\Net\WebSockets\WebSocketValidate.cs</Link>
+             Link="Common\System\Net\WebSockets\WebSocketValidate.cs">
     </Compile>
     <Compile Include="System\Net\WebSockets\WebSocketHandle.Managed.cs" />
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\SecurityProtocol.cs">
-      <Link>Common\System\Net\SecurityProtocol.cs</Link>
+             Link="Common\System\Net\SecurityProtocol.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -54,4 +54,4 @@
     <Reference Include="System.Text.Encoding.Extensions" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
index d685d7b270d7f..9cdffa3b90bfa 100644
--- a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
+++ b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
@@ -10,37 +10,37 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs">
-      <Link>Common\System\Net\Capability.Security.cs</Link>
+             Link="Common\System\Net\Capability.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs">
-      <Link>Common\System\Net\Configuration.Certificates.cs</Link>
+             Link="Common\System\Net\Configuration.Certificates.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Http.cs">
-      <Link>Common\System\Net\Configuration.Http.cs</Link>
+             Link="Common\System\Net\Configuration.Http.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs">
-      <Link>Common\System\Net\Configuration.Security.cs</Link>
+             Link="Common\System\Net\Configuration.Security.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.WebSockets.cs">
-      <Link>Common\System\Net\Configuration.WebSockets.cs</Link>
+             Link="Common\System\Net\Configuration.WebSockets.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\EventSourceTestLogging.cs">
-      <Link>Common\System\Net\EventSourceTestLogging.cs</Link>
+             Link="Common\System\Net\EventSourceTestLogging.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackProxyServer.cs">
-      <Link>Common\System\Net\Http\LoopbackProxyServer.cs</Link>
+             Link="Common\System\Net\Http\LoopbackProxyServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs">
-      <Link>Common\System\Net\Http\LoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\LoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs">
-      <Link>Common\System\Net\Http\GenericLoopbackServer.cs</Link>
+             Link="Common\System\Net\Http\GenericLoopbackServer.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
     <Compile Include="AbortTest.cs" />
     <Compile Include="CancelTest.cs" />
@@ -60,4 +60,4 @@
   <ItemGroup>
     <PackageReference Include="System.Net.TestData" Version="$(SystemNetTestDataVersion)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
index 81bfe86e00cd7..0e09eebe90e2d 100644
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/src/System.Net.WebSockets.WebSocketProtocol.csproj
@@ -9,10 +9,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Net\WebSockets\ManagedWebSocket.cs">
-      <Link>Common\System\Net\WebSockets\ManagedWebSocket.cs</Link>
+             Link="Common\System\Net\WebSockets\ManagedWebSocket.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\WebSockets\WebSocketValidate.cs">
-      <Link>Common\System\Net\WebSockets\WebSocketValidate.cs</Link>
+             Link="Common\System\Net\WebSockets\WebSocketValidate.cs">
     </Compile>
     <Compile Include="System\Net\WebSockets\ManagedWebSocket.netstandard.cs" />
     <Compile Include="System\Net\WebSockets\ManagedWebSocketExtensions.cs" />
@@ -42,4 +42,4 @@
     <Reference Include="System.Threading.Tasks.Extensions" />
     <Reference Include="System.Threading.Timer" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj
index 733a903456852..5a06c7717ec00 100644
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/tests/System.Net.WebSockets.WebSocketProtocol.Tests.csproj
@@ -4,17 +4,17 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketCreateTest.cs">
-      <Link>Common\System\Net\WebSockets\WebSocketCreateTest.cs</Link>
+             Link="Common\System\Net\WebSockets\WebSocketCreateTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.WebSockets.cs">
-      <Link>Common\System\Net\Configuration.WebSockets.cs</Link>
+             Link="Common\System\Net\Configuration.WebSockets.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
     <Compile Include="WebSocketProtocolTests.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj
index 06f9a2cf0c80b..05c857fb40109 100644
--- a/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj
+++ b/src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj
@@ -18,10 +18,10 @@
     <Compile Include="System\Net\WebSockets\WebSocketReceiveResult.cs" />
     <Compile Include="System\Net\WebSockets\WebSocketState.cs" />
     <Compile Include="$(CommonPath)System\Net\WebSockets\WebSocketValidate.cs">
-      <Link>Common\System\Net\WebSockets\WebSocketValidate.cs</Link>
+             Link="Common\System\Net\WebSockets\WebSocketValidate.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\WebSockets\ManagedWebSocket.cs">
-      <Link>Common\System\Net\WebSockets\ManagedWebSocket.cs</Link>
+             Link="Common\System\Net\WebSockets\ManagedWebSocket.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -38,4 +38,4 @@
     <Reference Include="System.Text.Encoding.Extensions" />
     <Reference Include="System.Threading" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
index 453ddb8ea157a..ead9d529feb52 100644
--- a/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
+++ b/src/libraries/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.csproj
@@ -7,16 +7,16 @@
     <Compile Include="WebSocketExceptionTests.cs" />
     <Compile Include="WebSocketReceiveResultTests.cs" />
     <Compile Include="$(CommonTestPath)System\Net\WebSockets\WebSocketCreateTest.cs">
-      <Link>Common\System\Net\WebSockets\WebSocketCreateTest.cs</Link>
+             Link="Common\System\Net\WebSockets\WebSocketCreateTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.cs">
-      <Link>Common\System\Net\Configuration.cs</Link>
+             Link="Common\System\Net\Configuration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Net\Configuration.WebSockets.cs">
-      <Link>Common\System\Net\Configuration.WebSockets.cs</Link>
+             Link="Common\System\Net\Configuration.WebSockets.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Net\HttpKnownHeaderNames.cs">
-      <Link>Common\System\Net\HttpKnownHeaderNames.cs</Link>
+             Link="Common\System\Net\HttpKnownHeaderNames.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
index 61d5ca2cc9cbf..05b2b891b1216 100644
--- a/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
+++ b/src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
@@ -4,22 +4,22 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerableTest.cs">
-      <Link>Common\System\CollectionsIEnumerableTest.cs</Link>
+             Link="Common\System\CollectionsIEnumerableTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollectionTest.cs">
-      <Link>Common\System\CollectionsICollectionTest.cs</Link>
+             Link="Common\System\CollectionsICollectionTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IListTest.cs">
-      <Link>Common\System\CollectionsIListTest.cs</Link>
+             Link="Common\System\CollectionsIListTest.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\Utils.cs">
-      <Link>Common\System\CollectionsUtils.cs</Link>
+             Link="Common\System\CollectionsUtils.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionaryTest.cs">
-      <Link>Common\System\CollectionsIDictionaryTest.cs</Link>
+             Link="Common\System\CollectionsIDictionaryTest.cs">
     </Compile>
     <Compile Include="ObservableCollection\ObservableCollection_ConstructorAndPropertyTests.cs" />
     <Compile Include="ObservableCollection\ObservableCollection_MethodsTest.cs" />
@@ -40,7 +40,7 @@
     <Compile Include="ReadOnlyObservableCollection\ReadOnlyObservableCollection_EventsTests.cs" />
     <Compile Include="ReadOnlyObservableCollection\ReadOnlyObservableCollectionTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -48,7 +48,7 @@
     <Compile Include="ReadOnlyDictionary\ReadOnlyDictionary_SerializationTests.cs" />
     <Compile Include="ReadOnlyObservableCollection\ReadOnlyObservableCollection_SerializationTests.cs" />
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
-      <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
+             Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
index 8fe6a6dca457c..65607cf851fe9 100644
--- a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
+++ b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -995,97 +995,97 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\WeakReference.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\WeakReference.T.cs" />
     <Compile Include="$(CommonPath)Interop\Interop.Libraries.cs">
-      <Link>Common\Interop\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Calendar.cs">
-      <Link>Common\Interop\Interop.Calendar.cs</Link>
+             Link="Common\Interop\Interop.Calendar.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
-      <Link>Common\Interop\Interop.Casing.cs</Link>
+             Link="Common\Interop\Interop.Casing.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
-      <Link>Common\Interop\Interop.Collation.cs</Link>
+             Link="Common\Interop\Interop.Collation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.ICU.cs">
-      <Link>Common\Interop\Interop.ICU.cs</Link>
+             Link="Common\Interop\Interop.ICU.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Idna.cs">
-      <Link>Common\Interop\Interop.Idna.cs</Link>
+             Link="Common\Interop\Interop.Idna.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Locale.cs">
-      <Link>Common\Interop\Interop.Locale.cs</Link>
+             Link="Common\Interop\Interop.Locale.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Normalization.cs">
-      <Link>Common\Interop\Interop.Normalization.cs</Link>
+             Link="Common\Interop\Interop.Normalization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.ResultCode.cs">
-      <Link>Common\Interop\Interop.ResultCode.cs</Link>
+             Link="Common\Interop\Interop.ResultCode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.TimeZoneInfo.cs">
-      <Link>Common\Interop\Interop.TimeZoneInfo.cs</Link>
+             Link="Common\Interop\Interop.TimeZoneInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Utils.cs">
-      <Link>Common\Interop\Interop.Utils.cs</Link>
+             Link="Common\Interop\Interop.Utils.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Interop.Errors.cs</Link>
+             Link="Common\Interop\Interop.Errors.cs">
     </Compile>
     <!-- The CLR internally uses a BOOL type analogous to the Windows BOOL type on Unix -->
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Globalization.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.Globalization.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.Globalization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ResolveLocaleName.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ResolveLocaleName.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ResolveLocaleName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Normaliz\Interop.Idna.cs">
-      <Link>Common\Interop\Windows\Normaliz\Interop.Idna.cs</Link>
+             Link="Common\Interop\Windows\Normaliz\Interop.Idna.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Normaliz\Interop.Normalization.cs">
-      <Link>Common\Interop\Windows\Normaliz\Interop.Normalization.cs</Link>
+             Link="Common\Interop\Windows\Normaliz\Interop.Normalization.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HResults.cs">
-      <Link>Common\System\HResults.cs</Link>
+             Link="Common\System\HResults.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Collections\Generic\ReferenceEqualityComparer.cs">
-      <Link>Common\System\Collections\Generic\ReferenceEqualityComparer.cs</Link>
+             Link="Common\System\Collections\Generic\ReferenceEqualityComparer.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs">
-      <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link>
+             Link="Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\StreamHelpers.CopyValidation.cs">
-      <Link>Common\System\IO\StreamHelpers.CopyValidation.cs</Link>
+             Link="Common\System\IO\StreamHelpers.CopyValidation.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+             Link="Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\Versioning\NonVersionableAttribute.cs">
-      <Link>Common\System\Runtime\Versioning\NonVersionableAttribute.cs</Link>
+             Link="Common\System\Runtime\Versioning\NonVersionableAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\StringBuilderCache.cs">
-      <Link>Common\System\Text\StringBuilderCache.cs</Link>
+             Link="Common\System\Text\StringBuilderCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ActivityControl.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.ActivityControl.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.ActivityControl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EtwEnableCallback.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.EtwEnableCallback.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.EtwEnableCallback.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EVENT_INFO_CLASS.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.EVENT_INFO_CLASS.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.EVENT_INFO_CLASS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.HostPolicy.cs">
-      <Link>Common\Interop\Interop.HostPolicy.cs</Link>
+             Link="Common\Interop\Interop.HostPolicy.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\Tracing\ActivityTracker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\Tracing\DiagnosticCounter.cs" />
@@ -1146,7 +1146,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\Common\src\System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -1182,334 +1182,334 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventActivityIdControl.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.EventActivityIdControl.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.EventActivityIdControl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventRegister.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.EventRegister.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.EventRegister.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventSetInformation.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.EventSetInformation.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.EventSetInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventTraceGuidsEx.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.EventTraceGuidsEx.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.EventTraceGuidsEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventUnregister.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.EventUnregister.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.EventUnregister.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventWriteString.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.EventWriteString.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.EventWriteString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EventWriteTransfer.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.EventWriteTransfer.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.EventWriteTransfer.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LookupAccountNameW.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.LookupAccountNameW.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.LookupAccountNameW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegCloseKey.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegCloseKey.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegCloseKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegCreateKeyEx.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegCreateKeyEx.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegCreateKeyEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegDeleteKeyEx.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegDeleteKeyEx.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegDeleteKeyEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegDeleteValue.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegDeleteValue.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegDeleteValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegEnumKeyEx.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegEnumKeyEx.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegEnumKeyEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegEnumValue.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegEnumValue.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegEnumValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegFlushKey.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegFlushKey.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegFlushKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegistryConstants.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegistryConstants.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegistryConstants.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegOpenKeyEx.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegOpenKeyEx.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegOpenKeyEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegQueryValueEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegSetValueEx.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.RegSetValueEx.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.RegSetValueEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptGenRandom.GetRandomBytes.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptGenRandom.GetRandomBytes.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptGenRandom.GetRandomBytes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptProtectMemory.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptProtectMemory.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptProtectMemory.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOLEAN.cs">
-      <Link>Common\Interop\Windows\Interop.BOOLEAN.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOLEAN.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CancelIoEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CancelIoEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CancelIoEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CompletionPort.cs" Condition="'$(FeaturePortableThreadPool)' == 'true'">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CompletionPort.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CompletionPort.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CreateFile.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CreateFile.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CreateFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ExpandEnvironmentStrings.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ExpandEnvironmentStrings.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ExpandEnvironmentStrings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FILE_STANDARD_INFO.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FILE_STANDARD_INFO.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FILE_STANDARD_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FILE_TIME.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FILE_TIME.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FILE_TIME.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileAttributes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FileAttributes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FileAttributes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileTimeToSystemTime.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FileTimeToSystemTime.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FileTimeToSystemTime.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FileTypes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FileTypes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FileTypes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FindClose.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FindClose.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FindClose.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FindFirstFileEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FindFirstFileEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FindFirstFileEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FlushFileBuffers.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GenericOperations.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GenericOperations.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GenericOperations.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GET_FILEEX_INFO_LEVELS.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GET_FILEEX_INFO_LEVELS.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GET_FILEEX_INFO_LEVELS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetComputerName.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetComputerName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCPInfo.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCPInfo.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCPInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentDirectory.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentDirectory.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCurrentDirectory.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetCurrentProcessId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetFileAttributesEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetFileAttributesEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetFileAttributesEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetFileInformationByHandleEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetFileInformationByHandleEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetFileInformationByHandleEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetFileType_SafeHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetFullPathNameW.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetFullPathNameW.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetFullPathNameW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetLogicalDrives.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetLogicalDrives.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetLogicalDrives.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetLongPathNameW.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetLongPathNameW.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetLongPathNameW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcessMemoryInfo.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessMemoryInfo.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcessMemoryInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetProcessTimes_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetProcessTimes_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetProcessTimes_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetSystemDirectoryW.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetSystemDirectoryW.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetSystemDirectoryW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetSystemInfo.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetSystemInfo.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetSystemInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetSystemTime.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetSystemTime.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetSystemTime.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetSystemTimeAsFileTime.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetSystemTimeAsFileTime.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetSystemTimeAsFileTime.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetSystemTimePreciseAsFileTime.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetSystemTimePreciseAsFileTime.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetSystemTimePreciseAsFileTime.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetSystemTimes.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetSystemTimes.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetSystemTimes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetTempFileNameW.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetTempFileNameW.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetTempFileNameW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetTempPathW.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetTempPathW.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetTempPathW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.IsWow64Process_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.IsWow64Process_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.IsWow64Process_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LoadLibraryEx_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.LoadLibraryEx_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LockFile.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.LockFile.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.LockFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MAX_PATH.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MAX_PATH.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MAX_PATH.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MemOptions.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MemOptions.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MemOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFORMATION.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFORMATION.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MEMORY_BASIC_INFORMATION.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MEMORYSTATUSEX.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MEMORYSTATUSEX.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MEMORYSTATUSEX.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MUI.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MUI.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MUI.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MultiByteToWideChar.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.OutputDebugString.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.OutputDebugString.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.OutputDebugString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.QueryPerformanceCounter.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.QueryPerformanceCounter.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.QueryPerformanceCounter.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.QueryPerformanceFrequency.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.QueryPerformanceFrequency.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.QueryPerformanceFrequency.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.QueryUnbiasedInterruptTime.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.QueryUnbiasedInterruptTime.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.QueryUnbiasedInterruptTime.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_NativeOverlapped.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SECURITY_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SecurityOptions.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SecurityOptions.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SecurityOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetCurrentDirectory.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetCurrentDirectory.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetCurrentDirectory.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetEndOfFile.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetEndOfFile.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetEndOfFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetFilePointerEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetFilePointerEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetFilePointerEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetThreadErrorMode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SystemTimeToFileTime.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SystemTimeToFileTime.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SystemTimeToFileTime.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.TimeZone.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.TimeZone.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.TimeZone.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.TimeZone.Registry.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.TimeZone.Registry.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.TimeZone.Registry.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.TzSpecificLocalTimeToSystemTime.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.TzSpecificLocalTimeToSystemTime.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.TzSpecificLocalTimeToSystemTime.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.VerifyVersionExW.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.VerifyVersionExW.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.VerifyVersionExW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.VerSetConditionMask.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.VerSetConditionMask.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.VerSetConditionMask.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.VirtualAlloc_Ptr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.VirtualAlloc_Ptr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.VirtualAlloc_Ptr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.VirtualFree.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.VirtualFree.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.VirtualFree.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.VirtualQuery_Ptr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.VirtualQuery_Ptr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.VirtualQuery_Ptr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WIN32_FILE_ATTRIBUTE_DATA.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WIN32_FILE_ATTRIBUTE_DATA.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WIN32_FILE_ATTRIBUTE_DATA.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WIN32_FIND_DATA.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WIN32_FIND_DATA.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WIN32_FIND_DATA.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_NativeOverlapped.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.NtQueryInformationFile.cs">
-      <Link>Common\Interop\Windows\NtDll\Interop.NtQueryInformationFile.cs</Link>
+             Link="Common\Interop\Windows\NtDll\Interop.NtQueryInformationFile.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.NtQuerySystemInformation.cs">
-      <Link>Common\Interop\Windows\NtDll\Interop.NtQuerySystemInformation.cs</Link>
+             Link="Common\Interop\Windows\NtDll\Interop.NtQuerySystemInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.RtlGetVersion.cs">
-      <Link>Common\Interop\Windows\NtDll\Interop.RtlGetVersion.cs</Link>
+             Link="Common\Interop\Windows\NtDll\Interop.RtlGetVersion.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.SYSTEM_LEAP_SECOND_INFORMATION.cs">
-      <Link>Common\Interop\Windows\NtDll\Interop.SYSTEM_LEAP_SECOND_INFORMATION.cs</Link>
+             Link="Common\Interop\Windows\NtDll\Interop.SYSTEM_LEAP_SECOND_INFORMATION.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoCreateGuid.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.CoCreateGuid.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.CoCreateGuid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Secur32\Interop.GetUserNameExW.cs">
-      <Link>Common\Interop\Windows\Secur32\Interop.GetUserNameExW.cs</Link>
+             Link="Common\Interop\Windows\Secur32\Interop.GetUserNameExW.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Shell32\Interop.SHGetKnownFolderPath.cs">
-      <Link>Common\Interop\Windows\Shell32\Interop.SHGetKnownFolderPath.cs</Link>
+             Link="Common\Interop\Windows\Shell32\Interop.SHGetKnownFolderPath.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\User32\Interop.Constants.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.Constants.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.LoadString.cs">
-      <Link>Common\Interop\Windows\User32\Interop.LoadString.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.LoadString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.SendMessageTimeout.cs">
-      <Link>Common\Interop\Windows\User32\Interop.SendMessageTimeout.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.SendMessageTimeout.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetProcessWindowStation.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetProcessWindowStation.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetProcessWindowStation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.GetUserObjectInformation.cs">
-      <Link>Common\Interop\Windows\User32\Interop.GetUserObjectInformation.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.GetUserObjectInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.USEROBJECTFLAGS.cs">
-      <Link>Common\Interop\Windows\User32\Interop.USEROBJECTFLAGS.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.USEROBJECTFLAGS.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Internal\IO\File.Windows.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Internal\Win32\RegistryKey.cs" />
@@ -1567,49 +1567,49 @@
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' or '$(FeatureCoreCLR)'=='true'">
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\SafeHandles\SafeWaitHandle.Windows.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.SysAllocStringLen.cs">
-      <Link>Common\Interop\Windows\OleAut32\Interop.SysAllocStringLen.cs</Link>
+             Link="Common\Interop\Windows\OleAut32\Interop.SysAllocStringLen.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\OleAut32\Interop.SysFreeString.cs">
-      <Link>Common\Interop\Windows\OleAut32\Interop.SysFreeString.cs</Link>
+             Link="Common\Interop\Windows\OleAut32\Interop.SysFreeString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Constants.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.Constants.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.Constants.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.EventWaitHandle.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.EventWaitHandle.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.EventWaitHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetEnvironmentVariable.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetEnvironmentVariable.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetEnvironmentVariable.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetEnvironmentStrings.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetEnvironmentStrings.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetEnvironmentStrings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FreeEnvironmentStrings.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FreeEnvironmentStrings.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FreeEnvironmentStrings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Mutex.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.Mutex.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.Mutex.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.OSVERSIONINFOEX.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.OSVERSIONINFOEX.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.OSVERSIONINFOEX.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Semaphore.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.Semaphore.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.Semaphore.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SetEnvironmentVariable.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SetEnvironmentVariable.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SetEnvironmentVariable.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WriteFile_SafeHandle_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\Win32Marshal.cs">
-      <Link>Common\System\IO\Win32Marshal.cs</Link>
+             Link="Common\System\IO\Win32Marshal.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)System\Environment.Variables.Windows.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Mutex.Windows.cs" />
@@ -1623,115 +1623,115 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs">
-      <Link>Common\Interop\Unix\Interop.IOErrors.cs</Link>
+             Link="Common\Interop\Unix\Interop.IOErrors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Access.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Access.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Access.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ChDir.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.ChDir.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.ChDir.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Close.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Close.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.FLock.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.FLock.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.FLock.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.FSync.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.FSync.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.FSync.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.FTruncate.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.FTruncate.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.FTruncate.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetCpuUtilization.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetCpuUtilization.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetCpuUtilization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetCwd.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetCwd.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetCwd.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetEUid.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetEUid.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetEUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetHostName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetHostName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetHostName.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.GetPid.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetPid.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetPid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPwUid.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetPwUid.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetPwUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetRandomBytes.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetRandomBytes.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetRandomBytes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetSystemTimeAsTicks.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetSystemTimeAsTicks.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetSystemTimeAsTicks.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetTimestamp.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetTimestamp.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetTimestamp.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetUnixName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetUnixName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetUnixName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetUnixRelease.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetUnixRelease.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetUnixRelease.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.LockFileRegion.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.LockFileRegion.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.LockFileRegion.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.LSeek.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.LSeek.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.LSeek.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MksTemps.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.MksTemps.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.MksTemps.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.MountPoints.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.MountPoints.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.MountPoints.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Open.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Open.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Open.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.OpenFlags.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.OpenFlags.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.OpenFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PathConf.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.PathConf.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.PathConf.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Permissions.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Permissions.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Permissions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PosixFAdvise.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.PosixFAdvise.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.PosixFAdvise.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Read.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Read.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Read.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ReadDir.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.ReadDir.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.ReadDir.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ReadLink.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.ReadLink.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.ReadLink.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Stat.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Stat.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SysConf.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SysConf.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SysConf.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SysLog.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.SysLog.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.SysLog.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Unlink.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Unlink.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Unlink.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Write.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Write.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Write.cs">
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Internal\IO\File.Unix.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\SafeHandles\SafeFileHandle.Unix.cs" />
diff --git a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
index 951b720326973..5e68269fa284f 100644
--- a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
+++ b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
@@ -18,10 +18,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
     <Compile Include="$(RuntimeSerializationSources)\Attributes.cs" />
     <Compile Include="$(RuntimeSerializationSources)\CodeGenerator.cs" />
diff --git a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
index 1f88c208e95f0..ea6d6fefbd0f9 100644
--- a/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
+++ b/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Collections\Generic\ArrayBuilder.cs">
-      <Link>Common\System\Collections\Generic\ArrayBuilder.cs</Link>
+             Link="Common\System\Collections\Generic\ArrayBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -38,7 +38,7 @@
     <Compile Include="System\UriScheme.cs" />
     <Compile Include="System\UriSyntax.cs" />
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
@@ -50,4 +50,4 @@
   <ItemGroup>
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj b/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj
index f1f97bbd7e89e..7fa240a072d62 100644
--- a/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj
+++ b/src/libraries/System.Private.Uri/tests/UnitTests/System.Private.Uri.Unit.Tests.csproj
@@ -16,10 +16,10 @@
     <Compile Include="..\..\src\System\IriHelper.cs" />
     <Compile Include="..\..\src\System\UriEnumTypes.cs" />
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj
index 55c377e763119..f5de47d09e753 100644
--- a/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj
+++ b/src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj
@@ -7,10 +7,10 @@
   <ItemGroup>
     <ProjectReference Include="..\..\System.Private.Xml\src\System.Private.Xml.csproj" />
     <Compile Include="$(CommonPath)System\Collections\Generic\EnumerableHelpers.cs">
-      <Link>Common\System\Collections\Generic\EnumerableHelpers.cs</Link>
+             Link="Common\System\Collections\Generic\EnumerableHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\StringBuilderCache.cs">
-      <Link>Common\System\Text\StringBuilderCache.cs</Link>
+             Link="Common\System\Text\StringBuilderCache.cs">
     </Compile>
     <Compile Include="System\Xml\Linq\BaseUriAnnotation.cs" />
     <Compile Include="System\Xml\Linq\Extensions.cs" />
diff --git a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
index 27fc4e7023b8e..4caf511ef1196 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/System.Xml.Linq.TreeManipulation.Tests.csproj
@@ -4,10 +4,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs">
-      <Link>Common\System\Collections\DictionaryExtensions.cs</Link>
+             Link="Common\System\Collections\DictionaryExtensions.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="AddFirstAddFirstIntoDocument.cs" />
     <Compile Include="AddFirstInvalidIntoXDocument.cs" />
@@ -56,4 +56,4 @@
     <ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" />
     <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
index 87a3ba557100a..056d4bfe17551 100644
--- a/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
+++ b/src/libraries/System.Private.Xml.Linq/tests/xNodeBuilder/System.Xml.Linq.xNodeBuilder.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\DictionaryExtensions.cs">
-      <Link>Common\System\Collections\DictionaryExtensions.cs</Link>
+             Link="Common\System\Collections\DictionaryExtensions.cs">
     </Compile>
     <Compile Include="CommonTests.cs" />
     <Compile Include="EndOfLineHandlingTests.cs" />
@@ -25,4 +25,4 @@
     <ProjectReference Include="..\XDocument.Common\XDocument.Common.csproj" />
     <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
index c0215be859644..4459d9db19f60 100644
--- a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
+++ b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Text\StringBuilderCache.cs">
-      <Link>Common\System\StringBuilderCache.cs</Link>
+             Link="Common\System\StringBuilderCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Marvin.cs">
-      <Link>Common\System\Marvin.cs</Link>
+             Link="Common\System\Marvin.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
     <Compile Include="System\Xml\BinaryXml\XmlBinaryReader.cs" />
     <Compile Include="System\Xml\BinaryXml\BinXmlToken.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj
index a3beda715d3df..5368493e40fb1 100644
--- a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <Compile Include="XmlDocumentTests\LoadTests.cs" />
     <Compile Include="XmlAttributeCollectionTests\AppendTests.cs" />
diff --git a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
index b28cbb68ef06e..1a3cab1cb9f45 100644
--- a/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
@@ -8,7 +8,7 @@
     <Compile Include="BaseUriTests.cs" />
     <Compile Include="ReaderEncodingTests.cs" />
     <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs">
-      <Link>Common\System\Threading\TrackingSynchronizationContext.cs</Link>
+             Link="Common\System\Threading\TrackingSynchronizationContext.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj
index c7b6e43f2f4ab..a6651ca65c30b 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/System.Xml.XmlSchemaSet.Tests.csproj
@@ -35,7 +35,7 @@
     <Compile Include="TC_SchemaSet_XmlNameTable.cs" />
     <Compile Include="TC_SchemaSet_XmlResolver.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">
-      <Link>Common\System\IO\TempDirectory.cs</Link>
+             Link="Common\System\IO\TempDirectory.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -44,4 +44,4 @@
           CopyToOutputDirectory="PreserveNewest"
           Visible="false" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj
index b79f7360072da..00a8e719e4256 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj
+++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj
@@ -21,7 +21,7 @@
     <Compile Include="XmlTestSettings.cs" />
     <Compile Include="CXmlTestResolver.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">
-      <Link>Common\System\IO\TempDirectory.cs</Link>
+             Link="Common\System\IO\TempDirectory.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -30,4 +30,4 @@
           CopyToOutputDirectory="PreserveNewest"
           Visible="false" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj b/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
index b57517632ecae..bd489daa833d8 100644
--- a/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
+++ b/src/libraries/System.Reflection.DispatchProxy/src/System.Reflection.DispatchProxy.csproj
@@ -12,7 +12,7 @@
     <Compile Include="System\Reflection\DispatchProxy.cs" />
     <Compile Include="System\Reflection\DispatchProxyGenerator.cs" />
     <Compile Include="$(CommonPath)System\Reflection\Emit\IgnoreAccessChecksToAttributeBuilder.cs">
-      <Link>Common\System\Reflection\Emit\IgnoreAccessChecksToAttributeBuilder.cs</Link>
+             Link="Common\System\Reflection\Emit\IgnoreAccessChecksToAttributeBuilder.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
@@ -33,4 +33,4 @@
     <Reference Include="System.Runtime" />
     <Reference Include="System.Threading" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
index e2054078129e7..f4d76758dad8f 100644
--- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
+++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.ReadFile_SafeHandle_IntPtr.cs">
     </Compile>
     <Compile Include="System\Reflection\Internal\Utilities\PinnedObject.cs" />
     <Compile Include="System\Reflection\Internal\Utilities\CriticalDisposableObject.cs" Condition="'$(TargetFramework)' != 'netstandard1.1'" />
diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
index 73119be2190f9..81f13fe85ece2 100644
--- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
+++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
@@ -7,22 +7,22 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FreeLibrary.cs">
-      <Link>Common\Interop\Windows\Interop.FreeLibrary.cs</Link>
+             Link="Common\Interop\Windows\Interop.FreeLibrary.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetModuleHandle.cs">
-      <Link>Common\Interop\Windows\Interop.GetModuleHandle.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetModuleHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.LoadLibraryEx.cs">
-      <Link>Common\Interop\Windows\Interop.LoadLibraryEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.LoadLibraryEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="Metadata\BlobContentIdTests.cs" />
     <Compile Include="Metadata\BlobTests.cs" />
@@ -141,4 +141,4 @@
     <DefaultReferenceExclusions Include="System.Reflection.Metadata" />
     <ReferenceFromRuntime Include="System.Reflection.Metadata" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj
index 346761c5ded63..9d14c1802cec3 100644
--- a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj
+++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj
@@ -5,10 +5,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\TempDirectory.cs">
-      <Link>Common\System\IO\TempDirectory.cs</Link>
+             Link="Common\System\IO\TempDirectory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="src\SampleMetadata\SampleMetadata.cs" />
     <Compile Include="src\Tests\Assembly\AssemblyGetNameTests.cs" />
@@ -71,4 +71,4 @@
     <Compile Include="src\TestUtils\TestUtils.JittedRuntimes.cs" />
     <Compile Include="src\TestUtils\TypeWrapper.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
index bc9f91e515bcd..73a1009ddc6aa 100644
--- a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
+++ b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj
@@ -8,12 +8,12 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Reflection\MockParameterInfo.cs">
-      <Link>Common\System\Reflection\MockParameterInfo.cs</Link>
-    </Compile>    
+             Link="Common\System\Reflection\MockParameterInfo.cs">
+    </Compile>
     <Compile Include="$(CommonTestPath)System\MockType.cs" Link="Common\System\MockType.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
-    </Compile>    
+             Link="Common\System\IO\TempFile.cs">
+    </Compile>
     <Compile Include="AssemblyNameTests.cs" />
     <Compile Include="AssemblyTests.cs" />
     <Compile Include="ConstructorInfoTests.cs" />
@@ -65,4 +65,4 @@
     <ProjectReference Include="TestExe\System.Reflection.TestExe.csproj" />
     <ProjectReference Include="TestAssembly\TestAssembly.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
index 87e65b381d465..23b1af6785142 100644
--- a/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
+++ b/src/libraries/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.csproj
@@ -19,7 +19,7 @@
     <Compile Include="MissingSatelliteAssemblyException.cs" />
     <Compile Include="ResourceSetTests.cs" />
     <Compile Include="$(CommonTestPath)System\Drawing\Helpers.cs">
-      <Link>Common\System\Drawing\Helpers.cs</Link>
+             Link="Common\System\Drawing\Helpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -55,7 +55,7 @@
     <None Include="Resources\icon.ico"
           Link="%(Filename)%(Extension)"
           CopyToOutputDirectory="PreserveNewest"
-          Visible="false" />          
+          Visible="false" />
   </ItemGroup>
   <!--
     MSBuild on .NET Core doesn't support non-string resources. See https://github.com/Microsoft/msbuild/issues/2221
@@ -70,4 +70,4 @@
 
     <Exec Command="resgen.exe %(_WorkaroundCoreMSBuildResource.Identity) $(_ResourceOutputName)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj
index 306b4b72c7585..e72a332604da4 100644
--- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj
+++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj
@@ -53,13 +53,13 @@
     <Compile Include="System\Runtime\Caching\MemoryMonitor.Windows.cs" />
     <Compile Include="System\Runtime\Caching\PhysicalMemoryMonitor.Windows.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GlobalMemoryStatusEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MEMORYSTATUSEX.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.MEMORYSTATUSEX.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.MEMORYSTATUSEX.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' != 'true'">
@@ -68,4 +68,4 @@
   <ItemGroup>
     <Reference Include="System.Configuration.ConfigurationManager" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
index fb959a4a8fadc..3fe9c9b0c42a9 100644
--- a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
+++ b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
@@ -74,19 +74,19 @@
     <Compile Include="System\Runtime\CompilerServices\SwitchExpressionExceptionTests.cs" />
 
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetNodeName.cs" Condition="'$(TargetsUnix)' == 'true'">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetNodeName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetNodeName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\PathFeatures.cs">
-      <Link>Common\System\IO\PathFeatures.cs</Link>
+             Link="Common\System\IO\PathFeatures.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\ShouldNotBeInvokedException.cs">
-      <Link>Common\System\ShouldNotBeInvokedException.cs</Link>
+             Link="Common\System\ShouldNotBeInvokedException.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>Common\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="Common\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -96,4 +96,4 @@
     <ProjectReference Include="TestApp\TestApp.csproj" />
     <ProjectReference Include="TargetFrameworkNameTestApp\TargetFrameworkNameTestApp.csproj" Condition="'$(TargetsNetCoreApp)' == 'true'" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
index 4536cd4853ea0..7cbbcacbe7976 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/src/System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -13,37 +13,37 @@
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="System\Runtime\InteropServices\RuntimeInformation\RuntimeInformation.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetUnixName.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetUnixName.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetUnixName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetUnixVersion.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetUnixVersion.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetUnixVersion.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetOSArchitecture.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetOSArchitecture.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetOSArchitecture.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetProcessArchitecture.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.GetProcessArchitecture.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.GetProcessArchitecture.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ProcessorArchitecture.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.ProcessorArchitecture.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.ProcessorArchitecture.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="System\Runtime\InteropServices\RuntimeInformation\RuntimeInformation.Windows.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetNativeSystemInfo.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetNativeSystemInfo.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetNativeSystemInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.SYSTEM_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetSystemInfo.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.GetSystemInfo.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.GetSystemInfo.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -53,4 +53,4 @@
     <Reference Include="System.Runtime.InteropServices" />
     <Reference Include="System.Threading" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
index d2db26f29416e..827e81fa4200b 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
@@ -9,7 +9,7 @@
     <Compile Include="RuntimeIdentifierTests.cs" />
     <Compile Include="DescriptionNameTests.cs" />
     <Compile Include="$(CommonPath)Interop\Linux\cgroups\Interop.cgroups.cs">
-      <Link>Common\Interop\Linux\Interop.cgroups.cs</Link>
+             Link="Common\Interop\Linux\Interop.cgroups.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
index da1195b134552..e8f0e0358cc95 100644
--- a/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
+++ b/src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\HResults.cs">
-      <Link>Common\System\HResults.cs</Link>
+             Link="Common\System\HResults.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Ole32\Interop.CoGetStandardMarshal.cs">
-      <Link>Common\Interop\Windows\Ole32\Interop.CoGetStandardMarshal.cs</Link>
+             Link="Common\Interop\Windows\Ole32\Interop.CoGetStandardMarshal.cs">
     </Compile>
     <Compile Include="System\Runtime\CompilerServices\IDispatchConstantAttribute.cs" />
     <Compile Include="System\Runtime\CompilerServices\IUnknownConstantAttribute.cs" />
@@ -65,4 +65,4 @@
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
     <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
index db7fd3040892d..62c8f8f347b86 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.csproj
@@ -56,7 +56,7 @@
     <Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryParser.cs" />
     <Compile Include="System\Runtime\Serialization\Formatters\Binary\BinaryUtilClasses.cs" />
     <Compile Include="$(CoreLibSharedDir)System\Collections\HashHelpers.cs">
-      <Link>Common\System\Collections\HashHelpers.cs</Link>
+             Link="Common\System\Collections\HashHelpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -67,4 +67,4 @@
     <ProjectReference Include="..\..\System.Collections.Concurrent\src\System.Collections.Concurrent.csproj" />
     <ProjectReference Include="..\..\System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
index 51a2cffae4811..20fe2d1a48024 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
@@ -22,18 +22,18 @@
     <Compile Include="TargetFrameworkMoniker.cs" />
     <Compile Include="TypeSerializableValue.cs" />
     <Compile Include="$(CommonTestPath)System\Drawing\Helpers.cs">
-      <Link>Common\System\Drawing\Helpers.cs</Link>
+             Link="Common\System\Drawing\Helpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\NonRuntimeType.cs">
-      <Link>Common\System\NonRuntimeType.cs</Link>
+             Link="Common\System\NonRuntimeType.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
-      <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
+             Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' != 'true'">
     <Compile Include="$(CommonPath)System\Collections\Generic\ReferenceEqualityComparer.cs">
-      <Link>Common\System\Collections\Generic\ReferenceEqualityComparer.cs</Link>
+             Link="Common\System\Collections\Generic\ReferenceEqualityComparer.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj
index e75ceed5c5134..abc2e9b6dc316 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/Canonicalization/System.Runtime.Serialization.Xml.Canonicalization.csproj
@@ -8,7 +8,7 @@
     <Compile Include="$(TestSourceFolder)TestConfigHelper.cs" />
     <Compile Include="$(TestSourceFolder)XmlCanonicalizationTest.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="CryptoCanonicalization\AncestralNamespaceContextProviderProxy.cs" />
     <Compile Include="CryptoCanonicalization\CanonicalEncoder.cs" />
@@ -67,4 +67,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj
index e94ffdde67a59..b0509647ce3e9 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj
@@ -13,10 +13,10 @@
     <Compile Include="$(TestSourceFolder)..\XmlDictionaryReaderTests.cs" />
     <Compile Include="$(TestSourceFolder)..\XmlDictionaryWriterTest.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\DataContractSerializerHelper.cs">
-      <Link>Common\System\Runtime\Serialization\DataContractSerializerHelper.cs</Link>
+             Link="Common\System\Runtime\Serialization\DataContractSerializerHelper.cs">
     </Compile>
     <Compile Include="$(TestSourceFolder)..\SerializationTestTypes\ObjRefSample.cs">
       <Link>SerializationTestTypes\ObjRefSample.cs</Link>
@@ -61,4 +61,4 @@
       <Link>SerializationTestTypes\SelfRefAndCycles.cs</Link>
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
index 6be96a664a569..27e4035d36257 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
+++ b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj
@@ -16,10 +16,10 @@
     <Compile Include="$(TestSourceFolder)SerializationTestTypes\DCRTypeLibrary.cs" />
     <Compile Include="$(TestSourceFolder)SerializationTestTypes\Primitives.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs">
-      <Link>Common\System\IO\TempFile.cs</Link>
+             Link="Common\System\IO\TempFile.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\DataContractSerializerHelper.cs">
-      <Link>Common\System\Runtime\Serialization\DataContractSerializerHelper.cs</Link>
+             Link="Common\System\Runtime\Serialization\DataContractSerializerHelper.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Utils.cs" />
     <Compile Include="$(TestSourceFolder)SerializationTestTypes\ObjRefSample.cs" />
@@ -32,4 +32,4 @@
     <Compile Include="SerializationTestTypes\SampleTypes.cs" />
     <Compile Include="SerializationTestTypes\SelfRefAndCycles.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj
index 99aded3293dee..614fdedb97a28 100644
--- a/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime.UI.Xaml/src/System.Runtime.WindowsRuntime.UI.Xaml.csproj
@@ -26,7 +26,7 @@
     <Compile Include="System\Windows\Media\Animation\RepeatBehavior.cs" />
     <Compile Include="System\Windows\Media\Media3D\Matrix3D.cs" />
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs">
-      <Link>Common\System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs</Link>
+             Link="Common\System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index 5b03245ecc137..43696533c0726 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -56,31 +56,31 @@
     <Compile Include="System\Windows\TokenizerHelper.cs" />
     <Compile Include="System\Windows\UI\Color.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Mincore\Interop.RoGetActivationFactory.cs">
-      <Link>Common\Interop\Windows\Mincore\Interop.RoGetActivationFactory.cs</Link>
+             Link="Common\Interop\Windows\Mincore\Interop.RoGetActivationFactory.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs">
-      <Link>Common\System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs</Link>
+             Link="Common\System\Runtime\InteropServices\WindowsRuntime\WindowsRuntimeImportAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.ResolveLocaleName.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.ResolveLocaleName.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.ResolveLocaleName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Mincore\Interop.RoGetBufferMarshaler.cs">
-      <Link>Common\Interop\Windows\Mincore\Interop.RoGetBufferMarshaler.cs</Link>
+             Link="Common\Interop\Windows\Mincore\Interop.RoGetBufferMarshaler.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\IO\Win32Marshal.cs">
-      <Link>Common\System\IO\Win32Marshal.cs</Link>
+             Link="Common\System\IO\Win32Marshal.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
diff --git a/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj b/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
index 48a9940abd8ff..8dd19704e10b2 100644
--- a/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
+++ b/src/libraries/System.Runtime/tests/NlsTests/System.Runtime.Nls.Tests.csproj
@@ -46,13 +46,13 @@
       <Link>System\Uri.MethodsTests.cs</Link>
     </Compile>
     <Compile Include="$(CommonTestPath)System\EnumTypes.cs">
-      <Link>Common\System\EnumTypes.cs</Link>
+             Link="Common\System\EnumTypes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\MockType.cs">
-      <Link>Common\System\MockType.cs</Link>
+             Link="Common\System\MockType.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)Tests\System\StringTests.cs">
-      <Link>Common\System\StringTests.cs</Link>
+             Link="Common\System\StringTests.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
index f517e557666bd..40016adc632bf 100644
--- a/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
+++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests.csproj
@@ -8,43 +8,43 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\EnumTypes.cs">
-      <Link>Common\System\EnumTypes.cs</Link>
+             Link="Common\System\EnumTypes.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\MockType.cs">
-      <Link>Common\System\MockType.cs</Link>
+             Link="Common\System\MockType.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\CollectionAsserts.cs">
-      <Link>Common\System\Collections\CollectionAsserts.cs</Link>
+             Link="Common\System\Collections\CollectionAsserts.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.Generic.Tests.cs">
-      <Link>Common\System\Collections\ICollection.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.Generic.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IList.Generic.Tests.cs">
-      <Link>Common\System\Collections\IList.Generic.Tests.cs</Link>
+             Link="Common\System\Collections\IList.Generic.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.Generic.cs">
-      <Link>Common\System\Collections\TestBase.Generic.cs</Link>
+             Link="Common\System\Collections\TestBase.Generic.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\TestBase.NonGeneric.cs">
-      <Link>Common\System\Collections\TestBase.NonGeneric.cs</Link>
+             Link="Common\System\Collections\TestBase.NonGeneric.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)Tests\System\StringTests.cs">
-      <Link>Common\System\StringTests.cs</Link>
+             Link="Common\System\StringTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IDictionary.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IDictionary.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IDictionary.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IList.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IList.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IList.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\ICollection.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\ICollection.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\ICollection.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.NonGeneric.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.NonGeneric.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.NonGeneric.Tests.cs">
     </Compile>
     <Compile Include="Helpers.cs" />
     <Compile Include="Microsoft\Win32\SafeHandles\CriticalHandleZeroOrMinusOneIsInvalid.cs" />
@@ -236,7 +236,7 @@
     <Compile Include="System\Type\TypeTests.cs" />
     <Compile Include="System\Type\TypeTests.Get.cs" />
     <Compile Include="$(CommonTestPath)System\RandomDataGenerator.cs">
-      <Link>Common\System\RandomDataGenerator.cs</Link>
+             Link="Common\System\RandomDataGenerator.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
@@ -263,7 +263,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Collections\IEnumerable.Generic.Serialization.Tests.cs">
-      <Link>Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs</Link>
+             Link="Common\System\Collections\IEnumerable.Generic.Serialization.Tests.cs">
     </Compile>
     <EmbeddedResource Include="System\Reflection\EmbeddedImage.png">
       <LogicalName>System.Reflection.Tests.EmbeddedImage.png</LogicalName>
@@ -272,7 +272,7 @@
       <LogicalName>System.Reflection.Tests.EmbeddedTextFile.txt</LogicalName>
     </EmbeddedResource>
     <Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
-      <Link>Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs</Link>
+             Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
index 4d82b1a50595d..eca9d5f78c14b 100644
--- a/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
+++ b/src/libraries/System.Security.AccessControl/src/System.Security.AccessControl.csproj
@@ -27,82 +27,82 @@
     <Compile Include="System\Security\Principal\Win32.cs" />
     <!-- PInvoke sources -->
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeTokenHandle.cs">
       <Link>Microsoft\Win32\SafeHandles\SafeTokenHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LUID.cs">
-      <Link>Common\Interop\Interop.LUID.cs</Link>
+             Link="Common\Interop\Interop.LUID.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LUID_AND_ATTRIBUTES.cs">
-      <Link>Common\Interop\Interop.LUID_AND_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Interop.LUID_AND_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.TOKEN_PRIVILEGE.cs">
-      <Link>Common\Interop\Interop.TOKEN_PRIVILEGE.cs</Link>
+             Link="Common\Interop\Interop.TOKEN_PRIVILEGE.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.SecurityImpersonationLevel.cs">
-      <Link>Common\Interop\Interop.SecurityImpersonationLevel.cs</Link>
+             Link="Common\Interop\Interop.SecurityImpersonationLevel.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Interop.Errors.cs</Link>
+             Link="Common\Interop\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ProcessOptions.cs">
-      <Link>Common\Interop\Interop.ProcessOptions.cs</Link>
+             Link="Common\Interop\Interop.ProcessOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LookupPrivilegeValue.cs">
-      <Link>Common\Interop\Interop.LookupPrivilegeValue.cs</Link>
+             Link="Common\Interop\Interop.LookupPrivilegeValue.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RevertToSelf.cs">
-      <Link>Common\Interop\Interop.RevertToSelf.cs</Link>
+             Link="Common\Interop\Interop.RevertToSelf.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ConvertSdToStringSd.cs">
-      <Link>Common\Interop\Interop.ConvertSdToStringSd.cs</Link>
+             Link="Common\Interop\Interop.ConvertSdToStringSd.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ConvertStringSdToSd.cs">
-      <Link>Common\Interop\Interop.ConvertStringSdToSd.cs</Link>
+             Link="Common\Interop\Interop.ConvertStringSdToSd.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetSecurityInfoByHandle.cs">
-      <Link>Common\Interop\Interop.GetSecurityInfoByHandle.cs</Link>
+             Link="Common\Interop\Interop.GetSecurityInfoByHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.SetSecurityInfoByHandle.cs">
-      <Link>Common\Interop\Interop.SetSecurityInfoByHandle.cs</Link>
+             Link="Common\Interop\Interop.SetSecurityInfoByHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetSecurityInfoByName.cs">
-      <Link>Common\Interop\Interop.GetSecurityInfoByName.cs</Link>
+             Link="Common\Interop\Interop.GetSecurityInfoByName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.SetSecurityInfoByName.cs">
-      <Link>Common\Interop\Interop.SetSecurityInfoByName.cs</Link>
+             Link="Common\Interop\Interop.SetSecurityInfoByName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetSecurityDescriptorLength.cs">
-      <Link>Common\Interop\Interop.GetSecurityDescriptorLength.cs</Link>
+             Link="Common\Interop\Interop.GetSecurityDescriptorLength.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenThreadToken_SafeTokenHandle.cs">
-      <Link>Common\Interop\Interop.OpenThreadToken_SafeTokenHandle.cs</Link>
+             Link="Common\Interop\Interop.OpenThreadToken_SafeTokenHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenProcessToken_IntPtr.cs">
-      <Link>Common\Interop\Interop.OpenProcessToken_IntPtrs.cs</Link>
+             Link="Common\Interop\Interop.OpenProcessToken_IntPtrs.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
-      <Link>Common\Interop\Interop.GetCurrentProcess_IntPtr.cs</Link>
+             Link="Common\Interop\Interop.GetCurrentProcess_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.SetThreadToken.cs">
-      <Link>Common\Interop\Interop.SetThreadToken.cs</Link>
+             Link="Common\Interop\Interop.SetThreadToken.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentThread.cs">
-      <Link>Common\Interop\Interop.GetCurrentThread.cs</Link>
+             Link="Common\Interop\Interop.GetCurrentThread.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.AdjustTokenPrivileges.cs">
-      <Link>Common\Interop\Interop.AdjustTokenPrivileges.cs</Link>
+             Link="Common\Interop\Interop.AdjustTokenPrivileges.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.DuplicateTokenEx_SafeTokenHandle.cs">
-      <Link>Common\Interop\Interop.DuplicateTokenEx_SafeTokenHandle.cs</Link>
+             Link="Common\Interop\Interop.DuplicateTokenEx_SafeTokenHandle.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' != 'true'">
@@ -120,4 +120,4 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="Microsoft.Win32.Primitives" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj
index 485f96ce4cf4a..9f2008406f0c2 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj
+++ b/src/libraries/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj
@@ -87,7 +87,7 @@
     <Compile Include="System\Security\Cryptography\TripleDES.cs" />
     <Compile Include="System\Security\Cryptography\XmlKeyHelper.cs" />
     <Compile Include="$(CommonPath)Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs">
-      <Link>Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs</Link>
+             Link="Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\BasicSymmetricCipher.cs">
       <Link>Internal\Cryptography\BasicSymmetricCipher.cs</Link>
@@ -99,7 +99,7 @@
       <Link>Internal\Cryptography\HashProvider.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\PemKeyImportHelpers.cs">
-      <Link>Common\Internal\Cryptography\PemKeyImportHelpers.cs</Link>
+             Link="Common\Internal\Cryptography\PemKeyImportHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\UniversalCryptoTransform.cs">
       <Link>Internal\Cryptography\UniversalCryptoTransform.cs</Link>
@@ -111,176 +111,176 @@
       <Link>Internal\Cryptography\UniversalCryptoDecryptor.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs">
-      <Link>Common\System\Memory\PointerMemoryManager.cs</Link>
+             Link="Common\System\Memory\PointerMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs">
-      <Link>Common\System\Security\Cryptography\CryptoPool.cs</Link>
+             Link="Common\System\Security\Cryptography\CryptoPool.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSAKeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\DSAKeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\DSAKeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\EccKeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\EccKeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\EccKeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeyBlobHelpers.cs">
-      <Link>Common\System\Security\Cryptography\KeyBlobHelpers.cs</Link>
+             Link="Common\System\Security\Cryptography\KeyBlobHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\KeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\KeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeySizeHelpers.cs">
-      <Link>Common\System\Security\Cryptography\KeySizeHelpers.cs</Link>
+             Link="Common\System\Security\Cryptography\KeySizeHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Oids.cs">
-      <Link>Common\System\Security\Cryptography\Oids.cs</Link>
+             Link="Common\System\Security\Cryptography\Oids.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\PasswordBasedEncryption.cs">
-      <Link>Common\System\Security\Cryptography\PasswordBasedEncryption.cs</Link>
+             Link="Common\System\Security\Cryptography\PasswordBasedEncryption.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\PemLabels.cs">
-      <Link>Common\System\Security\Cryptography\PemLabels.cs</Link>
+             Link="Common\System\Security\Cryptography\PemLabels.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Pkcs12Kdf.cs">
-      <Link>Common\System\Security\Cryptography\Pkcs12Kdf.cs</Link>
+             Link="Common\System\Security\Cryptography\Pkcs12Kdf.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSAKeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\RSAKeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\RSAKeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RsaPaddingProcessor.cs">
-      <Link>Common\System\Security\Cryptography\RsaPaddingProcessor.cs</Link>
+             Link="Common\System\Security\Cryptography\RsaPaddingProcessor.cs">
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\CurveAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\CurveAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\CurveAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\CurveAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\CurveAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\CurveAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\CurveAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\DssParms.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\DssParms.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DssParms.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\DssParms.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\DssParms.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DssParms.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\DssParms.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\ECDomainParameters.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\ECDomainParameters.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\ECPrivateKey.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\ECPrivateKey.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\FieldID.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\FieldID.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\FieldID.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\FieldID.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\FieldID.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\FieldID.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\FieldID.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PBEParameter.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PBEParameter.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBEParameter.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PBEParameter.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PBEParameter.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBEParameter.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PBEParameter.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PBES2Params.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PBES2Params.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBES2Params.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PBES2Params.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PBES2Params.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBES2Params.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PBES2Params.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2Params.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\SpecifiedECDomain.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\SpecifiedECDomain.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml</DependentUpon>
     </Compile>
   </ItemGroup>
@@ -310,58 +310,58 @@
       <Link>Internal\Cryptography\BasicSymmetricCipherBCrypt.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\AesBCryptModes.cs">
-      <Link>Common\Interop\Windows\BCrypt\AesBCryptModes.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\AesBCryptModes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Cng.cs">
-      <Link>Common\Interop\Windows\BCrypt\Cng.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Cng.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\BCrypt\Interop.BCryptImportKey.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptImportKey.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptImportKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\BCrypt\Interop.BCryptEncryptDecrypt.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptEncryptDecrypt.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptEncryptDecrypt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.Blobs.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.Blobs.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.Blobs.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.CreateCryptographicException.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.CreateCryptographicException.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.CreateCryptographicException.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptOpenAlgorithmProvider.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptOpenAlgorithmProvider.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptOpenAlgorithmProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptCloseAlgorithmProvider.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptCloseAlgorithmProvider.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptCloseAlgorithmProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptDestroyHash.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptDestroyHash.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptDestroyHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptCreateHash.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptCreateHash.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptCreateHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptHashData.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptHashData.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptHashData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptFinishHash.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptFinishHash.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptFinishHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.NCryptDeriveKeyMaterial.cs">
       <Link>Internal\Windows\NCrypt\Interop.NCryptDeriveKeyMaterial.cs</Link>
@@ -376,43 +376,43 @@
       <Link>Internal\Windows\BCrypt\BCryptAlgorithmCache.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\DESBCryptModes.cs">
-      <Link>Common\Interop\Windows\BCrypt\DESBCryptModes.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\DESBCryptModes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\RC2BCryptModes.cs">
-      <Link>Common\Interop\Windows\BCrypt\RC2BCryptModes.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\RC2BCryptModes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\TripleDesBCryptModes.cs">
-      <Link>Common\Interop\Windows\BCrypt\TripleDesBCryptModes.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\TripleDesBCryptModes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.HashIdAlg.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.HashIdAlg.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.HashIdAlg.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.AsymmetricPaddingMode.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.AsymmetricPaddingMode.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.AsymmetricPaddingMode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.ErrorCode.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.ErrorCode.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.ErrorCode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.EncryptDecrypt.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.EncryptDecrypt.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.EncryptDecrypt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.Keys.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.Keys.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.Keys.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.NCryptFreeObject.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.NCryptFreeObject.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.NCryptFreeObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.NCryptOpenStorageProvider.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.NCryptOpenStorageProvider.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.NCryptOpenStorageProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.Properties.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.ErrorCode.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.ErrorCode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.SignVerify.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.SignVerify.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs">
       <Link>Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs</Link>
@@ -445,150 +445,150 @@
       <Link>Internal\Windows\kernel32\Interop.FormatMessage.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CngPkcs8.cs">
-      <Link>Common\System\Security\Cryptography\CngPkcs8.cs</Link>
+             Link="Common\System\Security\Cryptography\CngPkcs8.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSACng.cs">
-      <Link>Common\System\Security\Cryptography\DSACng.cs</Link>
+             Link="Common\System\Security\Cryptography\DSACng.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSACng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\DSACng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\DSACng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSACng.SignVerify.cs">
-      <Link>Common\System\Security\Cryptography\DSACng.SignVerify.cs</Link>
+             Link="Common\System\Security\Cryptography\DSACng.SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECCng.HashAlgorithm.cs">
-      <Link>Common\System\Security\Cryptography\ECCng.HashAlgorithm.cs</Link>
+             Link="Common\System\Security\Cryptography\ECCng.HashAlgorithm.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECCng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\ECCng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\ECCng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanCng.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanCng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaCng.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaCng.HashData.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.HashData.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.HashData.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaCng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaCng.SignVerify.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.SignVerify.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSACng.cs">
-      <Link>Common\System\Security\Cryptography\RSACng.cs</Link>
+             Link="Common\System\Security\Cryptography\RSACng.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSACng.EncryptDecrypt.cs">
-      <Link>Common\System\Security\Cryptography\RSACng.EncryptDecrypt.cs</Link>
+             Link="Common\System\Security\Cryptography\RSACng.EncryptDecrypt.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSACng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\RSACng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\RSACng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSACng.SignVerify.cs">
-      <Link>Common\System\Security\Cryptography\RSACng.SignVerify.cs</Link>
+             Link="Common\System\Security\Cryptography\RSACng.SignVerify.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetstvOS)' != 'true'">
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Dsa.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Dsa.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Dsa.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.ImportExport.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.ImportExport.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EcKey.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcKey.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.EcKey.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.EcKey.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.EcKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Ecdh.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Ecdh.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Ecdh.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EVP.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EVP.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EVP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Hmac.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Hmac.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Hmac.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.RAND.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.RAND.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.RAND.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeDsaHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeDsaHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeDsaHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEcKeyHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeEcKeyHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeEcKeyHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEvpMdCtxHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeEvpMdCtxHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeEvpMdCtxHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHmacCtxHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHmacCtxHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeHmacCtxHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSAOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\DSAOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\DSAOpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanOpenSsl.Derive.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.Derive.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.Derive.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanOpenSslPublicKey.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanOpenSslPublicKey.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanOpenSslPublicKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaOpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\ECOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\ECOpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECOpenSsl.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\ECOpenSsl.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\ECOpenSsl.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSAOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\RSAOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\RSAOpenSsl.cs">
     </Compile>
     <Compile Include="Internal\Cryptography\AesImplementation.Unix.cs" />
     <Compile Include="Internal\Cryptography\DesImplementation.Unix.cs" />
@@ -603,88 +603,88 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFArray.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFData.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFData.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFError.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFError.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFError.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFString.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFString.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Digest.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Digest.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Digest.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ecc.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ecc.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ecc.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Hmac.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Hmac.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Hmac.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.KeyAgree.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.KeyAgree.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.KeyAgree.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.PAL_HashAlgorithm.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.PAL_HashAlgorithm.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.PAL_HashAlgorithm.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Random.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Random.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Random.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.RSA.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.RSA.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.RSA.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.Export.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.Export.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.Export.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Symmetric.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Symmetric.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Symmetric.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSASecurityTransforms.cs">
-      <Link>Common\System\Security\Cryptography\DSASecurityTransforms.cs</Link>
+             Link="Common\System\Security\Cryptography\DSASecurityTransforms.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\EccSecurityTransforms.cs">
-      <Link>Common\System\Security\Cryptography\EccSecurityTransforms.cs</Link>
+             Link="Common\System\Security\Cryptography\EccSecurityTransforms.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanSecurityTransforms.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanSecurityTransforms.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanSecurityTransforms.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaSecurityTransforms.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSASecurityTransforms.cs">
-      <Link>Common\System\Security\Cryptography\RSASecurityTransforms.cs</Link>
+             Link="Common\System\Security\Cryptography\RSASecurityTransforms.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\SecKeyPair.cs">
-      <Link>Common\System\Security\Cryptography\SecKeyPair.cs</Link>
+             Link="Common\System\Security\Cryptography\SecKeyPair.cs">
     </Compile>
     <Compile Include="Internal\Cryptography\AesImplementation.OSX.cs" />
     <Compile Include="Internal\Cryptography\AppleCCCryptor.cs" />
@@ -697,25 +697,25 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EVP.Cipher.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EVP.Cipher.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EVP.Cipher.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs">
-      <Link>Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs</Link>
+             Link="Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEvpCipherCtxHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeEvpCipherCtxHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeEvpCipherCtxHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanDerivation.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanDerivation.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanDerivation.cs">
     </Compile>
     <Compile Include="System\Security\Cryptography\AesCcm.Unix.cs" />
     <Compile Include="System\Security\Cryptography\AesGcm.Unix.cs" />
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj
index 8b648f3cc436c..45d493e09fc53 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj
@@ -4,97 +4,97 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\PositionValueStream.cs">
-      <Link>CommonTest\System\IO\PositionValueStream.cs</Link>
+             Link="CommonTest\System\IO\PositionValueStream.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\RandomDataGenerator.cs">
-      <Link>CommonTest\System\RandomDataGenerator.cs</Link>
+             Link="CommonTest\System\RandomDataGenerator.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.Data.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.Data.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.Data.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesContractTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesContractTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesContractTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesCornerTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesCornerTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesCornerTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesModeTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesModeTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesModeTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\CryptoUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\DecryptorReusability.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\DecryptorReusability.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\DecryptorReusability.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\AES\AesFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESCipherTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESCipherTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESCipherTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESReusabilityTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESReusabilityTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESReusabilityTests.cs">
     </Compile>
     <Compile Include="AesProvider.cs" />
     <Compile Include="AesTests.cs" />
@@ -131,7 +131,7 @@
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
     <Compile Include="DefaultECDsaProvider.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true' and '$(TargetsNetCoreApp)' == 'true'">
@@ -139,61 +139,61 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs">
     </Compile>
     <Compile Include="AesManagedTests.cs" />
     <Compile Include="AsymmetricSignatureFormatterTests.cs" />
@@ -225,73 +225,73 @@
     <Compile Include="Sha512ManagedTests.cs" />
     <Compile Include="SignatureDescriptionTests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AsymmetricSignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DES\DESCipherTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESCipherTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESCipherTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DES\DESFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DES\DesTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DesTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DesTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.NistValidation.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.NistValidation.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.NistValidation.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2CipherTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2CipherTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2CipherTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Tests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Tests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs">
     </Compile>
     <Compile Include="AesAEADTests.cs" />
     <Compile Include="AesCcmTests.cs" />
diff --git a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
index 0aae024d50dde..f289a5ed49651 100644
--- a/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
+++ b/src/libraries/System.Security.Cryptography.Cng/src/System.Security.Cryptography.Cng.csproj
@@ -71,13 +71,13 @@
     <Compile Include="Internal\Cryptography\SymmetricImportExportExtensions.cs" />
     <Compile Include="Internal\Cryptography\CngSymmetricAlgorithmCore.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\AesBCryptModes.cs">
-      <Link>Common\Interop\Windows\BCrypt\AesBCryptModes.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\AesBCryptModes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Cng.cs">
-      <Link>Common\Interop\Windows\BCrypt\Cng.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Cng.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptImportKey.cs">
       <Link>Interop\Windows\BCrypt\Interop.BCryptImportKey.cs</Link>
@@ -86,40 +86,40 @@
       <Link>Interop\Windows\BCrypt\Interop.BCryptEncryptDecrypt.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.AsymmetricEncryption.Types.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.Blobs.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.Blobs.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.Blobs.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.CreateCryptographicException.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.CreateCryptographicException.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.CreateCryptographicException.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptOpenAlgorithmProvider.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptOpenAlgorithmProvider.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptOpenAlgorithmProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptCloseAlgorithmProvider.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptCloseAlgorithmProvider.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptCloseAlgorithmProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptDestroyHash.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptDestroyHash.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptDestroyHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptCreateHash.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptCreateHash.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptCreateHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptHashData.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptHashData.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptHashData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptFinishHash.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptFinishHash.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptFinishHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\BCryptAlgorithmCache.cs">
       <Link>Internal\Windows\BCrypt\BCryptAlgorithmCache.cs</Link>
@@ -131,13 +131,13 @@
       <Link>Internal\Windows\BCrypt\Interop.BCryptKeyDataBlob.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\TripleDesBCryptModes.cs">
-      <Link>Common\Interop\Windows\BCrypt\TripleDesBCryptModes.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\TripleDesBCryptModes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
       <Link>Internal\Windows\Crypt32\Interop.FindOidInfo.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.HashIdAlg.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.HashIdAlg.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.HashIdAlg.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.AsymmetricPaddingMode.cs">
       <Link>Internal\Windows\NCrypt\Interop.AsymmetricPaddingMode.cs</Link>
@@ -236,194 +236,194 @@
       <Link>Internal\Cryptography\UniversalCryptoDecryptor.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs">
-      <Link>Common\System\Memory\PointerMemoryManager.cs</Link>
+             Link="Common\System\Memory\PointerMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs">
-      <Link>Common\System\Security\Cryptography\CryptoPool.cs</Link>
+             Link="Common\System\Security\Cryptography\CryptoPool.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CngPkcs8.cs">
-      <Link>Common\System\Security\Cryptography\CngPkcs8.cs</Link>
+             Link="Common\System\Security\Cryptography\CngPkcs8.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSACng.cs">
-      <Link>Common\System\Security\Cryptography\DSACng.cs</Link>
+             Link="Common\System\Security\Cryptography\DSACng.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSACng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\DSACng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\DSACng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSACng.SignVerify.cs">
-      <Link>Common\System\Security\Cryptography\DSACng.SignVerify.cs</Link>
+             Link="Common\System\Security\Cryptography\DSACng.SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\EccKeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\EccKeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\EccKeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECCng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\ECCng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\ECCng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanCng.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanCng.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanCng.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanCng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanCng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanCng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaCng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECCng.HashAlgorithm.cs">
-      <Link>Common\System\Security\Cryptography\ECCng.HashAlgorithm.cs</Link>
+             Link="Common\System\Security\Cryptography\ECCng.HashAlgorithm.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaCng.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaCng.HashData.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.HashData.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.HashData.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaCng.SignVerify.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaCng.SignVerify.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaCng.SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeyBlobHelpers.cs">
-      <Link>Common\System\Security\Cryptography\KeyBlobHelpers.cs</Link>
+             Link="Common\System\Security\Cryptography\KeyBlobHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\KeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\KeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeySizeHelpers.cs">
-      <Link>Common\System\Security\Cryptography\KeySizeHelpers.cs</Link>
+             Link="Common\System\Security\Cryptography\KeySizeHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Oids.cs">
-      <Link>Common\System\Security\Cryptography\Oids.cs</Link>
+             Link="Common\System\Security\Cryptography\Oids.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\PasswordBasedEncryption.cs">
-      <Link>Common\System\Security\Cryptography\PasswordBasedEncryption.cs</Link>
+             Link="Common\System\Security\Cryptography\PasswordBasedEncryption.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Pkcs12Kdf.cs">
-      <Link>Common\System\Security\Cryptography\Pkcs12Kdf.cs</Link>
+             Link="Common\System\Security\Cryptography\Pkcs12Kdf.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSACng.cs">
-      <Link>Common\System\Security\Cryptography\RSACng.cs</Link>
+             Link="Common\System\Security\Cryptography\RSACng.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSACng.EncryptDecrypt.cs">
-      <Link>Common\System\Security\Cryptography\RSACng.EncryptDecrypt.cs</Link>
+             Link="Common\System\Security\Cryptography\RSACng.EncryptDecrypt.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSACng.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\RSACng.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\RSACng.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSACng.SignVerify.cs">
-      <Link>Common\System\Security\Cryptography\RSACng.SignVerify.cs</Link>
+             Link="Common\System\Security\Cryptography\RSACng.SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RsaPaddingProcessor.cs">
-      <Link>Common\System\Security\Cryptography\RsaPaddingProcessor.cs</Link>
+             Link="Common\System\Security\Cryptography\RsaPaddingProcessor.cs">
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PBEParameter.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PBEParameter.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBEParameter.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PBEParameter.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PBEParameter.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBEParameter.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PBEParameter.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PBES2Params.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PBES2Params.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBES2Params.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PBES2Params.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PBES2Params.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBES2Params.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PBES2Params.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2Params.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\ECDomainParameters.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\ECDomainParameters.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\SpecifiedECDomain.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\SpecifiedECDomain.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\CurveAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\CurveAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\CurveAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\CurveAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\CurveAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\CurveAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\CurveAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\FieldID.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\FieldID.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\FieldID.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\FieldID.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\FieldID.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\FieldID.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\FieldID.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\ECPrivateKey.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\FieldID.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\FieldID.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\ECPrivateKey.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml</DependentUpon>
     </Compile>
   </ItemGroup>
diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
index a5d72223d4701..f0f7622ac08fb 100644
--- a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
@@ -16,79 +16,79 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.Data.cs">
-      <Link>CommonTest\AlgorithmImplementations\AES\AesCipherTests.Data.cs</Link>
+             Link="CommonTest\AlgorithmImplementations\AES\AesCipherTests.Data.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesCornerTests.cs">
-      <Link>CommonTest\AlgorithmImplementations\AES\AesCornerTests.cs</Link>
+             Link="CommonTest\AlgorithmImplementations\AES\AesCornerTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\DecryptorReusability.cs">
-      <Link>CommonTest\AlgorithmImplementations\AES\DecryptorReusability.cs</Link>
+             Link="CommonTest\AlgorithmImplementations\AES\DecryptorReusability.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesFactory.cs">
-      <Link>CommonTest\AlgorithmImplementations\AES\AesFactory.cs</Link>
+             Link="CommonTest\AlgorithmImplementations\AES\AesFactory.cs">
     </Compile>
     <Compile Include="AesProvider.cs" />
     <Compile Include="TripleDESCngProvider.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESFactory.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\CryptoUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs">
     </Compile>
     <Compile Include="ECDsaCngProvider.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs">
     </Compile>
     <Compile Include="RSACngProvider.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\PositionValueStream.cs">
-      <Link>CommonTest\System\IO\PositionValueStream.cs</Link>
+             Link="CommonTest\System\IO\PositionValueStream.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
@@ -100,134 +100,134 @@
     <Compile Include="ECDsaCngPkcs8Tests.cs" />
     <Compile Include="RSACngPkcs8Tests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AsymmetricSignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs">
     </Compile>
     <Compile Condition="'$(TargetsWindows)' == 'true'" Include="AesCngTests.cs" />
     <Compile Condition="'$(TargetsWindows)' == 'true'" Include="TripleDESCngTests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesContractTests.cs">
-      <Link>CommonTest\AlgorithmImplementations\AES\AesContractTests.cs</Link>
+             Link="CommonTest\AlgorithmImplementations\AES\AesContractTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESCipherTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESCipherTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESCipherTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesModeTests.cs">
-      <Link>CommonTest\AlgorithmImplementations\AES\AesModeTests.cs</Link>
+             Link="CommonTest\AlgorithmImplementations\AES\AesModeTests.cs">
     </Compile>
     <Compile Condition="'$(TargetsWindows)' == 'true'" Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESReusabilityTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESReusabilityTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\TripleDES\TripleDESReusabilityTests.cs">
     </Compile>
     <Compile Condition="'$(TargetsWindows)' == 'true'" Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\AES\AesCipherTests.cs">
-      <Link>CommonTest\AlgorithmImplementations\AES\AesCipherTests.cs</Link>
+             Link="CommonTest\AlgorithmImplementations\AES\AesCipherTests.cs">
     </Compile>
     <Compile Include="ECDiffieHellmanCngTests.cs" />
     <Compile Include="ECDiffieHellmanCngProvider.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs">
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj
index 85f5b05c2e6f6..a7558b017325a 100644
--- a/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj
+++ b/src/libraries/System.Security.Cryptography.Csp/src/System.Security.Cryptography.Csp.csproj
@@ -28,7 +28,7 @@
       <Link>Internal\Cryptography\Helpers.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeySizeHelpers.cs">
-      <Link>Common\System\Security\Cryptography\KeySizeHelpers.cs</Link>
+             Link="Common\System\Security\Cryptography\KeySizeHelpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
@@ -41,7 +41,7 @@
     <Compile Include="System\Security\Cryptography\RSACryptoServiceProvider.Unix.cs" />
     <Compile Include="Internal\Cryptography\Unix\HashAlgorithmNames.cs" />
     <Compile Include="$(CommonPath)Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs">
-      <Link>Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs</Link>
+             Link="Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
@@ -72,82 +72,82 @@
       <Link>Internal\Cryptography\Windows\CryptoThrowHelper.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptCreateHash.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptCreateHash.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptCreateHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptDecrypt.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDecrypt.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptDecrypt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptDeriveKey.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDeriveKey.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptDeriveKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptEncrypt.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptEncrypt.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptEncrypt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptExportKey.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptExportKey.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptExportKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptGenKey.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGenKey.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptGenKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptGetDefaultProvider.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetDefaultProvider.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptGetDefaultProvider.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptGetHashParam.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetHashParam.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptGetHashParam.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptGetKeyParam.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetKeyParam.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptGetKeyParam.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptGetUserKey.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetUserKey.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptGetUserKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptHashData.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptHashData.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptHashData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptImportKey.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptImportKey.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptImportKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptSetKeyParam.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptSetKeyParam.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptSetKeyParam.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptSignHash.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptSignHash.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptSignHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\SafeHashHandle.cs">
-      <Link>Common\Interop\Windows\Advapi32\SafeHashHandle.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\SafeHashHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\SafeKeyHandle.cs">
-      <Link>Common\Interop\Windows\Advapi32\SafeKeyHandle.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\SafeKeyHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\SafeProvHandle.cs">
-      <Link>Common\Interop\Windows\Advapi32\SafeProvHandle.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\SafeProvHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -162,4 +162,4 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Thread" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
index 887d4a3e1f205..39abb83751132 100644
--- a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
@@ -11,31 +11,31 @@
     <Compile Include="RSACryptoServiceProviderTests.cs" />
     <Compile Include="ShimHelpers.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\CryptoUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\PositionValueStream.cs">
-      <Link>CommonTest\System\IO\PositionValueStream.cs</Link>
+             Link="CommonTest\System\IO\PositionValueStream.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
@@ -52,79 +52,79 @@
     <Compile Include="SHAxCryptoServiceProviderTests.cs" />
     <Compile Include="TripleDESCryptoServiceProviderTests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AsymmetricSignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DES\DESCipherTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESCipherTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESCipherTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DES\DESFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DESFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DES\DesTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DesTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DES\DesTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2CipherTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2CipherTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2CipherTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Tests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Tests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Tests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs">
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
index 19f6ae909d28f..def5b616aeeab 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
+++ b/src/libraries/System.Security.Cryptography.Encoding/src/System.Security.Cryptography.Encoding.csproj
@@ -27,7 +27,7 @@
       <Link>System\Security\Cryptography\CryptoPool.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true'">
@@ -35,22 +35,22 @@
     <Compile Include="Internal\Cryptography\CngAsnFormatter.cs" />
     <Compile Include="Internal\Cryptography\OidLookup.Windows.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs">
       <Link>Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Cng.cs">
-      <Link>Common\Interop\Windows\BCrypt\Cng.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Cng.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptPropertyStrings.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptFormatObject.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptFormatObject.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptFormatObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\Windows\CryptoThrowHelper.cs">
       <Link>Internal\Cryptography\Windows\CryptoThrowHelper.cs</Link>
@@ -59,7 +59,7 @@
       <Link>Internal\Windows\kernel32\Interop.FormatMessage.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetstvOS)' != 'true'">
@@ -67,69 +67,69 @@
     <Compile Include="Internal\Cryptography\OidLookup.Unix.cs" />
     <Compile Include="Internal\Cryptography\OpenSslAsnFormatter.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.LookupFriendlyNameByOid.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.LookupFriendlyNameByOid.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.LookupFriendlyNameByOid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs">
-      <Link>Common\System\Memory\PointerMemoryManager.cs</Link>
+             Link="Common\System\Memory\PointerMemoryManager.cs">
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\DirectoryStringAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\DirectoryStringAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\GeneralNameAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\GeneralNameAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\OtherNameAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\OtherNameAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="Internal\Cryptography\AsnFormatter.OSX.cs" />
diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj
index 1a63d7889f1b9..b56ed5a9a30c2 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj
@@ -6,7 +6,7 @@
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" />
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs">
-      <Link>Common\System\Security\Cryptography\CryptoPool.cs</Link>
+             Link="Common\System\Security\Cryptography\CryptoPool.cs">
     </Compile>
     <Compile Include="Asn1\Reader\Asn1ReaderTests.cs" />
     <Compile Include="Asn1\Reader\ComprehensiveReadTests.cs" />
@@ -91,10 +91,10 @@
     <Compile Include="PemEncodingFindTests.cs" />
     <Compile Include="PemEncodingTests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs">
-      <Link>Common\System\Memory\PointerMemoryManager.cs</Link>
+             Link="Common\System\Memory\PointerMemoryManager.cs">
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
index 6f9f04c70d574..b8ff95c2e8ad5 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj
@@ -19,127 +19,127 @@
     <Compile Include="System\Security\Cryptography\ECDsaOpenSsl.cs" />
     <Compile Include="System\Security\Cryptography\RSAOpenSsl.cs" />
     <Compile Include="$(CommonPath)Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs">
-      <Link>Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs</Link>
+             Link="Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs">
-      <Link>Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs</Link>
+             Link="Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\Helpers.cs">
       <Link>Internal\Cryptography\Helpers.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Dsa.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Dsa.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Dsa.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.ImportExport.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.ImportExport.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcDsa.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EcKey.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcKey.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EcKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Dsa.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Dsa.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Dsa.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Ecdh.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Ecdh.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Ecdh.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.EcKey.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.EcKey.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.EcKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Rsa.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Rsa.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.EvpPkey.Rsa.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OpenSslVersion.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeDsaHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeDsaHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeDsaHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEcKeyHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeEcKeyHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeEcKeyHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs">
-      <Link>Common\System\Memory\PointerMemoryManager.cs</Link>
+             Link="Common\System\Memory\PointerMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs">
-      <Link>Common\System\Security\Cryptography\CryptoPool.cs</Link>
+             Link="Common\System\Security\Cryptography\CryptoPool.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSAOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\DSAOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\DSAOpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanDerivation.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanDerivation.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanDerivation.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanOpenSsl.Derive.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.Derive.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanOpenSsl.Derive.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDiffieHellmanOpenSslPublicKey.cs">
-      <Link>Common\System\Security\Cryptography\ECDiffieHellmanOpenSslPublicKey.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDiffieHellmanOpenSslPublicKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaOpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\ECOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\ECOpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECOpenSsl.ImportExport.cs">
-      <Link>Common\System\Security\Cryptography\ECOpenSsl.ImportExport.cs</Link>
+             Link="Common\System\Security\Cryptography\ECOpenSsl.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeyBlobHelpers.cs">
-      <Link>Common\System\Security\Cryptography\KeyBlobHelpers.cs</Link>
+             Link="Common\System\Security\Cryptography\KeyBlobHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSAOpenSsl.cs">
-      <Link>Common\System\Security\Cryptography\RSAOpenSsl.cs</Link>
+             Link="Common\System\Security\Cryptography\RSAOpenSsl.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RsaPaddingProcessor.cs">
-      <Link>Common\System\Security\Cryptography\RsaPaddingProcessor.cs</Link>
+             Link="Common\System\Security\Cryptography\RsaPaddingProcessor.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
index f766dd7a378c3..b6e5c40edc64d 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
@@ -7,85 +7,85 @@
     <Compile Include="EcDsaOpenSslTests.cs" />
     <Compile Include="RSAOpenSslProvider.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\CurveDef.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\EccTestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hash.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Hmac.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.NistValidation.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Tls.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanTests.Xml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaSignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaStub.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.NistValidation.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTestsBase.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\IO\PositionValueStream.cs">
-      <Link>CommonTest\System\IO\PositionValueStream.cs</Link>
+             Link="CommonTest\System\IO\PositionValueStream.cs">
     </Compile>
     <Compile Include="EcDiffieHellmanOpenSslProvider.cs" />
     <Compile Include="EcDiffieHellmanOpenSslTests.cs" />
@@ -94,90 +94,90 @@
     <Compile Include="DsaOpenSslProvider.cs" />
     <Compile Include="DsaOpenSslTests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AsymmetricSignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AsymmetricSignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DsaFamilySignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAImportExport.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyGeneration.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignatureFormatTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSASignVerify.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSATestData.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaXml.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyExchangeFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\DSA\DSAKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyFileTests.LimitedPrivate.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\EC\ECKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDhKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDsa\ECDsaTests.netcoreapp.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyFileTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs">
-      <Link>CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.netcoreapp.cs">
     </Compile>
     <Compile Include="SafeEvpPKeyHandleTests.cs" />
   </ItemGroup>
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
index 8f3d58028081e..7b2f9fc9d9c83 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj
@@ -60,23 +60,23 @@
       <Link>Internal\Cryptography\Helpers.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <!-- Internal types (platform: AnyOS) -->
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="Internal\Cryptography\Pal\AnyOS\AsnHelpers.cs" />
@@ -161,223 +161,223 @@
   <!-- Interop types (platform: Windows) -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(IsPartialFacadeAssembly)' != 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptDestroyHash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptDestroyKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptGetProvParam.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.CryptReleaseContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\SafeHashHandle.cs">
-      <Link>Common\Interop\Windows\Advapi32\SafeHashHandle.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\SafeHashHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\SafeKeyHandle.cs">
-      <Link>Common\Interop\Windows\Advapi32\SafeKeyHandle.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\SafeKeyHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\SafeProvHandle.cs">
-      <Link>Common\Interop\Windows\Advapi32\SafeProvHandle.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\SafeProvHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CERT_CONTEXT.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CERT_CONTEXT.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CERT_CONTEXT.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CERT_ID.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CERT_ID.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CERT_ID.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CERT_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CERT_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CERT_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CERT_ISSUER_SERIAL_NUMBER.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CERT_ISSUER_SERIAL_NUMBER.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CERT_ISSUER_SERIAL_NUMBER.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CERT_PUBLIC_KEY_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CERT_PUBLIC_KEY_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CERT_PUBLIC_KEY_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertContextPropId.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertContextPropId.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertContextPropId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertCreateCertificateContext.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertCreateCertificateContext.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertCreateCertificateContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertGetCertificateContextProperty.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertGetCertificateContextProperty.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertGetCertificateContextProperty.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertGetPublicKeyLength.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertGetPublicKeyLength.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertGetPublicKeyLength.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertIdChoice.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertIdChoice.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertIdChoice.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertNameStrTypeAndFlags.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertNameStrTypeAndFlags.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertNameStrTypeAndFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertNameToStr.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertNameToStr.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertNameToStr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_CMS_RECIPIENT_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_CMS_RECIPIENT_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_CMS_RECIPIENT_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_CTRL_DECRYPT_PARA.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_CTRL_DECRYPT_PARA.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_CTRL_DECRYPT_PARA.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_CTRL_KEY_AGREE_DECRYPT_PARA.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_CTRL_KEY_AGREE_DECRYPT_PARA.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_CTRL_KEY_AGREE_DECRYPT_PARA.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_ENVELOPED_ENCODE_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_ENVELOPED_ENCODE_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_ENVELOPED_ENCODE_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_KEY_AGREE_RECIPIENT_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_AGREE_RECIPIENT_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_AGREE_RECIPIENT_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_KEY_TRANS_RECIPIENT_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_TRANS_RECIPIENT_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_KEY_TRANS_RECIPIENT_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_RC2_AUX_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_RC2_AUX_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_RC2_AUX_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCODE_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCODE_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCODE_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCRYPTED_KEY_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCRYPTED_KEY_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMSG_RECIPIENT_ENCRYPTED_KEY_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMsgCmsRecipientChoice.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMsgCmsRecipientChoice.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMsgCmsRecipientChoice.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CMsgKeyAgreeOriginatorChoice.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CMsgKeyAgreeOriginatorChoice.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CMsgKeyAgreeOriginatorChoice.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CmsKeyAgreeKeyChoice.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CmsKeyAgreeKeyChoice.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CmsKeyAgreeKeyChoice.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CRYPT_ALGORITHM_IDENTIFIER.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CRYPT_ALGORITHM_IDENTIFIER.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CRYPT_ALGORITHM_IDENTIFIER.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTE.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTE.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTE.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTE_TYPE_VALUE.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTE_TYPE_VALUE.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTE_TYPE_VALUE.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CRYPT_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CRYPT_BIT_BLOB.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CRYPT_BIT_BLOB.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CRYPT_BIT_BLOB.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CRYPT_KEY_PROV_INFO.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CRYPT_KEY_PROV_INFO.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CRYPT_KEY_PROV_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CRYPT_RC2_CBC_PARAMETERS.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CRYPT_RC2_CBC_PARAMETERS.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CRYPT_RC2_CBC_PARAMETERS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptAcquireCertificatePrivateKey.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptAcquireCertificatePrivateKey.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptAcquireCertificatePrivateKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptAcquireCertificatePrivateKeyFlags.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptAcquireCertificatePrivateKeyFlags.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptAcquireCertificatePrivateKeyFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptDecodeObject.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptDecodeObject.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptDecodeObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptDecodeObjectStructType.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptDecodeObjectStructType.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptDecodeObjectStructType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptEncodeDecodeWrappers.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptEncodeDecodeWrappers.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptEncodeDecodeWrappers.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptEncodeObject.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptEncodeObject.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptEncodeObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptKeySpec.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptKeySpec.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptKeySpec.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptMsgClose.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptMsgClose.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptMsgClose.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptMsgControl.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptMsgControl.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptMsgControl.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptMsgGetParam.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptMsgGetParam.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptMsgGetParam.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptMsgOpenToDecode.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptMsgOpenToDecode.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptMsgOpenToDecode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptMsgOpenToEncode.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptMsgOpenToEncode.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptMsgOpenToEncode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptMsgParamType.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptMsgParamType.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptMsgParamType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptMsgType.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptMsgType.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptMsgType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptMsgUpdate.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptMsgUpdate.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptMsgUpdate.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptRc2Version.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptRc2Version.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptRc2Version.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.DATA_BLOB.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.DATA_BLOB.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.DATA_BLOB.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.ErrorCode.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.ErrorCode.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.ErrorCode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.MsgControlType.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.MsgControlType.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.MsgControlType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.MsgEncodingType.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.MsgEncodingType.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.MsgEncodingType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.Heap.cs">
-      <Link>Common\Interop\Windows\kernel32\Interop.Heap.cs</Link>
+             Link="Common\Interop\Windows\kernel32\Interop.Heap.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.ErrorCode.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.ErrorCode.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.ErrorCode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.Properties.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.Properties.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.Properties.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.NCryptFreeObject.cs">
-      <Link>Common\Interop\Windows\NCrypt\Interop.NCryptFreeObject.cs</Link>
+             Link="Common\Interop\Windows\NCrypt\Interop.NCryptFreeObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
   </ItemGroup>
   <!-- Common types (platform: Windows) -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(IsPartialFacadeAssembly)' != 'true'">
     <Compile Include="$(CommonPath)Internal\Cryptography\Windows\CryptoThrowHelper.cs">
-      <Link>Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs</Link>
+             Link="Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
     </Compile>
   </ItemGroup>
   <!-- Internal types (platform: AnyOS) -->
@@ -418,147 +418,147 @@
   </ItemGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
     <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs">
-      <Link>Common\System\Memory\PointerMemoryManager.cs</Link>
+             Link="Common\System\Memory\PointerMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs">
-      <Link>Common\System\Security\Cryptography\CryptoPool.cs</Link>
+             Link="Common\System\Security\Cryptography\CryptoPool.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Oids.cs">
-      <Link>Common\System\Security\Cryptography\Oids.cs</Link>
+             Link="Common\System\Security\Cryptography\Oids.cs">
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\DirectoryStringAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\DirectoryStringAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\GeneralNameAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\GeneralNameAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\OtherNameAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\OtherNameAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PBEParameter.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PBEParameter.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBEParameter.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PBEParameter.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PBEParameter.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBEParameter.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PBEParameter.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PBES2Params.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PBES2Params.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBES2Params.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PBES2Params.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PBES2Params.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBES2Params.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PBES2Params.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2Params.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PssParamsAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PssParamsAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\OaepParamsAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\OaepParamsAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\OaepParamsAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\OaepParamsAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\OaepParamsAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\OaepParamsAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\OaepParamsAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\X509ExtensionAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\X509ExtensionAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\X509ExtensionAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="System\Security\Cryptography\Pkcs\Asn1\CadesIssuerSerial.xml" />
@@ -656,59 +656,59 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' or '$(TargetFramework)' == 'netstandard2.1'">
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\KeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\KeyFormatHelper.cs">
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\DigestInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\DigestInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\MacData.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\MacData.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\PasswordBasedEncryption.cs">
-      <Link>Common\System\Security\Cryptography\PasswordBasedEncryption.cs</Link>
+             Link="Common\System\Security\Cryptography\PasswordBasedEncryption.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Pkcs12Kdf.cs">
-      <Link>Common\System\Security\Cryptography\Pkcs12Kdf.cs</Link>
+             Link="Common\System\Security\Cryptography\Pkcs12Kdf.cs">
     </Compile>
     <AsnXml Include="System\Security\Cryptography\Pkcs\Asn1\SecretBagAsn.xml" />
     <Compile Include="System\Security\Cryptography\Pkcs\Asn1\SecretBagAsn.xml.cs">
@@ -736,4 +736,4 @@
   <ItemGroup>
     <None Include="@(AsnXml)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
index 6ec360c29c787..08d9e6a34b85f 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
     <Compile Include="Certificates.cs" />
     <Compile Include="CertLoader.cs" />
@@ -68,4 +68,4 @@
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="EnvelopedCms\DecryptTests.KeyPersistence.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
index df10307ed4244..aeebe595a5098 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
+++ b/src/libraries/System.Security.Cryptography.Primitives/src/System.Security.Cryptography.Primitives.csproj
@@ -25,22 +25,22 @@
     <Compile Include="System\Security\Cryptography\PbeParameters.cs" />
     <Compile Include="System\Security\Cryptography\SymmetricAlgorithm.cs" />
     <Compile Include="$(CommonPath)System\Threading\Tasks\ForceAsyncAwaiter.cs">
-      <Link>Common\System\Threading\Tasks\ForceAsyncAwaiter.cs</Link>
+             Link="Common\System\Threading\Tasks\ForceAsyncAwaiter.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\Helpers.cs">
       <Link>Internal\Cryptography\Helpers.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs">
-      <Link>Common\System\Security\Cryptography\CryptoPool.cs</Link>
+             Link="Common\System\Security\Cryptography\CryptoPool.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeySizeHelpers.cs">
-      <Link>Common\System\Security\Cryptography\KeySizeHelpers.cs</Link>
+             Link="Common\System\Security\Cryptography\KeySizeHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Oids.cs">
-      <Link>Common\System\Security\Cryptography\Oids.cs</Link>
+             Link="Common\System\Security\Cryptography\Oids.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs">
-      <Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskToApm.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -48,4 +48,4 @@
     <Reference Include="System.Runtime" />
     <Reference Include="System.Threading" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj
index 6a871d8603058..28b8946d8a13f 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\PositionValueStream.cs">
-      <Link>CommonTest\System\IO\PositionValueStream.cs</Link>
+             Link="CommonTest\System\IO\PositionValueStream.cs">
     </Compile>
     <Compile Include="AsymmetricAlgorithm\Trivial.cs" />
     <Compile Include="CryptoConfigTests.cs" />
@@ -23,4 +23,4 @@
     <Compile Include="SymmetricAlgorithm\Trivial.cs" />
     <Compile Include="ZeroMemoryTests.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj
index 08baa54b43202..4612eb7094a1b 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/src/System.Security.Cryptography.ProtectedData.csproj
@@ -11,19 +11,19 @@
     <Compile Include="System\Security\Cryptography\DataProtectionScope.cs" />
     <Compile Include="System\Security\Cryptography\ProtectedData.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptProtectData.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptProtectData.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptProtectData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptUnprotectData.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptUnprotectData.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptUnprotectData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptProtectDataFlags.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptProtectDataFlags.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptProtectDataFlags.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.DATA_BLOB.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.DATA_BLOB.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.DATA_BLOB.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\Windows\CryptoThrowHelper.cs">
       <Link>Internal\Cryptography\Windows\CryptoThrowHelper.cs</Link>
@@ -32,10 +32,10 @@
       <Link>Internal\Windows\kernel32\Interop.FormatMessage.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HResults.cs">
-      <Link>Common\System\HResults.cs</Link>
+             Link="Common\System\HResults.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj
index 412b5dd0ac062..e0d78f11ac296 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/tests/System.Security.Cryptography.ProtectedData.Tests.csproj
@@ -6,7 +6,7 @@
   <ItemGroup>
     <Compile Include="ProtectedDataTests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
index 1d0586c53367d..4ce8d37f4197b 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/src/System.Security.Cryptography.X509Certificates.csproj
@@ -13,106 +13,106 @@
     <Compile Include="Internal\Cryptography\ICertificatePal.cs" />
     <Compile Include="Internal\Cryptography\ICertificatePalCore.cs" />
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs">
-      <Link>Common\System\Memory\PointerMemoryManager.cs</Link>
+             Link="Common\System\Memory\PointerMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs">
-      <Link>Common\System\Security\Cryptography\CryptoPool.cs</Link>
+             Link="Common\System\Security\Cryptography\CryptoPool.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Oids.cs">
-      <Link>Common\System\Security\Cryptography\Oids.cs</Link>
+             Link="Common\System\Security\Cryptography\Oids.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeyBlobHelpers.cs">
-      <Link>Common\System\Security\Cryptography\KeyBlobHelpers.cs</Link>
+             Link="Common\System\Security\Cryptography\KeyBlobHelpers.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeySizeHelpers.cs">
-      <Link>Common\System\Security\Cryptography\KeySizeHelpers.cs</Link>
+             Link="Common\System\Security\Cryptography\KeySizeHelpers.cs">
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AlgorithmIdentifierAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\AttributeAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\AttributeAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\AttributeAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\AttributeAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\DirectoryStringAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\DirectoryStringAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\DirectoryStringAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\EdiPartyNameAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\GeneralNameAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\GeneralNameAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\GeneralNameAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\OtherNameAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\OtherNameAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\OtherNameAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PssParamsAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PssParamsAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PssParamsAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\SubjectPublicKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\X509ExtensionAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\X509ExtensionAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\X509ExtensionAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\X509ExtensionAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs">
-      <Link>Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs</Link>
+             Link="Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Der.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\Helpers.cs">
       <Link>Internal\Cryptography\Helpers.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
     <Compile Include="Internal\Cryptography\CertificateExtensionsCommon.cs" />
     <Compile Include="Internal\Cryptography\ErrorCode.cs" />
@@ -251,52 +251,52 @@
     <Compile Include="Internal\Cryptography\Pal.Windows\X509Pal.PublicKey.cs" />
     <Compile Include="Internal\Cryptography\Pal.Windows\X509Pal.X500DistinguishedName.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertCloseStore.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertCloseStore.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertCloseStore.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertNameToStr.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertNameToStr.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertNameToStr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptMsgClose.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptMsgClose.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptMsgClose.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CryptFormatObject.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptFormatObject.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptFormatObject.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.FindOidInfo.cs">
     </Compile>
     <Compile Include="$(CommonPath)Internal\Cryptography\Windows\CryptoThrowHelper.cs">
-      <Link>Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs</Link>
+             Link="Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs">
-      <Link>Common\Internal\Windows\kernel32\Interop.FormatMessage.cs</Link>
+             Link="Common\Internal\Windows\kernel32\Interop.FormatMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptDestroyKey.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptDestroyKey.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptDestroyKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptExportKey.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptExportKey.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptExportKey.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.BCryptGetProperty.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.Blobs.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.Blobs.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.Blobs.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
-      <Link>Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs</Link>
+             Link="Common\Interop\Windows\BCrypt\Interop.NTSTATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBCryptHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBCryptKeyHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBCryptKeyHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBCryptKeyHandle.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetstvOS)' != 'true'">
@@ -309,13 +309,13 @@
       <DependentUpon>System\Security\Cryptography\X509Certificates\Asn1\DistributionPointNameAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\KeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\KeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\PasswordBasedEncryption.cs">
-      <Link>Common\System\Security\Cryptography\PasswordBasedEncryption.cs</Link>
+             Link="Common\System\Security\Cryptography\PasswordBasedEncryption.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Pkcs12Kdf.cs">
-      <Link>Common\System\Security\Cryptography\Pkcs12Kdf.cs</Link>
+             Link="Common\System\Security\Cryptography\Pkcs12Kdf.cs">
     </Compile>
     <Compile Include="System\Security\Cryptography\X509Certificates\Asn1\ReasonFlagsAsn.cs" />
     <Compile Include="Internal\Cryptography\Pal.Unix\CachedDirectoryStoreProvider.cs" />
@@ -339,277 +339,277 @@
     <Compile Include="Internal\Cryptography\Pal.Unix\X509Pal.cs" />
     <Compile Include="Internal\Cryptography\Pal.Unix\X509Persistence.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Permissions.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Permissions.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Permissions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.GetIntegerBytes.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.GetIntegerBytes.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.GetIntegerBytes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.Nid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Bignum.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.BIO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Encode.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Encode.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Encode.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ERR.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Initialization.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.OCSP.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OCSP.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.OCSP.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs12.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs12.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs12.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs7.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs7.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Pkcs7.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Rsa.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Ext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Name.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509Stack.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.X509StoreCtx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs">
-      <Link>Common\Interop\Unix\Interop.Close.cs</Link>
+             Link="Common\Interop\Unix\Interop.Close.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.FChMod.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.FChMod.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.FChMod.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetEUid.cs">
-      <Link>Common\Interop\Unix\Interop.GetEUid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetEUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPwUid.cs">
-      <Link>Common\Interop\Unix\Interop.GetPwUid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetPwUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Stat.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Stat.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.Crypto.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Security.Cryptography.Native\Interop.PooledCrypto.cs">
-      <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.PooledCrypto.cs</Link>
+             Link="Common\Interop\Unix\System.Security.Cryptography.Native\Interop.PooledCrypto.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\Asn1SafeHandles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBignumHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeBioHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafePkcs12Handle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafePkcs12Handle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafePkcs12Handle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafePkcs7Handle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafePkcs7Handle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafePkcs7Handle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeRsaHandle.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeX509Handles.Unix.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\X509ExtensionSafeHandles.Unix.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\IO\PersistedFiles.Unix.cs">
-      <Link>Common\System\IO\PersistedFiles.Unix.cs</Link>
+             Link="Common\System\IO\PersistedFiles.Unix.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\IO\PersistedFiles.Names.Unix.cs">
-      <Link>Common\System\IO\PersistedFiles.Names.Unix.cs</Link>
+             Link="Common\System\IO\PersistedFiles.Names.Unix.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition=" ('$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true') and '$(IsPartialFacadeAssembly)' != 'true'">
     <Compile Include="$(CommonPath)Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs">
-      <Link>Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs</Link>
+             Link="Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFArray.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFData.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFData.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFDate.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFDate.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFDate.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFError.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFError.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFError.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFString.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFString.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ecc.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ecc.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Ecc.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.PAL_HashAlgorithm.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.PAL_HashAlgorithm.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.PAL_HashAlgorithm.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.RSA.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.RSA.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.RSA.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.Export.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.Export.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecKeyRef.Export.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Trust.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Trust.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Trust.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Chain.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Chain.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Chain.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Store.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Store.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.X509Store.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSAKeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\DSAKeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\DSAKeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\DSASecurityTransforms.cs">
-      <Link>Common\System\Security\Cryptography\DSASecurityTransforms.cs</Link>
+             Link="Common\System\Security\Cryptography\DSASecurityTransforms.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\EccKeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\EccKeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\EccKeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\EccSecurityTransforms.cs">
-      <Link>Common\System\Security\Cryptography\EccSecurityTransforms.cs</Link>
+             Link="Common\System\Security\Cryptography\EccSecurityTransforms.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\ECDsaSecurityTransforms.cs">
-      <Link>Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs</Link>
+             Link="Common\System\Security\Cryptography\ECDsaSecurityTransforms.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\KeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\KeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\KeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\PasswordBasedEncryption.cs">
-      <Link>Common\System\Security\Cryptography\PasswordBasedEncryption.cs</Link>
+             Link="Common\System\Security\Cryptography\PasswordBasedEncryption.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Pkcs12Kdf.cs">
-      <Link>Common\System\Security\Cryptography\Pkcs12Kdf.cs</Link>
+             Link="Common\System\Security\Cryptography\Pkcs12Kdf.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSAKeyFormatHelper.cs">
-      <Link>Common\System\Security\Cryptography\RSAKeyFormatHelper.cs</Link>
+             Link="Common\System\Security\Cryptography\RSAKeyFormatHelper.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RsaPaddingProcessor.cs">
-      <Link>Common\System\Security\Cryptography\RsaPaddingProcessor.cs</Link>
+             Link="Common\System\Security\Cryptography\RsaPaddingProcessor.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\RSASecurityTransforms.cs">
-      <Link>Common\System\Security\Cryptography\RSASecurityTransforms.cs</Link>
+             Link="Common\System\Security\Cryptography\RSASecurityTransforms.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\SecKeyPair.cs">
-      <Link>Common\System\Security\Cryptography\SecKeyPair.cs</Link>
+             Link="Common\System\Security\Cryptography\SecKeyPair.cs">
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\CurveAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\CurveAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\CurveAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\CurveAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\CurveAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\CurveAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\CurveAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\DssParms.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\DssParms.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DssParms.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\DssParms.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\DssParms.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DssParms.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\DssParms.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\ECDomainParameters.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\ECDomainParameters.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\ECDomainParameters.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\ECPrivateKey.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\ECPrivateKey.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\ECPrivateKey.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\FieldID.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\FieldID.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\FieldID.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\FieldID.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\FieldID.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\FieldID.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\FieldID.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\RSAPrivateKeyAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\RSAPublicKeyAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\SpecifiedECDomain.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\SpecifiedECDomain.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\SpecifiedECDomain.xml</DependentUpon>
     </Compile>
     <Compile Include="Internal\Cryptography\Pal.OSX\AppleCertificatePal.cs" />
@@ -628,116 +628,116 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true'">
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\DigestInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\DigestInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\DigestInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\EncryptedPrivateKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\CertBagAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\MacData.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\MacData.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\MacData.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\PfxAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs12\SafeBagAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs7\ContentInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PBEParameter.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PBEParameter.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBEParameter.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PBEParameter.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PBEParameter.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBEParameter.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PBEParameter.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PBES2Params.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PBES2Params.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBES2Params.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PBES2Params.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PBES2Params.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PBES2Params.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PBES2Params.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2Params.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pbkdf2Params.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pbkdf2SaltChoice.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedContentInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Pkcs7\EncryptedDataAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\PrivateKeyInfoAsn.xml</DependentUpon>
     </Compile>
     <AsnXml Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.xml">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml">
     </AsnXml>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</DependentUpon>
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs">
-      <Link>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs</Link>
+             Link="Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.manual.cs">
       <DependentUpon>Common\System\Security\Cryptography\Asn1\Rc2CbcParameters.xml</DependentUpon>
     </Compile>
     <Compile Include="Internal\Cryptography\Pal.Unix\CertificatePolicy.cs" />
@@ -778,6 +778,6 @@
     <Reference Include="System.Console" Condition="'$(Configuration)' == 'Debug'" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="@(AsnXml)" /> 
+    <None Include="@(AsnXml)" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
index 3f129ff6efe9a..121680cefd9a9 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
@@ -9,10 +9,10 @@
   <Import Project="$(CommonPath)System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" />
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Memory\PointerMemoryManager.cs">
-      <Link>Common\System\Memory\PointerMemoryManager.cs</Link>
+             Link="Common\System\Memory\PointerMemoryManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Security\Cryptography\CryptoPool.cs">
-      <Link>Common\System\Security\Cryptography\CryptoPool.cs</Link>
+             Link="Common\System\Security\Cryptography\CryptoPool.cs">
     </Compile>
     <Compile Include="Cert.cs" />
     <Compile Include="CertTests.cs" />
@@ -41,7 +41,7 @@
     <Compile Include="X500DistinguishedNameTests.cs" />
     <Compile Include="X509StoreTests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs">
-      <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link>
+             Link="CommonTest\System\Security\Cryptography\ByteUtils.cs">
     </Compile>
     <Compile Include="ImportTests.cs" />
     <Compile Include="CertificateCreation\CertificateRequestApiTests.cs" />
@@ -66,71 +66,71 @@
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetstvOS)' != 'true'">
     <Compile Include="X509FilesystemTests.Unix.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs">
-      <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Unix\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs">
-      <Link>Common\Interop\Unix\Interop.Errors.cs</Link>
+             Link="Common\Interop\Unix\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetEUid.cs">
-      <Link>Common\Interop\Unix\Interop.GetEUid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetEUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPwUid.cs">
-      <Link>Common\Interop\Unix\Interop.GetPwUid.cs</Link>
+             Link="Common\Interop\Unix\Interop.GetPwUid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.FChMod.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.FChMod.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.FChMod.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Permissions.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Permissions.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Permissions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs">
-      <Link>Common\Interop\Unix\System.Native\Interop.Stat.cs</Link>
+             Link="Common\Interop\Unix\System.Native\Interop.Stat.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\IO\PersistedFiles.Unix.cs">
-      <Link>Common\System\IO\PersistedFiles.Unix.cs</Link>
+             Link="Common\System\IO\PersistedFiles.Unix.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\IO\PersistedFiles.Names.Unix.cs">
-      <Link>Common\System\IO\PersistedFiles.Names.Unix.cs</Link>
+             Link="Common\System\IO\PersistedFiles.Names.Unix.cs">
     </Compile>
     <Compile Include="HostnameMatchTests.Unix.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsOSX)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
     <Compile Include="X509StoreMutableTests.OSX.cs" />
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFArray.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFArray.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFData.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFData.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFError.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFError.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFError.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.CoreFoundation.CFString.cs">
-      <Link>Common\Interop\OSX\Interop.CoreFoundation.CFString.cs</Link>
+             Link="Common\Interop\OSX\Interop.CoreFoundation.CFString.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\Interop.Libraries.cs">
-      <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
+             Link="Common\Interop\OSX\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Err.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.SecErrMessage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs">
-      <Link>Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs</Link>
+             Link="Common\Interop\OSX\System.Security.Cryptography.Native.Apple\Interop.Keychain.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeCreateHandle.OSX.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj
index 44784da1fb405..b5f2c0ebe210b 100644
--- a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj
+++ b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj
@@ -84,7 +84,7 @@
     <Compile Include="System\Security\Cryptography\Xml\RSAPKCS1SHA512SignatureDescription.cs" />
     <Compile Include="System\Security\Cryptography\Xml\RSAPKCS1SHA384SignatureDescription.cs" />
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
@@ -115,4 +115,4 @@
     <Reference Include="System" />
     <Reference Include="System.Security" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
index 17bbfa7f04173..d34bea5382cc1 100644
--- a/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
+++ b/src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj
@@ -29,159 +29,159 @@
     <Compile Include="System\Security\Principal\WindowsIdentity.cs" />
     <Compile Include="System\Security\Principal\WindowsPrincipal.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.UNICODE_STRING.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.UNICODE_STRING.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.UNICODE_STRING.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.OBJECT_ATTRIBUTES.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.OBJECT_ATTRIBUTES.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.OBJECT_ATTRIBUTES.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.TOKENS.cs">
-      <Link>Common\Interop\Interop.TOKENS.cs</Link>
+             Link="Common\Interop\Interop.TOKENS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Interop.WinError.cs</Link>
+             Link="Common\Interop\Interop.WinError.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.Winnt.cs">
-      <Link>Common\Interop\Interop.Winnt.cs</Link>
+             Link="Common\Interop\Interop.Winnt.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.NtStatus.cs">
-      <Link>Common\Interop\Interop.NtStatus.cs</Link>
+             Link="Common\Interop\Interop.NtStatus.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.LSAStructs.cs">
-      <Link>Common\Interop\Interop.LSAStructs.cs</Link>
+             Link="Common\Interop\Interop.LSAStructs.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.SECURITY_LOGON_SESSION_DATA.cs">
-      <Link>Common\Interop\Interop.SECURITY_LOGON_SESSION_DATA.cs</Link>
+             Link="Common\Interop\Interop.SECURITY_LOGON_SESSION_DATA.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentProcess_IntPtr.cs">
-      <Link>Common\Interop\Interop.GetCurrentProcess.cs</Link>
+             Link="Common\Interop\Interop.GetCurrentProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCurrentThread.cs">
-      <Link>Common\Interop\Interop.GetCurrentThread.cs</Link>
+             Link="Common\Interop\Interop.GetCurrentThread.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ClaimSecurityAttributes.cs">
-      <Link>Common\Interop\Interop.ClaimSecurityAttributes.cs</Link>
+             Link="Common\Interop\Interop.ClaimSecurityAttributes.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenProcessToken_SafeAccessTokenHandle.cs">
-      <Link>Common\Interop\Interop.OpenProcessToken.cs</Link>
+             Link="Common\Interop\Interop.OpenProcessToken.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetTokenInformation.cs">
-      <Link>Common\Interop\Interop.GetTokenInformation.cs</Link>
+             Link="Common\Interop\Interop.GetTokenInformation.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.DuplicateTokenEx.cs">
-      <Link>Common\Interop\Interop.DuplicateTokenEx.cs</Link>
+             Link="Common\Interop\Interop.DuplicateTokenEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.DuplicateHandle.cs">
-      <Link>Common\Interop\Interop.DuplicateHandle.cs</Link>
+             Link="Common\Interop\Interop.DuplicateHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
-      <Link>Common\Interop\Interop.CloseHandle.cs</Link>
+             Link="Common\Interop\Interop.CloseHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.LsaGetLogonSessionData.cs">
-      <Link>Common\Interop\Interop.LsaGetLogonSessionData.cs</Link>
+             Link="Common\Interop\Interop.LsaGetLogonSessionData.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.LsaFreeReturnBuffer.cs">
-      <Link>Common\Interop\Interop.LsaFreeReturnBuffer.cs</Link>
+             Link="Common\Interop\Interop.LsaFreeReturnBuffer.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LsaLookupNames2.cs">
-      <Link>Common\Interop\Interop.LsaLookupNames2.cs</Link>
+             Link="Common\Interop\Interop.LsaLookupNames2.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LsaLookupSids.cs">
-      <Link>Common\Interop\Interop.LsaLookupSids.cs</Link>
+             Link="Common\Interop\Interop.LsaLookupSids.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LsaClose.cs">
-      <Link>Common\Interop\Interop.LsaClose.cs</Link>
+             Link="Common\Interop\Interop.LsaClose.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LsaFreeMemory.cs">
-      <Link>Common\Interop\Interop.LsaFreeMemory.cs</Link>
+             Link="Common\Interop\Interop.LsaFreeMemory.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LsaOpenPolicy.cs">
-      <Link>Common\Interop\Interop.LsaOpenPolicy.cs</Link>
+             Link="Common\Interop\Interop.LsaOpenPolicy.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ConvertStringSidToSid.cs">
-      <Link>Common\Interop\Interop.ConvertStringSidToSid.cs</Link>
+             Link="Common\Interop\Interop.ConvertStringSidToSid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CreateWellKnownSid.cs">
-      <Link>Common\Interop\Interop.CreateWellKnownSid.cs</Link>
+             Link="Common\Interop\Interop.CreateWellKnownSid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetWindowsAccountDomainSid.cs">
-      <Link>Common\Interop\Interop.GetWindowsAccountDomainSid.cs</Link>
+             Link="Common\Interop\Interop.GetWindowsAccountDomainSid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.IsWellKnownSid.cs">
-      <Link>Common\Interop\Interop.IsWellKnownSid.cs</Link>
+             Link="Common\Interop\Interop.IsWellKnownSid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.IsEqualDomainSid.cs">
-      <Link>Common\Interop\Interop.IsEqualDomainSid.cs</Link>
+             Link="Common\Interop\Interop.IsEqualDomainSid.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenThreadToken.cs">
-      <Link>Common\Interop\Interop.OpenThreadToken.cs</Link>
+             Link="Common\Interop\Interop.OpenThreadToken.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RevertToSelf.cs">
-      <Link>Common\Interop\Interop.RevertToSelf.cs</Link>
+             Link="Common\Interop\Interop.RevertToSelf.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ImpersonateLoggedOnUser.cs">
-      <Link>Common\Interop\Interop.ImpersonateLoggedOnUser.cs</Link>
+             Link="Common\Interop\Interop.ImpersonateLoggedOnUser.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LsaNtStatusToWinError.cs">
-      <Link>Common\Interop\Interop.LsaNtStatusToWinError.cs</Link>
+             Link="Common\Interop\Interop.LsaNtStatusToWinError.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.LSA_STRING.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.LSA_STRING.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.LSA_STRING.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.AuthenticationPackageNames.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.AuthenticationPackageNames.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.AuthenticationPackageNames.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.KerbLogonSubmitType.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.KerbLogonSubmitType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.KerbLogonSubmitType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.KerbS4uLogin.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.KerbS4uLogin.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.KerbS4uLogin.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.LsaConnectUntrusted.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.LsaConnectUntrusted.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.LsaConnectUntrusted.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.LsaDeregisterLogonProcess.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.LsaDeregisterLogonProcess.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.LsaDeregisterLogonProcess.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.LsaLogonUser.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.LsaLogonUser.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.LsaLogonUser.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.LsaLookupAuthenticationPackage.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.LsaLookupAuthenticationPackage.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.LsaLookupAuthenticationPackage.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.QuotaLimits.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.QuotaLimits.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.QuotaLimits.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.SecurityLogonType.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.SecurityLogonType.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.SecurityLogonType.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\Interop.TokenSource.cs">
-      <Link>Common\Interop\Windows\SspiCli\Interop.TokenSource.cs</Link>
+             Link="Common\Interop\Windows\SspiCli\Interop.TokenSource.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.AllocateLocallyUniqueId.cs">
-      <Link>Common\Interop\Windows\Advapi32\Interop.AllocateLocallyUniqueId.cs</Link>
+             Link="Common\Interop\Windows\Advapi32\Interop.AllocateLocallyUniqueId.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLocalAllocHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLsaHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLsaHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLsaHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLsaMemoryHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLsaMemoryHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLsaMemoryHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLsaPolicyHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLsaPolicyHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLsaPolicyHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeLsaReturnBufferHandle.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeLsaReturnBufferHandle.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeLsaReturnBufferHandle.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' and '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CheckTokenMembership.cs">
-      <Link>Common\Interop\Interop.CheckTokenMembership.cs</Link>
+             Link="Common\Interop\Interop.CheckTokenMembership.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
diff --git a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj
index 1607b7dbbce2b..c7baeda7da4cf 100644
--- a/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj
+++ b/src/libraries/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Threading\ThreadTestHelpers.cs">
-      <Link>Common\System\Threading\ThreadTestHelpers.cs</Link>
+             Link="Common\System\Threading\ThreadTestHelpers.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
index 6c47b7598ab68..454b572777376 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/src/System.ServiceProcess.ServiceController.csproj
@@ -10,76 +10,76 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' or ('$(TargetsNetStandard)' == 'true' and '$(TargetsWindows)' == 'true')">
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Errors.cs">
-      <Link>Common\Interop\Windows\Interop.Errors.cs</Link>
+             Link="Common\Interop\Windows\Interop.Errors.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ServiceProcessOptions.cs">
-      <Link>Common\Interop\Windows\Interop.ServiceProcessOptions.cs</Link>
+             Link="Common\Interop\Windows\Interop.ServiceProcessOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CloseServiceHandle.cs">
-      <Link>Common\Interop\Windows\Interop.CloseServiceHandle.cs</Link>
+             Link="Common\Interop\Windows\Interop.CloseServiceHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ControlService.cs">
-      <Link>Common\Interop\Windows\Interop.ControlService.cs</Link>
+             Link="Common\Interop\Windows\Interop.ControlService.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EnumDependentServices.cs">
-      <Link>Common\Interop\Windows\Interop.EnumDependentServices.cs</Link>
+             Link="Common\Interop\Windows\Interop.EnumDependentServices.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.EnumServicesStatusEx.cs">
-      <Link>Common\Interop\Windows\Interop.EnumServicesStatusEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.EnumServicesStatusEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetServiceDisplayName.cs">
-      <Link>Common\Interop\Windows\Interop.GetServiceDisplayName.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetServiceDisplayName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.GetServiceKeyName.cs">
-      <Link>Common\Interop\Windows\Interop.GetServiceKeyName.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetServiceKeyName.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenSCManager.cs">
-      <Link>Common\Interop\Windows\Interop.OpenSCManager.cs</Link>
+             Link="Common\Interop\Windows\Interop.OpenSCManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenService.cs">
-      <Link>Common\Interop\Windows\Interop.OpenService.cs</Link>
+             Link="Common\Interop\Windows\Interop.OpenService.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.QueryServiceConfig.cs">
-      <Link>Common\Interop\Windows\Interop.QueryServiceConfig.cs</Link>
+             Link="Common\Interop\Windows\Interop.QueryServiceConfig.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.QueryServiceStatus.cs">
-      <Link>Common\Interop\Windows\Interop.QueryServiceStatus.cs</Link>
+             Link="Common\Interop\Windows\Interop.QueryServiceStatus.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.StartService.cs">
-      <Link>Common\Interop\Windows\Interop.StartService.cs</Link>
+             Link="Common\Interop\Windows\Interop.StartService.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ENUM_SERVICE_STATUS.cs">
-      <Link>Common\Interop\Windows\Interop.ENUM_SERVICE_STATUS.cs</Link>
+             Link="Common\Interop\Windows\Interop.ENUM_SERVICE_STATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ENUM_SERVICE_STATUS_PROCESS.cs">
-      <Link>Common\Interop\Windows\Interop.ENUM_SERVICE_STATUS_PROCESS.cs</Link>
+             Link="Common\Interop\Windows\Interop.ENUM_SERVICE_STATUS_PROCESS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.QUERY_SERVICE_CONFIG.cs">
-      <Link>Common\Interop\Windows\Interop.QUERY_SERVICE_CONFIG.cs</Link>
+             Link="Common\Interop\Windows\Interop.QUERY_SERVICE_CONFIG.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.SERVICE_STATUS.cs">
-      <Link>Common\Interop\Windows\Interop.SERVICE_STATUS.cs</Link>
+             Link="Common\Interop\Windows\Interop.SERVICE_STATUS.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.SERVICE_TABLE_ENTRY.cs">
-      <Link>Common\Interop\Windows\Interop.SERVICE_TABLE_ENTRY.cs</Link>
+             Link="Common\Interop\Windows\Interop.SERVICE_TABLE_ENTRY.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.SetServiceStatus.cs">
-      <Link>Common\Interop\Windows\Interop.SetServiceStatus.cs</Link>
+             Link="Common\Interop\Windows\Interop.SetServiceStatus.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.WTSSESSION_NOTIFICATION.cs">
-      <Link>Common\Interop\Windows\Interop.WTSSESSION_NOTIFICATION.cs</Link>
+             Link="Common\Interop\Windows\Interop.WTSSESSION_NOTIFICATION.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.RegisterServiceCtrlHandlerEx.cs">
-      <Link>Common\Interop\Windows\Interop.RegisterServiceCtrlHandlerEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.RegisterServiceCtrlHandlerEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.StartServiceCtrlDispatcher.cs">
-      <Link>Common\Interop\Windows\Interop.StartServiceCtrlDispatcher.cs</Link>
+             Link="Common\Interop\Windows\Interop.StartServiceCtrlDispatcher.cs">
     </Compile>
     <Compile Include="Microsoft\Win32\SafeHandles\SafeServiceHandle.cs" />
     <Compile Include="System\ServiceProcess\PowerBroadcastStatus.cs" />
@@ -117,4 +117,4 @@
     <Reference Include="System.Threading.Thread" />
     <Reference Include="System.Threading.ThreadPool" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
index a93989888aa84..9d068f966fad5 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/tests/System.ServiceProcess.ServiceController.TestService/System.ServiceProcess.ServiceController.TestService.csproj
@@ -15,37 +15,37 @@
       <Link>Microsoft\Win32\SafeHandles\SafeServiceHandle.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ServiceProcessOptions.cs">
-      <Link>Common\Interop\Windows\Interop.ServiceProcessOptions.cs</Link>
+             Link="Common\Interop\Windows\Interop.ServiceProcessOptions.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CloseServiceHandle.cs">
-      <Link>Common\Interop\Windows\Interop.CloseServiceHandle.cs</Link>
+             Link="Common\Interop\Windows\Interop.CloseServiceHandle.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenSCManager.cs">
-      <Link>Common\Interop\Windows\Interop.OpenSCManager.cs</Link>
+             Link="Common\Interop\Windows\Interop.OpenSCManager.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.OpenService.cs">
-      <Link>Common\Interop\Windows\Interop.OpenService.cs</Link>
+             Link="Common\Interop\Windows\Interop.OpenService.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.CreateService.cs">
-      <Link>Common\Interop\Windows\Interop.CreateService.cs</Link>
+             Link="Common\Interop\Windows\Interop.CreateService.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.SERVICE_DESCRIPTION.cs">
-      <Link>Common\Interop\Windows\Interop.SERVICE_DESCRIPTION.cs</Link>
+             Link="Common\Interop\Windows\Interop.SERVICE_DESCRIPTION.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ChangeServiceConfig2.cs">
-      <Link>Common\Interop\Windows\Interop.ChangeServiceConfig2.cs</Link>
+             Link="Common\Interop\Windows\Interop.ChangeServiceConfig2.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs">
-      <Link>Common\Interop\Windows\Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs</Link>
+             Link="Common\Interop\Windows\Interop.SERVICE_DELAYED_AUTOSTART_INFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.DeleteService.cs">
-      <Link>Common\Interop\Windows\Interop.DeleteService.cs</Link>
+             Link="Common\Interop\Windows\Interop.DeleteService.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
index 54071d3f8948f..bc81ec486de07 100644
--- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
+++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj
@@ -32,19 +32,19 @@
   <ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
     <Compile Include="System\Text\CodePagesEncodingProvider.Windows.cs" />
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.BOOL.cs">
-      <Link>Common\Interop\Windows\Interop.BOOL.cs</Link>
+             Link="Common\Interop\Windows\Interop.BOOL.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.GetCPInfoEx.cs">
-      <Link>Common\Interop\Windows\Interop.GetCPInfoEx.cs</Link>
+             Link="Common\Interop\Windows\Interop.GetCPInfoEx.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.MAX_PATH.cs">
-      <Link>Common\Interop\Windows\Interop.MAX_PATH.cs</Link>
+             Link="Common\Interop\Windows\Interop.MAX_PATH.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
-      <Link>Common\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs</Link>
+             Link="Common\Interop\Windows\Kernel32\Interop.WideCharToMultiByte.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true' and '$(TargetsWindows)' != 'true' ">
@@ -79,4 +79,4 @@
     <PreferredIANANamesPath>Data\PreferredCodePageNames.csv</PreferredIANANamesPath>
     <OutputDataTablePath>System\Text\EncodingTable.Data.cs</OutputDataTablePath>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index 176198fafdd57..0588f5320b76c 100644
--- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -34,7 +34,7 @@
       <Link>System\Text\UnicodeUtility.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -48,4 +48,4 @@
     <Reference Include="System.Runtime.Intrinsics" />
     <Reference Include="System.Threading" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj
index 5c821348d95b4..e69392277ff1e 100644
--- a/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj
+++ b/src/libraries/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.csproj
@@ -53,7 +53,7 @@
       <Link>System\Text\UnicodeUtility.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
index a261c488c7293..eefe7d8c32d4a 100644
--- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj
+++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
@@ -16,10 +16,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+             Link="Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
     <Compile Include="System\Text\Json\BitStack.cs" />
     <Compile Include="System\Text\Json\Document\JsonDocument.cs" />
@@ -214,7 +214,7 @@
     <Compile Include="System\Collections\Generic\StackExtensions.netstandard.cs" />
     <!-- Common or Common-branched source files -->
     <Compile Include="$(CommonPath)System\Buffers\ArrayBufferWriter.cs">
-      <Link>Common\System\Buffers\ArrayBufferWriter.cs</Link>
+             Link="Common\System\Buffers\ArrayBufferWriter.cs">
     </Compile>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
@@ -225,7 +225,7 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true' or '$(TargetsNetFx)' == 'true' or '$(TargetFramework)' == 'netcoreapp3.0'">
     <Compile Include="$(CommonPath)System\Collections\Generic\ReferenceEqualityComparer.cs">
-      <Link>Common\System\Collections\Generic\ReferenceEqualityComparer.cs</Link>
+             Link="Common\System\Collections\Generic\ReferenceEqualityComparer.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj
index 89f75872b706b..9125a7d650dda 100644
--- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\IO\WrappedMemoryStream.cs">
-      <Link>CommonTest\System\IO\WrappedMemoryStream.cs</Link>
+             Link="CommonTest\System\IO\WrappedMemoryStream.cs">
     </Compile>
     <Compile Include="BitStackTests.cs" />
     <Compile Include="BufferFactory.cs" />
@@ -137,7 +137,7 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
     <Compile Include="$(CommonPath)System\Buffers\ArrayBufferWriter.cs">
-      <Link>CommonTest\System\Buffers\ArrayBufferWriter.cs</Link>
+             Link="CommonTest\System\Buffers\ArrayBufferWriter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
index f3a73189a0b72..22095d760f18a 100644
--- a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
+++ b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
@@ -48,16 +48,16 @@
     <Compile Include="System\Text\RegularExpressions\RegexLWCGCompiler.cs" />
     <!-- Common or Common-branched source files -->
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)System\Collections\Generic\ValueListBuilder.cs">
-      <Link>Common\System\Collections\Generic\ValueListBuilder.cs</Link>
+             Link="Common\System\Collections\Generic\ValueListBuilder.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -73,4 +73,4 @@
     <Reference Include="System.Reflection.Emit.Lightweight" />
     <Reference Include="System.Reflection.Primitives" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
index b89454d09d19d..459d2bdbd043f 100644
--- a/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
+++ b/src/libraries/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
@@ -44,7 +44,7 @@
     <Compile Include="RegexCompilationInfoTests.cs" />
     <Compile Include="RegexGroupNameTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj
index 46c9198e3b0d6..88e75764efd15 100644
--- a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj
+++ b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj
@@ -14,7 +14,7 @@
     <Compile Include="Stress.cs" />
     <Compile Include="DebugAttributeTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
index 495e5054c7ca5..a12323863504e 100644
--- a/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
+++ b/src/libraries/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Threading\ThreadTestHelpers.cs">
-      <Link>CommonTest\System\Threading\ThreadTestHelpers.cs</Link>
+             Link="CommonTest\System\Threading\ThreadTestHelpers.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
index 9e20116e0ba46..60511e8e3962b 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
+++ b/src/libraries/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj
@@ -42,7 +42,7 @@
     <Compile Include="Internal\TargetCore.cs" />
     <Compile Include="Internal\TargetRegistry.cs" />
     <Compile Include="$(CommonPath)Internal\Padding.cs">
-      <Link>Common\Internal\Padding.cs</Link>
+             Link="Common\Internal\Padding.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0' or '$(TargetFramework)' == 'netstandard1.1'">
@@ -76,4 +76,4 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Tasks" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj
index 1b02b25a8553c..fe417f00ca259 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj
@@ -22,10 +22,10 @@
     <Compile Include="Dataflow\TransformManyBlockTests.cs" />
     <Compile Include="Dataflow\WriteOnceBlockTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Diagnostics\DebuggerAttributes.cs">
-      <Link>Common\System\Diagnostics\DebuggerAttributes.cs</Link>
+             Link="Common\System\Diagnostics\DebuggerAttributes.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
index 65d89caaf8e72..7696b1e1e23eb 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.csproj
@@ -10,13 +10,13 @@
     <Compile Include="ManualResetValueTaskSourceTests.cs" />
     <Compile Include="ValueTaskTests.cs" />
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\Sources\ManualResetValueTaskSource.cs">
-      <Link>Common\System\Threading\Tasks\Sources\ManualResetValueTaskSource.cs</Link>
+             Link="Common\System\Threading\Tasks\Sources\ManualResetValueTaskSource.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\Sources\ManualResetValueTaskSourceFactory.cs">
-      <Link>Common\System\Threading\Tasks\Sources\ManualResetValueTaskSourceFactory.cs</Link>
+             Link="Common\System\Threading\Tasks\Sources\ManualResetValueTaskSourceFactory.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\GetStateMachineData.cs">
-      <Link>Common\System\Threading\Tasks\GetStateMachineData.cs</Link>
+             Link="Common\System\Threading\Tasks\GetStateMachineData.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj
index 0c93e3a41ffa0..ea599a2d62f43 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="BreakTests.cs" />
     <Compile Include="EtwTests.cs" />
@@ -26,7 +26,7 @@
     <Compile Include="RespectParentCancellationTest.cs" />
     <Compile Include="XunitAssemblyAttributes.cs" />
     <Compile Include="$(CommonTestPath)System\Threading\ThreadPoolHelpers.cs">
-      <Link>CommonTest\System\Threading\ThreadPoolHelpers.cs</Link>
+             Link="CommonTest\System\Threading\ThreadPoolHelpers.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
index d05826479b00d..c82d6ba75316f 100644
--- a/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
+++ b/src/libraries/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
@@ -49,14 +49,14 @@
     <Compile Include="System.Runtime.CompilerServices\TaskAwaiterTests.cs" />
     <Compile Include="System.Runtime.CompilerServices\YieldAwaitableTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="Common\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\ThreadPoolHelpers.cs">
-      <Link>CommonTest\System\Threading\ThreadPoolHelpers.cs</Link>
+             Link="CommonTest\System\Threading\ThreadPoolHelpers.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs">
-      <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
+             Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs">
     </Compile>
     <Compile Include="Task\TaskDisposeTests.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj
index 5834cb689cb11..91e566ba19946 100644
--- a/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj
+++ b/src/libraries/System.Threading.Thread/tests/System.Threading.Thread.Tests.csproj
@@ -13,10 +13,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Threading\ThreadTestHelpers.cs">
-      <Link>CommonTest\System\Threading\ThreadTestHelpers.cs</Link>
+             Link="CommonTest\System\Threading\ThreadTestHelpers.cs">
     </Compile>
     <ProjectReference Include="STAMain\STAMain.csproj" />
     <ProjectReference Include="MTAMain\MTAMain.csproj" />
     <ProjectReference Include="DefaultApartmentStateMain\DefaultApartmentStateMain.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
index c178d826b6809..c15ee3f2a49a0 100644
--- a/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
+++ b/src/libraries/System.Threading.ThreadPool/tests/System.Threading.ThreadPool.Tests.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Threading\ThreadTestHelpers.cs">
-      <Link>CommonTest\System\Threading\ThreadTestHelpers.cs</Link>
+             Link="CommonTest\System\Threading\ThreadTestHelpers.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
index ed2ea9ccca87b..f8278b90c0102 100644
--- a/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
+++ b/src/libraries/System.Threading.Timer/tests/System.Threading.Timer.Tests.csproj
@@ -11,7 +11,7 @@
     <Compile Include="TimerDisposeTests.cs" />
     <Compile Include="TimerMetricsTests.cs" />
     <Compile Include="$(CommonTestPath)System\Threading\ThreadTestHelpers.cs">
-      <Link>CommonTest\System\Threading\ThreadTestHelpers.cs</Link>
+             Link="CommonTest\System\Threading\ThreadTestHelpers.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Threading/src/System.Threading.csproj b/src/libraries/System.Threading/src/System.Threading.csproj
index 6401755e4cdbc..641b53719ea8b 100644
--- a/src/libraries/System.Threading/src/System.Threading.csproj
+++ b/src/libraries/System.Threading/src/System.Threading.csproj
@@ -15,7 +15,7 @@
     <Compile Include="System\Threading\LockCookie.cs" />
     <Compile Include="System\Threading\ReaderWriterLock.cs" />
     <Compile Include="$(CommonPath)System\HResults.cs">
-      <Link>Common\System\HResults.cs</Link>
+             Link="Common\System\HResults.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
index 4e27b5fc95d26..8b3dc695ab45f 100644
--- a/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
+++ b/src/libraries/System.Threading/tests/System.Threading.Tests.csproj
@@ -33,10 +33,10 @@
     <Compile Include="ExecutionContextTests.cs" />
     <Compile Include="SynchronizationContextTests.cs" />
     <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs">
-      <Link>CommonTest\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+             Link="CommonTest\System\Diagnostics\Tracing\TestEventListener.cs">
     </Compile>
     <Compile Include="$(CommonTestPath)System\Threading\ThreadTestHelpers.cs">
-      <Link>CommonTest\System\Threading\ThreadTestHelpers.cs</Link>
+             Link="CommonTest\System\Threading\ThreadTestHelpers.cs">
     </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
index dd5adc8a69195..4dabc712fb186 100644
--- a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
+++ b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj
@@ -51,10 +51,10 @@
     <Compile Include="System\Utf8Extensions.Portable.cs" />
     <Compile Include="System\Utf8String.Portable.cs" />
     <Compile Include="$(CommonPath)System\Marvin.cs">
-      <Link>Common\System\Marvin.cs</Link>
+             Link="Common\System\Marvin.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\NotImplemented.cs">
-      <Link>Common\System\NotImplemented.cs</Link>
+             Link="Common\System\NotImplemented.cs">
     </Compile>
     <Compile Include="$(CoreLibSharedDir)\System\Char8.cs">
       <Link>System\Char8.cs</Link>
@@ -174,4 +174,4 @@
     <Reference Include="System.Net.Primitives" />
     <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj
index 8779e2c76d94b..7e9b512bd54f6 100644
--- a/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj
+++ b/src/libraries/System.Web.HttpUtility/src/System.Web.HttpUtility.csproj
@@ -11,7 +11,7 @@
     <Compile Include="System\Web\Util\UriUtil.cs" />
     <Compile Include="System\Web\Util\Utf16StringValidator.cs" />
     <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
+             Link="Common\System\HexConverter.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
index 5608db2ffe150..7ea1b853c6b30 100644
--- a/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
+++ b/src/libraries/System.Windows.Extensions/src/System.Windows.Extensions.csproj
@@ -7,58 +7,58 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertAddCertificateLinkToStore.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertAddCertificateLinkToStore.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertAddCertificateLinkToStore.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertCloseStore.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertCloseStore.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertCloseStore.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertDuplicateCertificateContext.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertDuplicateCertificateContext.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertDuplicateCertificateContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore_IntPtr.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore_IntPtr.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertEnumCertificatesInStore_IntPtr.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertFreeCertificateContext.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Crypt32\Interop.CertOpenStore.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CertOpenStore.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CertOpenStore.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\CryptUI\Interop.CryptUIDlgCertificate.cs">
-      <Link>Common\Interop\Windows\Crypt32\Interop.CryptUIDlgCertificate.cs</Link>
+             Link="Common\Interop\Windows\Crypt32\Interop.CryptUIDlgCertificate.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\User32\Interop.MessageBeep.cs">
-      <Link>Common\Interop\Windows\User32\Interop.MessageBeep.cs</Link>
+             Link="Common\Interop\Windows\User32\Interop.MessageBeep.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinMm\Interop.MMCKINFO.cs">
-      <Link>Common\Interop\Windows\WinMm\Interop.MMCKINFO.cs</Link>
+             Link="Common\Interop\Windows\WinMm\Interop.MMCKINFO.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinMm\Interop.mmioAscend.cs">
-      <Link>Common\Interop\Windows\WinMm\Interop.mmioAscend.cs</Link>
+             Link="Common\Interop\Windows\WinMm\Interop.mmioAscend.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinMm\Interop.mmioClose.cs">
-      <Link>Common\Interop\Windows\WinMm\Interop.mmioClose.cs</Link>
+             Link="Common\Interop\Windows\WinMm\Interop.mmioClose.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinMm\Interop.mmioDescend.cs">
-      <Link>Common\Interop\Windows\WinMm\Interop.mmioDescend.cs</Link>
+             Link="Common\Interop\Windows\WinMm\Interop.mmioDescend.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinMm\Interop.mmioRead.cs">
-      <Link>Common\Interop\Windows\WinMm\Interop.mmioRead.cs</Link>
+             Link="Common\Interop\Windows\WinMm\Interop.mmioRead.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinMm\Interop.mmioOpen.cs">
-      <Link>Common\Interop\Windows\WinMm\Interop.mmioOpen.cs</Link>
+             Link="Common\Interop\Windows\WinMm\Interop.mmioOpen.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\WinMm\Interop.PlaySound.cs">
-      <Link>Common\Interop\Windows\WinMm\Interop.PlaySound.cs</Link>
+             Link="Common\Interop\Windows\WinMm\Interop.PlaySound.cs">
     </Compile>
     <Compile Include="$(CommonPath)Interop\Windows\Interop.Libraries.cs">
-      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+             Link="Common\Interop\Windows\Interop.Libraries.cs">
     </Compile>
     <Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
-      <Link>Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs</Link>
+             Link="Common\Microsoft\Win32\SafeHandles\SafeHandleCache.cs">
     </Compile>
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs">
-      <Link>Common\System\Text\ValueStringBuilder.cs</Link>
+             Link="Common\System\Text\ValueStringBuilder.cs">
     </Compile>
     <Compile Include="System\Security\Cryptography\X509Certificates\X509Certificate2UI.cs" />
     <Compile Include="System\Security\Cryptography\X509Certificates\SafeX509Handles.cs" />
diff --git a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj
index ebd9e736f130a..2326488fd4183 100644
--- a/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj
+++ b/src/libraries/System.Windows.Extensions/tests/System.Windows.Extensions.Tests.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(CommonTestPath)System\Drawing\Helpers.cs">
-      <Link>Common\System\Drawing\Helpers.cs</Link>
+             Link="Common\System\Drawing\Helpers.cs">
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -27,4 +27,4 @@
     <PackageReference Include="System.Drawing.Common.TestData" Version="$(SystemDrawingCommonTestDataVersion)" />
     <PackageReference Include="System.Windows.Extensions.TestData" Version="$(SystemWindowsExtensionsTestDataVersion)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index 48967bb3cbc8c..5a94043ffa08e 100644
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -293,7 +293,7 @@
   <ItemGroup Condition="'$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">
       <Compile Include="$(BclSourcesRoot)\System\Environment.iOS.cs" />
       <Compile Include="$(CommonPath)Interop\OSX\System.Native\Interop.SearchPath.cs">
-        <Link>Common\Interop\OSX\Interop.SearchPath.cs</Link>
+               Link="Common\Interop\OSX\Interop.SearchPath.cs">
       </Compile>
   </ItemGroup>
   <ItemGroup>