Skip to content

Commit cce6bdf

Browse files
dotnet-maestro[bot]jjonesczakoeplinger
authored
[main] Update dependencies from dotnet/roslyn (#111081)
* Update dependencies from https://github.com/dotnet/roslyn build 20250103.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.13.0-3.25052.5 -> To Version 4.13.0-3.25053.2 * Update dependencies from https://github.com/dotnet/roslyn build 20250104.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.13.0-3.25052.5 -> To Version 4.13.0-3.25054.1 * Update dependencies from https://github.com/dotnet/roslyn build 20250105.1 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.13.0-3.25052.5 -> To Version 4.13.0-3.25055.1 * Update dependencies from https://github.com/dotnet/roslyn build 20250106.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.13.0-3.25052.5 -> To Version 4.13.0-3.25056.2 * Update dependencies from https://github.com/dotnet/roslyn build 20250106.21 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.13.0-3.25052.5 -> To Version 4.13.0-3.25056.21 * Fix scoped variance breaks * Use params instead of scoped in TextWriter to match the base method --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Jones <[email protected]> Co-authored-by: Alexander Köplinger <[email protected]>
1 parent 36b161f commit cce6bdf

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -376,17 +376,17 @@
376376
<Uri>https://github.com/dotnet/runtime-assets</Uri>
377377
<Sha>f9f4ac2378fde175fe4da7220c8d56fddfd309ab</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25052.5">
379+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25056.21">
380380
<Uri>https://github.com/dotnet/roslyn</Uri>
381-
<Sha>14944a9ee7758b7f811de9b74bc17c19ca5f214b</Sha>
381+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
382382
</Dependency>
383-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25052.5">
383+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25056.21">
384384
<Uri>https://github.com/dotnet/roslyn</Uri>
385-
<Sha>14944a9ee7758b7f811de9b74bc17c19ca5f214b</Sha>
385+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25052.5">
387+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25056.21">
388388
<Uri>https://github.com/dotnet/roslyn</Uri>
389-
<Sha>14944a9ee7758b7f811de9b74bc17c19ca5f214b</Sha>
389+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
390390
</Dependency>
391391
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.24629.1">
392392
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
@@ -397,9 +397,9 @@
397397
<Sha>5ed336762c6260a83ece35cd1f6749251452bad0</Sha>
398398
</Dependency>
399399
<!-- Intermediate is necessary for source build. -->
400-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25052.5">
400+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25056.21">
401401
<Uri>https://github.com/dotnet/roslyn</Uri>
402-
<Sha>14944a9ee7758b7f811de9b74bc17c19ca5f214b</Sha>
402+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
403403
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
404404
</Dependency>
405405
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-alpha.1.24622.2">

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4545
they do not break the local dev experience.
4646
-->
47-
<MicrosoftCodeAnalysisCSharpVersion>4.13.0-3.25052.5</MicrosoftCodeAnalysisCSharpVersion>
48-
<MicrosoftCodeAnalysisVersion>4.13.0-3.25052.5</MicrosoftCodeAnalysisVersion>
49-
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25052.5</MicrosoftNetCompilersToolsetVersion>
47+
<MicrosoftCodeAnalysisCSharpVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisCSharpVersion>
48+
<MicrosoftCodeAnalysisVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisVersion>
49+
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25056.21</MicrosoftNetCompilersToolsetVersion>
5050
</PropertyGroup>
5151
<!--
5252
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.

‎src/libraries/System.Numerics.Tensors/ref/System.Numerics.Tensors.netcore.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -774,9 +774,9 @@ internal Tensor() { }
774774
public System.Numerics.Tensors.TensorSpan<T> AsTensorSpan(params scoped System.ReadOnlySpan<System.Buffers.NRange> start) { throw null; }
775775
public System.Numerics.Tensors.TensorSpan<T> AsTensorSpan(params scoped System.ReadOnlySpan<nint> start) { throw null; }
776776
public void Clear() { }
777-
public void CopyTo(System.Numerics.Tensors.TensorSpan<T> destination) { }
777+
public void CopyTo(scoped System.Numerics.Tensors.TensorSpan<T> destination) { }
778778
public void Fill(T value) { }
779-
public void FlattenTo(System.Span<T> destination) { }
779+
public void FlattenTo(scoped System.Span<T> destination) { }
780780
public System.Collections.Generic.IEnumerator<T> GetEnumerator() { throw null; }
781781
public override int GetHashCode() { throw null; }
782782
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -791,12 +791,12 @@ public void FlattenTo(System.Span<T> destination) { }
791791
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
792792
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
793793
ref readonly T System.Numerics.Tensors.IReadOnlyTensor<System.Numerics.Tensors.Tensor<T>, T>.GetPinnableReference() { throw null; }
794-
static System.Numerics.Tensors.Tensor<T> System.Numerics.Tensors.ITensor<System.Numerics.Tensors.Tensor<T>, T>.Create(System.ReadOnlySpan<nint> lengths, bool pinned) { throw null; }
795-
static System.Numerics.Tensors.Tensor<T> System.Numerics.Tensors.ITensor<System.Numerics.Tensors.Tensor<T>, T>.Create(System.ReadOnlySpan<nint> lengths, System.ReadOnlySpan<nint> strides, bool pinned) { throw null; }
796-
static System.Numerics.Tensors.Tensor<T> System.Numerics.Tensors.ITensor<System.Numerics.Tensors.Tensor<T>, T>.CreateUninitialized(System.ReadOnlySpan<nint> lengths, bool pinned) { throw null; }
797-
static System.Numerics.Tensors.Tensor<T> System.Numerics.Tensors.ITensor<System.Numerics.Tensors.Tensor<T>, T>.CreateUninitialized(System.ReadOnlySpan<nint> lengths, System.ReadOnlySpan<nint> strides, bool pinned) { throw null; }
794+
static System.Numerics.Tensors.Tensor<T> System.Numerics.Tensors.ITensor<System.Numerics.Tensors.Tensor<T>, T>.Create(scoped System.ReadOnlySpan<nint> lengths, bool pinned) { throw null; }
795+
static System.Numerics.Tensors.Tensor<T> System.Numerics.Tensors.ITensor<System.Numerics.Tensors.Tensor<T>, T>.Create(scoped System.ReadOnlySpan<nint> lengths, scoped System.ReadOnlySpan<nint> strides, bool pinned) { throw null; }
796+
static System.Numerics.Tensors.Tensor<T> System.Numerics.Tensors.ITensor<System.Numerics.Tensors.Tensor<T>, T>.CreateUninitialized(scoped System.ReadOnlySpan<nint> lengths, bool pinned) { throw null; }
797+
static System.Numerics.Tensors.Tensor<T> System.Numerics.Tensors.ITensor<System.Numerics.Tensors.Tensor<T>, T>.CreateUninitialized(scoped System.ReadOnlySpan<nint> lengths, scoped System.ReadOnlySpan<nint> strides, bool pinned) { throw null; }
798798
public string ToString(params scoped System.ReadOnlySpan<nint> maximumLengths) { throw null; }
799-
public bool TryCopyTo(System.Numerics.Tensors.TensorSpan<T> destination) { throw null; }
800-
public bool TryFlattenTo(System.Span<T> destination) { throw null; }
799+
public bool TryCopyTo(scoped System.Numerics.Tensors.TensorSpan<T> destination) { throw null; }
800+
public bool TryFlattenTo(scoped System.Span<T> destination) { throw null; }
801801
}
802802
}

‎src/libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/netcore/Tensor.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ internal Tensor(T[]? values, ReadOnlySpan<nint> lengths, ReadOnlySpan<nint> stri
9191
/// </summary>
9292
/// <param name="lengths">A <see cref="ReadOnlySpan{T}"/> indicating the lengths of each dimension.</param>
9393
/// <param name="pinned">A <see cref="bool"/> whether the underlying data should be pinned or not.</param>
94-
static Tensor<T> ITensor<Tensor<T>, T>.Create(ReadOnlySpan<nint> lengths, bool pinned)
94+
static Tensor<T> ITensor<Tensor<T>, T>.Create(scoped ReadOnlySpan<nint> lengths, bool pinned)
9595
{
9696
nint linearLength = TensorSpanHelpers.CalculateTotalLength(lengths);
9797
T[] values = pinned ? GC.AllocateArray<T>((int)linearLength, pinned) : (new T[linearLength]);
@@ -104,7 +104,7 @@ static Tensor<T> ITensor<Tensor<T>, T>.Create(ReadOnlySpan<nint> lengths, bool p
104104
/// <param name="lengths">A <see cref="ReadOnlySpan{T}"/> indicating the lengths of each dimension.</param>
105105
/// <param name="strides">A <see cref="ReadOnlySpan{T}"/> indicating the strides of each dimension.</param>
106106
/// <param name="pinned">A <see cref="bool"/> whether the underlying data should be pinned or not.</param>
107-
static Tensor<T> ITensor<Tensor<T>, T>.Create(ReadOnlySpan<nint> lengths, ReadOnlySpan<nint> strides, bool pinned)
107+
static Tensor<T> ITensor<Tensor<T>, T>.Create(scoped ReadOnlySpan<nint> lengths, scoped ReadOnlySpan<nint> strides, bool pinned)
108108
{
109109
nint linearLength = TensorSpanHelpers.CalculateTotalLength(lengths);
110110
T[] values = pinned ? GC.AllocateArray<T>((int)linearLength, pinned) : (new T[linearLength]);
@@ -116,7 +116,7 @@ static Tensor<T> ITensor<Tensor<T>, T>.Create(ReadOnlySpan<nint> lengths, ReadOn
116116
/// </summary>
117117
/// <param name="lengths">A <see cref="ReadOnlySpan{T}"/> indicating the lengths of each dimension.</param>
118118
/// <param name="pinned">A <see cref="bool"/> whether the underlying data should be pinned or not.</param>
119-
static Tensor<T> ITensor<Tensor<T>, T>.CreateUninitialized(ReadOnlySpan<nint> lengths, bool pinned)
119+
static Tensor<T> ITensor<Tensor<T>, T>.CreateUninitialized(scoped ReadOnlySpan<nint> lengths, bool pinned)
120120
{
121121
nint linearLength = TensorSpanHelpers.CalculateTotalLength(lengths);
122122
T[] values = GC.AllocateUninitializedArray<T>((int)linearLength, pinned);
@@ -129,7 +129,7 @@ static Tensor<T> ITensor<Tensor<T>, T>.CreateUninitialized(ReadOnlySpan<nint> le
129129
/// <param name="lengths">A <see cref="ReadOnlySpan{T}"/> indicating the lengths of each dimension.</param>
130130
/// <param name="strides">A <see cref="ReadOnlySpan{T}"/> indicating the strides of each dimension.</param>
131131
/// <param name="pinned">A <see cref="bool"/> whether the underlying data should be pinned or not.</param>
132-
static Tensor<T> ITensor<Tensor<T>, T>.CreateUninitialized(ReadOnlySpan<nint> lengths, ReadOnlySpan<nint> strides, bool pinned)
132+
static Tensor<T> ITensor<Tensor<T>, T>.CreateUninitialized(scoped ReadOnlySpan<nint> lengths, scoped ReadOnlySpan<nint> strides, bool pinned)
133133
{
134134
nint linearLength = TensorSpanHelpers.CalculateTotalLength(lengths);
135135
T[] values = GC.AllocateUninitializedArray<T>((int)linearLength, pinned);
@@ -516,7 +516,7 @@ public Tensor<T> Slice(params ReadOnlySpan<NIndex> startIndex)
516516
/// Thrown when the destination TensorSpan is shorter than the source Tensor.
517517
/// </exception>
518518
[MethodImpl(MethodImplOptions.AggressiveInlining)]
519-
public void CopyTo(TensorSpan<T> destination) => AsTensorSpan().CopyTo(destination);
519+
public void CopyTo(scoped TensorSpan<T> destination) => AsTensorSpan().CopyTo(destination);
520520

521521
/// <summary>
522522
/// Fills the contents of this span with the given value.
@@ -532,19 +532,19 @@ public Tensor<T> Slice(params ReadOnlySpan<NIndex> startIndex)
532532
/// <param name="destination">The span to copy items into.</param>
533533
/// <returns>If the destination span is shorter than the source tensor, this method
534534
/// return false and no data is written to the destination.</returns>
535-
public bool TryCopyTo(TensorSpan<T> destination) => AsTensorSpan().TryCopyTo(destination);
535+
public bool TryCopyTo(scoped TensorSpan<T> destination) => AsTensorSpan().TryCopyTo(destination);
536536

537537
/// <summary>
538538
/// Flattens the contents of this Tensor into the provided <see cref="Span{T}"/>.
539539
/// </summary>
540540
/// <param name="destination">The span to copy items into.</param>
541-
public void FlattenTo(Span<T> destination) => AsTensorSpan().FlattenTo(destination);
541+
public void FlattenTo(scoped Span<T> destination) => AsTensorSpan().FlattenTo(destination);
542542

543543
/// <summary>
544544
/// Flattens the contents of this Tensor into the provided <see cref="Span{T}"/>.
545545
/// </summary>
546546
/// <param name="destination">The span to copy items into.</param>
547-
public bool TryFlattenTo(Span<T> destination) => AsTensorSpan().TryFlattenTo(destination);
547+
public bool TryFlattenTo(scoped Span<T> destination) => AsTensorSpan().TryFlattenTo(destination);
548548

549549
// IEnumerable
550550
/// <summary>

‎src/libraries/System.Numerics.Tensors/tests/TensorSpanTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ public void TensorExtensionsTwoSpanInSpanOut<T>(TensorPrimitivesTwoSpanInSpanOut
482482
}
483483

484484
public delegate T TensorPrimitivesTwoSpanInTOut<T>(ReadOnlySpan<T> input, ReadOnlySpan<T> inputTwo);
485-
public delegate T TensorTwoSpanInTOut<T>(scoped in ReadOnlyTensorSpan<T> input, scoped in ReadOnlyTensorSpan<T> inputTwo);
485+
public delegate T TensorTwoSpanInTOut<T>(in ReadOnlyTensorSpan<T> input, in ReadOnlyTensorSpan<T> inputTwo);
486486
public static IEnumerable<object[]> TwoSpanInFloatOutData()
487487
{
488488
yield return Create<float>(TensorPrimitives.Distance, Tensor.Distance);

‎src/libraries/System.Numerics.Tensors/tests/TensorTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private static nint CalculateTotalLength(ReadOnlySpan<nint> lengths)
3434
return totalLength;
3535
}
3636

37-
public delegate Tensor<T> PerformSpanInSpanOut<T>(scoped in ReadOnlyTensorSpan<T> input);
37+
public delegate Tensor<T> PerformSpanInSpanOut<T>(in ReadOnlyTensorSpan<T> input);
3838
public delegate void PerformCalculationSpanInSpanOut<T>(ReadOnlySpan<T> input, Span<T> output);
3939

4040
public static IEnumerable<object[]> SpanInSpanOutData()
@@ -153,7 +153,7 @@ public void TensorExtensionsSpanInTOut<T>(PerformCalculationSpanInTOut<T> tensor
153153
});
154154
}
155155

156-
public delegate Tensor<T> PerformTwoSpanInSpanOut<T>(scoped in ReadOnlyTensorSpan<T> input, scoped in ReadOnlyTensorSpan<T> input2);
156+
public delegate Tensor<T> PerformTwoSpanInSpanOut<T>(in ReadOnlyTensorSpan<T> input, in ReadOnlyTensorSpan<T> input2);
157157
public delegate void PerformCalculationTwoSpanInSpanOut<T>(ReadOnlySpan<T> input, ReadOnlySpan<T> inputTwo, Span<T> output);
158158
public static IEnumerable<object[]> TwoSpanInSpanOutData()
159159
{
@@ -201,7 +201,7 @@ public void TensorExtensionsTwoSpanInSpanOut<T>(PerformCalculationTwoSpanInSpanO
201201
});
202202
}
203203

204-
public delegate T PerformTwoSpanInFloatOut<T>(scoped in ReadOnlyTensorSpan<T> input, scoped in ReadOnlyTensorSpan<T> input2);
204+
public delegate T PerformTwoSpanInFloatOut<T>(in ReadOnlyTensorSpan<T> input, in ReadOnlyTensorSpan<T> input2);
205205
public delegate T PerformCalculationTwoSpanInFloatOut<T>(ReadOnlySpan<T> input, ReadOnlySpan<T> inputTwo);
206206
public static IEnumerable<object[]> TwoSpanInFloatOutData()
207207
{

‎src/libraries/System.Private.CoreLib/src/System/IO/TextWriter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ protected override void Dispose(bool disposing)
860860
public override void Write([StringSyntax(StringSyntaxAttribute.CompositeFormat)] string format, object?[] arg) => _out.Write(format, arg);
861861

862862
[MethodImpl(MethodImplOptions.Synchronized)]
863-
public override void Write([StringSyntax(StringSyntaxAttribute.CompositeFormat)] string format, ReadOnlySpan<object?> arg) => _out.Write(format, arg);
863+
public override void Write([StringSyntax(StringSyntaxAttribute.CompositeFormat)] string format, params ReadOnlySpan<object?> arg) => _out.Write(format, arg);
864864

865865
[MethodImpl(MethodImplOptions.Synchronized)]
866866
public override void WriteLine() => _out.WriteLine();
@@ -923,7 +923,7 @@ protected override void Dispose(bool disposing)
923923
public override void WriteLine([StringSyntax(StringSyntaxAttribute.CompositeFormat)] string format, object?[] arg) => _out.WriteLine(format, arg);
924924

925925
[MethodImpl(MethodImplOptions.Synchronized)]
926-
public override void WriteLine([StringSyntax(StringSyntaxAttribute.CompositeFormat)] string format, ReadOnlySpan<object?> arg) => _out.WriteLine(format, arg);
926+
public override void WriteLine([StringSyntax(StringSyntaxAttribute.CompositeFormat)] string format, params ReadOnlySpan<object?> arg) => _out.WriteLine(format, arg);
927927

928928
//
929929
// On SyncTextWriter all APIs should run synchronously, even the async ones.

0 commit comments

Comments
 (0)