Merge pull request #63 from jaredpar/alloc

Reduce allocations

Src/Basic.Reference.Assemblies.UnitTests/Basic.Reference.Assemblies.UnitTests.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
   </ItemGroup>
 
   <ItemGroup>

Src/Basic.Reference.Assemblies.UnitTests/SanityUnitTests.cs

@@ -203,4 +203,12 @@ public static string Go()
         var actual = CompilationUtil.CompileAndRun(source, nameof(RunTuple), references);
         Assert.Equal("(1, 2)", actual);
     }
+
+    [Fact]
+    public void LoadAll()
+    {
+        Net461.References.All.ToList();
+        Net40.References.All.ToList();
+        Net70.References.All.ToList();
+    }
 }

Src/Directory.Build.props

@@ -10,6 +10,7 @@
     <SignAssembly>true</SignAssembly>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
+    <RoslynVersion>4.11.0</RoslynVersion>
 
     <!-- NuGet Properties -->
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

Src/Directory.Build.targets

@@ -5,7 +5,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsPackable)' == 'true'">

Src/Generate/Program.cs

@@ -478,7 +478,7 @@ public static PortableExecutableReference {{propName}}
                             {
                                 if ({{fieldName}} is null)
                                 {
-                                    {{fieldName}} = AssemblyMetadata.CreateFromImage(Resources.{{propName}}).GetReference(filePath: "{{dllName}}", display: "{{dll}} ({{lowerName}})");
+                                    {{fieldName}} = AssemblyMetadata.CreateFromImage(ResourceLoader.GetResourceBlobAsImmutable("{{logicalName}}")).GetReference(filePath: "{{dllName}}", display: "{{dll}} ({{lowerName}})");
                                 }
                                 return {{fieldName}};
                             }

Src/Shared/ResourceLoader.cs

@@ -1,13 +1,15 @@
 using System;
+using System.Collections.Immutable;
 using System.IO;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Text;
 
 namespace Basic.Reference.Assemblies
 {
     internal static class ResourceLoader
     {
-        private static Stream GetResourceStream(string name)
+        internal static Stream GetResourceStream(string name)
         {
             var assembly = typeof(ResourceLoader).GetTypeInfo().Assembly;
 
@@ -20,21 +22,22 @@ private static Stream GetResourceStream(string name)
             return stream;
         }
 
-        private static byte[] GetResourceBlob(string name)
+        internal static byte[] GetResourceBlob(string name)
         {
-            using (var stream = GetResourceStream(name))
-            {
-                var bytes = new byte[stream.Length];
-                using (var memoryStream = new MemoryStream(bytes))
-                {
-                    stream.CopyTo(memoryStream);
-                }
+            using var stream = GetResourceStream(name);
+            var bytes = new byte[stream.Length];
+            using var memoryStream = new MemoryStream(bytes);
+            stream.CopyTo(memoryStream);
+            return bytes;
+        }
 
-                return bytes;
-            }
+        internal static ImmutableArray<byte> GetResourceBlobAsImmutable(string name)
+        {
+            var blob = GetResourceBlob(name);
+            return ImmutableCollectionsMarshal.AsImmutableArray(blob);
         }
 
-        public static byte[] GetOrCreateResource(ref byte[]? resource, string name)
+        internal static byte[] GetOrCreateResource(ref byte[]? resource, string name)
         {
             if (resource == null)
             {
@@ -44,17 +47,13 @@ public static byte[] GetOrCreateResource(ref byte[]? resource, string name)
             return resource;
         }
 
-        public static string GetOrCreateResource(ref string resource, string name)
+        internal static string GetOrCreateResource(ref string resource, string name)
         {
             if (resource == null)
             {
-                using (var stream = GetResourceStream(name))
-                {
-                    using (var streamReader = new StreamReader(stream, Encoding.UTF8, detectEncodingFromByteOrderMarks: true))
-                    {
-                        resource = streamReader.ReadToEnd();
-                    }
-                }
+                using var stream = GetResourceStream(name);
+                using var streamReader = new StreamReader(stream, Encoding.UTF8, detectEncodingFromByteOrderMarks: true);
+                resource = streamReader.ReadToEnd();
             }
 
             return resource;