Skip to content

Commit

Permalink
Revert "[tests] Preserve a required method in System.Private.CoreLib …
Browse files Browse the repository at this point in the history 
…to work around a bug in .NET 6. (#10426)" (#11974)

This reverts commit 29727d6.

dotnet/runtime#46908 was fixed and the other part of the workaround was removed in PR#11958
  • Loading branch information
@spouliot
spouliot authored Jun 18, 2021
1 parent aaf8d70 commit 3590070
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 21 deletions.
2 changes: 0 additions & 2 deletions tests/monotouch-test/dotnet/MacCatalyst/monotouch-test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
<None Include="..\..\Entitlements.plist" />
<None Include="..\..\app.config" />
<None Include="..\..\EmptyNib.xib" />

<LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 0 additions & 9 deletions tests/monotouch-test/dotnet/extra-linker-defs.xml
View file

This file was deleted.

6 changes: 0 additions & 6 deletions tests/monotouch-test/dotnet/iOS/monotouch-test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,11 @@
<PackageReference Include="System.Json" Version="4.7.1" />
</ItemGroup>

<ItemGroup>
<LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
</ItemGroup>

<ItemGroup>
<None Include="Info.plist" />
<None Include="..\..\Entitlements.plist" />
<None Include="..\..\app.config" />
<None Include="..\..\EmptyNib.xib" />

<LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions tests/monotouch-test/dotnet/macOS/monotouch-test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
<None Include="..\..\Entitlements.plist" />
<None Include="..\..\app.config" />
<None Include="..\..\EmptyNib.xib" />

<LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions tests/monotouch-test/dotnet/tvOS/monotouch-test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
<None Include="..\..\Entitlements.plist" />
<None Include="..\..\app.config" />
<None Include="..\..\EmptyNib.xib" />

<LinkDescription Include="$(RootTestsDirectory)\monotouch-test\dotnet\extra-linker-defs.xml" />
</ItemGroup>

<ItemGroup>
Expand Down

7 comments on commit 3590070

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

❌ [CI Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

✅ API Diff (from PR only) (no change)
✅ Generator Diff (no change)

Packages generated

View packages

Test results

1 tests failed, 220 tests passed.

Failed tests

  • introspection/watchOS 32-bits - simulator/Debug (watchOS 5.0): Failed

Pipeline on Agent XAMBOT-1025.BigSur'
Revert "[tests] Preserve a required method in System.Private.CoreLib to work around a bug in .NET 6. (#10426)" (#11974)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

🔥 Tests failed catastrophically on VSTS: device tests tvOS 🔥

Not enough free space in the host.

Pipeline on Agent
Revert "[tests] Preserve a required method in System.Private.CoreLib to work around a bug in .NET 6. (#10426)" (#11974)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
Revert "[tests] Preserve a required method in System.Private.CoreLib to work around a bug in .NET 6. (#10426)" (#11974)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
Revert "[tests] Preserve a required method in System.Private.CoreLib to work around a bug in .NET 6. (#10426)" (#11974)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

✅ Tests passed on macOS Mac Catalina (10.15) ✅

Tests passed

All tests on macOS X Mac Catalina (10.15) passed.

Pipeline on Agent
Revert "[tests] Preserve a required method in System.Private.CoreLib to work around a bug in .NET 6. (#10426)" (#11974)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

✅ Tests passed on macOS Mac High Sierra (10.13) ✅

Tests passed

All tests on macOS X Mac High Sierra (10.13) passed.

Pipeline on Agent
Revert "[tests] Preserve a required method in System.Private.CoreLib to work around a bug in .NET 6. (#10426)" (#11974)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

⚠️ Tests were not ran (VSTS: device tests iOS32b). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
Revert "[tests] Preserve a required method in System.Private.CoreLib to work around a bug in .NET 6. (#10426)" (#11974)

Please sign in to comment.