From 459c8c34a880d3f2697c7242878d8cd38b1064f5 Mon Sep 17 00:00:00 2001
From: Betim Beja <11160171+BetimBeja@users.noreply.github.com>
Date: Sat, 28 Nov 2020 18:36:17 +0100
Subject: [PATCH] Added .Net Core Alpha Support

---
 .../XrmEntitySerializer.9.csproj              |  17 +++--
 .../XrmEntitySerializer.Core.Tests.csproj     |  59 ++++++++++++++++++
 XrmEntitySerializer.Core/StrongName.snk       | Bin 0 -> 596 bytes
 .../XrmEntitySerializer.Core.csproj           |  47 ++++++++++++++
 XrmEntitySerializer.sln                       |  15 +++++
 5 files changed, 134 insertions(+), 4 deletions(-)
 create mode 100644 XrmEntitySerializer.Core.Tests/XrmEntitySerializer.Core.Tests.csproj
 create mode 100644 XrmEntitySerializer.Core/StrongName.snk
 create mode 100644 XrmEntitySerializer.Core/XrmEntitySerializer.Core.csproj

diff --git a/XrmEntitySerializer.9/XrmEntitySerializer.9.csproj b/XrmEntitySerializer.9/XrmEntitySerializer.9.csproj
index 77a1be3..7262dd4 100644
--- a/XrmEntitySerializer.9/XrmEntitySerializer.9.csproj
+++ b/XrmEntitySerializer.9/XrmEntitySerializer.9.csproj
@@ -9,7 +9,7 @@
     <ProjectGuid>{49DD871D-D743-4600-9537-4F2BBD4747E1}</ProjectGuid>
     <AssemblyName>XrmEntitySerializer.9</AssemblyName>
     <PackageId>XrmEntitySerializer.9</PackageId>
-    <TargetFrameworks>net452;net462</TargetFrameworks>
+    <TargetFrameworks>net452;net462;netcoreapp3.0</TargetFrameworks>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
@@ -30,21 +30,30 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <DefineConstants>$(DefineConstants);NETCORE;</DefineConstants>
+  </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+    <PackageReference Include="Newtonsoft.Json" Version="6.0.1" />
     <PackageReference Include="Microsoft.CrmSdk.CoreAssemblies">
       <Version>[9.0.0.5,9.0.2.5]</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <PackageReference Include="Newtonsoft.Json" Version="6.0.1" />
     <PackageReference Include="Microsoft.CrmSdk.CoreAssemblies">
       <Version>[9.0.2.9,10)</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="6.0.1" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Microsoft.PowerPlatform.Cds.Client">
+      <Version>[0.2.1-Alpha,1.0.0)</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="../Logo_80x80.png" Pack="true" PackagePath="\"/>
+    <None Include="../Logo_80x80.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <Import Project="..\XrmEntitySerializer\XrmEntitySerializer.projitems" Label="Shared" />
 </Project>
\ No newline at end of file
diff --git a/XrmEntitySerializer.Core.Tests/XrmEntitySerializer.Core.Tests.csproj b/XrmEntitySerializer.Core.Tests/XrmEntitySerializer.Core.Tests.csproj
new file mode 100644
index 0000000..5392931
--- /dev/null
+++ b/XrmEntitySerializer.Core.Tests/XrmEntitySerializer.Core.Tests.csproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\XrmEntitySerializer.Version.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{F99D121A-4408-41C4-9304-6D1C9C784269}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>XrmEntitySerializer.Tests</RootNamespace>
+    <AssemblyName>XrmEntitySerializer.Core.Tests</AssemblyName>
+    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;XRM_9</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;XRM_9</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <DefineConstants>$(DefineConstants);NETCORE;</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Microsoft.PowerPlatform.Cds.Client">
+      <Version>[0.2.1-Alpha,1.0.0)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\XrmEntitySerializer.Core\XrmEntitySerializer.Core.csproj" />
+  </ItemGroup>
+  <Import Project="..\XrmEntitySerializer.Tests\XrmEntitySerializer.Tests.projitems" Label="Shared" />
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+</Project>
\ No newline at end of file
diff --git a/XrmEntitySerializer.Core/StrongName.snk b/XrmEntitySerializer.Core/StrongName.snk
new file mode 100644
index 0000000000000000000000000000000000000000..cf614c0fd5d630f1c8675072f1a7e1ee7fd56296
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097v`#fJT(Q>S^GXeQt7w($I9B{prVCQ+r
zi!ds%@0gCvk<&HA=pL@q4V}AmuOS=i{vDI3I{e59(w$}sIA1|{T;$t|T7CjiwDn>G
z;cp=4MPLmc$hl3EI3))!rn4VC6W4io)W!01=<OG1Gds4$G;2^(o)4XWBGh76Bx&v&
z0N05)XlB<Wnr41i8=z5$KGpA{{7p4|@;r4VquKv<{-Y=?!!Lf?UtN+>VY|ut)4;RW
z*XXLRWV|ncm8br9y(o8p+oi(hEq$%_(T<c~tM~awQ|1cD{<QKa#HXWFYo8#?#EF^C
zz2^5a=gqkIwbHHWp)%0HghYLwmaFgKnt|@11{0CbtDRpZOlx(0wlT5HCTo`|VVf&C
zGBsNNY^Q9kyvq<^7^fITc5YA1wd2(c)aI!*$`;iT)i|~{!nWKXP;@UeAZTv~1<bn6
zWCsURcw6~XF9P0b*;+O#xdNijk)5(#a8~7>gsf*n9ClKYQzY5YerA_UH_5}LlLCz)
z?t;Pt;;d<J^7+H>8y~8fo~Xk2jh2nMTW^pL_u7(UUj<PR!c*7)4Vn3$G_S)60>7v)
z8LqddJ5X{da(>n(priS|E9+YlDCmIn?gAbX27PxEMt&<&5fiQhdao~*hs6F{`a?hf
z*{Y2;1N{9+iv;loLIdKa#Ww3SBubxwn0Q3dB2RCS?aOTxT<8R4vy?;%<WPI@+p!uy
igzKx!Vqp@ysE9ly$WC`LQgeXEkQ@kVkx{oRPOrM4WFu_=

literal 0
HcmV?d00001

diff --git a/XrmEntitySerializer.Core/XrmEntitySerializer.Core.csproj b/XrmEntitySerializer.Core/XrmEntitySerializer.Core.csproj
new file mode 100644
index 0000000..0ca5c4d
--- /dev/null
+++ b/XrmEntitySerializer.Core/XrmEntitySerializer.Core.csproj
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\XrmEntitySerializer.props" />
+  <Import Project="..\XrmEntitySerializer.Version.props" />
+  <PropertyGroup>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{49DD871D-D743-4600-9537-4D2BBD4747E1}</ProjectGuid>
+    <AssemblyName>XrmEntitySerializer.Core</AssemblyName>
+    <PackageId>XrmEntitySerializer.Core</PackageId>
+    <PackageVersion>$(PackageVersion)-Alpha</PackageVersion>
+    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;XRM_9</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;XRM_9</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <DefineConstants>$(DefineConstants);NETCORE;</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Microsoft.PowerPlatform.Cds.Client">
+      <Version>[0.2.1-Alpha,1.0.0)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="../Logo_80x80.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+  <Import Project="..\XrmEntitySerializer\XrmEntitySerializer.projitems" Label="Shared" />
+</Project>
\ No newline at end of file
diff --git a/XrmEntitySerializer.sln b/XrmEntitySerializer.sln
index 53233c2..353bbc9 100644
--- a/XrmEntitySerializer.sln
+++ b/XrmEntitySerializer.sln
@@ -41,10 +41,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		XrmEntitySerializer.Version.props = XrmEntitySerializer.Version.props
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XrmEntitySerializer.Core", "XrmEntitySerializer.Core\XrmEntitySerializer.Core.csproj", "{49DD871D-D743-4600-9537-4D2BBD4747E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XrmEntitySerializer.Core.Tests", "XrmEntitySerializer.Core.Tests\XrmEntitySerializer.Core.Tests.csproj", "{F99D121A-4408-41C4-9304-6D1C9C784269}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		XrmEntitySerializer\XrmEntitySerializer.projitems*{3300d111-4bb0-430a-a061-cfd3ec583fdf}*SharedItemsImports = 5
 		XrmEntitySerializer\XrmEntitySerializer.projitems*{4920aaa1-94d4-4260-b46c-af9a88d760e5}*SharedItemsImports = 5
+		XrmEntitySerializer\XrmEntitySerializer.projitems*{49dd871d-d743-4600-9537-4d2bbd4747e1}*SharedItemsImports = 5
 		XrmEntitySerializer\XrmEntitySerializer.projitems*{49dd871d-d743-4600-9537-4f2bbd4747e1}*SharedItemsImports = 5
 		XrmEntitySerializer\XrmEntitySerializer.projitems*{64f38937-039a-4c09-a241-ff07a30aff2a}*SharedItemsImports = 13
 		XrmEntitySerializer.Tests\XrmEntitySerializer.Tests.projitems*{67a5259c-ac82-4636-b5b9-c9e6e85fb9b3}*SharedItemsImports = 5
@@ -54,6 +59,7 @@ Global
 		XrmEntitySerializer.Tests\XrmEntitySerializer.Tests.projitems*{df3dd1a2-5e13-4324-9b17-953ce7a7f5a2}*SharedItemsImports = 13
 		XrmEntitySerializer\XrmEntitySerializer.projitems*{e34db420-0a7a-4168-b607-0b8ab0d65cf8}*SharedItemsImports = 5
 		XrmEntitySerializer.Tests\XrmEntitySerializer.Tests.projitems*{f99d121a-4408-41c4-9304-661c9c784269}*SharedItemsImports = 5
+		XrmEntitySerializer.Tests\XrmEntitySerializer.Tests.projitems*{f99d121a-4408-41c4-9304-6d1c9c784269}*SharedItemsImports = 5
 		XrmEntitySerializer.Tests\XrmEntitySerializer.Tests.projitems*{ffdb1157-d6d1-4542-8e4b-aa327d1d6846}*SharedItemsImports = 5
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -101,6 +107,14 @@ Global
 		{67A5259C-AC82-4636-B5B9-C9E6E85FB9B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67A5259C-AC82-4636-B5B9-C9E6E85FB9B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67A5259C-AC82-4636-B5B9-C9E6E85FB9B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49DD871D-D743-4600-9537-4D2BBD4747E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49DD871D-D743-4600-9537-4D2BBD4747E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49DD871D-D743-4600-9537-4D2BBD4747E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49DD871D-D743-4600-9537-4D2BBD4747E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F99D121A-4408-41C4-9304-6D1C9C784269}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F99D121A-4408-41C4-9304-6D1C9C784269}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F99D121A-4408-41C4-9304-6D1C9C784269}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F99D121A-4408-41C4-9304-6D1C9C784269}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -112,6 +126,7 @@ Global
 		{A21B39A5-C139-4AAF-BE6E-697E42635056} = {C8631DB1-CBEF-4A31-8AE9-A1D58AF9D3C9}
 		{FFDB1157-D6D1-4542-8E4B-AA327D1D6846} = {C8631DB1-CBEF-4A31-8AE9-A1D58AF9D3C9}
 		{67A5259C-AC82-4636-B5B9-C9E6E85FB9B3} = {C8631DB1-CBEF-4A31-8AE9-A1D58AF9D3C9}
+		{F99D121A-4408-41C4-9304-6D1C9C784269} = {C8631DB1-CBEF-4A31-8AE9-A1D58AF9D3C9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FC57A865-FF55-4D1C-9C6B-51A2AFEF4404}