Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into thays_fix_56249
* origin/main: (64 commits)
  [wasm][debugger] Create test Inherited Properties (#56754)
  Mark new test as incompatible with GC Mark4781_1GcStressIncompatible (#56739)
  Ensure MetadataEnumResult is sufficiently updated by MetaDataImport::Enum (#56756)
  [mono] Remove gdb xdebug and binary writer support, it hasn't worked in a while. (#56759)
  Update windows-requirements.md (#56476)
  Update doc and generic parameter name for JsonValue.GetValue (#56639)
  [wasm][debugger] Inspect static class (#56740)
  Fix stack overflow handling issue in GC stress (#56733)
  Use ReflectionOnly as serialization mode in case dynamic code runtime feature is not supported (#56604)
  Move Windows Compat pack to NuGet pack task (#56686)
  Fix build error when building some packages (#56767)
  Simplify JIT shutdown logic in crossgen2 (#56687)
  Fix race in crossdac publishing with PGO (#56762)
  Add DictionaryKeyPolicy support for EnumConverter [#47765] (#54429)
  Use ComWrappers in some Marshal unit-tests and update platform metadata  (#56595)
  Set `DisableImplicitNamespaceImports_Dotnet=true` to workaround sdk issue (#56744)
  Make sure ServerGCHeapDetails is up to date (#56056)
  [libraries] Reenable System.Diagnostics.DiagnosticSorce.Switches.Tests on mobile (#56737)
  Disable failing arm64 win10 Graphics.FromHdc tests  (#56732)
  Match xplat event source conditions (#56435)
  ...
  • Loading branch information
thaystg committed Aug 3, 2021
commit c0e7fb28c4c26b8c731877ab8998f839a9c49df5
27 changes: 27 additions & 0 deletions src/mono/wasm/debugger/tests/debugger-test/debugger-test2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,30 @@ await getJsonTask.ContinueWith(t =>
}
}
}

public class TestParent2
{
public int k = 30;
public int GetK => k;
}

public class TestParent : TestParent2
{
public int j = 20;
public int GetJ => j;
}

public class TestChild : TestParent
{
public int i = 50;
public int GetI => i;
public TestChild()
{
Console.WriteLine("Hi");
}
public static void TestWatchWithInheritance()
{
TestChild test = new TestChild();
Debugger.Break();
}
}
You are viewing a condensed version of this merge commit. You can view the full changes here.