Browse Source

Tests need to be platform specific for ilasm.exe to be extracted correctly

pull/2642/head
Christoph Wille 3 years ago
parent
commit
52b1c49182
  1. 10
      .github/workflows/build-ilspy.yml
  2. 3
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  3. 2
      packages.props

10
.github/workflows/build-ilspy.yml

@ -54,14 +54,10 @@ jobs: @@ -54,14 +54,10 @@ jobs:
- name: Build
run: msbuild ILSpy.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform
- name: Execute ICS.D unit tests (net6.0)
run: vstest.console $env:Tests1
env:
Tests1: ICSharpCode.Decompiler.Tests\bin\${{ matrix.configuration }}\net6.0\ICSharpCode.Decompiler.Tests.dll
- name: Execute unit tests (net6.0-windows)
run: vstest.console $env:Tests2 $env:Tests3
- name: Execute unit tests
run: vstest.console $env:Tests1 $env:Tests2 $env:Tests3
env:
Tests1: ICSharpCode.Decompiler.Tests\bin\${{ matrix.configuration }}\net6.0-windows\win-x64\ICSharpCode.Decompiler.Tests.dll
Tests2: ILSpy.Tests\bin\${{ matrix.configuration }}\net6.0-windows\ILSpy.Tests.dll
Tests3: ILSpy.BamlDecompiler.Tests\bin\${{ matrix.configuration }}\net6.0-windows\ILSpy.BamlDecompiler.Tests.dll

3
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@ -2,7 +2,8 @@ @@ -2,7 +2,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<IsPackable>false</IsPackable>
<StartupObject>AutoGeneratedProgram</StartupObject>

2
packages.props

@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
<SystemCompilerServicesUnsafeVersion>5.0.0</SystemCompilerServicesUnsafeVersion>
<SystemCompositionVersion>5.0.1</SystemCompositionVersion>
<!-- Microsoft.NETCore.ILAsm -->
<ILAsmVersion>5.0.0</ILAsmVersion>
<ILAsmVersion>6.0.0</ILAsmVersion>
<!-- Microsoft.CodeAnalysis.* -->
<RoslynVersion>4.0.1</RoslynVersion>
<MonoCecilVersion>0.11.4</MonoCecilVersion>

Loading…
Cancel
Save