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

Jump to bottom

Fix full generation tests #777

Merged
merged 2 commits into from
Nov 16, 2022
Merged

Fix full generation tests #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8159049
Fix FullGeneration to include all COM interfaces
AArnott Nov 15, 2022
a2d686a
Extend timeouts
AArnott Nov 16, 2022
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
6 changes: 3 additions & 3 deletions azure-pipelines/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ parameters:

jobs:
- job: Windows
timeoutInMinutes: 120
timeoutInMinutes: 240
pool: ${{ parameters.windowsPool }}
variables:
TestFilter: ""
Expand All @@ -30,7 +30,7 @@ jobs:
RunTests: ${{ parameters.RunTests }}

- job: Linux
timeoutInMinutes: 120
timeoutInMinutes: 240
pool:
vmImage: Ubuntu 20.04
variables:
Expand All @@ -48,7 +48,7 @@ jobs:

- job: macOS
condition: ${{ parameters.includeMacOS }}
timeoutInMinutes: 120
timeoutInMinutes: 240
pool:
vmImage: macOS-12
variables:
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/dotnet-test-cloud.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if ($x86) {
--filter "TestCategory!=FailsInCloudTest$env:TESTFILTER" `
--collect "Code Coverage;Format=cobertura" `
--settings "$PSScriptRoot/test.runsettings" `
--blame-hang-timeout 600s `
--blame-hang-timeout 1500s `
--blame-crash `
-bl:"$ArtifactStagingFolder/build_logs/test.binlog" `
--diag "$ArtifactStagingFolder/test_logs/diag.log;TraceLevel=info" `
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Windows.CsWin32/Generator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,7 @@ internal void RequestAllInteropTypes(CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
TypeDefinition typeDef = this.Reader.GetTypeDefinition(typeDefinitionHandle);
if (typeDef.BaseType.IsNil)
if (typeDef.BaseType.IsNil && (typeDef.Attributes & TypeAttributes.Interface) != TypeAttributes.Interface)
{
continue;
}
Expand Down