Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add .NET Core Support #267

Merged
merged 84 commits into from
Jun 6, 2016
Merged

Add .NET Core Support #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
8c68f22
[WIP] Moq.NetCore
jeremymeng Sep 2, 2015
8b38431
Update .gitignore.
jeremymeng Sep 2, 2015
d20ae2b
Adding GetTypeInfo() for .NetCore.
jeremymeng Sep 2, 2015
7be485e
Add more reflection support.
jeremymeng Sep 2, 2015
55c4487
Add GetMethodInfo() change.
jeremymeng Sep 2, 2015
5904b39
Fix GetCustomAttribute errors.
jeremymeng Sep 2, 2015
a63a940
Refactor to workaround missing ReflectedType property in NetCore.
jeremymeng Sep 3, 2015
4758237
Disable usage of MethodBase.GetCurrentMethod() and StackTrace(Excepti…
jeremymeng Sep 3, 2015
ed28cb8
Define FEATURE_LEGACY_REFLECTION_API constant for the silverlight pro…
jeremymeng Sep 3, 2015
0b48433
Turn on Warning as Error and generation of XML doc.
jeremymeng Sep 3, 2015
b63b6e3
Work around roslyn bug https:/dotnet/roslyn/issues/4955 t…
jeremymeng Sep 3, 2015
ebc3b5b
Use the recommended way to run xUnit tests in VS.
jeremymeng Sep 3, 2015
155ecee
Add Moq.NetCore.Tests project.
jeremymeng Sep 4, 2015
53e9a21
Fix some build errors for NetCore.
jeremymeng Sep 4, 2015
f2a339d
Remove signing for NetCore.
jeremymeng Sep 8, 2015
b1692fc
Add a solution file for NetCore.
jeremymeng Sep 8, 2015
83b21bb
Define FEATURE_LEGACY_REFLECTION_API for the silverlight test project.
jeremymeng Sep 8, 2015
03d90f8
Change folder name to match assembly name.
jeremymeng Sep 8, 2015
723466f
Remove uses of Assert.DoesNotThrow(). It is a redundant call and has…
jeremymeng Sep 8, 2015
363febe
Link back some missing files.
jeremymeng Sep 8, 2015
73209bb
Fix more build errors: Remove Assert.DoesNotThrows() usage; exclude c…
jeremymeng Sep 8, 2015
3b15e6e
Add needed reflection using statements for NetCore.
jeremymeng Sep 8, 2015
6fe482e
Add test library projects for NetCore. Make their internals visible …
jeremymeng Sep 8, 2015
c21bfb4
Disable some tests for now as they are not working yet. Add DefineCo…
jeremymeng Sep 9, 2015
7c63367
Add Castle.Core dependency to the Moq.NetCore wrapper project.
jeremymeng Sep 10, 2015
e8b5ff4
Change the assembly name to "Moq.dll". Bump the version to prevent g…
jeremymeng Sep 10, 2015
a1e0063
Fix a bug so that the return values match the ones from legacy Type.…
jeremymeng Sep 10, 2015
8a19606
Exclude a test for NetCore as the string representation for the metho…
jeremymeng Sep 10, 2015
bbedfe0
Rename folder to UnitTests.NetCore to match other tests' names.
jeremymeng Sep 10, 2015
910da5c
Fix and re-enable two tests.
jeremymeng Sep 13, 2015
19d0b59
Bump version.
jeremymeng Sep 22, 2015
22bcd08
Fix a bug in HasMatchingParameterTypes() extension method.
jeremymeng Oct 21, 2015
f07f8cc
Merge the change to enable two tests.
jeremymeng Oct 21, 2015
6012a43
Use wrapped project for castle.core and moq. Add signing for Moq por…
jeremymeng Nov 6, 2015
a29621d
Enable signing the netcore test project.
jeremymeng Nov 6, 2015
6d4ef18
Use 99.99.99-wrapped version for the wrapped Moq project to make it c…
jeremymeng Nov 6, 2015
1b61ea8
Add IL Merge target. Currently disabled. Need to figure out how to …
jeremymeng Nov 6, 2015
e136870
Use NuSpec.ReferenceGenerator to maintain the dotnet group in the nus…
jeremymeng Nov 20, 2015
b278a8d
Merge chagnes from upstream.
jeremymeng Nov 20, 2015
a2e91fb
Update to RC1 update 1.
jeremymeng Dec 9, 2015
93c3121
Introduce GetTypeInfo() and GetMethodInfo() extension methods for pla…
jeremymeng Dec 9, 2015
cca1c70
Fix whitespaces.
jeremymeng Dec 9, 2015
59dd07d
Move the wrapped projects for Castle.Core and Moq out of the UnitTest…
jeremymeng Dec 9, 2015
0e8063c
Swith to depend on Castle.Core NuGet package.
jeremymeng Mar 10, 2016
565165f
Attempt to upgrade to RC2.
jeremymeng Apr 1, 2016
1c8ff13
Fix build errors
jeremymeng Apr 5, 2016
847e592
Switch to use the official Castle.Core NuGet package.
jeremymeng Apr 7, 2016
d8abf42
Use dotnet5.4 TFM.
jeremymeng Apr 7, 2016
b44047d
Update Castle.Core version in the nuspec.
jeremymeng Apr 8, 2016
a1bc2f3
Update to latest NuGet.exe (v3).
jeremymeng Apr 11, 2016
0c9d230
Integrate the netcore project to build.
jeremymeng Apr 11, 2016
497da3d
Pin the corefx version to 24018.
jeremymeng Apr 20, 2016
d7abe5d
Merge changes from netcore branch.
jeremymeng Apr 21, 2016
7398673
Update to work with latest RC2 VS tooling.
jeremymeng Apr 27, 2016
0a9a582
Use shared framework.
jeremymeng Apr 27, 2016
2e821d2
Upgrade to RC2 24027.
jeremymeng May 2, 2016
2c5da26
Update Castle.Core to v4.0.0-alpha001.
jeremymeng May 16, 2016
cf47ae8
Update for RC2 final build.
jeremymeng May 17, 2016
7439a8b
Merge branch 'master' of github.com:moq/moq4 into netcore
kzu May 22, 2016
dfb0ba9
Add netstandard binaries to nuget package
kzu May 22, 2016
e746ac5
Merge pull request #1 from kzu/netcore
jeremymeng May 22, 2016
34bfc99
Switch back to Castle.Core official release.
jeremymeng May 23, 2016
c9abfda
Fix build erros for .NET Core test project.
jeremymeng May 23, 2016
c1e4682
Correct dependency versions.
jeremymeng May 23, 2016
a568752
Disable ILMerging for .NET Core as it is not supported.
jeremymeng May 23, 2016
265adfe
Remove the checked-in version of Castle.Core.
jeremymeng May 23, 2016
2fb1daf
Remove redundant build for the .NET Core project since it is already …
jeremymeng May 23, 2016
fa6d341
Use "$(Cconfiguration)" in stead of hard-coded "Release".
jeremymeng May 23, 2016
032585f
Remove FEATURE_LEGACY_REFLECTION_API.
jeremymeng May 23, 2016
898ad57
Remove more Silverlight code.
jeremymeng May 23, 2016
1d38a06
Enable FEATURE_SERIALIZATION for .NET 4.5.
jeremymeng May 23, 2016
1eb322d
Don't commit nuget binaries, we fetch them on build
kzu May 24, 2016
2a9b512
We'll make this the 4.6 release
kzu May 24, 2016
de2ed71
Merge branch 'master' of github.com:moq/moq4 into netcore
kzu May 24, 2016
40d1d1f
Let PRs publish to the CI project feed
kzu May 24, 2016
bd3a491
Remove ILMerge.
jeremymeng May 25, 2016
7d8e995
Work around Castle.Core packaging issue.
jeremymeng May 25, 2016
26653f2
Fix Castle.Core version for the wrap project.
jeremymeng May 25, 2016
b31620c
Remove more Silverlight code.
jeremymeng May 25, 2016
5647fe5
Add steps to run .NET Core test project.
jeremymeng May 25, 2016
77369d0
Merge pull request #2 from jeremymeng/dotnet_test
jeremymeng May 26, 2016
d027c59
Merge changes from upstream/master.
jeremymeng May 26, 2016
3de2e23
Correct version number.
jeremymeng May 26, 2016
7710609
Suppress CS0419 warnings same as Moq.csproj does.
jeremymeng May 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ out
build
bin
obj
lib
packages
*.nuget.targets
*.nuget.props
Expand Down
Binary file removed .nuget/NuGet.exe
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion GitInfo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.5.0
4.6.0-alpha
45 changes: 45 additions & 0 deletions Moq.NetCore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
49 changes: 38 additions & 11 deletions Moq.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion Moq.shfb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Moq.shfbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions Moq.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading