From 52b6789b6678db32a99f6770e3072fc61965574e Mon Sep 17 00:00:00 2001
From: Jim Evans <james.h.evans.jr@gmail.com>
Date: Mon, 20 Jan 2020 09:22:18 -0800
Subject: [PATCH] Updating Bazel build files to refer to correct assemblies

---
 dotnet/src/support/BUILD.bazel                 | 8 ++++----
 dotnet/src/webdriver/BUILD.bazel               | 4 ++++
 dotnet/src/webdriverbackedselenium/BUILD.bazel | 8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dotnet/src/support/BUILD.bazel b/dotnet/src/support/BUILD.bazel
index c5bf7b7070593..5c1355ec01bbe 100644
--- a/dotnet/src/support/BUILD.bazel
+++ b/dotnet/src/support/BUILD.bazel
@@ -16,7 +16,7 @@ load(
         "PageObjects/**/*.cs",
         "UI/*.cs",
     ]),
-    out = "merged/{}/WebDriver.Support.dll".format(framework),
+    out = "merged/{}/WebDriver.Support".format(framework),
     target_frameworks = [
         "{}".format(framework),
     ],
@@ -40,7 +40,7 @@ csharp_library(
         "PageObjects/**/*.cs",
         "UI/*.cs",
     ]),
-    out = "merged/netstandard2.0/WebDriver.Support.dll",
+    out = "merged/netstandard2.0/WebDriver.Support",
     target_frameworks = [
         "netstandard2.0",
     ],
@@ -59,7 +59,7 @@ csharp_library(
         "PageObjects/**/*.cs",
         "UI/*.cs",
     ]),
-    out = "strongnamed/{}/WebDriver.Support.dll".format(framework),
+    out = "strongnamed/{}/WebDriver.Support".format(framework),
     keyfile = "//dotnet:WebDriver.snk",
     target_frameworks = [
         "{}".format(framework),
@@ -84,7 +84,7 @@ csharp_library(
         "PageObjects/**/*.cs",
         "UI/*.cs",
     ]),
-    out = "strongnamed/netstandard2.0/WebDriver.Support.dll",
+    out = "strongnamed/netstandard2.0/WebDriver.Support",
     keyfile = "//dotnet:WebDriver.snk",
     target_frameworks = [
         "netstandard2.0",
diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel
index b4eaee148886b..21a9d2ccd38bf 100644
--- a/dotnet/src/webdriver/BUILD.bazel
+++ b/dotnet/src/webdriver/BUILD.bazel
@@ -48,6 +48,7 @@ load(
         "@net//:System.Runtime.Serialization",
         "@net//:System.Xml",
     ],
+    out = "WebDriver",
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 csharp_library(
@@ -80,6 +81,7 @@ csharp_library(
     deps = [
         "@json.net//:Newtonsoft.Json",
     ],
+    out = "WebDriver",
 )
 
 [csharp_library(
@@ -122,6 +124,7 @@ csharp_library(
         "@net//:System.Runtime.Serialization",
         "@net//:System.Xml",
     ],
+    out = "WebDriver",
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 csharp_library(
@@ -155,6 +158,7 @@ csharp_library(
     deps = [
         "@json.net//:Newtonsoft.Json",
     ],
+    out = "WebDriver",
 )
 
 [merged_assembly(
diff --git a/dotnet/src/webdriverbackedselenium/BUILD.bazel b/dotnet/src/webdriverbackedselenium/BUILD.bazel
index d49d3ae46d441..a8abc16122420 100644
--- a/dotnet/src/webdriverbackedselenium/BUILD.bazel
+++ b/dotnet/src/webdriverbackedselenium/BUILD.bazel
@@ -13,7 +13,7 @@ load(
         "*.cs",
         "Internal/**/*.cs",
     ]),
-    out = "merged/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
+    out = "merged/{}/Selenium.WebDriverBackedSelenium".format(framework),
     resources = [
         "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
         "//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
@@ -53,7 +53,7 @@ csharp_library(
         "*.cs",
         "Internal/**/*.cs",
     ]),
-    out = "merged/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
+    out = "merged/netstandard2.0/Selenium.WebDriverBackedSelenium",
     resources = [
         "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
         "//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
@@ -84,7 +84,7 @@ csharp_library(
         "*.cs",
         "Internal/**/*.cs",
     ]),
-    out = "strongnamed/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
+    out = "strongnamed/{}/Selenium.WebDriverBackedSelenium".format(framework),
     keyfile = "//dotnet:WebDriver.snk",
     resources = [
         "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
@@ -125,7 +125,7 @@ csharp_library(
         "*.cs",
         "Internal/**/*.cs",
     ]),
-    out = "strongnamed/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
+    out = "strongnamed/netstandard2.0/Selenium.WebDriverBackedSelenium",
     keyfile = "//dotnet:WebDriver.snk",
     resources = [
         "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",