Remove coreclr shutdown from coreclr_t destructor. (dotnet/core-setup#5612)

Commit migrated from https://github.com/dotnet/core-setup/commit/d18247239a28e4ec353f92bedf2dde153a8068ea

diff --git a/src/installer/corehost/cli/coreclr.cpp b/src/installer/corehost/cli/coreclr.cpp
index a942761..9392711 100644 (file)
--- a/src/installer/corehost/cli/coreclr.cpp
+++ b/src/installer/corehost/cli/coreclr.cpp
@@ -74,14 +74,6 @@ namespace
 
         return true;
     }
-    
-    void coreclr_unload()
-    {
-        assert(g_coreclr != nullptr && coreclr_initialize != nullptr);
-
-        // [TODO] Unloading coreclr is not presently supported
-        // pal::unload_library(g_coreclr);
-    }
 }
 
 pal::hresult_t coreclr_t::create(
@@ -126,12 +118,6 @@ coreclr_t::coreclr_t(host_handle_t host_handle, domain_id_t domain_id)
 {
 }
 
-coreclr_t::~coreclr_t()
-{
-    (void)shutdown(nullptr);
-    coreclr_unload();
-}
-
 pal::hresult_t coreclr_t::execute_assembly(
     int argc,
     const char** argv,

diff --git a/src/installer/corehost/cli/coreclr.h b/src/installer/corehost/cli/coreclr.h
index 6213660..85fcca7 100644 (file)
--- a/src/installer/corehost/cli/coreclr.h
+++ b/src/installer/corehost/cli/coreclr.h
@@ -29,7 +29,7 @@ public:
     using domain_id_t = std::uint32_t;
 
     coreclr_t(host_handle_t host_handle, domain_id_t domain_id);
-    ~coreclr_t();
+    ~coreclr_t() = default;
 
     pal::hresult_t execute_assembly(
         int argc,