Merge main into live

.github/workflows/dotnet-code-metrics.yml

@@ -41,7 +41,7 @@ jobs:
         dir: ${{ './github-actions/DotNet.GitHubAction' }}
 
     - name: Create pull request
-      uses: peter-evans/create-pull-request@v7.0.8
+      uses: dotnet/actions-create-pull-request@v4
       if: ${{ steps.dotnet-code-metrics.outputs.updated-metrics }} == 'true'
       with:
         title: '${{ steps.dotnet-code-metrics.outputs.summary-title }}'

.github/workflows/markdownlint.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #@v2
     - name: Use Node.js
-      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a #@v1
+      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 #@v1
       with:
         node-version: 12.x
     - name: Run Markdownlint

.github/workflows/snippets5000.yml

@@ -62,7 +62,7 @@ jobs:
 
     # Update build output json file
     - name: Upload build results
-      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #@v4.6.1
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #@v4.6.2
       with:
         name: build
         path: ./output.json

core/getting-started/unit-testing-using-mstest/PrimeService.Tests/PrimeService.Tests.csproj

@@ -1,13 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
+    <PackageReference Include="MSTest" Version="3.8.3" />
   </ItemGroup>
 
   <ItemGroup>

core/interop/source-generation/ComWrappersGeneration/Server/Server.csproj

@@ -8,13 +8,17 @@
 
     <!-- Uncomment to publish as a native executable -->
     <!-- <PublishAOT>true</PublishAOT> -->
+  </PropertyGroup>
 
+  <PropertyGroup Condition="'$(PublishAOT)' != 'true'">
     <!-- Enable DNNE to dynamically load the managed .dll -->
-    <EnableDynamicLoading Condition="'$(PublishAOT)' != 'true'">true</EnableDynamicLoading>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <!-- Use our own .def file to export the COM methods as PRIVATE. The Windows native linker (Link.exe) warns when exported COM methods are not PRIVATE. -->
+    <DnneWindowsExportsDef>Server.def</DnneWindowsExportsDef>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DNNE" Version="2.*" Condition="'$(PublishAOT)' != 'true'"/>
+    <PackageReference Include="DNNE" Version="2.0.7" Condition="'$(PublishAOT)' != 'true'"/>
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <!-- When publishing AOT, use our own .def file to export the COM methods as PRIVATE. The Windows native linker (Link.exe) warns when exported COM methods are not PRIVATE. -->
     <LinkerArg Include="/DEF:&quot;Server.def&quot;" Condition="'$(PublishAOT)' == 'true'"/>

core/nativeaot/NativeLibrary/LibraryFunctions.cs

@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace NativeLibrary;
+
+public class LibraryFunctions
+{
+    [UnmanagedCallersOnly(EntryPoint = "aotsample_add")]
+    public static int Add(int a, int b)
+    {
+        return a + b;
+    }
+
+    [UnmanagedCallersOnly(EntryPoint = "aotsample_write_line")]
+    public static int WriteLine(IntPtr pString)
+    {
+        // The marshalling code is typically auto-generated by a custom tool in larger projects.
+        try
+        {
+            // UnmanagedCallersOnly methods only accept primitive arguments. The primitive arguments
+            // have to be marshalled manually if necessary.
+            string str = Marshal.PtrToStringAnsi(pString);
+
+            Console.WriteLine(str);
+        }
+        catch
+        {
+            // Exceptions escaping out of UnmanagedCallersOnly methods are treated as unhandled exceptions.
+            // The errors have to be marshalled manually if necessary.
+            return -1;
+        }
+        return 0;
+    }
+
+    [UnmanagedCallersOnly(EntryPoint = "aotsample_sumstring")]
+    public static IntPtr sumstring(IntPtr first, IntPtr second)
+    {
+        // Parse strings from the passed pointers 
+        string my1String = Marshal.PtrToStringAnsi(first);
+        string my2String = Marshal.PtrToStringAnsi(second);
+
+        // Concatenate strings 
+        string sum = my1String + my2String;
+
+        // Assign pointer of the concatenated string to sumPointer
+        IntPtr sumPointer = Marshal.StringToHGlobalAnsi(sum);
+
+        // Return pointer
+        return sumPointer;
+    }
+}

core/nativeaot/NativeLibrary/LoadLibrary.c

@@ -33,6 +33,8 @@
 int callSumFunc(char *path, char *funcName, int a, int b);
 char *callSumStringFunc(char *path, char *funcName, char *a, char *b);
 
+void* loadSymbol(char *path, char *funcName);
+
 int main()
 {
     // Check if the library file exists
@@ -54,43 +56,53 @@ int main()
     CoTaskMemFree(sumstring);
 }
 
-int callSumFunc(char *path, char *funcName, int firstInt, int secondInt)
+void *loadSymbol(char *path, char *funcName)
 {
-    // Call sum function defined in C# shared library
+    // Library loading
     #ifdef _WIN32
         HINSTANCE handle = LoadLibraryA(path);
     #else
         void *handle = dlopen(path, RTLD_LAZY);
     #endif
+    if (!handle)
+    {
+#ifdef _WIN32
+        int errorCode = GetLastError();
+        printf("Failed to load library at specified path. Error code: %d\n", errorCode);
+#else
+        puts("Failed to load library at specified path");
+#endif
+        return NULL;
+    }
+
+    // Declare a typedef
+    typedef char *(*myFunc)(char*,char*);
+
+    // Import Symbol named funcName
+
+    // NativeAOT libraries do not support unloading
+    // See https://github.com/dotnet/corert/issues/7887
+    return symLoad(handle, funcName);
+}
 
+int callSumFunc(char *path, char *funcName, int firstInt, int secondInt)
+{
     typedef int(*myFunc)(int,int);
-    myFunc MyImport = (myFunc)symLoad(handle, funcName);
+    myFunc MyImport = (myFunc)loadSymbol(path, funcName);
 
     int result = MyImport(firstInt, secondInt);
-
-    // NOTE: Native AOT libraries do not support unloading
     return result;
 }
 
 char *callSumStringFunc(char *path, char *funcName, char *firstString, char *secondString)
 {
-    // Library loading
-    #ifdef _WIN32
-        HINSTANCE handle = LoadLibraryA(path);
-    #else
-        void *handle = dlopen(path, RTLD_LAZY);
-    #endif
-
     // Declare a typedef
     typedef char *(*myFunc)(char*,char*);
 
     // Import Symbol named funcName
-    myFunc MyImport = (myFunc)symLoad(handle, funcName);
+    myFunc MyImport = (myFunc)loadSymbol(path, funcName);
 
     // The C# function will return a pointer
     char *result = MyImport(firstString, secondString);
-
-    // CoreRT libraries do not support unloading
-    // See https://github.com/dotnet/corert/issues/7887
     return result;
 }