Skip to content
This repository has been archived by the owner on Jan 8, 2023. It is now read-only.

Commit

Permalink
Merge pull request #45 from nunit/release-3.0.1
Browse files Browse the repository at this point in the history
3.0.1 release
  • Loading branch information
rprouse committed Dec 3, 2015
2 parents 449bd88 + 8f5b661 commit 6e1dd8a
Show file tree
Hide file tree
Showing 23 changed files with 114 additions and 66 deletions.
4 changes: 2 additions & 2 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;


// Versioning
var packageVersion = "3.0.0";
var packageVersion = "3.0.1";
var packageModifier = "";
var displayVersion = "3.0.0";
var displayVersion = "3.0.1";

var semVersion = packageVersion + packageModifier;

Expand Down
2 changes: 1 addition & 1 deletion nuget/nunit.runners.xamarin.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Supported Xamarin platforms:

<dependencies>
<group>
<dependency id="nunit" version="[3.0.0]" />
<dependency id="nunit" version="[3.0.1]" />
<dependency id="Xamarin.Forms" version="1.5.0.6447" />
</group>
</dependencies>
Expand Down
15 changes: 0 additions & 15 deletions nunit.runner.userprefs

This file was deleted.

6 changes: 3 additions & 3 deletions src/runner/nunit.runner.Droid/nunit.runner.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<DevInstrumentationEnabled>True</DevInstrumentationEnabled>
<TargetFrameworkVersion>v5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
Expand Down Expand Up @@ -45,8 +45,8 @@
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="nunit.framework, Version=3.0.5797.27550, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.0.5813.39035, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion src/runner/nunit.runner.Droid/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.0.0" targetFramework="monoandroid51" />
<package id="NUnit" version="3.0.1" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v4" version="23.0.1.3" targetFramework="monoandroid403" />
<package id="Xamarin.Forms" version="1.5.0.6447" targetFramework="monoandroid51" />
</packages>
4 changes: 2 additions & 2 deletions src/runner/nunit.runner.iOS/nunit.runner.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.0.5797.27550, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.0.5813.39035, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion src/runner/nunit.runner.iOS/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.0.0" targetFramework="xamarinios1" />
<package id="NUnit" version="3.0.1" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="1.5.0.6447" targetFramework="xamarinios1" />
</packages>
2 changes: 1 addition & 1 deletion src/runner/nunit.runner.uwp/nunit.runner.uwp.nuget.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
<NuGetPackageRoot>C:\Users\Rob\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
Expand Down
2 changes: 1 addition & 1 deletion src/runner/nunit.runner.uwp/project.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
"NUnit": "3.0.0",
"NUnit": "3.0.1",
"Xamarin.Forms": "1.5.0.6447"
},
"frameworks": {
Expand Down
24 changes: 12 additions & 12 deletions src/runner/nunit.runner.uwp/project.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -1803,7 +1803,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -3438,7 +3438,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -5078,7 +5078,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -6713,7 +6713,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -8353,7 +8353,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -9988,7 +9988,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -12036,8 +12036,8 @@
"ref/xamarinmac20/_._"
]
},
"NUnit/3.0.0": {
"sha512": "/7lqdUb+/e1NAd3NDhY05ppjQUieAamnUxHzhKgaxWVNyTJqhdR0z73MXNc2VV2dignM4MieF3Tzs1wXsWx8/w==",
"NUnit/3.0.1": {
"sha512": "Fhz2Flnzlb+HjVxTK+W3dNAb9FUIbGxUp/G6jTTL487lBxInaDOWigNGzWbj1Ipjb87ix77heBCzrsVhk8+X8w==",
"type": "Package",
"files": [
"[Content_Types].xml",
Expand All @@ -12056,7 +12056,7 @@
"LICENSE.txt",
"NOTICES.txt",
"NUnit.nuspec",
"package/services/metadata/core-properties/45d9d63e089a4fbb8ffafab5905528b3.psmdcp"
"package/services/metadata/core-properties/59ec910f17c54b6493a6276f36784454.psmdcp"
]
},
"System.AppContext/4.0.0": {
Expand Down Expand Up @@ -14755,7 +14755,7 @@
]
},
"Xamarin.Forms/1.5.0.6447": {
"sha512": "0oBfhFmKt4kxFK+iBdTtZaW6Ys/adM7fH/47EcHLXfsNoe34xtYAqEZ7A4lGMnzg/5hgRVHmiOV2Z0cmZvuTwg==",
"sha512": "iPmiog6UF5ZZNyE0faRdWhGlVaoqVRi193wyeStwRxX6l3QNomMFBaHN58ly2vOuKD2KYk+McjBOEQi6HfNwEA==",
"type": "Package",
"files": [
"[Content_Types].xml",
Expand Down Expand Up @@ -14837,7 +14837,7 @@
"projectFileDependencyGroups": {
"": [
"Microsoft.NETCore.UniversalWindowsPlatform >= 5.0.0",
"NUnit >= 3.0.0",
"NUnit >= 3.0.1",
"Xamarin.Forms >= 1.5.0.6447"
],
"UAP,Version=v10.0": []
Expand Down
4 changes: 2 additions & 2 deletions src/runner/nunit.runner.wp81/nunit.runner.wp81.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.0.5797.27550, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.0.5813.39035, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/runner/nunit.runner.wp81/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.0.0" targetFramework="wpa81" />
<package id="NUnit" version="3.0.1" targetFramework="wpa81" />
<package id="Xamarin.Forms" version="1.5.0.6447" targetFramework="wpa81" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
<TargetFrameworkVersion>v5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -53,8 +53,8 @@
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="nunit.framework, Version=3.0.5797.27550, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.0.5813.39035, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion src/tests/nunit.runner.tests.Droid/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.0.0" targetFramework="monoandroid51" />
<package id="NUnit" version="3.0.1" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v4" version="23.0.1.3" targetFramework="monoandroid51" />
<package id="Xamarin.Forms" version="1.5.0.6447" targetFramework="monoandroid51" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
</ItemGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.0.5797.27550, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.0\lib\dotnet\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.0.5813.39035, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.0.1\lib\dotnet\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion src/tests/nunit.runner.tests.iOS/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.0.0" targetFramework="xamarinios1" />
<package id="NUnit" version="3.0.1" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="1.5.0.6447" targetFramework="xamarinios1" />
</packages>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
<NuGetPackageRoot>C:\Users\Rob\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\1.5.0.6447\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
Expand Down
2 changes: 1 addition & 1 deletion src/tests/nunit.runner.tests.uwp/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0",
"Microsoft.ApplicationInsights.WindowsApps": "1.0.0",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
"NUnit": "3.0.0",
"NUnit": "3.0.1",
"Xamarin.Forms": "1.5.0.6447"
},
"frameworks": {
Expand Down
24 changes: 12 additions & 12 deletions src/tests/nunit.runner.tests.uwp/project.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -1865,7 +1865,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -3531,7 +3531,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -5202,7 +5202,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -6868,7 +6868,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -8539,7 +8539,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -10205,7 +10205,7 @@
"lib/dotnet/Microsoft.Win32.Primitives.dll": {}
}
},
"NUnit/3.0.0": {
"NUnit/3.0.1": {
"compile": {
"lib/dotnet/nunit.framework.dll": {}
},
Expand Down Expand Up @@ -12303,8 +12303,8 @@
"ref/xamarinmac20/_._"
]
},
"NUnit/3.0.0": {
"sha512": "/7lqdUb+/e1NAd3NDhY05ppjQUieAamnUxHzhKgaxWVNyTJqhdR0z73MXNc2VV2dignM4MieF3Tzs1wXsWx8/w==",
"NUnit/3.0.1": {
"sha512": "Fhz2Flnzlb+HjVxTK+W3dNAb9FUIbGxUp/G6jTTL487lBxInaDOWigNGzWbj1Ipjb87ix77heBCzrsVhk8+X8w==",
"type": "Package",
"files": [
"[Content_Types].xml",
Expand All @@ -12323,7 +12323,7 @@
"LICENSE.txt",
"NOTICES.txt",
"NUnit.nuspec",
"package/services/metadata/core-properties/45d9d63e089a4fbb8ffafab5905528b3.psmdcp"
"package/services/metadata/core-properties/59ec910f17c54b6493a6276f36784454.psmdcp"
]
},
"System.AppContext/4.0.0": {
Expand Down Expand Up @@ -15022,7 +15022,7 @@
]
},
"Xamarin.Forms/1.5.0.6447": {
"sha512": "0oBfhFmKt4kxFK+iBdTtZaW6Ys/adM7fH/47EcHLXfsNoe34xtYAqEZ7A4lGMnzg/5hgRVHmiOV2Z0cmZvuTwg==",
"sha512": "iPmiog6UF5ZZNyE0faRdWhGlVaoqVRi193wyeStwRxX6l3QNomMFBaHN58ly2vOuKD2KYk+McjBOEQi6HfNwEA==",
"type": "Package",
"files": [
"[Content_Types].xml",
Expand Down Expand Up @@ -15107,7 +15107,7 @@
"Microsoft.ApplicationInsights.PersistenceChannel >= 1.0.0",
"Microsoft.ApplicationInsights.WindowsApps >= 1.0.0",
"Microsoft.NETCore.UniversalWindowsPlatform >= 5.0.0",
"NUnit >= 3.0.0",
"NUnit >= 3.0.1",
"Xamarin.Forms >= 1.5.0.6447"
],
"UAP,Version=v10.0": []
Expand Down
Loading

0 comments on commit 6e1dd8a

Please sign in to comment.