Skip to content

Commit 7b0205b

Browse files
nvborisenkonvborisenko
authored
[dotnet] Fix dev environment to run tests on Windows/MacOS (#15303)
1 parent 18ae989 commit 7b0205b

File tree

7 files changed

+72
-203
lines changed

7 files changed

+72
-203
lines changed

‎dotnet/paket.dependencies

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
11
group nuget
22
framework: net8.0,netstandard2.0
3+
strategy: min
34
source https://api.nuget.org/v3/index.json
45

56
nuget BenderProxy 1.0.0
67
nuget CommandLineParser 2.8.0
78
nuget Handlebars.Net 1.11.5
89
nuget Humanizer.Core 2.8.26
9-
nuget Microsoft.AspNetCore.App.Ref 6.0.9
10-
nuget Microsoft.CSharp 4.5.0
1110
nuget Microsoft.Extensions.DependencyInjection 3.1.9
12-
nuget Microsoft.Extensions.DependencyInjection.Abstractions 3.1.9
13-
nuget Microsoft.NETCore.App.Runtime.linux-x64 6.0.15
14-
nuget Microsoft.NETCore.App.Runtime.osx-arm64 6.0.15
15-
nuget Microsoft.NETCore.App.Runtime.osx-x64 6.0.15
16-
nuget Microsoft.NETCore.App.Runtime.win-x64 6.0.15
17-
nuget Microsoft.NETCore.App.Ref 6.0.9
1811
nuget Moq 4.20.72
1912
nuget NETStandard.Library 2.0.3
2013
nuget Newtonsoft.Json 13.0.1
2114
nuget NUnit 3.13.2
2215
nuget NUnitLite 3.13.2
23-
nuget System.Diagnostics.Tools 4.3.0
24-
nuget System.Drawing.Common 7.0.0
25-
nuget System.Runtime 4.3.1
26-
nuget System.Runtime.InteropServices 4.3.0
2716
nuget System.Text.Json 8.0.5
28-
nuget Runfiles 0.12.0
17+
nuget Runfiles 0.14.0

‎dotnet/paket.lock

Lines changed: 38 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11

22

33
GROUP nuget
4-
RESTRICTION: || (== net7.0) (== netstandard2.0)
4+
STRATEGY: MIN
5+
RESTRICTION: || (== net8.0) (== netstandard2.0)
56
NUGET
67
remote: https://api.nuget.org/v3/index.json
78
BenderProxy (1.0)
89
Castle.Core (5.1.1)
9-
System.Diagnostics.EventLog (>= 4.7) - restriction: || (&& (== net7.0) (< net6.0)) (&& (== net7.0) (< netstandard2.1)) (== netstandard2.0)
10-
System.Diagnostics.EventLog (>= 6.0) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= net6.0))
11-
System.Reflection.Emit (>= 4.7) - restriction: || (&& (== net7.0) (< netstandard2.1)) (== netstandard2.0)
10+
System.Diagnostics.EventLog (>= 4.7) - restriction: || (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
11+
System.Diagnostics.EventLog (>= 6.0) - restriction: || (== net8.0) (&& (== netstandard2.0) (>= net6.0))
12+
System.Reflection.Emit (>= 4.7) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
1213
CommandLineParser (2.8)
1314
Handlebars.Net (1.11.5)
1415
Microsoft.CSharp (>= 4.4)
1516
System.Reflection.TypeExtensions (>= 4.4)
1617
Humanizer.Core (2.8.26)
17-
Microsoft.AspNetCore.App.Ref (6.0.9)
18-
Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
19-
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< netstandard2.1)) (== netstandard2.0)
20-
Microsoft.CSharp (4.5)
18+
Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
19+
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
20+
Microsoft.CSharp (4.4)
2121
Microsoft.Extensions.DependencyInjection (3.1.9)
22-
Microsoft.Bcl.AsyncInterfaces (>= 1.1.1) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netstandard2.1)) (== netstandard2.0)
22+
Microsoft.Bcl.AsyncInterfaces (>= 1.1.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
2323
Microsoft.Extensions.DependencyInjection.Abstractions (>= 3.1.9)
2424
Microsoft.Extensions.DependencyInjection.Abstractions (3.1.9)
25-
Microsoft.NETCore.App.Ref (6.0.9)
26-
Microsoft.NETCore.App.Runtime.linux-x64 (6.0.15)
27-
Microsoft.NETCore.App.Runtime.osx-arm64 (6.0.15)
28-
Microsoft.NETCore.App.Runtime.osx-x64 (6.0.15)
29-
Microsoft.NETCore.App.Runtime.win-x64 (6.0.15)
30-
Microsoft.NETCore.Platforms (7.0.4)
31-
Microsoft.NETCore.Targets (5.0)
32-
Microsoft.Win32.SystemEvents (7.0) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= net6.0))
25+
Microsoft.NETCore.Platforms (1.1)
3326
Moq (4.20.72)
3427
Castle.Core (>= 5.1.1)
35-
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< netstandard2.1)) (== netstandard2.0)
28+
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
3629
NETStandard.Library (2.0.3)
3730
Microsoft.NETCore.Platforms (>= 1.1)
3831
Newtonsoft.Json (13.0.1)
@@ -41,75 +34,31 @@ NUGET
4134
NUnitLite (3.13.2)
4235
NETStandard.Library (>= 2.0)
4336
NUnit (3.13.2)
44-
Runfiles (0.12)
45-
System.Buffers (4.5.1) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
46-
System.Diagnostics.EventLog (7.0)
47-
System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
48-
System.Diagnostics.Tools (4.3)
49-
Microsoft.NETCore.Platforms (>= 1.1)
50-
Microsoft.NETCore.Targets (>= 1.1)
51-
System.Runtime (>= 4.3)
52-
System.Drawing.Common (7.0)
53-
Microsoft.Win32.SystemEvents (>= 7.0) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= net6.0))
54-
System.IO (4.3)
55-
Microsoft.NETCore.Platforms (>= 1.1)
56-
Microsoft.NETCore.Targets (>= 1.1)
57-
System.Runtime (>= 4.3)
58-
System.Text.Encoding (>= 4.3)
59-
System.Threading.Tasks (>= 4.3)
60-
System.Memory (4.5.5) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
61-
System.Buffers (>= 4.5.1) - restriction: || (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.0)
62-
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net7.0) (< netcoreapp2.0)) (== netstandard2.0)
63-
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net7.0) (>= monotouch)) (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.0)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= uap10.1)) (&& (== net7.0) (>= xamarinios)) (&& (== net7.0) (>= xamarinmac)) (&& (== net7.0) (>= xamarintvos)) (&& (== net7.0) (>= xamarinwatchos)) (== netstandard2.0)
64-
System.Numerics.Vectors (4.5) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< netcoreapp2.0)) (== netstandard2.0)
65-
System.Reflection (4.3)
66-
Microsoft.NETCore.Platforms (>= 1.1)
67-
Microsoft.NETCore.Targets (>= 1.1)
68-
System.IO (>= 4.3)
69-
System.Reflection.Primitives (>= 4.3)
70-
System.Runtime (>= 4.3)
71-
System.Reflection.Emit (4.7) - restriction: || (&& (== net7.0) (< netstandard2.1)) (== netstandard2.0)
72-
System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net7.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.0)
73-
System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== net7.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net7.0) (< netstandard1.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.0)
74-
System.Reflection.Primitives (4.3)
75-
Microsoft.NETCore.Platforms (>= 1.1)
76-
Microsoft.NETCore.Targets (>= 1.1)
77-
System.Runtime (>= 4.3)
78-
System.Reflection.TypeExtensions (4.7)
79-
System.Runtime (4.3.1)
80-
Microsoft.NETCore.Platforms (>= 1.1.1)
81-
Microsoft.NETCore.Targets (>= 1.1.3)
82-
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
83-
System.Runtime.Handles (4.3)
84-
Microsoft.NETCore.Platforms (>= 1.1)
85-
Microsoft.NETCore.Targets (>= 1.1)
86-
System.Runtime (>= 4.3)
87-
System.Runtime.InteropServices (4.3)
88-
Microsoft.NETCore.Platforms (>= 1.1)
89-
Microsoft.NETCore.Targets (>= 1.1)
90-
System.Reflection (>= 4.3)
91-
System.Reflection.Primitives (>= 4.3)
92-
System.Runtime (>= 4.3)
93-
System.Runtime.Handles (>= 4.3)
94-
System.Security.Principal.Windows (5.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
95-
System.Text.Encoding (4.3)
96-
Microsoft.NETCore.Platforms (>= 1.1)
97-
Microsoft.NETCore.Targets (>= 1.1)
98-
System.Runtime (>= 4.3)
99-
System.Text.Encodings.Web (8.0)
100-
System.Buffers (>= 4.5.1) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
101-
System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
102-
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
37+
Runfiles (0.14)
38+
System.Buffers (4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
39+
System.Diagnostics.EventLog (6.0)
40+
System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
41+
System.Memory (4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
42+
System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0)
43+
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net8.0) (< netcoreapp2.0)) (== netstandard2.0)
44+
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos)) (== netstandard2.0)
45+
System.Numerics.Vectors (4.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.0)) (== netstandard2.0)
46+
System.Reflection.Emit (4.7) - restriction: || (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
47+
System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (== netstandard2.0)
48+
System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== net8.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (== netstandard2.0)
49+
System.Reflection.TypeExtensions (4.4)
50+
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0)
51+
System.Security.Principal.Windows (5.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
52+
System.Text.Encodings.Web (8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0)
53+
System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
54+
System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
55+
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0)
10356
System.Text.Json (8.0.5)
104-
Microsoft.Bcl.AsyncInterfaces (>= 8.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
105-
System.Buffers (>= 4.5.1) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
106-
System.Memory (>= 4.5.5) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
107-
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
108-
System.Text.Encodings.Web (>= 8.0)
109-
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
110-
System.Threading.Tasks (4.3)
111-
Microsoft.NETCore.Platforms (>= 1.1)
112-
Microsoft.NETCore.Targets (>= 1.1)
113-
System.Runtime (>= 4.3)
114-
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
115-
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net7.0) (>= net461)) (&& (== net7.0) (< netcoreapp2.1)) (&& (== net7.0) (< netstandard1.0)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (>= wp8)) (== netstandard2.0)
57+
Microsoft.Bcl.AsyncInterfaces (>= 8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
58+
System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
59+
System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
60+
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0)
61+
System.Text.Encodings.Web (>= 8.0) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< net7.0)) (== netstandard2.0)
62+
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
63+
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (== netstandard2.0)
64+
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.0)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= wp8)) (== netstandard2.0)

‎dotnet/paket.nuget.bzl

Lines changed: 13 additions & 31 deletions
Large diffs are not rendered by default.

‎dotnet/src/webdriver/BiDi/Modules/Script/CallFunctionCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ internal record CallFunctionCommandParameters(string FunctionDeclaration, bool A
3131

3232
public record CallFunctionOptions : CommandOptions
3333
{
34-
public IEnumerable<LocalValue?>? Arguments { get; set; }
34+
public IEnumerable<LocalValue>? Arguments { get; set; }
3535

3636
public ResultOwnership? ResultOwnership { get; set; }
3737

0 commit comments

Comments
 (0)