Skip to content

[main] Update dependencies from dotnet/roslyn #31499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotnet-maestro merged 15 commits into from
Apr 11, 2023
Merged

[main] Update dependencies from dotnet/roslyn #31499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0d5db18
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Mar 28, 2023
e7768ad
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Mar 29, 2023
ccc8711
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Mar 29, 2023
f7f7bd5
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Mar 30, 2023
0b9eaf0
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Mar 30, 2023
3f22f73
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 1, 2023
6c68270
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 1, 2023
c7f549a
adjust to new struct formatting xd
nagilson Apr 6, 2023
32e9a02
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 7, 2023
d11c6fa
Merge remote-tracking branch 'upstream/main' into darc-main-e5b4c870-…
mmitche Apr 7, 2023
41f1d68
Update SBRP
mmitche Apr 7, 2023
533d3f4
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 7, 2023
c147c19
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 8, 2023
d775906
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Apr 11, 2023
f7a6cc4
Merge branch 'main' into darc-main-e5b4c870-f805-4f58-8338-1cc601e2fad0
NikolaMilosavljevic Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,34 +70,34 @@
<Sha>0b968051beac5d7c1a62a52aee7fbbbb47dc1f47</Sha>
<SourceBuild RepoName="format" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-2.23177.13">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-3.23210.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>542fea0c2a93aacb3e8c52c2ce43e975d29832f3</Sha>
<Sha>a10bbf218cbd333e13a5387661c73f9b4077bd48</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-2.23177.13">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-3.23210.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>542fea0c2a93aacb3e8c52c2ce43e975d29832f3</Sha>
<Sha>a10bbf218cbd333e13a5387661c73f9b4077bd48</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-2.23177.13">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-3.23210.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>542fea0c2a93aacb3e8c52c2ce43e975d29832f3</Sha>
<Sha>a10bbf218cbd333e13a5387661c73f9b4077bd48</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.6.0-2.23177.13">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.6.0-3.23210.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>542fea0c2a93aacb3e8c52c2ce43e975d29832f3</Sha>
<Sha>a10bbf218cbd333e13a5387661c73f9b4077bd48</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.6.0-2.23177.13">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.6.0-3.23210.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>542fea0c2a93aacb3e8c52c2ce43e975d29832f3</Sha>
<Sha>a10bbf218cbd333e13a5387661c73f9b4077bd48</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0-2.23177.13">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0-3.23210.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>542fea0c2a93aacb3e8c52c2ce43e975d29832f3</Sha>
<Sha>a10bbf218cbd333e13a5387661c73f9b4077bd48</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.6.0-2.23177.13">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.6.0-3.23210.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>542fea0c2a93aacb3e8c52c2ce43e975d29832f3</Sha>
<Sha>a10bbf218cbd333e13a5387661c73f9b4077bd48</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.0-preview.4.23210.11">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.6.0-2.23177.13</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.6.0-2.23177.13</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.6.0-2.23177.13</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.6.0-2.23177.13</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.6.0-2.23177.13</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.6.0-2.23177.13</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.6.0-2.23177.13</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.6.0-3.23210.15</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.6.0-3.23210.15</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.6.0-3.23210.15</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.6.0-3.23210.15</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.6.0-3.23210.15</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.6.0-3.23210.15</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.6.0-3.23210.15</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
78 changes: 47 additions & 31 deletions src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public void TestNamespaceDeclaration()
namespace A
{
namespace B {}

namespace C.D { public struct Bar {} }
}
""",
Expand Down Expand Up @@ -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<ReadonlyRecordStruct> { }
internal readonly record struct ReadonlyRecordStruct : System.IEquatable<ReadonlyRecordStruct>
{
}

internal readonly partial struct ReadonlyStruct { }
internal readonly partial struct ReadonlyStruct
{
}

internal partial struct RecordStruct : System.IEquatable<RecordStruct> { }
internal record struct RecordStruct : System.IEquatable<RecordStruct>
{
}
}
""");
}
Expand All @@ -165,7 +181,7 @@ public interface IPoint
// Property signatures:
int X { get; set; }
int Y { get; set; }

double CalculateDistance(IPoint p);
}
}
Expand All @@ -178,7 +194,7 @@ public partial interface IPoint
// Property signatures:
int X { get; set; }
int Y { get; set; }

double CalculateDistance(IPoint p);
}
}
Expand Down Expand Up @@ -280,7 +296,7 @@ public interface ISurface
{
void Paint();
}

public class SampleClass : IControl, ISurface
{
public void Paint()
Expand All @@ -300,7 +316,7 @@ public partial interface ISurface
{
void Paint();
}

public partial class SampleClass : IControl, ISurface
{
public void Paint()
Expand All @@ -318,19 +334,19 @@ public void TestPartiallySpecifiedGenericClassGeneration()
namespace Foo
{
public class BaseNodeMultiple<T, U> { }

public class Node4<T> : BaseNodeMultiple<T, int> { }

public class Node5<T, U> : BaseNodeMultiple<T, U> { }
}
""",
expected: """
namespace Foo
{
public partial class BaseNodeMultiple <T, U> { }

public partial class Node4 <T> : BaseNodeMultiple<T, int> { }

public partial class Node5 <T, U> : BaseNodeMultiple<T, U> { }
}
""");
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -563,7 +579,7 @@ public enum Animal
Cat = 2,
Bird = 3
}

public partial class AnimalProperty {
public Animal _animal;

Expand Down Expand Up @@ -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; }
}
}
Expand Down Expand Up @@ -951,7 +967,7 @@ public sealed partial class B : A
#pragma warning disable CS8597
public override TResult? Accept<TResult>(int a) where TResult : default { throw null; }
#pragma warning restore CS8597
}
}
}
""",
expected: """
Expand Down Expand Up @@ -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!) { }
Expand Down Expand Up @@ -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) { }
Expand Down Expand Up @@ -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) { }
Expand Down Expand Up @@ -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) { }
Expand Down Expand Up @@ -1657,7 +1673,7 @@ public class Bar
{
public Bar(int a) { }
}

public class Foo : Bar
{
private Foo() : base(1) { }
Expand All @@ -1683,7 +1699,7 @@ public partial class Bar
{
public Bar(int a) { }
}

public partial class Foo : Bar
{
internal Foo() : base(default) { }
Expand Down Expand Up @@ -1830,7 +1846,7 @@ public partial interface AreEqual<T>
public partial interface IOption
{
}

public partial class PerLanguageOption : IOption
{
}
Expand Down Expand Up @@ -2030,7 +2046,7 @@ public AnyTestAttribute(System.Type xType)
{
XType = xType;
}

public System.Type XType { get; set; }
}

Expand Down