diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index faf48d1ccbf3..611841315164 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -70,34 +70,34 @@ 0b968051beac5d7c1a62a52aee7fbbbb47dc1f47 - + https://github.com/dotnet/roslyn - 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 + a10bbf218cbd333e13a5387661c73f9b4077bd48 - + https://github.com/dotnet/roslyn - 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 + a10bbf218cbd333e13a5387661c73f9b4077bd48 - + https://github.com/dotnet/roslyn - 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 + a10bbf218cbd333e13a5387661c73f9b4077bd48 - + https://github.com/dotnet/roslyn - 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 + a10bbf218cbd333e13a5387661c73f9b4077bd48 - + https://github.com/dotnet/roslyn - 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 + a10bbf218cbd333e13a5387661c73f9b4077bd48 - + https://github.com/dotnet/roslyn - 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 + a10bbf218cbd333e13a5387661c73f9b4077bd48 - + https://github.com/dotnet/roslyn - 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 + a10bbf218cbd333e13a5387661c73f9b4077bd48 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a2ad23667032..f8ecd3801ad9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23177.13 - 4.6.0-2.23177.13 - 4.6.0-2.23177.13 - 4.6.0-2.23177.13 - 4.6.0-2.23177.13 - 4.6.0-2.23177.13 - 4.6.0-2.23177.13 + 4.6.0-3.23210.15 + 4.6.0-3.23210.15 + 4.6.0-3.23210.15 + 4.6.0-3.23210.15 + 4.6.0-3.23210.15 + 4.6.0-3.23210.15 + 4.6.0-3.23210.15 $(MicrosoftNetCompilersToolsetPackageVersion) diff --git a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs index 99564229aff8..b79f0217c3f1 100644 --- a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs +++ b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs @@ -70,7 +70,7 @@ public void TestNamespaceDeclaration() namespace A { namespace B {} - + namespace C.D { public struct Bar {} } } """, @@ -135,21 +135,37 @@ public readonly ref struct PublicReadonlyRefStruct { } expected: """ namespace Foo { - internal partial struct InternalStruct { } + internal partial struct InternalStruct + { + } - public readonly partial struct PublicReadonlyRefStruct { } + public readonly partial struct PublicReadonlyRefStruct + { + } - public readonly partial struct PublicReadonlyStruct { } + public readonly partial struct PublicReadonlyStruct + { + } - public partial struct PublicRefStruct { } + public partial struct PublicRefStruct + { + } - public partial struct PublicStruct { } + public partial struct PublicStruct + { + } - internal readonly partial struct ReadonlyRecordStruct : System.IEquatable { } + internal readonly record struct ReadonlyRecordStruct : System.IEquatable + { + } - internal readonly partial struct ReadonlyStruct { } + internal readonly partial struct ReadonlyStruct + { + } - internal partial struct RecordStruct : System.IEquatable { } + internal record struct RecordStruct : System.IEquatable + { + } } """); } @@ -165,7 +181,7 @@ public interface IPoint // Property signatures: int X { get; set; } int Y { get; set; } - + double CalculateDistance(IPoint p); } } @@ -178,7 +194,7 @@ public partial interface IPoint // Property signatures: int X { get; set; } int Y { get; set; } - + double CalculateDistance(IPoint p); } } @@ -280,7 +296,7 @@ public interface ISurface { void Paint(); } - + public class SampleClass : IControl, ISurface { public void Paint() @@ -300,7 +316,7 @@ public partial interface ISurface { void Paint(); } - + public partial class SampleClass : IControl, ISurface { public void Paint() @@ -318,9 +334,9 @@ public void TestPartiallySpecifiedGenericClassGeneration() namespace Foo { public class BaseNodeMultiple { } - + public class Node4 : BaseNodeMultiple { } - + public class Node5 : BaseNodeMultiple { } } """, @@ -328,9 +344,9 @@ public class Node5 : BaseNodeMultiple { } namespace Foo { public partial class BaseNodeMultiple { } - + public partial class Node4 : BaseNodeMultiple { } - + public partial class Node5 : BaseNodeMultiple { } } """); @@ -370,17 +386,17 @@ public enum Kind None = 0, Disable = 1 } - + public readonly struct Options { public readonly bool BoolMember = true; public readonly Kind KindMember = Kind.Disable; - + public Options(Kind kindVal) : this(kindVal, false) { } - + public Options(Kind kindVal, bool boolVal) { BoolMember = boolVal; @@ -563,7 +579,7 @@ public enum Animal Cat = 2, Bird = 3 } - + public partial class AnimalProperty { public Animal _animal; @@ -681,7 +697,7 @@ public partial class Bar { public int? AMember { get { throw null; } set { } } public string? BMember { get { throw null; } } - + public string? Execute(string? a, int? b) { throw null; } } } @@ -951,7 +967,7 @@ public sealed partial class B : A #pragma warning disable CS8597 public override TResult? Accept(int a) where TResult : default { throw null; } #pragma warning restore CS8597 - } + } } """, expected: """ @@ -1312,7 +1328,7 @@ public B(int p1, string p2) { } [System.Obsolete("Constructor is deprecated.", true)] public B(int p1) { } } - + public partial class C : B { public C() : base(default, default!) { } @@ -1349,7 +1365,7 @@ public B(int p1, string p2) { } [System.Obsolete("Constructor is deprecated.")] public B(int p1) { } } - + public partial class C : B { public C() : base(default) { } @@ -1386,7 +1402,7 @@ public B(int p1, string p2) { } [System.Obsolete(null)] public B(int p1) { } } - + public partial class C : B { public C() : base(default) { } @@ -1589,7 +1605,7 @@ public partial class Bar { public unsafe Bar(char* f) { } } - + public partial class Foo : Bar { public unsafe Foo(char* f) : base(default) { } @@ -1657,7 +1673,7 @@ public class Bar { public Bar(int a) { } } - + public class Foo : Bar { private Foo() : base(1) { } @@ -1683,7 +1699,7 @@ public partial class Bar { public Bar(int a) { } } - + public partial class Foo : Bar { internal Foo() : base(default) { } @@ -1830,7 +1846,7 @@ public partial interface AreEqual public partial interface IOption { } - + public partial class PerLanguageOption : IOption { } @@ -2030,7 +2046,7 @@ public AnyTestAttribute(System.Type xType) { XType = xType; } - + public System.Type XType { get; set; } }