From 01938824ee39c4ee128c6220312ff20622715e98 Mon Sep 17 00:00:00 2001
From: stakx <stakx@eml.cc>
Date: Fri, 14 Jul 2017 23:41:58 +0200
Subject: [PATCH] Merge `Moq.Tests.csproj` and `Moq.NetCore.Tests.csproj`

---
 Moq.NetCore.sln                               |  50 -------
 Moq.VisualBasicTests/project.json             |   4 +-
 Moq.sln                                       |  26 ++--
 Source/Properties/AssemblyInfo.cs             |   1 -
 UnitTests/ClassLibrary1.Silverlight.dll       | Bin 6144 -> 0 bytes
 UnitTests/ClassLibrary1.dll                   | Bin 6144 -> 0 bytes
 UnitTests/ClassLibrary2.Silverlight.dll       | Bin 6144 -> 0 bytes
 UnitTests/ClassLibrary2.dll                   | Bin 5632 -> 0 bytes
 UnitTests/Library/ClassLibrary1.sln           |  28 ----
 .../ClassLibrary1.NetCore.csproj              |  21 ---
 .../ClassLibrary1/ClassLibrary1.csproj        |  72 +++-------
 UnitTests/Library/ClassLibrary1/Foo.cs        |   1 -
 UnitTests/Library/ClassLibrary2/Bar.cs        |   1 -
 .../ClassLibrary2.NetCore.csproj              |  22 ---
 .../ClassLibrary2/ClassLibrary2.csproj        |  76 +++-------
 UnitTests/Moq.NetCore.Tests.csproj            |  46 ------
 UnitTests/Moq.Tests.csproj                    | 133 +++++-------------
 UnitTests/project.json                        |  13 --
 build.proj                                    |  42 ++----
 packages.config                               |   5 +-
 20 files changed, 99 insertions(+), 442 deletions(-)
 delete mode 100644 Moq.NetCore.sln
 delete mode 100644 UnitTests/ClassLibrary1.Silverlight.dll
 delete mode 100644 UnitTests/ClassLibrary1.dll
 delete mode 100644 UnitTests/ClassLibrary2.Silverlight.dll
 delete mode 100644 UnitTests/ClassLibrary2.dll
 delete mode 100644 UnitTests/Library/ClassLibrary1.sln
 delete mode 100644 UnitTests/Library/ClassLibrary1/ClassLibrary1.NetCore.csproj
 delete mode 100644 UnitTests/Library/ClassLibrary2/ClassLibrary2.NetCore.csproj
 delete mode 100644 UnitTests/Moq.NetCore.Tests.csproj
 delete mode 100644 UnitTests/project.json

diff --git a/Moq.NetCore.sln b/Moq.NetCore.sln
deleted file mode 100644
index 5b32e4e9b..000000000
--- a/Moq.NetCore.sln
+++ /dev/null
@@ -1,50 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.3
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EFFD4CEA-0C67-4B36-B2FE-CDADBACE1C5C}"
-	ProjectSection(SolutionItems) = preProject
-		appveyor.yml = appveyor.yml
-		build.proj = build.proj
-		GitInfo.txt = GitInfo.txt
-		License.txt = License.txt
-		Moq.nuspec = Moq.nuspec
-		packages.config = packages.config
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary1.NetCore", "UnitTests\Library\ClassLibrary1\ClassLibrary1.NetCore.csproj", "{48DF0ABB-450B-4617-B3F3-14E92CE2C7B6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary2.NetCore", "UnitTests\Library\ClassLibrary2\ClassLibrary2.NetCore.csproj", "{B145B6CA-F4EE-4DFE-8E4D-976DAF182864}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.NetCore.Tests", "UnitTests\Moq.NetCore.Tests.csproj", "{193B5DD4-77B8-4B36-8E62-C0E6BD733FAA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq", "Source\Moq.csproj", "{4BA03097-04CA-4B7C-B618-5AAD1B27B4B5}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{48DF0ABB-450B-4617-B3F3-14E92CE2C7B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48DF0ABB-450B-4617-B3F3-14E92CE2C7B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48DF0ABB-450B-4617-B3F3-14E92CE2C7B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48DF0ABB-450B-4617-B3F3-14E92CE2C7B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B145B6CA-F4EE-4DFE-8E4D-976DAF182864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B145B6CA-F4EE-4DFE-8E4D-976DAF182864}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B145B6CA-F4EE-4DFE-8E4D-976DAF182864}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B145B6CA-F4EE-4DFE-8E4D-976DAF182864}.Release|Any CPU.Build.0 = Release|Any CPU
-		{193B5DD4-77B8-4B36-8E62-C0E6BD733FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{193B5DD4-77B8-4B36-8E62-C0E6BD733FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{193B5DD4-77B8-4B36-8E62-C0E6BD733FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{193B5DD4-77B8-4B36-8E62-C0E6BD733FAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4BA03097-04CA-4B7C-B618-5AAD1B27B4B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BA03097-04CA-4B7C-B618-5AAD1B27B4B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BA03097-04CA-4B7C-B618-5AAD1B27B4B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4BA03097-04CA-4B7C-B618-5AAD1B27B4B5}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Moq.VisualBasicTests/project.json b/Moq.VisualBasicTests/project.json
index a6f9170d6..6b5522cd6 100644
--- a/Moq.VisualBasicTests/project.json
+++ b/Moq.VisualBasicTests/project.json
@@ -1,8 +1,8 @@
 {
 	"dependencies": {
 		"Castle.Core": "4.1.1",
-		"xunit": "2.1.0",
-		"xunit.runner.visualstudio": "2.1.0"
+		"xunit": "2.3.0-beta3-build3705",
+		"xunit.runner.visualstudio": "2.3.0-beta3-build3705"
 	},
 	"frameworks": {
 		"net45": {}
diff --git a/Moq.sln b/Moq.sln
index e3928ff1c..38d9042f7 100644
--- a/Moq.sln
+++ b/Moq.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26206.0
+VisualStudioVersion = 15.0.26430.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5A5B8C3-D43F-43C6-AEC7-6FA7C35B8BE9}"
 	ProjectSection(SolutionItems) = preProject
@@ -13,12 +13,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		packages.config = packages.config
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq", "Source\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq", "Source\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Tests", "UnitTests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Tests", "UnitTests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Moq.VisualBasicTests", "Moq.VisualBasicTests\Moq.VisualBasicTests.vbproj", "{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary1", "UnitTests\Library\ClassLibrary1\ClassLibrary1.csproj", "{A417D76E-32C9-45B7-81C7-299032CE8E77}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary2", "UnitTests\Library\ClassLibrary2\ClassLibrary2.csproj", "{D1099DEF-1A3F-4F94-A871-449DAAB2D890}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -29,24 +33,24 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|x86.ActiveCfg = Release|Any CPU
 		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.ActiveCfg = Release|Any CPU
 		{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Debug|x86.Build.0 = Debug|Any CPU
 		{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Release|x86.ActiveCfg = Release|Any CPU
-		{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Release|x86.Build.0 = Release|Any CPU
+		{A417D76E-32C9-45B7-81C7-299032CE8E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A417D76E-32C9-45B7-81C7-299032CE8E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A417D76E-32C9-45B7-81C7-299032CE8E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A417D76E-32C9-45B7-81C7-299032CE8E77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
index 95a040c85..fb7ee2a6c 100644
--- a/Source/Properties/AssemblyInfo.cs
+++ b/Source/Properties/AssemblyInfo.cs
@@ -23,7 +23,6 @@
 #endif
 
 [assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
-[assembly: InternalsVisibleTo("Moq.NetCore.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 
 [assembly: CLSCompliant(true)]
diff --git a/UnitTests/ClassLibrary1.Silverlight.dll b/UnitTests/ClassLibrary1.Silverlight.dll
deleted file mode 100644
index 9036b036122aa47b0c2f33f4be33c77af710d7e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6144
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
QTi$SI)AtMA&wT{`4FI2<^Z)<=

diff --git a/UnitTests/ClassLibrary1.dll b/UnitTests/ClassLibrary1.dll
deleted file mode 100644
index deb5f34869de9adb7be1426b80932eedb3387eeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6144
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

diff --git a/UnitTests/ClassLibrary2.Silverlight.dll b/UnitTests/ClassLibrary2.Silverlight.dll
deleted file mode 100644
index 1f938de50f6ddf968a5df85233f8f7a39a9b3cc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6144
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
auiA+PcqSlK{{Omj$(c0zO85UI0{;X-M3zbb

diff --git a/UnitTests/ClassLibrary2.dll b/UnitTests/ClassLibrary2.dll
deleted file mode 100644
index d070860a4c9d5be9e2cb09d83559352e95e44289..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5632
zcmeHLd2m(L8UOCfLJ|xkXf3S_TnbLzc;5ZJTR;=?1Oo}gB!J6n!(GlzuDrY(?tKAL
zY7OJ4NT)6xmr<!zi*=b+><k?ktuxiS6k9A)NB^i}>wq1cv2~ettkaGD&bcokA!z$Y
z>-dM~<^1lqob#RUd}mMR6}M0g5!E6eJ4Uo0U!Gb7emsmqJ!9SzGiYz)!TI~8j)U`i
z2f{=iilhG68I(PzT#hQT%j9^tEQe*eu%<^IjC_`DZf;swHQjYFQHNARPt7THjJ5U#
zW#&(p8eklf`c!)FB79}!7Gw@GKAF^SP{M!yrBP(auUtatSIc!or;5Mh-zv+?B6Yy-
z8cwtj4e>ynm^Kid0@*LlCz^Aj?&Elw2t6224d5>s=ZLZuwzUF&cQXJw(O39AG08+5
zvT+i75DMQ~K=6S=mnNnbc%O|~DMCT+D{VmLwoXT$kXneAO<)B%%HxW}ealcCeJB$h
znoiWng%eVjoQ8IS=%nP*mMw*|JD<Ci&3n|jW9_pKpZ5BZ?;ZR{@gn)bzfXJdp1lw5
zxOvx%S*scs-+ROUN4+N+qj&c0c;@ck?Aia=mJh5QOuPK2yRO>z_Q0L@G}Yf$v#a5@
zBM0vL_RKe~**fwg`s?>=4n1|#^nu;C&w1&bm#nAhvRD6k;L<-mbiu>#(C!^i-hH_L
zhTlK-!_yRr;66!2Gc((OwN2+y{kdPt)LhM(bLVExo<-Dj?y{bh%OqY3iN|cSmQ}K*
zlGAcrQb#4=<A~vcZ(`grFMh@8o=O~+`x9Q`t-5r47p(1}_dxR@S+HVldx0x4XAeQP
zU|A`0Igf<u()!OoAc?sC?JS+n5I)l9po4kg395);<6gl@I;|>4T_NW~&vl$fAFAHh
zQ!D9cayhVxuAm;^UU~rdOM!0*oF;LJEYKF%D=-rHkhDW;q9+9&5R$_J=VgvTzB;ow
zvw~bS+eDj$<W_-ufZUTbiaeV4gPTM1g^cs3(goleLDe8%PhaN6k)Cf3(Yv%B=VF=-
z?vTuN*EeuohK^P_uFKGSDK~qR7F6T43uPtR1zjE57^U;*9D%ApTVSiec7c})yj-9I
zR45emCV?XYw+p-xXwqH4#pn@l@ezSD1<t2$(P7F$cMP~n;I*`;E(@=@<V=AJs7}hl
zr$0iX)9Ii$QVF<?et?oaWP<jn4>(<v*+>U6yo^?xrG&m)w?VWrD)1=!$Ro(deH+cK
zVk(m$<(e8qLBi%xN42A4Ba(hws^fub)g-|qp3-@g3Y%zUN^o4#8TrE{b|JNuoFwT8
z-Pnmow5(q$QTs9{o-C#lB`UQqk0RoEF!7?e6uQ(il2q6r6`Ts|4F}npAV^q+`dOuK
z{QxTyn3ND))~iG@E#dTq8~gf}Io?JryX7G(`Lx+74YR7bY&Q!^%&UY^nOc*C4Z5X~
z-mp?)traX(ceujF#RZmlaX7?_PF1!=<sj@Ij-8KE4-Pryk*W2%VuZ=7OjWc+LnCq6
zKX4LNZ|wMN(1|ymq}Fh$G8|8EJ`Gy7d$?Rd%(Cs}3X7wm9u{v7J(f^gG`KEILU&?+
zR}6>#RLkpFoSd}h%fk|zqCBBlG&6)^@p!w!kFrxrs;&1%$6Kt{Erd>gIZ7&_mr#MZ
z!~OlvBsWtT1{D)6?FpI?;qPW8XRDx+<5sH?;GRI`hNZAFVK~MdT*1l=W5^~10CTxU
z<};eUadp`Jc357q^MNCJ@z3woQ^Uf-{m&;I?kNrXzFu7S1>=nyYh{|*TqjG?%;ws&
zL87KqQx68B85}Y~+0My^(fep2&XZB1+hDz(FD3BZJ*_G~q50mY_q>12ykYa%E$eT2
zrepQoO)tMT?e&)*{_wRgYJd6N(VtvDuj}UTTy|`!cgf;C19!8lf@|!id$;x7dB@ML
zJag7ppS#~{KYgD0(!0Mta`?dF7k*yX)wK7=(^hO+yz=(Aas9#fFM7@_eXa2FD+dcZ
zn~ugiUnve1TjLv^zS?=Z*1Y2nFTA)faUQSb+iUGK^k$Ys&68F#4mh#*&XB0FGxXvp
zi2__kWQookpStohkI3UXSyNPn=p2a_+RVutzGp1T8-cyZP+Vn^ZCU;z)5z<NWvf=;
zIXF@!nx^7J#gAzFl@e`V+Zk=j_OhgsoG*6`yQR=u#YUDYie@N08F}%sQ%+GVMH7Om
z-qcLpP<54;6mm`>+d<B;O(k!ciW1}lIFh$DH3w^Y-c$nS+n$DGdYb12L7=IDZhLtr
z$UAP}n1*V)s%050@D)GL6vqm3fo7_@t9q(xnYQcajhv?YUd~n&Pxp<y>gILb$?1;f
zdVvc2hNoJd;WEqcO+z;|FK^kV<>hT#R}8~ow&SU$su{j+**en$MYHp2p5+Zy2~;bm
z+qQ4Hwr%Q~;aa-MK$*Jh*f}`p=1t3SU5B~0Ybc%#XB8!<c$Ti2Ow)WH7ryQN2(H6}
z+Y^>HGwin5cRmaB{~^#J0__z>%FbZuVe8*If(>Wv*wN1a-_2>yG;*Hf={d*sZOm5R
z#RO)77GPF6Iu=HtyZBh1XXmlr6w_BU*KtfsRgA#!0#C{5hU4hAYwK>1%bQw|^KH$t
zEEqO*&(rK2%lR7f1E#o`o}TXoSV(G4!-6mstb?4Z+Nx@sZqBlDu4@FA;d*YKX{x5`
zc_r{w-}Vj5@iiC*s3zP{Y~9uj&tp!IGdv@2sVoRA4J*xpE1HefqBy#tFck|7z$_={
z>tGnF<>7cvF-*_H1-t>fhuEM%q>re%d`IogoUuN3hE_-Ai?@1A9Ok_PakM27Woi5k
z$v5Kw`Axjp-ozWSyQk3e+YjVzcdfmA<-Y5pov+SbwVPM*zfx?&`BNN>HWe#)qi!s&
zEr%7cM-{7=p5ml^vlzKo6~);#S)Lv8UD&Hs-%=pyCQi$onwrMmT&bq7Es6`JQl}G^
z)B6%*;-<y5$Ic?TB`x-eAiuE_?%TNNPD(ubgd6izIWNZFj+eEd9)HMG)9e}p)H>XB
z`+yfyH>h^Jv{!>~2QE)v-SkxLyZ=h>sntOgEfHN*wS&WS(mj=n3&;|zIuyfBh_@Pp
z%`(P3;%XekyjCx?4x|b64pmSt0+*)8Yqw&ONbsqGQX%C1C$ZEk$|&e}`ZLJoF(3o)
zAc@*wZ;*yW8zbnE1C9yvov`S^ZiKcYc!i@CKF>g%F>ebfnTRqWEKKyRO?aC?+W{-C
z=tE2+q``)Q#c<rlI@pL&?s&gcyfu{Z%-fuW@;ovXQML>pOA|c(=(e)tqa=R=7xA8v
z;0r^9cx~S6A^5|i)=vYXZ&PJ5UQ9Agjf0GSD5Q!g;(sr~zcp1`d=z*KV=>}f8qxp8
z&m|(hU9c6w_hH1gGNGpgzxgaUd0Y(<*U5EHjP8lC&5Js%!Xks8F6@t>&;O~Om>{1f
UkkkKv+_&`8<kV-rd{PnkH(Bs3CIA2c

diff --git a/UnitTests/Library/ClassLibrary1.sln b/UnitTests/Library/ClassLibrary1.sln
deleted file mode 100644
index 9aafa8529..000000000
--- a/UnitTests/Library/ClassLibrary1.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibrary1", "ClassLibrary1\ClassLibrary1.csproj", "{AD73DEAC-E669-4070-BE05-099F9F313007}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibrary2", "ClassLibrary2\ClassLibrary2.csproj", "{F16C2503-9FBB-464D-AFF0-E58E97769B9E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AD73DEAC-E669-4070-BE05-099F9F313007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD73DEAC-E669-4070-BE05-099F9F313007}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD73DEAC-E669-4070-BE05-099F9F313007}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD73DEAC-E669-4070-BE05-099F9F313007}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F16C2503-9FBB-464D-AFF0-E58E97769B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F16C2503-9FBB-464D-AFF0-E58E97769B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F16C2503-9FBB-464D-AFF0-E58E97769B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F16C2503-9FBB-464D-AFF0-E58E97769B9E}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/UnitTests/Library/ClassLibrary1/ClassLibrary1.NetCore.csproj b/UnitTests/Library/ClassLibrary1/ClassLibrary1.NetCore.csproj
deleted file mode 100644
index 1fa8b77f4..000000000
--- a/UnitTests/Library/ClassLibrary1/ClassLibrary1.NetCore.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>netstandard1.3</TargetFramework>
-		<AssemblyName>ClassLibrary1</AssemblyName>
-		<AssemblyOriginatorKeyFile>Foo.snk</AssemblyOriginatorKeyFile>
-		<SignAssembly>true</SignAssembly>
-		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-		<PackageId>ClassLibrary1</PackageId>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-	</PropertyGroup>
-
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-		<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
-	</PropertyGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-		<PackageReference Include="System.Linq.Queryable" Version="4.0.1" />
-	</ItemGroup>
-
-</Project>
diff --git a/UnitTests/Library/ClassLibrary1/ClassLibrary1.csproj b/UnitTests/Library/ClassLibrary1/ClassLibrary1.csproj
index 1b0ce8664..9455d094e 100644
--- a/UnitTests/Library/ClassLibrary1/ClassLibrary1.csproj
+++ b/UnitTests/Library/ClassLibrary1/ClassLibrary1.csproj
@@ -1,61 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
 	<PropertyGroup>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<ProductVersion>8.0.30703</ProductVersion>
-		<SchemaVersion>2.0</SchemaVersion>
-		<ProjectGuid>{AD73DEAC-E669-4070-BE05-099F9F313007}</ProjectGuid>
-		<OutputType>Library</OutputType>
-		<AppDesignerFolder>Properties</AppDesignerFolder>
-		<RootNamespace>ClassLibrary1</RootNamespace>
+		<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
 		<AssemblyName>ClassLibrary1</AssemblyName>
-		<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-		<FileAlignment>512</FileAlignment>
-		<OutputPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Moq.Tests.csproj))\</OutputPath>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<DebugSymbols>true</DebugSymbols>
-		<DebugType>full</DebugType>
-		<Optimize>false</Optimize>
-		<DefineConstants>DEBUG;TRACE</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<DebugType>pdbonly</DebugType>
-		<Optimize>true</Optimize>
-		<DefineConstants>TRACE</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-	</PropertyGroup>
-	<PropertyGroup>
+		<AssemblyOriginatorKeyFile>Foo.snk</AssemblyOriginatorKeyFile>
 		<SignAssembly>true</SignAssembly>
+		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	</PropertyGroup>
-	<PropertyGroup>
-		<AssemblyOriginatorKeyFile>Foo.snk</AssemblyOriginatorKeyFile>
+
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
+		<DefineConstants>$(DefineConstants);DESKTOP;FEATURE_CAS;FEATURE_CODEDOM;FEATURE_COM;FEATURE_SERIALIZATION</DefineConstants>
 	</PropertyGroup>
-	<ItemGroup>
-		<Reference Include="System" />
-		<Reference Include="System.Core" />
-		<Reference Include="System.Xml.Linq" />
-		<Reference Include="System.Data.DataSetExtensions" />
-		<Reference Include="System.Data" />
-		<Reference Include="System.Xml" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Include="Foo.cs" />
-		<Compile Include="Properties\AssemblyInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="Foo.snk" />
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+		<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
+	</PropertyGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+		<PackageReference Include="System.Linq.Queryable" Version="4.0.1" />
 	</ItemGroup>
-	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-	<!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-			 Other similar extension points exist, see Microsoft.Common.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/UnitTests/Library/ClassLibrary1/Foo.cs b/UnitTests/Library/ClassLibrary1/Foo.cs
index 59f408f34..552e4a430 100644
--- a/UnitTests/Library/ClassLibrary1/Foo.cs
+++ b/UnitTests/Library/ClassLibrary1/Foo.cs
@@ -5,7 +5,6 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
-[assembly: InternalsVisibleTo("Moq.NetCore.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 
 namespace ClassLibrary1
diff --git a/UnitTests/Library/ClassLibrary2/Bar.cs b/UnitTests/Library/ClassLibrary2/Bar.cs
index b51011849..13f708c96 100644
--- a/UnitTests/Library/ClassLibrary2/Bar.cs
+++ b/UnitTests/Library/ClassLibrary2/Bar.cs
@@ -6,7 +6,6 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
-[assembly: InternalsVisibleTo("Moq.NetCore.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 
 namespace ClassLibrary2
diff --git a/UnitTests/Library/ClassLibrary2/ClassLibrary2.NetCore.csproj b/UnitTests/Library/ClassLibrary2/ClassLibrary2.NetCore.csproj
deleted file mode 100644
index f40f533fb..000000000
--- a/UnitTests/Library/ClassLibrary2/ClassLibrary2.NetCore.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<VersionPrefix>2.0.0</VersionPrefix>
-		<TargetFramework>netstandard1.3</TargetFramework>
-		<AssemblyName>ClassLibrary2</AssemblyName>
-		<AssemblyOriginatorKeyFile>Bar.snk</AssemblyOriginatorKeyFile>
-		<SignAssembly>true</SignAssembly>
-		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-		<PackageId>ClassLibrary2</PackageId>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\ClassLibrary1\ClassLibrary1.NetCore.csproj" />
-	</ItemGroup>
-
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-		<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
-	</PropertyGroup>
-
-</Project>
diff --git a/UnitTests/Library/ClassLibrary2/ClassLibrary2.csproj b/UnitTests/Library/ClassLibrary2/ClassLibrary2.csproj
index 9e69ca302..e1710cac5 100644
--- a/UnitTests/Library/ClassLibrary2/ClassLibrary2.csproj
+++ b/UnitTests/Library/ClassLibrary2/ClassLibrary2.csproj
@@ -1,67 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
 	<PropertyGroup>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<ProductVersion>8.0.30703</ProductVersion>
-		<SchemaVersion>2.0</SchemaVersion>
-		<ProjectGuid>{F16C2503-9FBB-464D-AFF0-E58E97769B9E}</ProjectGuid>
-		<OutputType>Library</OutputType>
-		<AppDesignerFolder>Properties</AppDesignerFolder>
-		<RootNamespace>ClassLibrary2</RootNamespace>
+		<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
 		<AssemblyName>ClassLibrary2</AssemblyName>
-		<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-		<FileAlignment>512</FileAlignment>
-		<OutputPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Moq.Tests.csproj))\</OutputPath>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<DebugSymbols>true</DebugSymbols>
-		<DebugType>full</DebugType>
-		<Optimize>false</Optimize>
-		<DefineConstants>DEBUG;TRACE</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<DebugType>pdbonly</DebugType>
-		<Optimize>true</Optimize>
-		<DefineConstants>TRACE</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-	</PropertyGroup>
-	<PropertyGroup>
+		<AssemblyOriginatorKeyFile>Bar.snk</AssemblyOriginatorKeyFile>
 		<SignAssembly>true</SignAssembly>
+		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	</PropertyGroup>
-	<PropertyGroup>
-		<AssemblyOriginatorKeyFile>Bar.snk</AssemblyOriginatorKeyFile>
+
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
+		<DefineConstants>$(DefineConstants);DESKTOP;FEATURE_CAS;FEATURE_CODEDOM;FEATURE_COM;FEATURE_SERIALIZATION</DefineConstants>
 	</PropertyGroup>
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+		<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
+	</PropertyGroup>
+
 	<ItemGroup>
-		<Reference Include="System" />
-		<Reference Include="System.Core" />
-		<Reference Include="System.Xml.Linq" />
-		<Reference Include="System.Data.DataSetExtensions" />
-		<Reference Include="System.Data" />
-		<Reference Include="System.Xml" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Include="Bar.cs" />
-		<Compile Include="Properties\AssemblyInfo.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="Bar.snk" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\ClassLibrary1\ClassLibrary1.csproj">
-			<Project>{AD73DEAC-E669-4070-BE05-099F9F313007}</Project>
-			<Name>ClassLibrary1</Name>
-		</ProjectReference>
+		<ProjectReference Include="..\ClassLibrary1\ClassLibrary1.csproj" />
 	</ItemGroup>
-	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-	<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-	     Other similar extension points exist, see Microsoft.Common.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/UnitTests/Moq.NetCore.Tests.csproj b/UnitTests/Moq.NetCore.Tests.csproj
deleted file mode 100644
index 502d688b1..000000000
--- a/UnitTests/Moq.NetCore.Tests.csproj
+++ /dev/null
@@ -1,46 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<Description>Moq.NetCore.UnitTests Class Library</Description>
-		<TargetFramework>netcoreapp1.0</TargetFramework>
-		<AssemblyName>Moq.NetCore.Tests</AssemblyName>
-		<AssemblyOriginatorKeyFile>../Moq.snk</AssemblyOriginatorKeyFile>
-		<SignAssembly>true</SignAssembly>
-		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-		<PackageId>Moq.NetCore.Tests</PackageId>
-		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<Compile Remove="Library\**\*.cs;Pex\**\*.cs;Properties\**\*.cs" />
-	</ItemGroup>
-
-	<ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
-		<PackageReference Include="Castle.Core" Version="4.1.1" />
-		<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
-		<PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
-		<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
-		<PackageReference Include="System.ServiceModel.Primitives" Version="4.3.0" />
-	</ItemGroup>
-
-	<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
-		<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-		<PackageReference Include="xunit" Version="2.2.0" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Source\Moq.csproj" />
-		<ProjectReference Include="Library\ClassLibrary1\ClassLibrary1.NetCore.csproj" />
-		<ProjectReference Include="Library\ClassLibrary2\ClassLibrary2.NetCore.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-	</ItemGroup>
-
-</Project>
diff --git a/UnitTests/Moq.Tests.csproj b/UnitTests/Moq.Tests.csproj
index db4d31c5d..0200efa77 100644
--- a/UnitTests/Moq.Tests.csproj
+++ b/UnitTests/Moq.Tests.csproj
@@ -1,115 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
 	<PropertyGroup>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<ProductVersion>9.0.30729</ProductVersion>
-		<SchemaVersion>2.0</SchemaVersion>
-		<ProjectGuid>{81BBC911-4916-4E10-A955-752AE47CB2B9}</ProjectGuid>
-		<OutputType>Library</OutputType>
-		<AppDesignerFolder>Properties</AppDesignerFolder>
-		<RootNamespace>Moq.Tests</RootNamespace>
+		<TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
 		<AssemblyName>Moq.Tests</AssemblyName>
-		<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-		<FileAlignment>512</FileAlignment>
-		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>..\Moq.snk</AssemblyOriginatorKeyFile>
-		<TargetFrameworkProfile />
-		<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-		<RestorePackages>true</RestorePackages>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<AssemblyOriginatorKeyFile>../Moq.snk</AssemblyOriginatorKeyFile>
 		<DebugSymbols>true</DebugSymbols>
 		<DebugType>full</DebugType>
-		<Optimize>false</Optimize>
-		<OutputPath>bin\Debug\</OutputPath>
-		<DefineConstants>TRACE;DEBUG;DESKTOP;FEATURE_CAS;FEATURE_CODEDOM;FEATURE_COM;FEATURE_SERIALIZATION</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+		<SignAssembly>true</SignAssembly>
 	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<DebugType>full</DebugType>
-		<Optimize>true</Optimize>
-		<OutputPath>bin\Release\</OutputPath>
-		<DefineConstants>TRACE;DESKTOP;FEATURE_CAS;FEATURE_CODEDOM;FEATURE_COM;FEATURE_SERIALIZATION</DefineConstants>
-		<ErrorReport>prompt</ErrorReport>
-		<WarningLevel>4</WarningLevel>
-		<DebugSymbols>true</DebugSymbols>
-		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
+		<DefineConstants>$(DefineConstants);DESKTOP;FEATURE_CAS;FEATURE_CODEDOM;FEATURE_COM;FEATURE_SERIALIZATION</DefineConstants>
 	</PropertyGroup>
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
+		<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
+	</PropertyGroup>
+
 	<ItemGroup>
-		<Reference Include="ClassLibrary1">
-			<HintPath>.\ClassLibrary1.dll</HintPath>
-		</Reference>
-		<Reference Include="ClassLibrary2">
-			<HintPath>.\ClassLibrary2.dll</HintPath>
-		</Reference>
-		<Reference Include="System" />
-		<Reference Include="System.Core" />
+		<PackageReference Include="Castle.Core" Version="4.1.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+		<PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
+		<ProjectReference Include="..\Source\Moq.csproj" />
+		<ProjectReference Include="Library\ClassLibrary1\ClassLibrary1.csproj" />
+		<ProjectReference Include="Library\ClassLibrary2\ClassLibrary2.csproj" />
+		<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" />
+	</ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
 		<Reference Include="System.Web" />
 		<Reference Include="System.Windows.Forms" />
-		<Reference Include="System.Xml" />
 	</ItemGroup>
-	<ItemGroup>
-		<Compile Include="AsInterfaceFixture.cs" />
-		<Compile Include="CaptureFixture.cs" />
-		<Compile Include="ConditionalSetupFixture.cs" />
-		<Compile Include="CustomMatcherFixture.cs" />
-		<Compile Include="ExtensionsFixture.cs" />
-		<Compile Include="CaptureMatchFixture.cs" />
-		<Compile Include="GeneratedReturnsExtensionsFixture.cs" />
-		<Compile Include="Regressions\FluentMockIssues.cs" />
-		<Compile Include="ReturnsExtensionsFixture.cs" />
-		<Compile Include="Linq\MockRepositoryQuerying.cs" />
-		<Compile Include="MockedDelegatesFixture.cs" />
-		<Compile Include="MockSequenceFixture.cs" />
-		<Compile Include="Linq\SupportedQuerying.cs" />
-		<Compile Include="Linq\UnsupportedQuerying.cs" />
-		<Compile Include="PropertiesFixture.cs" />
-		<Compile Include="Linq\QueryableMocksFixture.cs" />
-		<Compile Include="RecursiveMocksFixture.cs" />
-		<Compile Include="CallbacksFixture.cs" />
-		<Compile Include="EmptyDefaultValueProviderFixture.cs" />
-		<Compile Include="MatcherAttributeFixture.cs" />
-		<Compile Include="Demo.cs" />
-		<Compile Include="ExpressionExtensionsFixture.cs" />
-		<Compile Include="ExtensibilityFixture.cs" />
-		<Compile Include="AdvancedMatcherAttributeFixture.cs" />
-		<Compile Include="MatchersFixture.cs" />
-		<Compile Include="Matchers\AnyMatcherFixture.cs" />
-		<Compile Include="MockBehaviorFixture.cs" />
-		<Compile Include="MockDefaultValueProviderFixture.cs" />
-		<Compile Include="MockedFixture.cs" />
-		<Compile Include="MockedEventsFixture.cs" />
-		<Compile Include="MockRepositoryFixture.cs" />
-		<Compile Include="MockFixture.cs" />
-		<Compile Include="OccurrenceFixture.cs" />
-		<Compile Include="OutRefFixture.cs" />
-		<Compile Include="ProtectedMockFixture.cs" />
-		<Compile Include="Properties\AssemblyInfo.cs" />
-		<Compile Include="Regressions\IssueReportsFixture.cs" />
-		<Compile Include="Regressions\StreamFixture.cs" />
-		<Compile Include="SequenceExtensionsFixture.cs" />
-		<Compile Include="ReturnsFixture.cs" />
-		<Compile Include="StubExtensionsFixture.cs" />
-		<Compile Include="TimesFixture.cs" />
-		<Compile Include="VerifyFixture.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="..\Moq.snk">
-			<Link>Moq.snk</Link>
-		</None>
-		<None Include="project.json" />
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+		<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
+		<PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
+		<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
+		<PackageReference Include="System.ServiceModel.Primitives" Version="4.3.0" />
 	</ItemGroup>
+
 	<ItemGroup>
-		<ProjectReference Include="..\Source\Moq.csproj">
-			<Project>{1C91AC30-5977-4BE5-BA67-8EB186C03514}</Project>
-			<Name>Moq</Name>
-		</ProjectReference>
+		<Compile Remove="Library\**\*.cs;Pex\**\*.cs;Properties\**\*.cs" />
 	</ItemGroup>
+
 	<ItemGroup>
-		<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+		<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
 	</ItemGroup>
-	<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
diff --git a/UnitTests/project.json b/UnitTests/project.json
deleted file mode 100644
index a6f9170d6..000000000
--- a/UnitTests/project.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"dependencies": {
-		"Castle.Core": "4.1.1",
-		"xunit": "2.1.0",
-		"xunit.runner.visualstudio": "2.1.0"
-	},
-	"frameworks": {
-		"net45": {}
-	},
-	"runtimes": {
-		"win": {}
-	}
-}
diff --git a/build.proj b/build.proj
index e7cb09a7e..84f275afb 100644
--- a/build.proj
+++ b/build.proj
@@ -15,10 +15,7 @@
 	<ItemGroup>
 		<Solution Include="Moq.sln"/>
 		<NuSpec Include="Moq.nuspec" />
-		<TestProject Include="UnitTests\Moq.Tests.csproj" />
 		<Source Include="Source\Moq.csproj" />
-		<NetCoreSolution Include="Moq.NetCore.sln" />
-		<NetCoreTestProject Include="UnitTests\Moq.NetCore.Tests.csproj" />
 	</ItemGroup>
 	
 	<Target Name="Clean">
@@ -33,8 +30,6 @@
 	<Target Name="Build" DependsOnTargets="GitVersion">
 		<MSBuild Projects="@(Solution)" Properties="$(CommonBuildProperties)" />
 
-		<MSBuild Projects="@(NetCoreSolution)" BuildInParallel="false" Targets="Restore;Build" Properties="$(CommonBuildProperties)" />
-
 		<Exec Command="xcopy &quot;Source\bin\$(Configuration)\net45\Moq.*&quot; &quot;$(DropDirectory)lib\net45\&quot; /Y" ContinueOnError="false" />
 		<Exec Command="xcopy &quot;Source\bin\$(Configuration)\netstandard1.3\Moq.*&quot; &quot;$(DropDirectory)lib\netstandard1.3\&quot; /Y" ContinueOnError="false" />
 
@@ -42,35 +37,26 @@
 	</Target>
 
 	<Target Name="Test" DependsOnTargets="Build">
-		<MSBuild Projects="@(TestProject)" BuildInParallel="false" Targets="GetTargetPath" Properties="$(CommonBuildProperties)">
-			<Output TaskParameter="TargetOutputs" ItemName="_TestAssembly" />
-		</MSBuild>
 
-		<ItemGroup>
-			<TestAssembly Include="@(_TestAssembly)" Condition=" Exists('%(_TestAssembly.FullPath)') " />
-		</ItemGroup>
+		<!-- See if dotnet CLI is available: -->
+		<Exec ContinueOnError="True" Command="dotnet --info">
+			<Output TaskParameter="ExitCode" PropertyName="DotNetErrorCode"/>
+		</Exec>
+		<Warning Condition="'$(DotNetErrorCode)' != '0'" Text="Error in executing dotnet." />
 
-		<PropertyGroup>
-			<XunitConsole>$(PackagesPath)\xunit.runner.console\tools\xunit.console.exe</XunitConsole>
-			<XunitOptions>$(XunitOptions) -html $(Out)\test.html -xml $(Out)\test.xml -parallel all -noshadow</XunitOptions>
+		<!-- Test runner report files will be written to the `out\` directory,
+		     so create it if it doesn't exist yet. -->
+		<MakeDir Directories="$(Out)" Condition=" !Exists('$(Out)') " />
+
+		<Exec Command="dotnet xunit -nobuild -configuration $(Configuration) -noshadow -appveyor -html ..\$(Out)\test.html -xml ..\$(Out)\test.xml"
+		      WorkingDirectory="UnitTests"
+			  ContinueOnError="false" />
 
+		<PropertyGroup>
 			<CoverageConsole>$(PackagesPath)\OpenCover\tools\OpenCover.Console.exe</CoverageConsole>
 			<CoverageOptions>$(CoverageOptions) -output:$(Out)\coverage.xml -returntargetcode -register:user -filter:"+[Moq.*]* -[xunit*]* -[*.Tests]* -[*]*ThisAssembly* -[*]*IFluentInterface*" -excludebyattribute:*ExcludeFromCodeCoverage*;*CompilerGenerated* -skipautoprops -showunvisited -mergebyhash -hideskipped:All</CoverageOptions>
 		</PropertyGroup>
 
-		<xunit Assemblies="@(TestAssembly)"
-			   Html="$(Out)\test.html"
-			   Xml="$(Out)\test.xml"
-			   ParallelizeAssemblies="true"
-			   ParallelizeTestCollections="true"
-			   ContinueOnError="ErrorAndContinue" />
-
-		<Exec ContinueOnError="True" Command="dotnet --info">
-			<Output TaskParameter="ExitCode" PropertyName="DotNetErrorCode"/>
-		</Exec>
-		<Warning Condition="'$(DotNetErrorCode)' != '0'" Text="Error in executing dotnet. Skipping .NET Core tests." />
-		<Exec Command="dotnet test &quot;@(NetCoreTestProject, ' ')&quot; --no-build -c $(Configuration) --logger:trx;LogFileName=$(Out)\test.dotnet.trx" ContinueOnError="false" />
-
 		<!-- This isn't collecting any data right now, so make Coverage == '' by default so it won't run with this condition -->
 		<Exec Command="$(CoverageConsole) $(CoverageOptions) -target:$(XunitConsole) -targetargs:&quot;@(TestAssembly, ' ') $(XunitOptions)&quot;"
 		      Condition=" '$(Coverage)' == 'true' "
@@ -97,12 +83,10 @@
 	<PropertyGroup>
 		<GitInfoTargets>$(PackagesPath)\GitInfo\build\GitInfo.targets</GitInfoTargets>
 		<PendingRestore Condition=" !Exists('$(GitInfoTargets)') ">true</PendingRestore>
-		<XunitProps>$(PackagesPath)\xunit.runner.msbuild\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.props</XunitProps>
 	</PropertyGroup>
 
 	<Target Name="GitVersion" /><!-- Gets overriden by the $(GitInfoTargets) if it exists -->
 	<Import Project="$(GitInfoTargets)" Condition=" Exists('$(GitInfoTargets)') " />
-	<Import Project="$(XunitProps)" Condition=" Exists('$(XunitProps)') " />
 
 	<Target Name="Configure" DependsOnTargets="_GetNuGet;GitInfoReport">
 		<!-- We always run NuGet Install since it already checks for already-installed packages and skips them -->
diff --git a/packages.config b/packages.config
index 61105e1d9..a2f9f1a21 100644
--- a/packages.config
+++ b/packages.config
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
 	<package id="GitInfo" version="1.1.15" targetFramework="net45" />
-	<package id="xunit.runner.msbuild" version="2.1.0" targetFramework="net45" />
-	<package id="xunit.runner.console" version="2.1.0" targetFramework="net45" />
 	<package id="GitLink" version="2.2.0" targetFramework="net45" />
+	<package id="xunit" version="2.3.0-beta3-build3705" />
+	<package id="dotnet-xunit" version="2.3.0-beta3-build3705" />
 	<package id="OpenCover" version="4.6.166" targetFramework="net45" />
 	<package id="coveralls.io" version="1.3.4" targetFramework="net45" />
-	<package id="MSBuilder.CodeTaskAssembly" version="0.2.2" targetFramework="net45" />
 </packages>
\ No newline at end of file