Skip to content

Commit 08cff2e

Browse files
KvanTTTKvanTTT
authored
Merge 0745292 into 9d5a5ee 
2 parents 9d5a5ee + 0745292 commit 08cff2e

File tree

8 files changed

+74
-2
lines changed

8 files changed

+74
-2
lines changed

‎Confuser2.sln‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IncorrectRedirectToGac", "T
9696
EndProject
9797
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IncorrectRedirectToGac.Test", "Tests\IncorrectRedirectToGac.Test\IncorrectRedirectToGac.Test.csproj", "{B7FF0EE8-6C68-46C6-AADB-58C0E3309FB2}"
9898
EndProject
99+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCore.Test", "Tests\NetCore.Test\NetCore.Test.csproj", "{148B6251-FF1F-491F-A1C2-6F1D39AEA361}"
100+
EndProject
101+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCore", "Tests\NetCore\NetCore.csproj", "{89E07BFD-D11F-44DA-9CC3-AFA08184D651}"
102+
EndProject
99103
Global
100104
GlobalSection(SolutionConfigurationPlatforms) = preSolution
101105
Debug|Any CPU = Debug|Any CPU
@@ -258,6 +262,14 @@ Global
258262
{B7FF0EE8-6C68-46C6-AADB-58C0E3309FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
259263
{B7FF0EE8-6C68-46C6-AADB-58C0E3309FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
260264
{B7FF0EE8-6C68-46C6-AADB-58C0E3309FB2}.Release|Any CPU.Build.0 = Release|Any CPU
265+
{148B6251-FF1F-491F-A1C2-6F1D39AEA361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
266+
{148B6251-FF1F-491F-A1C2-6F1D39AEA361}.Debug|Any CPU.Build.0 = Debug|Any CPU
267+
{148B6251-FF1F-491F-A1C2-6F1D39AEA361}.Release|Any CPU.ActiveCfg = Release|Any CPU
268+
{148B6251-FF1F-491F-A1C2-6F1D39AEA361}.Release|Any CPU.Build.0 = Release|Any CPU
269+
{89E07BFD-D11F-44DA-9CC3-AFA08184D651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
270+
{89E07BFD-D11F-44DA-9CC3-AFA08184D651}.Debug|Any CPU.Build.0 = Debug|Any CPU
271+
{89E07BFD-D11F-44DA-9CC3-AFA08184D651}.Release|Any CPU.ActiveCfg = Release|Any CPU
272+
{89E07BFD-D11F-44DA-9CC3-AFA08184D651}.Release|Any CPU.Build.0 = Release|Any CPU
261273
EndGlobalSection
262274
GlobalSection(SolutionProperties) = preSolution
263275
HideSolutionNode = FALSE
@@ -294,6 +306,8 @@ Global
294306
{87BEF4D7-813E-48BA-96FE-E3A24BF2DC34} = {356BDB31-853E-43BB-8F9A-D8AC08F69EBB}
295307
{9B823D93-BF1B-407B-A4CD-231347F656AD} = {356BDB31-853E-43BB-8F9A-D8AC08F69EBB}
296308
{B7FF0EE8-6C68-46C6-AADB-58C0E3309FB2} = {356BDB31-853E-43BB-8F9A-D8AC08F69EBB}
309+
{148B6251-FF1F-491F-A1C2-6F1D39AEA361} = {356BDB31-853E-43BB-8F9A-D8AC08F69EBB}
310+
{89E07BFD-D11F-44DA-9CC3-AFA08184D651} = {356BDB31-853E-43BB-8F9A-D8AC08F69EBB}
297311
EndGlobalSection
298312
GlobalSection(ExtensibilityGlobals) = postSolution
299313
SolutionGuid = {0D937D9E-E04B-4A68-B639-D4260473A388}

‎Tests/Confuser.UnitTest/Confuser.UnitTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\ConfuserEx.Common.props" Condition="Exists('..\ConfuserEx.Common.props')" />
44

55
<PropertyGroup Label="Assembly Settings">
6-
<TargetFramework>net461</TargetFramework>
6+
<TargetFramework>netstandard2.0</TargetFramework>
77
</PropertyGroup>
88

99
<ItemGroup Label="Nuget Dependencies">

‎Tests/NetCore.Test/NetCore.Test.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup Label="Nuget Dependencies">
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
9+
</ItemGroup>
10+
11+
<ItemGroup>
12+
<ProjectReference Include="..\Confuser.UnitTest\Confuser.UnitTest.csproj" />
13+
<ProjectReference Include="..\NetCore\NetCore.csproj" />
14+
</ItemGroup>
15+
</Project>

‎Tests/NetCore.Test/NetCoreTest.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System.Threading.Tasks;
2+
using Confuser.UnitTest;
3+
using Xunit;
4+
using Xunit.Abstractions;
5+
6+
namespace NetCore.Test {
7+
public class NetCoreTest : TestBase {
8+
public NetCoreTest(ITestOutputHelper outputHelper) : base(outputHelper) { }
9+
10+
[Fact(Skip = "TODO: fix https://github.com/mkaring/ConfuserEx/issues/106 and other related")]
11+
public async Task NetCore() =>
12+
await Run("NetCore.dll", new string[0], null);
13+
}
14+
}

‎Tests/NetCore/Class1.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
3+
namespace NetCore {
4+
public class Class1 {
5+
public int GetARandomInt() {
6+
object o = null;
7+
var test = o?.GetType()?.Name;
8+
return new Random().Next();
9+
}
10+
}
11+
}

‎Tests/NetCore/NetCore.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
</PropertyGroup>
6+
7+
</Project>

‎Tests/NetCore/Program.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
3+
namespace NetCore {
4+
public class Program {
5+
static int Main(string[] args) {
6+
Console.WriteLine("START");
7+
Console.WriteLine("END");
8+
return 42;
9+
}
10+
}
11+
}

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: '{build}'
2-
image: Visual Studio 2017
2+
image: Visual Studio 2019
33
configuration: Release
44
platform: Any CPU
55
skip_commits:

0 commit comments

Comments
 (0)