Merge branch 'master' of https://code.google.com/p/selenium

.gitignore

@@ -20,6 +20,7 @@ iphone/src/objc/atoms.h
 /build/
 android/client/bin/
 android/server/bin/
+android/gen/org/openqa/selenium/android/app/Manifest.java
 cpp/IEDriver/IEReturnTypes.h
 java/org/openqa/selenium/ie/IeReturnTypes.java
 java/client/src/org/openqa/selenium/ie/IeReturnTypes.java

android/gen/org/openqa/selenium/android/app/R.java

@@ -1,43 +1,5 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
 package org.openqa.selenium.android.app;
 
+/* This stub is for using by IDE only. It is NOT the R class actually packed into APK */
 public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int alert_dialog_icon=0x7f020000;
-        public static final int ic_menu_add=0x7f020001;
-        public static final int ic_menu_delete=0x7f020002;
-        public static final int ic_menu_share=0x7f020003;
-        public static final int selenium_icon=0x7f020004;
-    }
-    public static final class id {
-        public static final int rssWebView=0x7f060002;
-        public static final int status=0x7f060000;
-        public static final int webview=0x7f060001;
-    }
-    public static final class layout {
-        public static final int single_session_layout=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f050009;
-        public static final int ctx_menu_navigate=0x7f050001;
-        public static final int default_session_status=0x7f050002;
-        public static final int httpd_already_started=0x7f050005;
-        public static final int httpd_not_running=0x7f050008;
-        public static final int httpd_not_started=0x7f050004;
-        public static final int httpd_not_stopped=0x7f050007;
-        public static final int httpd_started=0x7f050003;
-        public static final int httpd_stopped=0x7f050006;
-        public static final int main_title=0x7f050000;
-    }
-    public static final class xml {
-        public static final int preferences=0x7f040000;
-    }
-}
+}

android/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-15

dotnet/CHANGELOG

@@ -1,3 +1,17 @@
+v2.31.2
+=======
+ * Fixed .NET WebDriverBackedSelenium NuGet packaging. Package was lacking
+   dependencies on other Selenium NuGet packages.
+ * Entirely removed the dependency on Castle.Core.dll for .NET support library.
+   Using the Castle DynamicProxy has been nothing but a thorn in the side of us
+   of WebDriver.Support.dll. This change implements hard-coded "proxy" objects
+   the .NET PageFactory implementation. Hopefully, this will resolve the issues
+   the PageFactory for everyone. Nevertheless, there is every possibility that
+   will entirely break the PageFactory in some unforseen way for some subset of
+   users, despite the fact that all of the tests (unit tests, and browser-based
+   tests) pass. If that is the case, feel free to file issues, if the issues
+   include code samples that reproduce the problem. Fixes issue #5221.
+
 v2.31.1
 =======
  * Fixing assemblies merged with ILMerge on .NET 4.0 when built on a machine

dotnet/build.desc

@@ -70,17 +70,6 @@ dotnet_library(name = "support",
     "System.Xml.dll",
     ":dotnet"
   ],
-  merge_refs = [
-    "third_party/dotnet/Castle.Core.3.2.0/net40/Castle.Core.dll"
-  ],
-  exclude_merge_types = [
-    "Castle.DynamicProxy.AbstractInvocation",
-	"Castle.DynamicProxy.IInterceptor",
-	"Castle.DynamicProxy.IInvocation",
-	"Castle.DynamicProxy.IProxyBuilder",
-	"Castle.DynamicProxy.IProxyTargetAccessor",
-	"Castle.DynamicProxy.Internal.CompositionInvocation"
-  ],
   keyfile = "WebDriver.snk",
   framework_ver = "net40",
   out = "WebDriver.Support.dll"
@@ -96,17 +85,6 @@ dotnet_library(name = "support35",
     "System.Xml.dll",
     ":dotnet35"
   ],
-  merge_refs = [
-    "third_party/dotnet/Castle.Core.3.2.0/net35/Castle.Core.dll"
-  ],
-  exclude_merge_types = [
-    "Castle.DynamicProxy.AbstractInvocation",
-	"Castle.DynamicProxy.IInterceptor",
-	"Castle.DynamicProxy.IInvocation",
-	"Castle.DynamicProxy.IProxyBuilder",
-	"Castle.DynamicProxy.IProxyTargetAccessor",
-	"Castle.DynamicProxy.Internal.CompositionInvocation"
-  ],
   framework_ver = "net35",
   keyfile = "WebDriver.snk",
   out = "WebDriver.Support.dll"
@@ -249,6 +227,10 @@ dotnet_package(name = "webdriverbackedselenium-package",
   summary = "Implementation of the Selenium Remote Control (RC) API, using WebDriver technology",
   description = "Selenium is a set of different software tools each with a different approach to supporting browser automation. These tools are highly flexible, allowing many options for locating and manipulating elements within a browser, and one of its key features is the support for automating multiple browser platforms. This package contains the .NET bindings for the older, more procedural Selenium Remote Control (or Selenium RC) API, but implemented using the newer WebDriver technology. It does not require a running instance of the Selenium Server, and is not limited to the functionality available from within the JavaScript sandbox. It is intended as a transitional package to allow organizations with significant investment in the Selenium RC API to run their code with minimal modifications until they are able to migrate to the newer Selenium WebDriver API.",
   tags = "Selenium WebDriver remote control RC browser automation",
+  packagedeps = [
+    {":dotnet-package" : ""},
+	{":core-package" : ""}
+  ],
   assemblies = [
     {"System.Drawing" : ""}
   ]

dotnet/src/Selenium.Core/Properties/AssemblyInfo.cs

@@ -21,5 +21,5 @@
 //      Minor Version 
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("2.31.1.0")]
-[assembly: AssemblyFileVersion("2.31.1.0")]
+[assembly: AssemblyVersion("2.31.2.0")]
+[assembly: AssemblyFileVersion("2.31.2.0")]

dotnet/src/Selenium.WebDriverBackedSelenium/Properties/AssemblyInfo.cs

@@ -50,5 +50,5 @@
 //      Minor Version 
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("2.31.1.0")]
-[assembly: AssemblyFileVersion("2.31.1.0")]
+[assembly: AssemblyVersion("2.31.2.0")]
+[assembly: AssemblyFileVersion("2.31.2.0")]