File tree Expand file tree Collapse file tree 5 files changed +17
-11
lines changed
src/Xamarin.Android.Tools.AndroidSdk Expand file tree Collapse file tree 5 files changed +17
-11
lines changed Original file line number Diff line number Diff line change 11CONFIGURATION := Debug
2- NUNIT_CONSOLE := packages/NUnit.ConsoleRunner.3.2.1 /tools/nunit3-console.exe
2+ NUNIT_CONSOLE := packages/NUnit.ConsoleRunner.3.9.0 /tools/nunit3-console.exe
33OS := $(shell uname)
44RUNTIME := mono --debug=casts
55V ?= 0
Original file line number Diff line number Diff line change 1616 displayName : ' VsTest - NUnit3'
1717 inputs :
1818 testAssemblyVer2 : ' bin\TestDebug\*-Tests.dll'
19- pathtoCustomTestAdapters : ' packages\NUnit3TestAdapter.3.12 .0\build\net35'
19+ pathtoCustomTestAdapters : ' packages\NUnit3TestAdapter.3.13 .0\build\net35'
2020 - powershell : |
2121 $hashOfLastVersionChange = & "git" "log" "--follow" "-1" "--pretty=%H" "nuget.version"
2222 $commitsSinceVersionChange = & "git" "rev-list" "--count" "$hashOfLastVersionChange..HEAD"
4444 displayName : ' Build solution Xamarin.Android.Tools.sln'
4545 inputs :
4646 solution : Xamarin.Android.Tools.sln
47- - script : mono packages/NUnit.ConsoleRunner.3.2.1 /tools/nunit3-console.exe bin/TestDebug/Xamarin.Android.Tools.AndroidSdk-Tests.dll
47+ - script : mono packages/NUnit.ConsoleRunner.3.9.0 /tools/nunit3-console.exe bin/TestDebug/Xamarin.Android.Tools.AndroidSdk-Tests.dll
4848 displayName : Run NUnit Tests
4949 - task : PublishTestResults@2
5050 condition : always()
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<Project DefaultTargets =" Build" ToolsVersion =" 4.0" xmlns =" http://schemas.microsoft.com/developer/msbuild/2003" >
3+ <Import Project =" ..\..\..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition =" Exists('..\..\..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
4+ <Import Project =" ..\..\..\packages\NUnit.3.11.0\build\NUnit.props" Condition =" Exists('..\..\..\packages\NUnit.3.11.0\build\NUnit.props')" />
35 <Import Project =" $(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition =" Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
46 <PropertyGroup >
57 <Configuration Condition =" '$(Configuration)' == '' " >Debug</Configuration >
911 <AppDesignerFolder >Properties</AppDesignerFolder >
1012 <RootNamespace >Xamarin.Android.Tools.Tests</RootNamespace >
1113 <AssemblyName >Xamarin.Android.Tools.AndroidSdk-Tests</AssemblyName >
12- <TargetFrameworkVersion >v4.5.2 </TargetFrameworkVersion >
14+ <TargetFrameworkVersion >v4.7.1 </TargetFrameworkVersion >
1315 <FileAlignment >512</FileAlignment >
1416 </PropertyGroup >
1517 <PropertyGroup Condition =" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " >
3133 </PropertyGroup >
3234 <ItemGroup >
3335 <Reference Include =" nunit.framework" >
34- <HintPath >..\..\..\packages\NUnit.3.2.1 \lib\net45\nunit.framework.dll</HintPath >
36+ <HintPath >..\..\..\packages\NUnit.3.11.0 \lib\net45\nunit.framework.dll</HintPath >
3537 </Reference >
3638 <Reference Include =" System" />
3739 <Reference Include =" System.Core" />
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<packages >
3- <package id =" NUnit" version =" 3.2.1" targetFramework =" net45" />
4- <package id =" NUnit.Console" version =" 3.2.1" />
5- <package id =" NUnit.ConsoleRunner" version =" 3.2.1" />
6- <package id =" NUnit.Extension.NUnitV2ResultWriter" version =" 3.2.1" />
7- <package id =" NUnit3TestAdapter" version =" 3.12.0" targetFramework =" net452" />
3+ <package id =" NUnit" version =" 3.11.0" targetFramework =" net452" />
4+ <package id =" NUnit.Console" version =" 3.9.0" targetFramework =" net452" />
5+ <package id =" NUnit.ConsoleRunner" version =" 3.9.0" targetFramework =" net452" />
6+ <package id =" NUnit.Extension.NUnitProjectLoader" version =" 3.5.0" targetFramework =" net452" />
7+ <package id =" NUnit.Extension.NUnitV2Driver" version =" 3.6.0" targetFramework =" net452" />
8+ <package id =" NUnit.Extension.NUnitV2ResultWriter" version =" 3.5.0" targetFramework =" net452" />
9+ <package id =" NUnit.Extension.TeamCityEventListener" version =" 1.0.3" targetFramework =" net452" />
10+ <package id =" NUnit.Extension.VSProjectLoader" version =" 3.8.0" targetFramework =" net452" />
11+ <package id =" NUnit3TestAdapter" version =" 3.13.0" targetFramework =" net452" />
812 <package id =" Unofficial.Ionic.Zip" version =" 1.9.1.8" targetFramework =" net45" />
913</packages >
Original file line number Diff line number Diff line change 77 <OutputType >Library</OutputType >
88 <RootNamespace >Xamarin.Android.Tools</RootNamespace >
99 <AssemblyName >Xamarin.Android.Tools.AndroidSdk</AssemblyName >
10- <TargetFrameworkVersion >v4.5 </TargetFrameworkVersion >
10+ <TargetFrameworkVersion >v4.7.1 </TargetFrameworkVersion >
1111 <ProductVersion >8.0.30703</ProductVersion >
1212 <SchemaVersion >2.0</SchemaVersion >
1313 <SignAssembly >true</SignAssembly >
You can’t perform that action at this time.
0 commit comments