Skip to content
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

build(deps): bump Microsoft.CodeAnalysis.Common from 4.5.0 to 4.6.0 #8793

Merged
merged 6 commits into from
May 26, 2023
Merged

build(deps): bump Microsoft.CodeAnalysis.Common from 4.5.0 to 4.6.0 #8793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0912940
build(deps): bump Microsoft.CodeAnalysis.Common from 4.5.0 to 4.6.0
dependabot[bot] May 22, 2023
c1a5b1f
Update Directory.Packages.props
yufeih May 25, 2023
080c3d3
test(snapshot): update snapshots for d3183f704910d87ec25362926ca45f45…
yufeih May 25, 2023
4476281
fix tests
yufeih May 25, 2023
0fc6877
update nuget.frameworks
yufeih May 26, 2023
8cbcd8e
fix "The feature 'primary constructors' is currently in Preview and *…
yufeih May 26, 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
20 changes: 10 additions & 10 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<PackageVersion Include="Markdig" Version="0.31.0" />
<PackageVersion Include="Microsoft.Build" Version="17.5.0" />
<PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.5.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.5.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.5.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.5.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.5.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.5.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.5.0" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.6.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.6.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="PdfPig" Version="0.1.8-alpha-20230423-3898f" />
Expand All @@ -36,10 +36,10 @@
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="13.1.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageVersion Include="Microsoft.Playwright" Version="1.33.0" />
<PackageVersion Include="NuGet.Frameworks" Version="6.6.0-preview.3.61" />
<PackageVersion Include="NuGet.Frameworks" Version="6.6.0" />
<PackageVersion Include="Verify.DiffPlex" Version="2.2.1" />
<PackageVersion Include="Verify.Xunit" Version="19.14.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageVersion Include="xunit" Version="2.4.2" />
</ItemGroup>
</Project>
</Project>
3 changes: 0 additions & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet-tools">
<package pattern="NuGet.Frameworks" />
</packageSource>
</packageSourceMapping>
</configuration>
16 changes: 8 additions & 8 deletions test/Microsoft.DocAsCode.Dotnet.Tests/GenerateMetadataFromCSUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2640,19 +2640,19 @@ public void EnumUndefinedValue(ConsoleKey? key = (ConsoleKey)999) { }

var flagsDefault = output.Items[0].Items[0].Items[1];
Assert.NotNull(flagsDefault);
Assert.Equal(@"public void EnumDefault(ConsoleSpecialKey? key = 0)", flagsDefault.Syntax.Content[SyntaxLanguage.CSharp]);
Assert.Equal(@"public void EnumDefault(ConsoleSpecialKey? key = ConsoleSpecialKey.ControlC)", flagsDefault.Syntax.Content[SyntaxLanguage.CSharp]);

var flagsValue = output.Items[0].Items[0].Items[2];
Assert.NotNull(flagsValue);
Assert.Equal(@"public void EnumValue(ConsoleSpecialKey? key = 1)", flagsValue.Syntax.Content[SyntaxLanguage.CSharp]);
Assert.Equal(@"public void EnumValue(ConsoleSpecialKey? key = ConsoleSpecialKey.ControlBreak)", flagsValue.Syntax.Content[SyntaxLanguage.CSharp]);

var enumUndefinedDefault = output.Items[0].Items[0].Items[3];
Assert.NotNull(enumUndefinedDefault);
Assert.Equal(@"public void EnumUndefinedDefault(ConsoleKey? key = 0)", enumUndefinedDefault.Syntax.Content[SyntaxLanguage.CSharp]);
Assert.Equal(@"public void EnumUndefinedDefault(ConsoleKey? key = (ConsoleKey)0)", enumUndefinedDefault.Syntax.Content[SyntaxLanguage.CSharp]);

var enumUndefinedValue = output.Items[0].Items[0].Items[4];
Assert.NotNull(enumUndefinedValue);
Assert.Equal(@"public void EnumUndefinedValue(ConsoleKey? key = 999)", enumUndefinedValue.Syntax.Content[SyntaxLanguage.CSharp]);
Assert.Equal(@"public void EnumUndefinedValue(ConsoleKey? key = (ConsoleKey)999)", enumUndefinedValue.Syntax.Content[SyntaxLanguage.CSharp]);
}

[Fact]
Expand Down Expand Up @@ -2681,19 +2681,19 @@ public void FlagsUndefinedValue(AttributeTargets? targets = (AttributeTargets)65

var enumDefault = output.Items[0].Items[0].Items[1];
Assert.NotNull(enumDefault);
Assert.Equal(@"public void FlagsDefault(Base64FormattingOptions? options = 0)", enumDefault.Syntax.Content[SyntaxLanguage.CSharp]);
Assert.Equal(@"public void FlagsDefault(Base64FormattingOptions? options = Base64FormattingOptions.None)", enumDefault.Syntax.Content[SyntaxLanguage.CSharp]);

var enumValue = output.Items[0].Items[0].Items[2];
Assert.NotNull(enumValue);
Assert.Equal(@"public void FlagsValue(Base64FormattingOptions? options = 1)", enumValue.Syntax.Content[SyntaxLanguage.CSharp]);
Assert.Equal(@"public void FlagsValue(Base64FormattingOptions? options = Base64FormattingOptions.InsertLineBreaks)", enumValue.Syntax.Content[SyntaxLanguage.CSharp]);

var flagsUndefinedDefault = output.Items[0].Items[0].Items[3];
Assert.NotNull(flagsUndefinedDefault);
Assert.Equal(@"public void FlagsUndefinedDefault(AttributeTargets? targets = 0)", flagsUndefinedDefault.Syntax.Content[SyntaxLanguage.CSharp]);
Assert.Equal(@"public void FlagsUndefinedDefault(AttributeTargets? targets = (AttributeTargets)0)", flagsUndefinedDefault.Syntax.Content[SyntaxLanguage.CSharp]);

var flagsUndefinedValue = output.Items[0].Items[0].Items[4];
Assert.NotNull(flagsUndefinedValue);
Assert.Equal(@"public void FlagsUndefinedValue(AttributeTargets? targets = 65536)", flagsUndefinedValue.Syntax.Content[SyntaxLanguage.CSharp]);
Assert.Equal(@"public void FlagsUndefinedValue(AttributeTargets? targets = (AttributeTargets)65536)", flagsUndefinedValue.Syntax.Content[SyntaxLanguage.CSharp]);
}

[Fact]
Expand Down
5 changes: 3 additions & 2 deletions ...arp/api/CSharp11.StaticAbstractMembersInInterfaces.RepeatSequence.html.view.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,8 @@
"value": "<xref uid=\"System.String\" text=\"string\"/>"
}
]
}
},
"description": "<p sourcefile=\"api/CSharp11.StaticAbstractMembersInInterfaces.RepeatSequence.yml\" sourcestartlinenumber=\"1\">The fully qualified type name.</p>\n"
}
},
"source": {
Expand Down Expand Up @@ -546,7 +547,7 @@
},
"level": 0.0,
"type": "method",
"summary": "",
"summary": "<p sourcefile=\"api/CSharp11.StaticAbstractMembersInInterfaces.RepeatSequence.yml\" sourcestartlinenumber=\"1\">Returns the fully qualified type name of this instance.</p>\n",
"platform": null,
"docurl": "https://github.com/dotnet/docfx/new/main/apiSpec/new?filename=CSharp11_StaticAbstractMembersInInterfaces_RepeatSequence_ToString.md&value=---%0Auid%3A%20CSharp11.StaticAbstractMembersInInterfaces.RepeatSequence.ToString%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A",
"sourceurl": "https://github.com/dotnet/docfx/blob/main/samples/csharp/src/CSharp11.cs/#L20",
Expand Down
5 changes: 3 additions & 2 deletions ...cfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp8.ReadOnlyMembers.html.view.verified.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,8 @@
"value": "<xref uid=\"System.String\" text=\"string\"/>"
}
]
}
},
"description": "<p sourcefile=\"api/CSharp8.ReadOnlyMembers.yml\" sourcestartlinenumber=\"1\">The fully qualified type name.</p>\n"
}
},
"source": {
Expand Down Expand Up @@ -989,7 +990,7 @@
},
"level": 0.0,
"type": "method",
"summary": "",
"summary": "<p sourcefile=\"api/CSharp8.ReadOnlyMembers.yml\" sourcestartlinenumber=\"1\">Returns the fully qualified type name of this instance.</p>\n",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like ValueType.ToString now gets a default XML comment documenting the return type is FQTN. Overriding the ToString method of a struct should also override the XML documentation.

"platform": null,
"docurl": "https://github.com/dotnet/docfx/new/main/apiSpec/new?filename=CSharp8_ReadOnlyMembers_ToString.md&value=---%0Auid%3A%20CSharp8.ReadOnlyMembers.ToString%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A",
"sourceurl": "https://github.com/dotnet/docfx/blob/main/samples/csharp/src/CSharp8.cs/#L18",
Expand Down
2 changes: 1 addition & 1 deletion test/docfx.Tests/CompositeCommandTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace Hello{
/// }
/// </code>
/// </example>
public class HelloWorld(){}}
public class HelloWorld {}}
";
var sourceFile = Path.Combine(_projectFolder, "src", "test.cs");
CreateFile(sourceFile, sourceCode, "src");
Expand Down