From a7332322e5ec0fef5ca4d10a011b409100aedf4e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 13:18:29 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/symstore build 20230110.1 Microsoft.SymbolStore From Version 1.0.405901 -> To Version 1.0.406001 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 731fc854d3..bbbdd1dccc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/symstore - 65e1cd47410a80290b379c3d86c87415d5d07689 + 4fa642ff7760b7cb9e1ec7d1c625ecde11d8ddc4 https://github.com/microsoft/clrmd diff --git a/eng/Versions.props b/eng/Versions.props index c78e1f2593..9299e0e53d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,7 +16,7 @@ - 1.0.405901 + 1.0.406001 7.0.0-rtm.22513.12 7.0.0 From fdc4298ab2a49226e0a492d791603142202419c8 Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Wed, 11 Jan 2023 10:23:25 -0800 Subject: [PATCH 2/2] Fix build breaks --- .../ElfModule.cs | 7 +------ .../MachOModule.cs | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/ElfModule.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/ElfModule.cs index 66f786f496..584f26cc3b 100644 --- a/src/Microsoft.Diagnostics.DebugServices.Implementation/ElfModule.cs +++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/ElfModule.cs @@ -13,10 +13,8 @@ namespace Microsoft.Diagnostics.DebugServices.Implementation /// /// Disposable ELFFile wrapper around the module file. /// - public class ELFModule : ELFFile, IDisposable + public class ELFModule : ELFFile { - private readonly Stream _stream; - /// /// Opens and returns an ELFFile instance from the local file path /// @@ -48,9 +46,6 @@ public static ELFModule OpenFile(string filePath) public ELFModule(Stream stream) : base(new StreamAddressSpace(stream), position: 0, isDataSourceVirtualAddressSpace: false) { - _stream = stream; } - - public void Dispose() => _stream.Dispose(); } } \ No newline at end of file diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/MachOModule.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/MachOModule.cs index f530888ebe..467f52c8f2 100644 --- a/src/Microsoft.Diagnostics.DebugServices.Implementation/MachOModule.cs +++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/MachOModule.cs @@ -13,10 +13,8 @@ namespace Microsoft.Diagnostics.DebugServices.Implementation /// /// Disposable MachOFile wrapper around the module file. /// - public class MachOModule : MachOFile, IDisposable + public class MachOModule : MachOFile { - private readonly Stream _stream; - /// /// Opens and returns an MachOFile instance from the local file path /// @@ -48,9 +46,6 @@ public static MachOModule OpenFile(string filePath) public MachOModule(Stream stream) : base(new StreamAddressSpace(stream), position: 0, dataSourceIsVirtualAddressSpace: false) { - _stream = stream; } - - public void Dispose() => _stream.Dispose(); } }