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

Ignore line endings when comparing AsnXml generated content #101657

Merged
merged 2 commits into from Apr 29, 2024
Merged

Ignore line endings when comparing AsnXml generated content #101657

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b42098c
Ignore line endings when comparing AsnXml generated content
vcsjones Apr 28, 2024
98e3c6f
Code review feedback
vcsjones Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 28 additions & 11 deletions src/libraries/Common/src/System/Security/Cryptography/Asn1/AsnXml.targets
View file
Open in desktop
@@ -1,16 +1,34 @@
<Project>
<PropertyGroup>
<AsnXml />
<_AsnXmlDiffCmd>%24%28command -v diff%29 -q -a</_AsnXmlDiffCmd>
<_AsnXmlDiffCmd Condition="$([MSBuild]::IsOsPlatform('windows')) == 'true'">$(SystemRoot)\System32\fc.exe /a</_AsnXmlDiffCmd>
<_AsnXmlDiffCmd Condition="$([MSBuild]::IsOsPlatform('osx')) == 'true'">diff</_AsnXmlDiffCmd>
vcsjones marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)asn.xsd">
<Link>Common\System\Security\Cryptography\Asn1\asn.xsd</Link>
</None>
</ItemGroup>

<UsingTask
TaskName="CompareFilesIgnoreLineEndings"
TaskFactory="RoslynCodeTaskFactory"
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<GeneratedFile ParameterType="Microsoft.Build.Framework.ITaskItem" Required="true" />
<ExistingFile ParameterType="Microsoft.Build.Framework.ITaskItem" Required="true" />
<ContentsDiffer ParameterType="System.Boolean" Output="true" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Using Namespace="System.Linq" />
<Code Type="Fragment" Language="cs">
<![CDATA[
ContentsDiffer = !File.Exists(ExistingFile.ItemSpec) ||
!File.ReadLines(ExistingFile.ItemSpec).SequenceEqual(File.ReadLines(GeneratedFile.ItemSpec));
]]>
</Code>
</Task>
</UsingTask>

<Target Name="CompileAsn" BeforeTargets="CoreCompile"
Condition=" '@(AsnXml)' != '' "
Inputs="@(AsnXml);$(MSBuildThisFileDirectory)asn.xslt"
Expand All @@ -27,18 +45,17 @@
XmlInputPaths="@(AsnXml)"
OutputPaths="@(AsnXml -> '$(_AsnIntermediatePath)%(filename).cs')" />

<Exec
IgnoreExitCode="true"
StandardOutputImportance="Low"
Command="$(_AsnXmlDiffCmd) @(AsnXml -> '&quot;$(_AsnIntermediatePath)%(filename).cs&quot;') @(AsnXml -> '&quot;%(Identity).cs&quot;')">
<Output TaskParameter="ExitCode" ItemName="_AsnXmlDiffCode" />
</Exec>
<CompareFilesIgnoreLineEndings
GeneratedFile="@(AsnXml -> '$(_AsnIntermediatePath)%(filename).cs')"
ExistingFile="@(AsnXml -> '%(Identity).cs')">
<Output TaskParameter="ContentsDiffer" ItemName="_FilesDiffer" />
</CompareFilesIgnoreLineEndings>

<Copy
Condition="'@(_AsnXmlDiffCode)' != '0'"
Condition="'@(_FilesDiffer)' == 'true'"
SourceFiles="@(AsnXml -> '$(_AsnIntermediatePath)%(filename).cs')"
DestinationFiles="@(AsnXml -> '%(Identity).cs')" />

<Warning Condition="'@(_AsnXmlDiffCode)' != '0'" Text="AsnXml regenerated files, be sure to check them in: @(AsnXml -> '%(Identity).cs')" />
<Warning Condition="'@(_FilesDiffer)' == 'true'" Text="AsnXml regenerated files, be sure to check them in: @(AsnXml -> '%(Identity).cs')" />
</Target>
</Project>