Update Runtime.Native assembly and implementation

- Following nanoframework#1379. - Add code to fill in the new functions to retrieve Platform and TargetName from NFReleaseInfo struct. Signed-off-by: José Simões <jose.simoes@eclo.solutions>
Eclo · Jun 20, 2019 · 225e388 · 225e388
1 parent 7a6bf2e
commit 225e388
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/CLR/Runtime.Native/nf_rt_native.cpp b/src/CLR/Runtime.Native/nf_rt_native.cpp
@@ -16,7 +16,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
     Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_Model___STATIC__U1,
     Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_SKU___STATIC__U2,
     Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_TargetName___STATIC__STRING,
-    Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_PlatformName___STATIC__STRING,
+    Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_Platform___STATIC__STRING,
     NULL,
     Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::GetNativeFloatingPointSupport___STATIC__U1,
     NULL,
@@ -48,7 +48,7 @@ static const CLR_RT_MethodHandler method_lookup[] =
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_Runtime_Native =
 {
     "nanoFramework.Runtime.Native", 
-    0x783D119F,
+    0x1639FF83,
     method_lookup,
     { 1, 0, 5, 0 }
 };
diff --git a/src/CLR/Runtime.Native/nf_rt_native.h b/src/CLR/Runtime.Native/nf_rt_native.h
@@ -32,7 +32,7 @@ struct Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo
     NANOCLR_NATIVE_DECLARE(get_Model___STATIC__U1);
     NANOCLR_NATIVE_DECLARE(get_SKU___STATIC__U2);
     NANOCLR_NATIVE_DECLARE(get_TargetName___STATIC__STRING);
-    NANOCLR_NATIVE_DECLARE(get_PlatformName___STATIC__STRING);
+    NANOCLR_NATIVE_DECLARE(get_Platform___STATIC__STRING);
     NANOCLR_NATIVE_DECLARE(GetNativeFloatingPointSupport___STATIC__U1);
 
     //--//

diff --git a/src/CLR/Runtime.Native/nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp b/src/CLR/Runtime.Native/nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp
@@ -108,18 +108,23 @@ HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_Target
 
     Target_GetReleaseInfo( releaseInfo );
 
-    NANOCLR_SET_AND_LEAVE(stack.SetResult_String( (char*)releaseInfo.InfoString ));
+    NANOCLR_SET_AND_LEAVE(stack.SetResult_String( (char*)releaseInfo.TargetName ));
 
     NANOCLR_NOCLEANUP();
 }
 
-HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_PlatformName___STATIC__STRING( CLR_RT_StackFrame& stack )
+HRESULT Library_nf_rt_native_nanoFramework_Runtime_Native_SystemInfo::get_Platform___STATIC__STRING( CLR_RT_StackFrame& stack )
 {
     NATIVE_PROFILE_CLR_CORE();
 
     NANOCLR_HEADER();
 
-    NANOCLR_SET_AND_LEAVE(stack.NotImplementedStub());
+
+    NFReleaseInfo releaseInfo;
+
+    Target_GetReleaseInfo( releaseInfo );
+
+    NANOCLR_SET_AND_LEAVE(stack.SetResult_String( (char*)releaseInfo.PlatformName ));
 
     NANOCLR_NOCLEANUP();
 }