Un-Embedding the link.xml

CHANGELOG.md

@@ -8,6 +8,7 @@
 
 ### Fixes
 
+- Un-embedding the link.xml to fix code stripping ([#237]/(https://github.com/getsentry/sentry-unity/pull/237))
 - Setting IsEnvironmentUser to false by default ([#230](https://github.com/getsentry/sentry-unity/pull/230))
 
 ## 0.2.0

src/Sentry.Unity.Editor/Resources/link.xml

@@ -0,0 +1,65 @@
+<linker>
+    <assembly fullname="Sentry" preserve="all"/>
+    <assembly fullname="Sentry.Unity" preserve="all"/>
+    <assembly fullname="System.Text.Json" preserve="all"/>
+
+    <assembly fullname="System">
+        <type fullname="System.ComponentModel.TypeConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.ArrayConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.BaseNumberConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.BooleanConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.ByteConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.CharConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.CollectionConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.ComponentConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.CultureInfoConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.DateTimeConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.DecimalConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.DoubleConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.EnumConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.ExpandableObjectConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.Int16Converter" preserve="all"/>
+        <type fullname="System.ComponentModel.Int32Converter" preserve="all"/>
+        <type fullname="System.ComponentModel.Int64Converter" preserve="all"/>
+        <type fullname="System.ComponentModel.NullableConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.SByteConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.SingleConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.StringConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.TimeSpanConverter" preserve="all"/>
+        <type fullname="System.ComponentModel.UInt16Converter" preserve="all"/>
+        <type fullname="System.ComponentModel.UInt32Converter" preserve="all"/>
+        <type fullname="System.ComponentModel.UInt64Converter" preserve="all"/>
+    </assembly>
+
+
+    <!--https://docs.microsoft.com/en-us/dotnet/api/system.linq.expressions.lambdaexpression.name?view=netframework-4.7.2&viewFallbackFrom=netframework-2.0-->
+    <assembly fullname="System.Core">
+        <type fullname="System.Linq.Expressions" preserve="all"/>
+        <type fullname="System.Linq.Expressions.*" preserve="all"/>
+        <type fullname="System.Linq.Expressions.Interpreter.LightLambda" preserve="all"/>
+        <type fullname="System.Linq.Expressions.LambdaExpression" preserve="all"/>
+    </assembly>
+    <assembly fullname="System.Linq.Expressions">
+        <type fullname="System.Linq.Expressions" preserve="all"/>
+        <type fullname="System.Linq.Expressions.*" preserve="all"/>
+        <type fullname="System.Linq.Expressions.Interpreter.LightLambda" preserve="all"/>
+        <type fullname="System.Linq.Expressions.LambdaExpression" preserve="all"/>
+    </assembly>
+    <assembly fullname="System.Runtime">
+        <type fullname="System.Exception" preserve="all"/>
+        <type fullname="System.Exception" preserve="all"/>
+        <type fullname="System.Diagnostics.StackTrace" preserve="all"/>
+    </assembly>
+    <assembly fullname="mscorlib">
+        <type fullname="System.Exception" preserve="all"/>
+        <type fullname="System.Diagnostics.StackTrace" preserve="all"/>
+    </assembly>
+    <assembly fullname="netstandard">
+        <type fullname="System.Linq.Expressions" preserve="all"/>
+        <type fullname="System.Linq.Expressions.*" preserve="all"/>
+        <type fullname="System.Linq.Expressions.Interpreter.LightLambda" preserve="all"/>
+        <type fullname="System.Linq.Expressions.LambdaExpression" preserve="all"/>
+        <type fullname="System.Exception" preserve="all"/>
+        <type fullname="System.Diagnostics.StackTrace" preserve="all"/>
+    </assembly>
+</linker>

src/Sentry.Unity.Editor/Sentry.Unity.Editor.csproj

@@ -14,8 +14,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="SentryLogoLight.png" />
-    <EmbeddedResource Include="SentryLogoDark.png" />
+    <EmbeddedResource Include="Resources\link.xml" />
+    <EmbeddedResource Include="Resources\SentryLogoDark.png" />
+    <EmbeddedResource Include="Resources\SentryLogoLight.png" />
   </ItemGroup>
 
   <!-- Add reference once we figure out where the DLL is (find Unity version and install location) -->

src/Sentry.Unity.Editor/SentryWindow.cs

@@ -5,12 +5,12 @@
 using UnityEditor;
 using UnityEngine;
 
-using CompressionLevel = System.IO.Compression.CompressionLevel;
-
 namespace Sentry.Unity.Editor
 {
     public class SentryWindow : EditorWindow
     {
+        private const string LinkXmlPath = "Assets/Plugins/Sentry/link.xml";
+
         [MenuItem("Tools/Sentry")]
         public static SentryWindow OpenSentryWindow()
             => (SentryWindow)GetWindow(typeof(SentryWindow));
@@ -25,6 +25,8 @@ private void OnEnable()
         {
             SetTitle();
 
+            CopyLinkXmlToPlugins();
+
             CheckForAndConvertJsonConfig();
             Options = LoadOptions();
         }
@@ -192,13 +194,37 @@ private void CreateConfigDirectory()
             AssetDatabase.Refresh();
         }
 
+        /// <summary>
+        /// Creates Sentry folder 'Plugins/Sentry' and copies the link.xml into it
+        /// </summary>
+        private void CopyLinkXmlToPlugins()
+        {
+            if (!AssetDatabase.IsValidFolder("Assets/Plugins"))
+            {
+                AssetDatabase.CreateFolder("Assets", "Plugins");
+            }
+            if (!AssetDatabase.IsValidFolder("Assets/Plugins/Sentry"))
+            {
+                AssetDatabase.CreateFolder("Assets/Plugins", "Sentry");
+            }
+
+            if (!AssetDatabase.IsValidFolder(LinkXmlPath))
+            {
+                using var fileStream = File.Create(LinkXmlPath);
+                using var resourceStream = GetType().Assembly.GetManifestResourceStream("Sentry.Unity.Editor.Resources.link.xml");
+                resourceStream.CopyTo(fileStream);
+
+                AssetDatabase.ImportAsset(LinkXmlPath);
+            }
+        }
+
         private void SetTitle()
         {
             var isDarkMode = EditorGUIUtility.isProSkin;
             var texture = new Texture2D(16, 16);
             using var memStream = new MemoryStream();
             using var stream = GetType().Assembly
-                .GetManifestResourceStream($"Sentry.Unity.Editor.SentryLogo{(isDarkMode ? "Light" : "Dark")}.png");
+                .GetManifestResourceStream($"Sentry.Unity.Editor.Resources.SentryLogo{(isDarkMode ? "Light" : "Dark")}.png");
             stream.CopyTo(memStream);
             stream.Flush();
             memStream.Position = 0;

src/Sentry.Unity/Sentry.Unity.csproj

@@ -16,12 +16,6 @@
     </ItemGroup>
     <Delete Files="@(FilesToDelete)" ContinueOnError="true" />
   </Target>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\link.xml">
-      <LogicalName>Sentry.Unity.xml</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\sentry-dotnet\src\Sentry\Sentry.csproj" />

test/Sentry.Unity.Editor.Tests/EmbeddedResourcesTests.cs

@@ -0,0 +1,19 @@
+using NUnit.Framework;
+using Sentry.Unity.Editor;
+
+namespace Sentry.Unity.Tests
+{
+    public sealed class EmbeddedResourcesTests
+    {
+        [Test]
+        public void Resources_Embedded()
+        {
+            var resourceNames = typeof(SentryWindow).Assembly.GetManifestResourceNames();
+
+            Assert.NotNull(resourceNames);
+            Assert.Contains("Sentry.Unity.Editor.Resources.link.xml", resourceNames);
+            Assert.Contains("Sentry.Unity.Editor.Resources.SentryLogoLight.png", resourceNames);
+            Assert.Contains("Sentry.Unity.Editor.Resources.SentryLogoDark.png", resourceNames);
+        }
+    }
+}