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.

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

Migrate GitHub Actions #107

Merged
merged 17 commits into from
Oct 17, 2021
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Added ability for dual tfm regression test.
Detected some different test result between net45 and netstandard2.0, so improves test.
kekyo committed Oct 17, 2021
commit 20468228b05898a262f578307f407f20c5088cfe
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>

<OutputType>Library</OutputType>
2 changes: 1 addition & 1 deletion tests/IL2C.Core.Test.Common/IL2C.Core.Test.Common.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>

<OutputType>Library</OutputType>
9 changes: 8 additions & 1 deletion tests/IL2C.Core.Test.Common/ILSupport.Standard.targets
Original file line number Diff line number Diff line change
@@ -87,6 +87,7 @@
</ItemGroup>
<PropertyGroup>
<ILSource>$([System.IO.File]::ReadAllText($(ILFile)))</ILSource>
<!-- Replace forwardref declaration to real il body -->
<Replacement>// method ${method} forwardref removed for IL import</Replacement>
<Pattern>\.method [^{}]+ cil managed forwardref[^}]+} // end of method (?&lt;method&gt;[^ \r\t\n]+)</Pattern>
<ILSource>$([System.Text.RegularExpressions.Regex]::Replace($(ILSource), $(Pattern), $(Replacement)))</ILSource>
@@ -151,7 +152,13 @@
<ReadLinesFromFile File="%(IL.Identity)">
<Output TaskParameter="Lines" ItemName="ILLines" />
</ReadLinesFromFile>
<WriteLinesToFile File="$(MergedILPath)" Lines="@(ILLines)" Overwrite="true" />

<!-- Replace '[netstandard]` to `[mscorlib]` is build target is .NET Framework. -->
<WriteLinesToFile Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"
File="$(MergedILPath)" Lines="@(ILLines->Replace('[netstandard]','[mscorlib]'))" Overwrite="true" />
<WriteLinesToFile Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'"
File="$(MergedILPath)" Lines="@(ILLines->Replace('[mscorlib]','[netstandard]'))" Overwrite="true" />

<Message Importance="normal" Text="ILSupport: ILAsm = $(ILAsm)" />
<Exec Command="$(ILAsm) &quot;$(MergedILPath)&quot;" />
<ItemGroup>
2 changes: 1 addition & 1 deletion tests/IL2C.Core.Test.Fixture/IL2C.Core.Test.Fixture.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFrameworks>net462;net5.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>

<OutputType>Library</OutputType>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>

<OutputType>Library</OutputType>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>

<OutputType>Library</OutputType>