Skip to content

Commit e2cac86

Browse files
committed
Fix CI script to support updated test structure and netcoreapp run.
1 parent 138d911 commit e2cac86

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

MsgPack.Common.props

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,27 @@
1212
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
1313
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1414
<SignAssembly>true</SignAssembly>
15+
<DebugType>portable</DebugType>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
1718
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
2020
<OutputPath>bin\Debug\</OutputPath>
2121
<DefineConstants>$(DefineConstants);DEBUG;SKIP_LARGE_TEST</DefineConstants>
2222
</PropertyGroup>
2323
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
24-
<DebugType>pdbonly</DebugType>
2524
<Optimize>true</Optimize>
2625
<OutputPath>bin\Release\</OutputPath>
2726
</PropertyGroup>
2827
<PropertyGroup Condition="'$(Configuration)' == 'Instrument'">
2928
<OutputPath>bin\Instrument\</OutputPath>
3029
<Optimize>true</Optimize>
31-
<DebugType>pdbonly</DebugType>
3230
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
3331
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
3432
</PropertyGroup>
3533
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU'">
3634
<OutputPath>bin\CodeAnalysis\</OutputPath>
3735
<Optimize>true</Optimize>
38-
<DebugType>pdbonly</DebugType>
3936
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
4037
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
4138
</PropertyGroup>

build/RunUnitTests.cmd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest/bin/Debug/MsgPack.UnitTest.dll --framework:net-4.5 --result=test-result-net45.xml;format=AppVeyor
2-
nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions/bin/Debug/MsgPack.UnitTest.BclExtensions.dll --framework:net-4.5 --result=test-result-net45-bclext.xml;format=AppVeyor
3-
nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom/bin/Debug/MsgPack.UnitTest.CodeDom.dll --framework:net-4.5 --result=test-result-net45-codedom.xml;format=AppVeyor
4-
nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.Net35/bin/Debug/MsgPack.UnitTest.Net35.dll --framework:net-3.5 --result=test-result-net35.xml;format=AppVeyor
5-
nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom.Net35/bin/Debug/MsgPack.UnitTest.CodeDom.Net35.dll --framework:net-3.5 --result=test-result-net35-codedom.xml;format=AppVeyor
1+
dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest/MsgPack.UnitTest.csproj
2+
dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions/MsgPack.UnitTest.BclExtensions.csproj
3+
dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom/MsgPack.UnitTest.CodeDom.csproj
4+
nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.Net35/bin/Debug/net35/MsgPack.UnitTest.Net35.dll --framework:net-3.5 --result=test-result-net35.xml;format=AppVeyor
5+
nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom.Net35/bin/Debug/net35/MsgPack.UnitTest.CodeDom.Net35.dll --framework:net-3.5 --result=test-result-net35-codedom.xml;format=AppVeyor
66
@rem WinRT related tests require developer license...
77
@rem vstest.console /logger:Appveyor /InIsolation %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.WinRT/AppPackages/MsgPack.UnitTest.WinRT_1.1.0.0_AnyCPU_Debug_Test/MsgPack.UnitTest.WinRT_1.1.0.0_AnyCPU_Debug.appx
88
@rem vstest.console /logger:Appveyor /InIsolation %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions.WinRT/AppPackages/MsgPack.UnitTest.BclExtensions.WinRT_1.1.0.0_AnyCPU_Debug_Test/MsgPack.UnitTest.BclExtensions.WinRT_1.1.0.0_AnyCPU_Debug.appx

test/MsgPack.UnitTest.BclExtensions/MsgPack.UnitTest.BclExtensions.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.1" />
2727
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2828
</ItemGroup>
29+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
30+
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.5" />
31+
</ItemGroup>
2932
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
3033
<PackageReference Include="Microsoft.NETCore.App" Version="2.0.0" />
3134
</ItemGroup>

test/MsgPack.UnitTest.CodeDom/MsgPack.UnitTest.CodeDom.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2121
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.1" />
2222
</ItemGroup>
23-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
24-
<PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
25-
</ItemGroup>
2623
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
2724
<PackageReference Include="Microsoft.NETCore.App" Version="2.0.0" />
2825
</ItemGroup>

test/MsgPack.UnitTest/MsgPack.UnitTest.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2626
</ItemGroup>
2727
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
28+
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.5" />
2829
<PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
2930
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
3031
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />

0 commit comments

Comments
 (0)