Improve trimmability

xoofx · Dec 15, 2024 · d5c6496 · d5c6496
1 parent ce1b0e2
commit d5c6496
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/Ultra.Core/Ultra.Core.csproj b/src/Ultra.Core/Ultra.Core.csproj
@@ -27,10 +27,6 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Ultra.Sampler\UltraSamplerConstants.cs" Link="UltraSamplerConstants.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)../../img/ultra.png" Pack="true" PackagePath="/" />
     <None Include="readme.md" Pack="true" PackagePath="/" />
@@ -55,4 +51,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ultra.Sampler\Ultra.Sampler.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/Ultra.Sampler/UltraSamplerSource.cs b/src/Ultra.Sampler/UltraSamplerSource.cs
@@ -11,6 +11,7 @@ namespace Ultra.Sampler;
 [EventSource(Name = UltraSamplerConstants.ProviderName)] // Cannot set the ProviderGuid that is not used https://github.com/dotnet/diagnostics/issues/389
 internal sealed class UltraSamplerSource : EventSource
 {
+    [DynamicDependency(DynamicallyAccessedMemberTypes.PublicMethods, typeof(UltraSamplerSource))]
     public static readonly UltraSamplerSource Log = new();
 
     private UltraSamplerSource()

diff --git a/src/Ultra.Sampler/libUltraSampler.dylib b/src/Ultra.Sampler/libUltraSampler.dylib
diff --git a/src/Ultra.Tests/UltraSamplerTests.cs b/src/Ultra.Tests/UltraSamplerTests.cs
@@ -2,6 +2,7 @@
 // Licensed under the BSD-Clause 2 license.
 // See license.txt file in the project root for full license information.
 
+using Ultra.Core;
 using Ultra.Sampler;
 using Ultra.Sampler.MacOS;
 
@@ -23,4 +24,12 @@ public void TestNativeModules()
             Console.WriteLine($"{nativeModule}");
         }
     }
+
+    [TestMethod]
+    public void TestEventSource()
+    {
+        var sampler = UltraSamplerSource.Log;
+        Assert.AreEqual(UltraSamplerConstants.ProviderName, sampler.Name);
+        Assert.AreEqual(UltraSamplerConstants.ProviderGuid, sampler.Guid);
+    }
 }