nunit
/
nunit.xamarin
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixed issues based on testing

This commit is contained in:
Rob Prouse 2015-09-04 16:25:38 -04:00
Родитель dd58333e74
Коммит e094738404
6 изменённых файлов: 35 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
NUnit.proj
Просмотреть файл

@ -82,12 +82,21 @@
<Target Name="Build" Label="Build the Xamarin runner projects" DependsOnTargets="BuildRunner" />
<Target Name="BuildAll" Label="Build the Xamarin runner projects" DependsOnTargets="BuildRunner" />
<Target Name="BuildAll" Label="Build the Xamarin runner projects and the platform specific test projects"
DependsOnTargets="BuildRunner,BuildAndroid,BuildIos" />
<Target Name="BuildRunner" Label="Build the Xamarin runner projects">
<MSBuild Targets="Build" Projects="@(RunnerProjects)" Properties="Configuration=$(Configuration); Platform=AnyCPU" />
</Target>
<Target Name="BuildAndroid" Label="Build the Android test project">
<MSBuild Targets="Build" Projects="@(AndroidProjects)" Properties="Configuration=$(Configuration); Platform=AnyCPU" />
</Target>
<Target Name="BuildIos" Label="Build the iPhone test project">
<MSBuild Targets="Build" Projects="@(IosProjects)" Properties="Configuration=$(Configuration); Platform=iPhone" />
</Target>
<!-- End Region -->
<!-- Region Packaging Targets -->
@ -99,8 +108,7 @@
<!-- creates the package to first make sure that the build is up to date. -->
<!-- *********************************************************************** -->
<Target Name="PackageNuGet" Label="Creates the NuGet package"
DependsOnTargets="_CreateImageIfNotPresent">
<Target Name="PackageNuGet" Label="Creates the NuGet package">
<Message Text="******************************************************************" />
<Message Text="* Creating the Nuget $(Configuration) package" />
@ -118,8 +126,14 @@
<ItemGroup Label="Projects for building Xamarin runners">
<RunnerProjects Include="$(ProjectSrcDir)\runner\nunit.runner.Droid\nunit.runner.Droid.csproj" />
<RunnerProjects Include="$(ProjectSrcDir)\runner\nunit.runner.iOS\nunit.runner.iOS.csproj" />
<RunnerProjects Include="$(ProjectSrcDir)\tests\nunit.runner.tests.Droid\nunit.runner.tests.Droid.csproj" />
<RunnerProjects Include="$(ProjectSrcDir)\tests\nunit.runner.tests.iOS\nunit.runner.tests.iOS.csproj" />
</ItemGroup>
<ItemGroup Label="Android test project">
<AndroidProjects Include="$(ProjectSrcDir)\tests\nunit.runner.tests.Droid\nunit.runner.tests.Droid.csproj" />
</ItemGroup>
<ItemGroup Label="iOS test project">
<IosProjects Include="$(ProjectSrcDir)\tests\nunit.runner.tests.iOS\nunit.runner.tests.iOS.csproj" />
</ItemGroup>
<!-- End Region -->

2
nuget/MainActivity.cs.txt.pp
Просмотреть файл

@ -27,7 +27,7 @@ using Android.OS;
namespace $rootnamespace$
{
[Activity(Label = "NUnit 3.0", MainLauncher = true, Theme= "@android:style/Theme.Holo.Light, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation")]
[Activity(Label = "NUnit 3.0", MainLauncher = true, Theme= "@android:style/Theme.Holo.Light", ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsApplicationActivity
{
protected override void OnCreate(Bundle savedInstanceState)

14
nuget/nunit.runners.xamarin.nuspec
Просмотреть файл

@ -17,10 +17,14 @@
<copyright>Copyright (c) 2015 Charlie Poole</copyright>
<dependencies>
<dependency id="nunit.framework" version="3.0.0-beta-4" />
<dependency id="Xamarin.Forms" version="1.4.4.6392" />
<group targetFramework="Xamarin.iOS">
<dependency id="nunit" version="[$version$]" />
<dependency id="Xamarin.Forms" version="1.4.4.6392" />
</group>
<group targetFramework="monoandroid">
<dependency id="nunit" version="[$version$]" />
<dependency id="Xamarin.Forms" version="1.4.4.6392" />
<dependency id="Xamarin.Android.Support.v4" version="22.2.1.0" />
</group>
</dependencies>
@ -30,8 +34,8 @@
<file src="bin\Release\nunit.runner.Droid.dll" target="lib\MonoAndroid\nunit.runner.Droid.dll" />
<file src="bin\Release\nunit.runner.Droid.xml" target="lib\MonoAndroid\nunit.runner.Droid.xml" />
<file src="nuget\AppDelegate-unified.cs.txt.pp" target="content\Xamarin.iOS\AppDelegate.cs.txt.pp" />
<file src="bin\iPhone\Release\nunit.runner.iOS.dll" target="lib\Xamarin.iOS\nunit.runner.iOS.dll" />
<file src="bin\iPhone\Release\nunit.runner.iOS.xml" target="lib\Xamarin.iOS\nunit.runner.iOS.xml" />
<file src="nuget\AppDelegate.cs.txt.pp" target="content\Xamarin.iOS\AppDelegate.cs.txt.pp" />
<file src="bin\Release\nunit.runner.iOS.dll" target="lib\Xamarin.iOS\nunit.runner.iOS.dll" />
<file src="bin\Release\nunit.runner.iOS.xml" target="lib\Xamarin.iOS\nunit.runner.iOS.xml" />
</files>
</package>

1
nunit.runner.sln
Просмотреть файл

@ -37,6 +37,7 @@ EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\tests\nunit.runner.tests\nunit.runner.tests.projitems*{391ce92c-08f6-4ddf-941c-a8980dcc196e}*SharedItemsImports = 4
src\tests\nunit.runner.tests\nunit.runner.tests.projitems*{17a2b97c-56ea-40b8-8901-5e0728876657}*SharedItemsImports = 4
src\tests\nunit.runner.tests\nunit.runner.tests.projitems*{af293652-baa0-4813-b4f3-2d5a2cdde0b4}*SharedItemsImports = 13
src\runner\nunit.runner\nunit.runner.projitems*{3bf3745a-8491-46a9-af66-f8de22accf31}*SharedItemsImports = 4
src\runner\nunit.runner\nunit.runner.projitems*{c9209134-aea3-4c7f-ad74-00d578a6f208}*SharedItemsImports = 13

1
src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj
Просмотреть файл

@ -39,6 +39,7 @@
<DefineConstants>TRACE;__DROID__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\..\bin\Release\nunit.runner.Droid.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="FormsViewGroup, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">

7
src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj
Просмотреть файл

@ -18,23 +18,24 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutputPath>
<OutputPath>..\..\..\bin\Debug\</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<DocumentationFile>..\..\..\bin\AnyCPU\Debug\nunit.runner.iOS.XML</DocumentationFile>
<DocumentationFile>..\..\..\bin\Debug\nunit.runner.iOS.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutputPath>
<OutputPath>..\..\..\bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<DocumentationFile>..\..\..\bin\Release\nunit.runner.iOS.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />