Merge pull request #788 from nunit/release-beta-4

Release beta 4
nunit · Aug 25, 2015 · 955c47e · 955c47e
2 parents 503965a + d60090f
commit 955c47e
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 18 deletions.
diff --git a/NUnit.proj b/NUnit.proj
@@ -7,8 +7,8 @@
   <PropertyGroup Label="Common Properties">
     <ProjectName>$(MSBuildProjectName)</ProjectName>
     <PackageVersion>3.0.0</PackageVersion>
-    <PackageModifier>-beta-3</PackageModifier>
-    <DisplayVersion>3.0 Beta 3</DisplayVersion>
+    <PackageModifier>-beta-4</PackageModifier>
+    <DisplayVersion>3.0 Beta 4</DisplayVersion>
     <PackageName>$(ProjectName)-$(PackageVersion)$(PackageModifier)</PackageName>
     <PackageNameCF>$(ProjectName)CF-$(PackageVersion)$(PackageModifier)</PackageNameCF>
   </PropertyGroup>
@@ -499,7 +499,7 @@
     <Message Text="******************************************************************" />
 
     <Zip Files="@(CFBinZipFiles)" WorkingDirectory="$(CurrentImageDir)"
-         ZipFileName="$(ProjectPackageDir)\$PackageNameCF$ConfigSuffix).zip" />
+         ZipFileName="$(ProjectPackageDir)\$(PackageNameCF)$(ConfigSuffix).zip" />
 
   </Target>
 
@@ -613,7 +613,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <CFBinZipFiles Include="$(CurrentImageDir)\bin\netcf-3.5\**\*/*" />
+    <CFBinZipFiles Include="$(CurrentImageDir)\bin\netcf-3.5\*.*" />
   </ItemGroup>
 
   <ItemGroup Label="Supported Frameworks">

diff --git a/Rebracer.xml b/Rebracer.xml
@@ -11,9 +11,14 @@
       <ToolsOptionsSubCategory name="CSharp-Specific">
         <PropertyValue name="AutoComment">1</PropertyValue>
         <PropertyValue name="BringUpOnIdentifier">1</PropertyValue>
+        <PropertyValue name="ClosedFileDiagnostics">1</PropertyValue>
         <PropertyValue name="CodeDefinitionWindow_DocumentationComment_IndentBase">1</PropertyValue>
         <PropertyValue name="CodeDefinitionWindow_DocumentationComment_IndentOffset">2</PropertyValue>
         <PropertyValue name="CodeDefinitionWindow_DocumentationComment_WrapLength">80</PropertyValue>
+        <PropertyValue name="DisplayLineSeparators">0</PropertyValue>
+        <PropertyValue name="EnableHighlightRelatedKeywords">1</PropertyValue>
+        <PropertyValue name="ExtractMethod_AllowMovingDeclaration">0</PropertyValue>
+        <PropertyValue name="ExtractMethod_DoNotPutOutOrRefOnStruct">1</PropertyValue>
         <PropertyValue name="Formatting_TriggerOnBlockCompletion">1</PropertyValue>
         <PropertyValue name="Formatting_TriggerOnPaste">1</PropertyValue>
         <PropertyValue name="Formatting_TriggerOnStatementCompletion">1</PropertyValue>
@@ -40,6 +45,7 @@
         <PropertyValue name="NewLines_ObjectInitializer_EachMember">1</PropertyValue>
         <PropertyValue name="NewLines_QueryExpression_EachClause">1</PropertyValue>
         <PropertyValue name="RemoveUnusedUsings">1</PropertyValue>
+        <PropertyValue name="RenameTrackingPreview">1</PropertyValue>
         <PropertyValue name="SortUsings">1</PropertyValue>
         <PropertyValue name="SortUsings_PlaceSystemFirst">1</PropertyValue>
         <PropertyValue name="Space_AfterBasesColon">1</PropertyValue>
@@ -68,6 +74,10 @@
         <PropertyValue name="Space_WithinMethodDeclarationParentheses">0</PropertyValue>
         <PropertyValue name="Space_WithinOtherParentheses">0</PropertyValue>
         <PropertyValue name="Space_WithinSquares">0</PropertyValue>
+        <PropertyValue name="Style_PreferIntrinsicPredefinedTypeKeywordInDeclaration">1</PropertyValue>
+        <PropertyValue name="Style_PreferIntrinsicPredefinedTypeKeywordInMemberAccess">1</PropertyValue>
+        <PropertyValue name="Style_QualifyMemberAccessWithThisOrMe">0</PropertyValue>
+        <PropertyValue name="Style_UseVarWhenDeclaringLocals">1</PropertyValue>
         <PropertyValue name="WarnOnBuildErrors">1</PropertyValue>
         <PropertyValue name="WarnWhenMembersCauseCompilerGeneratedReferences">1</PropertyValue>
         <PropertyValue name="Wrapping_IgnoreSpacesAroundBinaryOperators">0</PropertyValue>

diff --git a/install/runners/engine-files.wxi b/install/runners/engine-files.wxi
@@ -36,9 +36,9 @@
                 <File Id="nunit_agent_x86.exe.config"
                       Source="$(var.Binaries)\nunit-agent-x86.exe.config" />
             </Component>
-            <Component Id="MONO.ADDINS" Location="local" Guid="C3E15752-7785-4C94-9E96-F642175CEFFA">
-                <File Id="Mono.Addins.dll"
-                      Source="$(var.Binaries)\Mono.Addins.dll" />
+            <Component Id="MONO.CECIL" Location="local" Guid="D4A15752-6685-3494-9346-F623175CEFFA">
+                <File Id="Mono.Cecil.dll"
+                      Source="$(var.Binaries)\Mono.Cecil.dll" />
             </Component>
             <Component Id="NUNIT.ENGINE.REGISTRY">
                 <RegistryKey Root="HKMU" Key="Software\NUnit.org\Engine" >

diff --git a/nuget/nunit.console.nuspec b/nuget/nunit.console.nuspec
@@ -32,7 +32,7 @@
     <file src="bin/nunit.engine.dll" target="tools" />
     <file src="bin/nunit.engine.addins" target="tools" />
     <file src="bin/nunit.engine.addin.xml" target="tools" />
-    <file src="bin/Mono.Addins.dll" target="tools" />
+    <file src="bin/Mono.Cecil.dll" target="tools" />
     <file src="bin/addins/nunit.v2.driver.dll" target="tools/addins" />
     <file src="bin/addins/nunit.engine.api.dll" target="tools/addins" />
     <file src="bin/addins/nunit.core.dll" target="tools/addins" />

diff --git a/nuget/nunitlite.nuspec b/nuget/nunitlite.nuspec
@@ -30,8 +30,8 @@
     <file src="bin/net-4.0/nunitlite.dll" target="lib/net40" />
     <file src="bin/net-4.5/nunitlite.dll" target="lib/net45" />
     <file src="bin/sl-5.0/nunitlite.dll" target="lib/sl5" />
-    <file src="../../nuget/Program.cs" target="content" />
-    <file src="../../nuget/Program.vb" target="content" />
-    <file src="../../nuget/install.ps1" target="tools" />
+    <file src="..\..\nuget\Program.cs" target="content" />
+    <file src="..\..\nuget\Program.vb" target="content" />
+    <file src="..\..\nuget\install.ps1" target="tools" />
   </files>
 </package>
diff --git a/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj b/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj
@@ -42,12 +42,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Mono.Cecil.0.9.6.1\lib\net20\Mono.Cecil.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Mdb">
-      <HintPath>..\..\..\packages\Mono.Cecil.0.9.6.1\lib\net20\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb">
-      <HintPath>..\..\..\packages\Mono.Cecil.0.9.6.1\lib\net20\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Drawing" />

diff --git a/src/NUnitEngine/nunit.engine/Services/DriverService.cs b/src/NUnitEngine/nunit.engine/Services/DriverService.cs
@@ -94,7 +94,7 @@ public override void StartService()
 
                 Status = ServiceStatus.Started;
             }
-            catch(Exception ex)
+            catch(Exception)
             {
                 Status = ServiceStatus.Error;
                 throw;

diff --git a/src/NUnitFramework/framework/Attributes/RepeatAttribute.cs b/src/NUnitFramework/framework/Attributes/RepeatAttribute.cs
@@ -69,6 +69,9 @@ public TestCommand Wrap(TestCommand command)
 
         #region Nested RepeatedTestCommand Class
 
+        /// <summary>
+        /// The test command for the RepeatAttribute
+        /// </summary>
         public class RepeatedTestCommand : DelegatingTestCommand
         {
             private int repeatCount;

diff --git a/src/NUnitFramework/framework/Attributes/RetryAttribute.cs b/src/NUnitFramework/framework/Attributes/RetryAttribute.cs
@@ -69,6 +69,9 @@ public TestCommand Wrap(TestCommand command)
 
         #region Nested RetryCommand Class
 
+        /// <summary>
+        /// The test command for the RetryAttribute
+        /// </summary>
         public class RetryCommand : DelegatingTestCommand
         {
             private int _retryCount;

diff --git a/src/NUnitFramework/tests/Attributes/TimeoutTests.cs b/src/NUnitFramework/tests/Attributes/TimeoutTests.cs
@@ -131,6 +131,7 @@ public void TestTimeOutElapsed()
             Assert.That(result.ResultState, Is.EqualTo(ResultState.Failure));
             Assert.That(result.Message, Does.Contain("100ms"));
         }
+#if !NETCF
         [Test]
         public void TestTimeOutTestCaseWithOutElapsed()
         {
@@ -142,6 +143,7 @@ public void TestTimeOutTestCaseWithOutElapsed()
             Assert.That(result.Children[0].ResultState, Is.EqualTo(ResultState.Success));
             Assert.That(result.Children[1].ResultState, Is.EqualTo(ResultState.Failure));
         }
+#endif
     }
 }
 #endif