Fixing resources for M5Core screen init (#54)

Author: Ellerbach

Tests/M5CoreTestApp/M5CoreTestApp.nfproj

@@ -20,11 +20,6 @@
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Iot.Device.Bmm150, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
@@ -129,12 +124,6 @@
     <None Include="packages.config" />
     <None Include="Resources\segoeuiregular12.tinyfnt" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\nanoFramework.M5Core\nanoFramework.M5Core.nfproj" />
   </ItemGroup>

nanoFramework.M5Core/M5Core.cs

@@ -103,7 +103,11 @@ public static void InitializeScreen()
             if (_screen == null)
             {
                 _screen = new();
+#if M5CORE2
                 Console.Font = Resource.GetFont(Resource.FontResources.consolas_regular_16);
+#else
+                Console.Font = ResourceCore.GetFont(ResourceCore.FontResources.consolas_regular_16);
+#endif
             }
         }
 
@@ -113,7 +117,7 @@ public static void InitializeScreen()
         /// <remarks>Please make sure to read the documentation before adjusting any element.</remarks>
         public static Ip5306 Power { get => _power; }
 
-        #endregion
+#endregion
 
         static M5Core()
         {

nanoFramework.M5Core/Resource.Designer.cs renamed to nanoFramework.M5Core/ResourceCore.Designer.cs

@@ -119,6 +119,6 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="consolas_regular_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\consolas_regular_16.tinyfnt;System.Byte[], mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731</value>
+    <value>Resources\consolas_regular_16.tinyfnt;System.Byte[], mscorlib, Version=1.11.7.2, Culture=neutral, PublicKeyToken=c07d481e9758c731</value>
   </data>
 </root>

nanoFramework.M5Core/Resource.resx renamed to nanoFramework.M5Core/ResourceCore.resx

@@ -35,10 +35,10 @@
   <ItemGroup>
     <Compile Include="M5Core.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resource.Designer.cs">
+    <Compile Include="ResourceCore.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
+      <DependentUpon>ResourceCore.resx</DependentUpon>
     </Compile>
     <Compile Include="Screen.cs" />
   </ItemGroup>
@@ -159,9 +159,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resource.resx">
+    <EmbeddedResource Include="ResourceCore.resx">
       <Generator>nFResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+      <LastGenOutput>ResourceCore.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="..\M5StackCommon\M5StackCommon.projitems" Label="Shared" />