Skip to content

Commit

Permalink
Update linker repo to the latest SDK (#1995)
Browse files Browse the repository at this point in the history
* Pick up the DynamicallyAccessedMemberTypes.Interfaces enum from runtime
* Update branding of the linker assembly
* Fix nullref in tests - corelib now has an assembly level attribute with annotations (so the reported "source" is null - since we can't represent assembly as a source just yet).
  • Loading branch information
vitek-karas committed Apr 26, 2021
1 parent e63107b commit 4f95e90
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<MinorVersion>0</MinorVersion>
<PatchVersion>100</PatchVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
<PreReleaseVersionIteration>5</PreReleaseVersionIteration>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100-preview.4.21179.4",
"dotnet": "6.0.100-preview.5.21225.11",
"runtimes": {
"dotnet": [
"5.0.0"
Expand Down
4 changes: 2 additions & 2 deletions test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -998,9 +998,9 @@ void VerifyRecordedReflectionPatterns (AssemblyDefinition original, TestReflecti
// By now all verified recorded patterns were removed from the test recorder lists, so validate
// that there are no remaining patterns for this type.
var recognizedPatternsForType = reflectionPatternRecorder.RecognizedPatterns
.Where (pattern => pattern.Source.DeclaringType?.FullName == typeToVerify.FullName);
.Where (pattern => pattern.Source?.DeclaringType?.FullName == typeToVerify.FullName);
var unrecognizedPatternsForType = reflectionPatternRecorder.UnrecognizedPatterns
.Where (pattern => pattern.Source.DeclaringType?.FullName == typeToVerify.FullName);
.Where (pattern => pattern.Source?.DeclaringType?.FullName == typeToVerify.FullName);

if (recognizedPatternsForType.Any () || unrecognizedPatternsForType.Any ()) {
string recognizedPatterns = string.Join (Environment.NewLine, recognizedPatternsForType
Expand Down

0 comments on commit 4f95e90

Please sign in to comment.