Merge branch 'master' of github.com:moq/moq4 into netcore

# Conflicts: # .gitignore # .nuget/NuGet.exe # Moq.nuspec # Source.Silverlight/Moq.Silverlight.csproj # Source/Moq.csproj # Source/Properties/AssemblyInfo.cs # Source/packages.config # UnitTests.Silverlight/Moq.Silverlight.Tests.csproj # UnitTests.Silverlight/packages.config # UnitTests/AsInterfaceFixture.cs # UnitTests/Moq.Tests.csproj # UnitTests/Regressions/IssueReportsFixture.cs # UnitTests/packages.config # build.cmd # build.proj
devlooped · May 22, 2016 · 7439a8b · 7439a8b
2 parents cf47ae8 + 5ee6d52
commit 7439a8b
Show file tree

Hide file tree

Showing 123 changed files with 622 additions and 8,382 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,45 +1,15 @@
-#ignore thumbnails created by windows
-Thumbs.db
-#Ignore files build by Visual Studio
-*.obj
-*.exe
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*_i.c
-*_p.c
-*.ncb
+.nuget
+out
+build
+bin
+obj
+packages
+*.nuget.targets
+*.nuget.props
+*.lock.json
 *.suo
-*.tlb
-*.tlh
-*.bak
+*.user
 *.cache
-*.ilk
-*.log
-[Bb]in
-[Dd]ebug*/
-*.lib
-*.sbr
-*.scc
-*.tokens
-[Bb]in
-[Db]ebug*/
-obj/
-[Rr]elease*/
-*resharper*
-_ReSharper*/
-[Tt]est[Rr]esult*
-[bB]uild/
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-*.pidb
-*.userprefs
-*.swp
-*.DotSettings
-
-/packages
-*.lock.json
-*.vs
-*.nuget.targets
+.vs
+.*
+log.txt
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/Before.Moq.sln.targets b/Before.Moq.sln.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+
+	<Import Project="NuGet.Restore.targets" />
+
+</Project>
diff --git a/GitInfo.txt b/GitInfo.txt
@@ -0,0 +1 @@
+4.5.0-alpha
diff --git a/Lib/Castle/ASL - Apache Software Foundation License.txt b/Lib/Castle/ASL - Apache Software Foundation License.txt
diff --git a/Lib/Castle/bin-NET35/Castle.Core.dll b/Lib/Castle/bin-NET35/Castle.Core.dll
diff --git a/Lib/Castle/bin-NET40/Castle.Core.dll b/Lib/Castle/bin-NET40/Castle.Core.dll
diff --git a/Lib/Castle/bin-SL3/Castle.Core.dll b/Lib/Castle/bin-SL3/Castle.Core.dll
diff --git a/Lib/Castle/bin-SL4/Castle.Core.dll b/Lib/Castle/bin-SL4/Castle.Core.dll
diff --git a/Lib/Castle/sl-30/Castle.Core.dll b/Lib/Castle/sl-30/Castle.Core.dll
diff --git a/Lib/Castle/sl-30/Castle.DynamicProxy2.dll b/Lib/Castle/sl-30/Castle.DynamicProxy2.dll
diff --git a/Lib/Microsoft/Microsoft.Silverlight.Testing.dll b/Lib/Microsoft/Microsoft.Silverlight.Testing.dll
diff --git a/Lib/Microsoft/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll b/Lib/Microsoft/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll
diff --git a/Lib/Microsoft/Readme.txt b/Lib/Microsoft/Readme.txt