Merge pull request #267 from jeremymeng/netcore

Add .NET Core Support
devlooped · Jun 6, 2016 · 03a077f · 03a077f
2 parents 44b3fbc + 7710609
commit 03a077f
Show file tree

Hide file tree

Showing 66 changed files with 908 additions and 464 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ out
 build
 bin
 obj
+lib
 packages
 *.nuget.targets
 *.nuget.props

diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/GitInfo.txt b/GitInfo.txt
@@ -1 +1 @@
-4.5.0
+4.6.0-alpha
diff --git a/Moq.NetCore.sln b/Moq.NetCore.sln
@@ -0,0 +1,45 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.NetCore", "Source.NetCore\Moq.NetCore.csproj", "{F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EFFD4CEA-0C67-4B36-B2FE-CDADBACE1C5C}"
+ ProjectSection(SolutionItems) = preProject
+ global.json = global.json
+ EndProjectSection
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Moq.NetCore.Tests", "UnitTests.NetCore\Moq.NetCore.Tests\Moq.NetCore.Tests.xproj", "{78216B74-6479-48CB-AE0F-A13B0C632CC7}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClassLibrary1", "UnitTests.NetCore\ClassLibrary1\ClassLibrary1.xproj", "{AAC19895-C12F-4BDC-AF70-5FEF44D0612F}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClassLibrary2", "UnitTests.NetCore\ClassLibrary2\ClassLibrary2.xproj", "{CD91690D-170E-4AF7-AEF9-7FEF94455CB5}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {78216B74-6479-48CB-AE0F-A13B0C632CC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {78216B74-6479-48CB-AE0F-A13B0C632CC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {78216B74-6479-48CB-AE0F-A13B0C632CC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {78216B74-6479-48CB-AE0F-A13B0C632CC7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AAC19895-C12F-4BDC-AF70-5FEF44D0612F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AAC19895-C12F-4BDC-AF70-5FEF44D0612F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AAC19895-C12F-4BDC-AF70-5FEF44D0612F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AAC19895-C12F-4BDC-AF70-5FEF44D0612F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CD91690D-170E-4AF7-AEF9-7FEF94455CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CD91690D-170E-4AF7-AEF9-7FEF94455CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CD91690D-170E-4AF7-AEF9-7FEF94455CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CD91690D-170E-4AF7-AEF9-7FEF94455CB5}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/Moq.nuspec b/Moq.nuspec
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
-<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+ <metadata>
  <id>Moq</id>
- <version>4.1</version>
+ <version>4.6</version>
  <title>Moq: an enjoyable mocking library</title>
  <authors>Daniel Cazzulino, kzu</authors>
  <owners>Daniel Cazzulino, Clarius Labs, kzu</owners>
@@ -176,16 +176,43 @@ Version 1.0
 
 * Initial release, initial documentation process in place, etc. 
 </releaseNotes>
- <dependencies>
+ <dependencies>
  <group targetFramework=".NETFramework4.5">
- <dependency id="Castle.Core" version="3.3.3" />
+ <dependency id="Castle.Core" version="4.0.0-alpha001" />
  </group>
- </dependencies>
+ <group targetFramework=".NETStandard1.3">
+ <dependency id="Castle.Core" version="4.0.0-alpha001" />
+ <dependency id="System.Collections" version="4.0.11-rc2-24027" />
+ <dependency id="System.Collections.Concurrent" version="4.0.12-rc2-24027" />
+ <dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" />
+ <dependency id="System.Diagnostics.Tools" version="4.0.1-rc2-24027" />
+ <dependency id="System.Globalization" version="4.0.11-rc2-24027" />
+ <dependency id="System.Linq" version="4.1.0-rc2-24027" />
+ <dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" />
+ <dependency id="System.Linq.Queryable" version="4.0.1-rc2-24027" />
+ <dependency id="System.Reflection" version="4.1.0-rc2-24027" />
+ <dependency id="System.Reflection.Emit" version="4.0.1-rc2-24027" />
+ <dependency id="System.Reflection.Emit.ILGeneration" version="4.0.1-rc2-24027" />
+ <dependency id="System.Reflection.Extensions" version="4.0.1-rc2-24027" />
+ <dependency id="System.Reflection.Primitives" version="4.0.1-rc2-24027" />
+ <dependency id="System.Reflection.TypeExtensions" version="4.1.0-rc2-24027" />
+ <dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" />
+ <dependency id="System.Runtime" version="4.1.0-rc2-24027" />
+ <dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" />
+ <dependency id="System.Text.RegularExpressions" version="4.0.12-rc2-24027" />
+ <dependency id="System.Threading" version="4.0.11-rc2-24027" />
+ <dependency id="System.Threading.Tasks" version="4.0.11-rc2-24027" />
+ </group>
+ </dependencies>
  </metadata>
  <files>
- <file src="Source\bin\$configuration$\Moq.dll" target="lib\net45" />
- <!-- Could not verify that GitLink works, so disabling pdbs for now -->
- <!--<file src="Source\bin\$configuration$\Moq.pdb" target="lib\net45" />-->
- <file src="Source\bin\$configuration$\Moq.xml" target="lib\net45" /> 
+ <file src="Source\bin\$configuration$\Moq.dll" target="lib\net45" />
+ <!-- Could not verify that GitLink works, so disabling pdbs for now -->
+ <!--<file src="Source\bin\$configuration$\Moq.pdb" target="lib\net45" />-->
+ <file src="Source\bin\$configuration$\Moq.xml" target="lib\net45" />
+ <file src="Source.NetCore\bin\$configuration$\Moq.dll" target="lib\netstandard1.3" />
+ <!-- Could not verify that GitLink works, so disabling pdbs for now -->
+ <!--<file src="Source.NetCore\bin\$configuration$\Moq.pdb" target="lib\netstandard1.3" />-->
+ <file src="Source.NetCore\bin\$configuration$\Moq.xml" target="lib\netstandard1.3" />
  </files>
 </package>
diff --git a/Moq.shfb b/Moq.shfb
@@ -17,7 +17,7 @@
  <namespaceSummaryItem name="Castle.DynamicProxy.Generators.Emitters.CodeBuilders" isDocumented="False" />
  <namespaceSummaryItem name="Castle.DynamicProxy.Generators.Emitters.SimpleAST" isDocumented="False" />
  <namespaceSummaryItem name="Castle.DynamicProxy.Serialization" isDocumented="False" />
- <namespaceSummaryItem name="Moq" isDocumented="True">Root namespace of Moq (pronounced "Mock-you" or just "Mock"), the only mocking library for .NET and Silverlight developed from scratch to take full advantage of .NET 3.5 (i.e. Linq expression trees) and C# 3.0 features (i.e. lambda expressions) that make it the most productive, simple and refactoring-friendly mocking library available.
+ <namespaceSummaryItem name="Moq" isDocumented="True">Root namespace of Moq (pronounced "Mock-you" or just "Mock"), the only mocking library for .NET developed from scratch to take full advantage of .NET 3.5 (i.e. Linq expression trees) and C# 3.0 features (i.e. lambda expressions) that make it the most productive, simple and refactoring-friendly mocking library available.
 &lt;p&gt;
 See the &lt;a href="http://code.google.com/p/moq/wiki/QuickStart"&gt;online quickstarts&lt;/a&gt; for more examples than those available in this code documentation.
 &lt;/p&gt;

diff --git a/Moq.shfbproj b/Moq.shfbproj
@@ -113,7 +113,7 @@
  <NamespaceSummaryItem name="Castle.DynamicProxy.Generators.Emitters.CodeBuilders" isDocumented="False" xmlns="" />
  <NamespaceSummaryItem name="Castle.DynamicProxy.Generators.Emitters.SimpleAST" isDocumented="False" xmlns="" />
  <NamespaceSummaryItem name="Castle.DynamicProxy.Serialization" isDocumented="False" xmlns="" />
- <NamespaceSummaryItem name="Moq" isDocumented="True" xmlns="">Root namespace of Moq (pronounced "Mock-you" or just "Mock"), the only mocking library for .NET and Silverlight developed from scratch to take full advantage of .NET 3.5 (i.e. Linq expression trees) and C# 3.0 features (i.e. lambda expressions) that make it the most productive, simple and refactoring-friendly mocking library available.
+ <NamespaceSummaryItem name="Moq" isDocumented="True" xmlns="">Root namespace of Moq (pronounced "Mock-you" or just "Mock"), the only mocking library for .NET developed from scratch to take full advantage of .NET 3.5 (i.e. Linq expression trees) and C# 3.0 features (i.e. lambda expressions) that make it the most productive, simple and refactoring-friendly mocking library available.
 &lt;p&gt;
 See the &lt;a href="http://code.google.com/p/moq/wiki/QuickStart"&gt;online quickstarts&lt;/a&gt; for more examples than those available in this code documentation.
 &lt;/p&gt;

diff --git a/Moq.sln b/Moq.sln
@@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq", "Source\Moq.csproj",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Tests", "UnitTests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.NetCore", "Source.NetCore\Moq.NetCore.csproj", "{F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -37,6 +39,14 @@ Global
  {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
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Debug|x86.Build.0 = Debug|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Release|x86.ActiveCfg = Release|Any CPU
+ {F04EAC58-919C-4CB5-9250-B38DE6FB5ED9}.Release|x86.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE