Updated GUI projects

Author: RobertvanderHulst

src/Runtime/VOSDK/Source/VOSDK/GUI_Classes_SDK/VOGUIClasses.xsproj

@@ -228,16 +228,14 @@
     <None Include="Resources\WINS.ICO" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Name>System.Drawing</Name>
-      <AssemblyName>System.Drawing.dll</AssemblyName>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <Name>System.Windows.Forms</Name>
-      <AssemblyName>System.Windows.Forms.dll</AssemblyName>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
+    <Reference Include="System.ComponentModel.Primitives" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Drawing" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Runtime">
+      <Version>4.3.1</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <NativeResource Include="Resources\CurHand.rc" />

src/Runtime/VOSdkTyped/Source/VOSdk/GUI_Classes_SDK/XSharp.VO.GUIClasses.xsproj

@@ -245,35 +245,8 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="PresentationCore">
-      <Name>PresentationCore</Name>
-      <SpecificVersion>False</SpecificVersion>
-      <AssemblyName>PresentationCore.dll</AssemblyName>
-    </Reference>
-    <Reference Include="PresentationFramework">
-      <Name>PresentationFramework</Name>
-      <SpecificVersion>False</SpecificVersion>
-      <AssemblyName>PresentationFramework.dll</AssemblyName>
-    </Reference>
-    <Reference Include="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Name>System.Design</Name>
-      <AssemblyName>System.Design.dll</AssemblyName>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Name>System.Drawing</Name>
-      <AssemblyName>System.Drawing.dll</AssemblyName>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Name>System.Windows.Forms</Name>
-      <AssemblyName>System.Windows.Forms.dll</AssemblyName>
-    </Reference>
-    <Reference Include="WindowsBase">
-      <Name>WindowsBase</Name>
-      <SpecificVersion>False</SpecificVersion>
-      <AssemblyName>WindowsBase.dll</AssemblyName>
-    </Reference>
+    <Reference Include="System.ComponentModel.Primitives" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ClassMapping.xlsx" />
@@ -304,6 +277,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="System.Drawing.Primitives">
+      <Version>4.3.0</Version>
+    </PackageReference>
     <PackageReference Include="System.Runtime">
       <Version>4.3.1</Version>
     </PackageReference>

src/Runtime/VOSdkTyped/Source/VOSdk/VOSDK.Targets

@@ -62,6 +62,7 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <UseSharedCompilation>false</UseSharedCompilation>
     <PlatformTarget>AnyCPU</PlatformTarget>
+	<RuntimeIdentifier>win</RuntimeIdentifier>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Documentation|AnyCPU'" Label="Configuration">
     <EmitDebugInformation>true</EmitDebugInformation>