Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use attribute Link syntax for Common files #35436

Merged
merged 4 commits into from
Apr 25, 2020
Merged

Use attribute Link syntax for Common files #35436

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
120d9cb
Use attribute Link syntax for Common files
marcusturewicz Apr 25, 2020
5951f54
Revert "Use attribute Link syntax for Common files"
marcusturewicz Apr 25, 2020
c9cfe8f
Change <Link>...</Link> to Link="..."
marcusturewicz Apr 25, 2020
0984854
Format existing Link="..."
marcusturewicz Apr 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
marcusturewicz marked this conversation as resolved.
Show resolved Hide resolved
<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'">
Expand All @@ -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'" />
Expand Down Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion .../tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
70 changes: 35 additions & 35 deletions ...Security/Cryptography/Asn1Reader/System.Security.Cryptography.Asn1Reader.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading