Skip to content

Commit 5224d0c

Browse files
committed
Added .NET 4.5 output and removed OpenCover
1 parent 8cca675 commit 5224d0c

File tree

6 files changed

+20
-34
lines changed

6 files changed

+20
-34
lines changed

MLAPI-Editor/MLAPI-Editor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="../common.props" />
33
<PropertyGroup>
44
<RootNamespace>MLAPI_Editor</RootNamespace>
5-
<TargetFrameworks>net35;net471;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net35;net471;net45;netstandard2.0</TargetFrameworks>
66
<AssemblyTitle>MLAPI-Editor</AssemblyTitle>
77
<Product>MLAPI-Editor</Product>
88
<LangVersion>7</LangVersion>

MLAPI-Examples/MLAPI-Examples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="../common.props" />
33
<PropertyGroup>
44
<RootNamespace>MLAPI_Examples</RootNamespace>
5-
<TargetFrameworks>net35;net471;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net35;net471;net45;netstandard2.0</TargetFrameworks>
66
<AssemblyTitle>MLAPI-Examples</AssemblyTitle>
77
<Product>MLAPI-Examples</Product>
88
</PropertyGroup>

MLAPI-Tests/MLAPI-Tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<Import Project="../common.props" />
33
<PropertyGroup>
44
<RootNamespace>MLAPI_Tests</RootNamespace>
5-
<TargetFrameworks>net35;net471;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net35;net471;net45;netstandard2.0</TargetFrameworks>
66
<LangVersion>7</LangVersion>
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="NUnit" Version="3.10.1" />
10-
<PackageReference Include="OpenCover" Version="4.6.519" />
1110
</ItemGroup>
1211
<ItemGroup>
1312
<ProjectReference Include="..\MLAPI\MLAPI.csproj" />

MLAPI/MLAPI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Description>Game networking stack for Unity.</Description>
99
<Version>6.0.0</Version>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
11-
<TargetFrameworks>net35;net471;netstandard2.0</TargetFrameworks>
11+
<TargetFrameworks>net35;net471;net45;netstandard2.0</TargetFrameworks>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -915,9 +915,6 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId, int t
915915
}
916916
}
917917

918-
#if NET45
919-
[MethodImpl(MethodImplOptions.AggressiveInlining)]
920-
#endif
921918
internal void DisconnectClient(uint clientId)
922919
{
923920
if (!IsServer)

appveyor.yml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,53 +23,43 @@ artifacts:
2323

2424
image: Visual Studio 2017
2525

26-
install:
27-
- cd C:\
28-
- cmd: mkdir testOutput
29-
- if not exist opencover.zip appveyor DownloadFile "https://github.com/OpenCover/opencover/releases/download/4.6.519/opencover.4.6.519.zip" -FileName opencover.zip
30-
- 7z x -y opencover.zip -o"C:\opencover" > nul
31-
3226
before_build:
33-
- cd %appveyor_build_folder%
3427
- nuget restore
3528

3629
for:
3730
-
3831
matrix:
3932
only:
4033
- configuration: Debug
41-
test_script:
42-
- C:\OpenCover\OpenCover.Console.exe -returntargetcode -register:user -target:"nunit3-console.exe" -targetargs:"MLAPI-Tests\bin\Debug\net35\MLAPI-Tests.dll" -output:"coverage.xml" -filter:"+[MLAPI*]* -[MLAPI-Tests*]* "
4334
artifacts:
44-
- path: 'MLAPI\bin\Debug\net35\MLAPI*'
35+
- path: 'MLAPI\bin\Debug\*\*MLAPI*'
36+
test:
37+
assemblies:
38+
- 'MLAPI\bin\Debug\*\MLAPI.dll'
4539
-
4640
matrix:
4741
only:
4842
- configuration: Debug_Lite
49-
test_script:
50-
- C:\OpenCover\OpenCover.Console.exe -returntargetcode -register:user -target:"nunit3-console.exe" -targetargs:"MLAPI-Tests\bin\Lite\Debug\net35\MLAPI-Tests.dll" -output:"coverage.xml" -filter:"+[MLAPI*]* -[MLAPI-Tests*]* "
5143
artifacts:
52-
- path: 'MLAPI\bin\Lite\Debug\net35\MLAPI*'
44+
- path: 'MLAPI\bin\Lite\Debug\*\*MLAPI*'
45+
test:
46+
assemblies:
47+
- 'MLAPI\bin\Lite\Debug\*\MLAPI.dll'
5348
-
5449
matrix:
5550
only:
5651
- configuration: Release
57-
test_script:
58-
- C:\OpenCover\OpenCover.Console.exe -returntargetcode -register:user -target:"nunit3-console.exe" -targetargs:"MLAPI-Tests\bin\Release\net35\MLAPI-Tests.dll" -output:"coverage.xml" -filter:"+[MLAPI*]* -[MLAPI-Tests*]* "
5952
artifacts:
60-
- path: 'MLAPI\bin\Release\net35\MLAPI*'
53+
- path: 'MLAPI\bin\Release\*\*MLAPI*'
54+
test:
55+
assemblies:
56+
- 'MLAPI\bin\Release\*\MLAPI.dll'
6157
-
6258
matrix:
6359
only:
6460
- configuration: Release_Lite
65-
test_script:
66-
- C:\OpenCover\OpenCover.Console.exe -returntargetcode -register:user -target:"nunit3-console.exe" -targetargs:"MLAPI-Tests\bin\Lite\Release\net35\MLAPI-Tests.dll" -output:"coverage.xml" -filter:"+[MLAPI*]* -[MLAPI-Tests*]* "
6761
artifacts:
68-
- path: 'MLAPI\bin\Lite\Release\net35\MLAPI*'
69-
70-
71-
after_test:
72-
- ps: |
73-
$env:PATH = 'C:\msys64\usr\bin;' + $env:PATH
74-
Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
75-
bash codecov.sh -f "coverage.xml"
62+
- path: 'MLAPI\bin\Lite\Release\*\*MLAPI*'
63+
test:
64+
assemblies:
65+
- 'MLAPI\bin\Lite\Release\*\MLAPI.dll'

0 commit comments

Comments
 (0)