Merge branch 'New-New-Settings' into beta

Ink Canvas/InkCanvasForClass.csproj

@@ -114,6 +114,7 @@
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="netstandard" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Management" />
@@ -564,14 +565,7 @@
   <ItemGroup>
     <Compile Remove="AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Remove="Properties\Strings.en-US.resx" />
-    <EmbeddedResource Remove="**\Strings.en-US.resx" />
-    <None Include="Properties\Strings.en-US.resx" />
-    <EmbeddedResource Include="Properties\Strings.enUS.xml">
-      <LogicalName>Ink_Canvas.Properties.Strings.enUS.xml</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
+
   <ItemGroup>
     <None Remove="MainWindow.xaml~RF6c3144.TMP" />
     <None Remove="Resources\Cursors\Cursor.cur" />