From a31ac5ff23724b6706291d3ea3831a64bc5eb990 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Tue, 18 May 2021 10:55:56 -0700
Subject: [PATCH] Fix visibility and resource weirdness.

---
 .../DllImportGenerator/DllImportGenerator.csproj            | 6 ++++--
 .../DllImportGenerator/GeneratorDiagnostics.cs              | 4 ++--
 .../Microsoft.Interop.SourceGeneration.csproj               | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj b/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj
index 3409e73485e4..544304fd71a4 100644
--- a/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj
+++ b/DllImportGenerator/DllImportGenerator/DllImportGenerator.csproj
@@ -28,8 +28,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="../Microsoft.Interop.SourceGeneration/**/*.cs"
-      Link="Microsoft.Interop.SourceGeneration/%(RecursiveDir)%(FileName)%(Extension)" />
+    <Compile Include="../Microsoft.Interop.SourceGeneration/**/*.cs" Link="Microsoft.Interop.SourceGeneration/%(RecursiveDir)%(FileName)%(Extension)" />
+    <EmbeddedResource Include="../Microsoft.Interop.SourceGeneration/Resources.resx" Link="Microsoft.Interop.SourceGeneration/Resources.resx"
+                      LogicalName="Microsoft.Interop.SourceGeneration.Resources.resources" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,6 +45,7 @@
     <EmbeddedResource Update="Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <LogicalName>Microsoft.Interop.Resources.resources</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
 </Project>
diff --git a/DllImportGenerator/DllImportGenerator/GeneratorDiagnostics.cs b/DllImportGenerator/DllImportGenerator/GeneratorDiagnostics.cs
index 73e674450514..ed5cf1d66787 100644
--- a/DllImportGenerator/DllImportGenerator/GeneratorDiagnostics.cs
+++ b/DllImportGenerator/DllImportGenerator/GeneratorDiagnostics.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Interop
     /// <summary>
     /// Class for reporting diagnostics in the DLL import generator
     /// </summary>
-    internal class GeneratorDiagnostics : IGeneratorDiagnostics
+    public class GeneratorDiagnostics : IGeneratorDiagnostics
     {
         public class Ids
         {
@@ -153,7 +153,7 @@ public void ReportConfigurationNotSupported(
         /// <param name="method">Method with the parameter/return</param>
         /// <param name="info">Type info for the parameter/return</param>
         /// <param name="notSupportedDetails">[Optional] Specific reason for lack of support</param>
-        public void ReportMarshallingNotSupported(
+        void IGeneratorDiagnostics.ReportMarshallingNotSupported(
             IMethodSymbol method,
             TypePositionInfo info,
             string? notSupportedDetails)
diff --git a/DllImportGenerator/Microsoft.Interop.SourceGeneration/Microsoft.Interop.SourceGeneration.csproj b/DllImportGenerator/Microsoft.Interop.SourceGeneration/Microsoft.Interop.SourceGeneration.csproj
index 159264372579..02d8201acd88 100644
--- a/DllImportGenerator/Microsoft.Interop.SourceGeneration/Microsoft.Interop.SourceGeneration.csproj
+++ b/DllImportGenerator/Microsoft.Interop.SourceGeneration/Microsoft.Interop.SourceGeneration.csproj
@@ -23,7 +23,6 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <Generator>ResXFileCodeGenerator</Generator>
-      <TypeName>Microsoft.Interop.SourceGenerationResources</TypeName>
     </EmbeddedResource>
     <Compile Update="@(Compile)" Pack="true" />
     <EmbeddedResource Update="@(EmbeddedResource)" Pack="true" />