Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/linker.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2020-01-29 14:56:17 +0300
committerMarek Safar <marek.safar@gmail.com>2020-01-30 01:04:59 +0300
commit6e0105e0fc16b959510480298599ca09a5509a21 (patch)
tree893d475b52a9005746f0bc6f06a21e7694af5ff0 /test/Mono.Linker.Tests
parent2818dc1d5f405819fac7caf5738b205408314202 (diff)
Clean up illink build a bit
Diffstat (limited to 'test/Mono.Linker.Tests')
-rw-r--r--test/Mono.Linker.Tests/Mono.Linker.Tests.csproj5
-rw-r--r--test/Mono.Linker.Tests/TestCasesRunner/LinkerArgumentBuilder.cs2
2 files changed, 3 insertions, 4 deletions
diff --git a/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj b/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj
index c01424cc3..391a93ab0 100644
--- a/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj
+++ b/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj
@@ -43,16 +43,13 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
<PackageReference Include="nunit" Version="3.10.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<!-- This reference is purely so that the linker can resolve this
dependency of mscorlib. It is not actually required to build
the tests. -->
<PackageReference Include="System.Threading.AccessControl" Version="4.5.0" />
</ItemGroup>
- <Target Name="PrepareTools"
- BeforeTargets="Build"
- Condition="$(ILLinkBuild)">
+ <Target Name="PrepareTools" BeforeTargets="Build" Condition="$(ILLinkBuild)">
<!-- Restore ilasm using ilasm.ilproj. Restore must be done
separately from copy with a different set of input
properties, to force MSBuild to re-evaluate using new props
diff --git a/test/Mono.Linker.Tests/TestCasesRunner/LinkerArgumentBuilder.cs b/test/Mono.Linker.Tests/TestCasesRunner/LinkerArgumentBuilder.cs
index 3a3f2a055..a4e6bd4eb 100644
--- a/test/Mono.Linker.Tests/TestCasesRunner/LinkerArgumentBuilder.cs
+++ b/test/Mono.Linker.Tests/TestCasesRunner/LinkerArgumentBuilder.cs
@@ -161,8 +161,10 @@ namespace Mono.Linker.Tests.TestCasesRunner {
// our test cases that pollutes the results
IncludeBlacklist (options.IncludeBlacklistStep);
+#if !NETCOREAPP
if (!string.IsNullOrEmpty (options.Il8n))
AddIl8n (options.Il8n);
+#endif
if (!string.IsNullOrEmpty (options.KeepTypeForwarderOnlyAssemblies))
AddKeepTypeForwarderOnlyAssemblies (options.KeepTypeForwarderOnlyAssemblies);