Skip to content

Commit 21eb5a1

Browse files
authored
Merge pull request #8894 from michaelnebel/csharp/upgrade-dotnet
C#: Upgrade dotnet to 6.0.202.
2 parents 66a9759 + b8ec225 commit 21eb5a1

File tree

6 files changed

+22
-3
lines changed

6 files changed

+22
-3
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup dotnet
3131
uses: actions/setup-dotnet@v2
3232
with:
33-
dotnet-version: 6.0.101
33+
dotnet-version: 6.0.202
3434

3535
- name: Checkout repository
3636
uses: actions/checkout@v3

csharp/ql/src/Stubs/make_stubs_nuget.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def run_cmd(cmd, msg="Failed to run command"):
7171
cmd.append(version)
7272
run_cmd(cmd)
7373

74-
sdk_version = '6.0.101'
74+
sdk_version = '6.0.202'
7575
print("\n* Creating new global.json file and setting SDK to " + sdk_version)
7676
run_cmd(['dotnet', 'new', 'globaljson', '--force', '--sdk-version', sdk_version, '--output', workDir])
7777

csharp/ql/test/library-tests/cil/attributes/attribute.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2342,7 +2342,7 @@ attrArgPositional
23422342
| System.Number.BigInteger | [ObsoleteAttribute(...)] | 0 | Types with embedded references are not supported in this version of your compiler. |
23432343
| System.Number.BigInteger | [ObsoleteAttribute(...)] | 1 | True |
23442344
| System.Number.BigInteger._blocks | [FixedBufferAttribute(...)] | 0 | System.UInt32 |
2345-
| System.Number.BigInteger._blocks | [FixedBufferAttribute(...)] | 1 | 115 |
2345+
| System.Number.BigInteger._blocks | [FixedBufferAttribute(...)] | 1 | 116 |
23462346
| System.Number.DiyFp | [ObsoleteAttribute(...)] | 0 | Types with embedded references are not supported in this version of your compiler. |
23472347
| System.Number.DiyFp | [ObsoleteAttribute(...)] | 1 | True |
23482348
| System.Number.NumberBuffer | [ObsoleteAttribute(...)] | 0 | Types with embedded references are not supported in this version of your compiler. |

csharp/ql/test/library-tests/cil/typeAnnotations/typeAnnotations.expected

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,6 +1178,7 @@
11781178
| Parameter 1 of System.Runtime.InteropServices.MemoryMarshal.TryRead | parameter | 32 |
11791179
| Parameter 1 of System.Runtime.InteropServices.MemoryMarshal.TryWrite | parameter | 32 |
11801180
| Parameter 1 of System.Runtime.InteropServices.MemoryMarshal.Write | parameter | 32 |
1181+
| Parameter 1 of System.Runtime.InteropServices.NFloat.TryParse | parameter | 32 |
11811182
| Parameter 1 of System.Runtime.InteropServices.NativeLibrary.TryLoad | parameter | 32 |
11821183
| Parameter 1 of System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal.CreateReferenceTrackingHandle | parameter | 32 |
11831184
| Parameter 1 of System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal.UnhandledExceptionPropagationHandler.EndInvoke | parameter | 32 |
@@ -1673,6 +1674,7 @@
16731674
| Parameter 2 of System.Runtime.InteropServices.Marshal.QueryInterface | parameter | 32 |
16741675
| Parameter 2 of System.Runtime.InteropServices.MemoryMarshal.TryGetMemoryManager | parameter | 32 |
16751676
| Parameter 2 of System.Runtime.InteropServices.MemoryMarshal.TryGetString | parameter | 32 |
1677+
| Parameter 2 of System.Runtime.InteropServices.NFloat.TryFormat | parameter | 32 |
16761678
| Parameter 2 of System.Runtime.InteropServices.NativeLibrary.TryGetExport | parameter | 32 |
16771679
| Parameter 2 of System.Runtime.Serialization.SerializationInfo.GetElement | parameter | 32 |
16781680
| Parameter 2 of System.Runtime.Serialization.SerializationInfo.GetElementNoThrow | parameter | 32 |
@@ -1971,6 +1973,7 @@
19711973
| Parameter 3 of System.Runtime.InteropServices.ComWrappers.TryGetOrCreateComInterfaceForObjectInternal | parameter | 32 |
19721974
| Parameter 3 of System.Runtime.InteropServices.MemoryMarshal.TryGetMemoryManager | parameter | 32 |
19731975
| Parameter 3 of System.Runtime.InteropServices.MemoryMarshal.TryGetString | parameter | 32 |
1976+
| Parameter 3 of System.Runtime.InteropServices.NFloat.TryParse | parameter | 32 |
19741977
| Parameter 3 of System.Runtime.InteropServices.NativeLibrary.TryLoad | parameter | 32 |
19751978
| Parameter 3 of System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal.UnhandledExceptionPropagationHandler.BeginInvoke | parameter | 32 |
19761979
| Parameter 3 of System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal.UnhandledExceptionPropagationHandler.Invoke | parameter | 32 |

csharp/ql/test/library-tests/conversion/operator/Operator.expected

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,27 @@
33
| ArraySegment<T> | ReadOnlySpan<> |
44
| ArraySegment<T> | Span<> |
55
| Byte | Decimal |
6+
| Byte | NFloat |
67
| Char | Decimal |
8+
| Char | NFloat |
79
| Char | StandardFormat |
810
| DateTime | DateTimeOffset |
911
| Int16 | Decimal |
12+
| Int16 | NFloat |
1013
| Int32 | C |
1114
| Int32 | Decimal |
1215
| Int32 | Index |
1316
| Int32 | MetadataToken |
17+
| Int32 | NFloat |
1418
| Int64 | Decimal |
19+
| Int64 | NFloat |
20+
| IntPtr | NFloat |
1521
| Memory<> | ReadOnlyMemory<T> |
1622
| MetadataToken | Int32 |
23+
| NFloat | Double |
1724
| SByte | Decimal |
25+
| SByte | NFloat |
26+
| Single | NFloat |
1827
| Span<> | ReadOnlySpan<T> |
1928
| String | ReadOnlySpan<Char> |
2029
| T | Nullable<> |
@@ -24,5 +33,9 @@
2433
| T[] | ReadOnlySpan<> |
2534
| T[] | Span<> |
2635
| UInt16 | Decimal |
36+
| UInt16 | NFloat |
2737
| UInt32 | Decimal |
38+
| UInt32 | NFloat |
2839
| UInt64 | Decimal |
40+
| UInt64 | NFloat |
41+
| UIntPtr | NFloat |

csharp/ql/test/library-tests/dispatch/viableCallable.expected

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,19 @@
216216
| ViableCallable.cs:178:13:178:17 | dynamic call to operator + | + | Double |
217217
| ViableCallable.cs:178:13:178:17 | dynamic call to operator + | + | Int32 |
218218
| ViableCallable.cs:178:13:178:17 | dynamic call to operator + | + | Int64 |
219+
| ViableCallable.cs:178:13:178:17 | dynamic call to operator + | + | NFloat |
219220
| ViableCallable.cs:178:13:178:17 | dynamic call to operator + | + | Single |
220221
| ViableCallable.cs:180:13:180:17 | dynamic call to operator - | - | Decimal |
221222
| ViableCallable.cs:180:13:180:17 | dynamic call to operator - | - | Double |
222223
| ViableCallable.cs:180:13:180:17 | dynamic call to operator - | - | Int32 |
223224
| ViableCallable.cs:180:13:180:17 | dynamic call to operator - | - | Int64 |
225+
| ViableCallable.cs:180:13:180:17 | dynamic call to operator - | - | NFloat |
224226
| ViableCallable.cs:180:13:180:17 | dynamic call to operator - | - | Single |
225227
| ViableCallable.cs:182:13:182:18 | dynamic call to operator + | + | Decimal |
226228
| ViableCallable.cs:182:13:182:18 | dynamic call to operator + | + | Double |
227229
| ViableCallable.cs:182:13:182:18 | dynamic call to operator + | + | Int32 |
228230
| ViableCallable.cs:182:13:182:18 | dynamic call to operator + | + | Int64 |
231+
| ViableCallable.cs:182:13:182:18 | dynamic call to operator + | + | NFloat |
229232
| ViableCallable.cs:182:13:182:18 | dynamic call to operator + | + | Single |
230233
| ViableCallable.cs:185:17:185:25 | object creation of type C10 | C10 | C10 |
231234
| ViableCallable.cs:186:9:186:153 | call to method InvokeMember | + | C10 |

0 commit comments

Comments
 (0)