Skip to content

Commit 8717085

Browse files
authored
[build] Upgrade rules_dotnet to 0.20.5 (#16592)
1 parent cba5eb0 commit 8717085

File tree

7 files changed

+16
-11
lines changed

7 files changed

+16
-11
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bazel_dep(name = "protobuf", version = "29.2", dev_dependency = True, repo_name
1717
# Required for rules_rust to import the crates properly
1818
bazel_dep(name = "rules_cc", version = "0.2.8", dev_dependency = True)
1919

20-
bazel_dep(name = "rules_dotnet", version = "0.17.5")
20+
bazel_dep(name = "rules_dotnet", version = "0.20.5")
2121
bazel_dep(name = "rules_java", version = "8.7.1")
2222
bazel_dep(name = "rules_jvm_external", version = "6.8")
2323
bazel_dep(name = "rules_multitool", version = "1.3.0")

dotnet/src/webdriver/Firefox/FirefoxExtension.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
using System.Globalization;
2323
using System.IO;
2424
using System.IO.Compression;
25+
using System.Reflection;
2526
using System.Text.Json.Nodes;
2627
using System.Xml;
2728

@@ -88,7 +89,7 @@ public void Install(string profileDirectory)
8889

8990
// First, expand the .xpi archive into a temporary location.
9091
Directory.CreateDirectory(tempFileName);
91-
Stream zipFileStream = ResourceUtilities.GetResourceStream(this.extensionFileName, this.extensionResourceId);
92+
Stream zipFileStream = ResourceUtilities.GetResourceStream(this.extensionFileName, $"{Assembly.GetExecutingAssembly().GetName().Name}.{this.extensionResourceId}");
9293
using (ZipArchive extensionZipArchive = new ZipArchive(zipFileStream, ZipArchiveMode.Read))
9394
{
9495
extensionZipArchive.ExtractToDirectory(tempFileName);

dotnet/src/webdriver/Firefox/FirefoxProfile.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using System.Diagnostics.CodeAnalysis;
2424
using System.IO;
2525
using System.IO.Compression;
26+
using System.Reflection;
2627
using System.Text.Json;
2728

2829
namespace OpenQA.Selenium.Firefox;
@@ -297,7 +298,7 @@ private void UpdateUserPreferences(string profileDirectory)
297298

298299
private Preferences ReadDefaultPreferences()
299300
{
300-
using (Stream defaultPrefsStream = ResourceUtilities.GetResourceStream("webdriver_prefs.json", "webdriver_prefs.json"))
301+
using (Stream defaultPrefsStream = ResourceUtilities.GetResourceStream("webdriver_prefs.json", $"{Assembly.GetExecutingAssembly().GetName().Name}.webdriver_prefs.json"))
301302
{
302303
using JsonDocument defaultPreferences = JsonDocument.Parse(defaultPrefsStream);
303304

dotnet/src/webdriver/JavaScriptEngine.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
using System.Globalization;
2626
using System.IO;
2727
using System.Linq;
28+
using System.Reflection;
2829
using System.Text.Json;
2930
using System.Threading.Tasks;
3031

@@ -411,7 +412,7 @@ private async Task EnableDomains()
411412
private static string GetMutationListenerScript()
412413
{
413414
string listenerScript = string.Empty;
414-
using (Stream resourceStream = ResourceUtilities.GetResourceStream("mutation-listener.js", "mutation-listener.js"))
415+
using (Stream resourceStream = ResourceUtilities.GetResourceStream("mutation-listener.js", $"{Assembly.GetExecutingAssembly().GetName().Name}.mutation-listener.js"))
415416
{
416417
using (StreamReader resourceReader = new StreamReader(resourceStream))
417418
{

dotnet/src/webdriver/RelativeBy.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using System.Collections.ObjectModel;
2424
using System.Globalization;
2525
using System.IO;
26+
using System.Reflection;
2627

2728
namespace OpenQA.Selenium;
2829

@@ -38,7 +39,7 @@ public sealed class RelativeBy : By
3839
private static string GetWrappedAtom()
3940
{
4041
string atom;
41-
using (Stream atomStream = ResourceUtilities.GetResourceStream("find-elements.js", "find-elements.js"))
42+
using (Stream atomStream = ResourceUtilities.GetResourceStream("find-elements.js", $"{Assembly.GetExecutingAssembly().GetName().Name}.find-elements.js"))
4243
{
4344
using (StreamReader atomReader = new StreamReader(atomStream))
4445
{

dotnet/src/webdriver/Selenium.WebDriver.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,23 @@
8585
<ItemGroup>
8686
<EmbeddedResource Include="$(ProjectDir)..\..\..\third_party\js\selenium\webdriver.json">
8787
<Visible>False</Visible>
88-
<LogicalName>webdriver_prefs.json</LogicalName>
88+
<LogicalName>$(AssemblyName).webdriver_prefs.json</LogicalName>
8989
</EmbeddedResource>
9090
<EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\webdriver\atoms\get-attribute.js">
9191
<Visible>False</Visible>
92-
<LogicalName>get-attribute.js</LogicalName>
92+
<LogicalName>$(AssemblyName).get-attribute.js</LogicalName>
9393
</EmbeddedResource>
9494
<EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\atoms\fragments\is-displayed.js">
9595
<Visible>False</Visible>
96-
<LogicalName>is-displayed.js</LogicalName>
96+
<LogicalName>$(AssemblyName).is-displayed.js</LogicalName>
9797
</EmbeddedResource>
9898
<EmbeddedResource Include="$(ProjectDir)..\..\..\bazel-bin\javascript\atoms\fragments\find-elements.js">
9999
<Visible>False</Visible>
100-
<LogicalName>find-elements.js</LogicalName>
100+
<LogicalName>$(AssemblyName).find-elements.js</LogicalName>
101101
</EmbeddedResource>
102102
<EmbeddedResource Include="$(ProjectDir)..\..\..\javascript\cdp-support\mutation-listener.js">
103103
<Visible>False</Visible>
104-
<LogicalName>mutation-listener.js</LogicalName>
104+
<LogicalName>$(AssemblyName).mutation-listener.js</LogicalName>
105105
</EmbeddedResource>
106106
</ItemGroup>
107107
</Target>

dotnet/src/webdriver/WebElement.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
using System.IO;
2828
using System.IO.Compression;
2929
using System.Linq;
30+
using System.Reflection;
3031

3132
namespace OpenQA.Selenium;
3233

@@ -709,7 +710,7 @@ protected virtual Response Execute(string commandToExecute, Dictionary<string,
709710
private static string GetAtom(string atomResourceName)
710711
{
711712
string atom;
712-
using (Stream atomStream = ResourceUtilities.GetResourceStream(atomResourceName, atomResourceName))
713+
using (Stream atomStream = ResourceUtilities.GetResourceStream(atomResourceName, $"{Assembly.GetExecutingAssembly().GetName().Name}.{atomResourceName}"))
713714
{
714715
using (StreamReader atomReader = new StreamReader(atomStream))
715716
{

0 commit comments

Comments
 (0)