Introduce src/ and tests/ folders

devlooped · Jul 21, 2018 · 1f8aba4 · 1f8aba4
1 parent 3924ad2
commit 1f8aba4
Show file tree

Hide file tree

Showing 188 changed files with 24 additions and 24 deletions.
diff --git a/Moq.nuspec b/Moq.nuspec
@@ -30,11 +30,11 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="Source\bin\$configuration$\net45\Moq.dll" target="lib\net45" />
-		<file src="Source\bin\$configuration$\net45\Moq.pdb" target="lib\net45" />
-		<file src="Source\bin\$configuration$\net45\Moq.xml" target="lib\net45" />
-		<file src="Source\bin\$configuration$\netstandard1.3\Moq.dll" target="lib\netstandard1.3" />
-		<file src="Source\bin\$configuration$\netstandard1.3\Moq.pdb" target="lib\netstandard1.3" />
-		<file src="Source\bin\$configuration$\netstandard1.3\Moq.xml" target="lib\netstandard1.3" />
+		<file src="src\Moq\bin\$configuration$\net45\Moq.dll" target="lib\net45" />
+		<file src="src\Moq\bin\$configuration$\net45\Moq.pdb" target="lib\net45" />
+		<file src="src\Moq\bin\$configuration$\net45\Moq.xml" target="lib\net45" />
+		<file src="src\Moq\bin\$configuration$\netstandard1.3\Moq.dll" target="lib\netstandard1.3" />
+		<file src="src\Moq\bin\$configuration$\netstandard1.3\Moq.pdb" target="lib\netstandard1.3" />
+		<file src="src\Moq\bin\$configuration$\netstandard1.3\Moq.xml" target="lib\netstandard1.3" />
 	</files>
 </package>
diff --git a/Moq.sln b/Moq.sln
@@ -14,11 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq", "Source\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq", "src\Moq\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Tests", "Moq.Tests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Tests", "tests\Moq.Tests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}"
 EndProject
-Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Moq.Tests.VisualBasic", "Moq.Tests.VisualBasic\Moq.Tests.VisualBasic.vbproj", "{840A8B2E-3D4B-4521-A61A-0291562CDC8B}"
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Moq.Tests.VisualBasic", "tests\Moq.Tests.VisualBasic\Moq.Tests.VisualBasic.vbproj", "{840A8B2E-3D4B-4521-A61A-0291562CDC8B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/build.proj b/build.proj
@@ -15,7 +15,7 @@
 	<ItemGroup>
 		<Solution Include="Moq.sln"/>
 		<NuSpec Include="Moq.nuspec" />
-		<Source Include="Source\Moq.csproj" />
+		<Source Include="src\Moq\Moq.csproj" />
 	</ItemGroup>
 
 	<Target Name="Clean">
@@ -42,12 +42,12 @@
 		     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="Moq.Tests"
+		<Exec Command="dotnet xunit -nobuild -configuration $(Configuration) -noshadow -appveyor -html ..\..\$(Out)\test.html -xml ..\..\$(Out)\test.xml"
+		      WorkingDirectory="tests\Moq.Tests"
 			  ContinueOnError="false" />
 
-		<Exec Command="dotnet xunit -nobuild -configuration $(Configuration) -noshadow -appveyor -html ..\$(Out)\test-vb.html -xml ..\$(Out)\test-vb.xml"
-		      WorkingDirectory="Moq.Tests.VisualBasic"
+		<Exec Command="dotnet xunit -nobuild -configuration $(Configuration) -noshadow -appveyor -html ..\..\$(Out)\test-vb.html -xml ..\..\$(Out)\test-vb.xml"
+		      WorkingDirectory="tests\Moq.Tests.VisualBasic"
 			  ContinueOnError="false" />
 
 		<PropertyGroup>
@@ -74,8 +74,8 @@
 
 		<!-- Verify that created NuGet package is correctly source-linked to the GitHub repository -->
 		<!--
-		<Exec Command="dotnet sourcelink test ..\$(Out)\%(NuSpec.Filename).$(Version).nupkg"
-		      WorkingDirectory="Source"
+		<Exec Command="dotnet sourcelink test ..\..\$(Out)\%(NuSpec.Filename).$(Version).nupkg"
+		      WorkingDirectory="src\Moq"
 		      ContinueOnError="false" />
 		-->
 	</Target>

diff --git a/Source/AsInterface.cs → src/Moq/AsInterface.cs b/Source/AsInterface.cs → src/Moq/AsInterface.cs
diff --git a/Source/Capture.cs → src/Moq/Capture.cs b/Source/Capture.cs → src/Moq/Capture.cs
diff --git a/Source/CaptureMatch.cs → src/Moq/CaptureMatch.cs b/Source/CaptureMatch.cs → src/Moq/CaptureMatch.cs
diff --git a/Source/Condition.cs → src/Moq/Condition.cs b/Source/Condition.cs → src/Moq/Condition.cs
diff --git a/Source/ConditionalContext.cs → src/Moq/ConditionalContext.cs b/Source/ConditionalContext.cs → src/Moq/ConditionalContext.cs
diff --git a/Source/DefaultValue.cs → src/Moq/DefaultValue.cs b/Source/DefaultValue.cs → src/Moq/DefaultValue.cs
diff --git a/Source/DefaultValueProvider.cs → src/Moq/DefaultValueProvider.cs b/Source/DefaultValueProvider.cs → src/Moq/DefaultValueProvider.cs
diff --git a/Source/EmptyDefaultValueProvider.cs → src/Moq/EmptyDefaultValueProvider.cs b/Source/EmptyDefaultValueProvider.cs → src/Moq/EmptyDefaultValueProvider.cs
diff --git a/Source/Evaluator.cs → src/Moq/Evaluator.cs b/Source/Evaluator.cs → src/Moq/Evaluator.cs
diff --git a/Source/EventHandlerCollection.cs → src/Moq/EventHandlerCollection.cs b/Source/EventHandlerCollection.cs → src/Moq/EventHandlerCollection.cs
diff --git a/Source/ExpressionComparer.cs → src/Moq/ExpressionComparer.cs b/Source/ExpressionComparer.cs → src/Moq/ExpressionComparer.cs
diff --git a/Source/ExpressionExtensions.cs → src/Moq/ExpressionExtensions.cs b/Source/ExpressionExtensions.cs → src/Moq/ExpressionExtensions.cs
diff --git a/Source/ExpressionStringBuilder.cs → src/Moq/ExpressionStringBuilder.cs b/Source/ExpressionStringBuilder.cs → src/Moq/ExpressionStringBuilder.cs
diff --git a/Source/Extensions.cs → src/Moq/Extensions.cs b/Source/Extensions.cs → src/Moq/Extensions.cs
diff --git a/Source/FluentMockContext.cs → src/Moq/FluentMockContext.cs b/Source/FluentMockContext.cs → src/Moq/FluentMockContext.cs
diff --git a/Source/Guard.cs → src/Moq/Guard.cs b/Source/Guard.cs → src/Moq/Guard.cs
diff --git a/Source/IInvocation.cs → src/Moq/IInvocation.cs b/Source/IInvocation.cs → src/Moq/IInvocation.cs
diff --git a/Source/IInvocationList.cs → src/Moq/IInvocationList.cs b/Source/IInvocationList.cs → src/Moq/IInvocationList.cs
diff --git a/Source/IMatcher.cs → src/Moq/IMatcher.cs b/Source/IMatcher.cs → src/Moq/IMatcher.cs
diff --git a/Source/IMock.cs → src/Moq/IMock.cs b/Source/IMock.cs → src/Moq/IMock.cs
diff --git a/Source/IMocked.cs → src/Moq/IMocked.cs b/Source/IMocked.cs → src/Moq/IMocked.cs
diff --git a/Source/Includes/GenericTypeParameters.tt → src/Moq/Includes/GenericTypeParameters.tt b/Source/Includes/GenericTypeParameters.tt → src/Moq/Includes/GenericTypeParameters.tt
diff --git a/Source/Interception/IInterceptor.cs → src/Moq/Interception/IInterceptor.cs b/Source/Interception/IInterceptor.cs → src/Moq/Interception/IInterceptor.cs
diff --git a/Source/Interception/InterceptionAspect.cs → src/Moq/Interception/InterceptionAspect.cs b/Source/Interception/InterceptionAspect.cs → src/Moq/Interception/InterceptionAspect.cs
diff --git a/Source/Interception/InterceptionAspects.cs → src/Moq/Interception/InterceptionAspects.cs b/Source/Interception/InterceptionAspects.cs → src/Moq/Interception/InterceptionAspects.cs
diff --git a/Source/Interception/Mock.cs → src/Moq/Interception/Mock.cs b/Source/Interception/Mock.cs → src/Moq/Interception/Mock.cs
diff --git a/Source/Invocation.cs → src/Moq/Invocation.cs b/Source/Invocation.cs → src/Moq/Invocation.cs
diff --git a/Source/InvocationCollection.cs → src/Moq/InvocationCollection.cs b/Source/InvocationCollection.cs → src/Moq/InvocationCollection.cs
diff --git a/Source/It.cs → src/Moq/It.cs b/Source/It.cs → src/Moq/It.cs
diff --git a/Source/It.xdoc → src/Moq/It.xdoc b/Source/It.xdoc → src/Moq/It.xdoc
diff --git a/Source/Language/Flow/ICallbackResult.cs → src/Moq/Language/Flow/ICallbackResult.cs b/Source/Language/Flow/ICallbackResult.cs → src/Moq/Language/Flow/ICallbackResult.cs
diff --git a/Source/Language/Flow/IReturnsResult.cs → src/Moq/Language/Flow/IReturnsResult.cs b/Source/Language/Flow/IReturnsResult.cs → src/Moq/Language/Flow/IReturnsResult.cs
diff --git a/Source/Language/Flow/IReturnsThrows.cs → src/Moq/Language/Flow/IReturnsThrows.cs b/Source/Language/Flow/IReturnsThrows.cs → src/Moq/Language/Flow/IReturnsThrows.cs
diff --git a/Source/Language/Flow/ISetup.cs → src/Moq/Language/Flow/ISetup.cs b/Source/Language/Flow/ISetup.cs → src/Moq/Language/Flow/ISetup.cs
diff --git a/Source/Language/Flow/IThrowsResult.cs → src/Moq/Language/Flow/IThrowsResult.cs b/Source/Language/Flow/IThrowsResult.cs → src/Moq/Language/Flow/IThrowsResult.cs
diff --git a/Source/Language/Flow/SetupSequencePhrase.cs → src/Moq/Language/Flow/SetupSequencePhrase.cs b/Source/Language/Flow/SetupSequencePhrase.cs → src/Moq/Language/Flow/SetupSequencePhrase.cs
diff --git a/Source/Language/ICallback.Generated.cs → src/Moq/Language/ICallback.Generated.cs b/Source/Language/ICallback.Generated.cs → src/Moq/Language/ICallback.Generated.cs
diff --git a/Source/Language/ICallback.cs → src/Moq/Language/ICallback.cs b/Source/Language/ICallback.cs → src/Moq/Language/ICallback.cs
diff --git a/Source/Language/ICallback.tt → src/Moq/Language/ICallback.tt b/Source/Language/ICallback.tt → src/Moq/Language/ICallback.tt
diff --git a/Source/Language/ICallbackGetter.cs → src/Moq/Language/ICallbackGetter.cs b/Source/Language/ICallbackGetter.cs → src/Moq/Language/ICallbackGetter.cs
diff --git a/Source/Language/ICallbackSetter.cs → src/Moq/Language/ICallbackSetter.cs b/Source/Language/ICallbackSetter.cs → src/Moq/Language/ICallbackSetter.cs
diff --git a/Source/Language/IRaise.Generated.cs → src/Moq/Language/IRaise.Generated.cs b/Source/Language/IRaise.Generated.cs → src/Moq/Language/IRaise.Generated.cs
diff --git a/Source/Language/IRaise.cs → src/Moq/Language/IRaise.cs b/Source/Language/IRaise.cs → src/Moq/Language/IRaise.cs
diff --git a/Source/Language/IRaise.tt → src/Moq/Language/IRaise.tt b/Source/Language/IRaise.tt → src/Moq/Language/IRaise.tt
diff --git a/Source/Language/IReturns.Generated.cs → src/Moq/Language/IReturns.Generated.cs b/Source/Language/IReturns.Generated.cs → src/Moq/Language/IReturns.Generated.cs
diff --git a/Source/Language/IReturns.cs → src/Moq/Language/IReturns.cs b/Source/Language/IReturns.cs → src/Moq/Language/IReturns.cs
diff --git a/Source/Language/IReturns.tt → src/Moq/Language/IReturns.tt b/Source/Language/IReturns.tt → src/Moq/Language/IReturns.tt
diff --git a/Source/Language/IReturnsGetter.cs → src/Moq/Language/IReturnsGetter.cs b/Source/Language/IReturnsGetter.cs → src/Moq/Language/IReturnsGetter.cs
diff --git a/Source/Language/ISetupConditionResult.cs → src/Moq/Language/ISetupConditionResult.cs b/Source/Language/ISetupConditionResult.cs → src/Moq/Language/ISetupConditionResult.cs
diff --git a/Source/Language/ISetupSequentialAction.cs → src/Moq/Language/ISetupSequentialAction.cs b/Source/Language/ISetupSequentialAction.cs → src/Moq/Language/ISetupSequentialAction.cs
diff --git a/Source/Language/ISetupSequentialResult.cs → src/Moq/Language/ISetupSequentialResult.cs b/Source/Language/ISetupSequentialResult.cs → src/Moq/Language/ISetupSequentialResult.cs
diff --git a/Source/Language/IThrows.cs → src/Moq/Language/IThrows.cs b/Source/Language/IThrows.cs → src/Moq/Language/IThrows.cs
diff --git a/Source/Language/IVerifies.cs → src/Moq/Language/IVerifies.cs b/Source/Language/IVerifies.cs → src/Moq/Language/IVerifies.cs
diff --git a/Source/Linq/FluentMockVisitor.cs → src/Moq/Linq/FluentMockVisitor.cs b/Source/Linq/FluentMockVisitor.cs → src/Moq/Linq/FluentMockVisitor.cs
diff --git a/Source/Linq/Mock.cs → src/Moq/Linq/Mock.cs b/Source/Linq/Mock.cs → src/Moq/Linq/Mock.cs
diff --git a/Source/Linq/MockQuery.cs → src/Moq/Linq/MockQuery.cs b/Source/Linq/MockQuery.cs → src/Moq/Linq/MockQuery.cs
diff --git a/Source/Linq/MockRepository.cs → src/Moq/Linq/MockRepository.cs b/Source/Linq/MockRepository.cs → src/Moq/Linq/MockRepository.cs
diff --git a/Source/Linq/MockSetupsBuilder.cs → src/Moq/Linq/MockSetupsBuilder.cs b/Source/Linq/MockSetupsBuilder.cs → src/Moq/Linq/MockSetupsBuilder.cs
diff --git a/Source/Linq/Mocks.cs → src/Moq/Linq/Mocks.cs b/Source/Linq/Mocks.cs → src/Moq/Linq/Mocks.cs
diff --git a/...e/LookupOrFallbackDefaultValueProvider.cs → ...q/LookupOrFallbackDefaultValueProvider.cs b/...e/LookupOrFallbackDefaultValueProvider.cs → ...q/LookupOrFallbackDefaultValueProvider.cs
diff --git a/Source/Match.cs → src/Moq/Match.cs b/Source/Match.cs → src/Moq/Match.cs
diff --git a/Source/Match.xdoc → src/Moq/Match.xdoc b/Source/Match.xdoc → src/Moq/Match.xdoc
diff --git a/Source/MatchExpression.cs → src/Moq/MatchExpression.cs b/Source/MatchExpression.cs → src/Moq/MatchExpression.cs
diff --git a/Source/MatcherFactory.cs → src/Moq/MatcherFactory.cs b/Source/MatcherFactory.cs → src/Moq/MatcherFactory.cs
diff --git a/Source/Matchers/AnyMatcher.cs → src/Moq/Matchers/AnyMatcher.cs b/Source/Matchers/AnyMatcher.cs → src/Moq/Matchers/AnyMatcher.cs
diff --git a/Source/Matchers/ConstantMatcher.cs → src/Moq/Matchers/ConstantMatcher.cs b/Source/Matchers/ConstantMatcher.cs → src/Moq/Matchers/ConstantMatcher.cs
diff --git a/Source/Matchers/ExpressionMatcher.cs → src/Moq/Matchers/ExpressionMatcher.cs b/Source/Matchers/ExpressionMatcher.cs → src/Moq/Matchers/ExpressionMatcher.cs
diff --git a/Source/Matchers/LazyEvalMatcher.cs → src/Moq/Matchers/LazyEvalMatcher.cs b/Source/Matchers/LazyEvalMatcher.cs → src/Moq/Matchers/LazyEvalMatcher.cs
diff --git a/Source/Matchers/MatcherAttributeMatcher.cs → src/Moq/Matchers/MatcherAttributeMatcher.cs b/Source/Matchers/MatcherAttributeMatcher.cs → src/Moq/Matchers/MatcherAttributeMatcher.cs
diff --git a/Source/Matchers/ParamArrayMatcher.cs → src/Moq/Matchers/ParamArrayMatcher.cs b/Source/Matchers/ParamArrayMatcher.cs → src/Moq/Matchers/ParamArrayMatcher.cs
diff --git a/Source/Matchers/RefMatcher.cs → src/Moq/Matchers/RefMatcher.cs b/Source/Matchers/RefMatcher.cs → src/Moq/Matchers/RefMatcher.cs
diff --git a/Source/MethodCall.Generated.cs → src/Moq/MethodCall.Generated.cs b/Source/MethodCall.Generated.cs → src/Moq/MethodCall.Generated.cs
diff --git a/Source/MethodCall.cs → src/Moq/MethodCall.cs b/Source/MethodCall.cs → src/Moq/MethodCall.cs
diff --git a/Source/MethodCall.tt → src/Moq/MethodCall.tt b/Source/MethodCall.tt → src/Moq/MethodCall.tt
diff --git a/Source/MethodCallReturn.Generated.cs → src/Moq/MethodCallReturn.Generated.cs b/Source/MethodCallReturn.Generated.cs → src/Moq/MethodCallReturn.Generated.cs
diff --git a/Source/MethodCallReturn.cs → src/Moq/MethodCallReturn.cs b/Source/MethodCallReturn.cs → src/Moq/MethodCallReturn.cs
diff --git a/Source/MethodCallReturn.tt → src/Moq/MethodCallReturn.tt b/Source/MethodCallReturn.tt → src/Moq/MethodCallReturn.tt
diff --git a/Source/Mock.Generic.cs → src/Moq/Mock.Generic.cs b/Source/Mock.Generic.cs → src/Moq/Mock.Generic.cs
diff --git a/Source/Mock.Generic.xdoc → src/Moq/Mock.Generic.xdoc b/Source/Mock.Generic.xdoc → src/Moq/Mock.Generic.xdoc
diff --git a/Source/Mock.cs → src/Moq/Mock.cs b/Source/Mock.cs → src/Moq/Mock.cs
diff --git a/Source/Mock.xdoc → src/Moq/Mock.xdoc b/Source/Mock.xdoc → src/Moq/Mock.xdoc
diff --git a/Source/MockBehavior.cs → src/Moq/MockBehavior.cs b/Source/MockBehavior.cs → src/Moq/MockBehavior.cs
diff --git a/Source/MockDefaultValueProvider.cs → src/Moq/MockDefaultValueProvider.cs b/Source/MockDefaultValueProvider.cs → src/Moq/MockDefaultValueProvider.cs
diff --git a/Source/MockException.cs → src/Moq/MockException.cs b/Source/MockException.cs → src/Moq/MockException.cs
diff --git a/Source/MockExceptionReason.cs → src/Moq/MockExceptionReason.cs b/Source/MockExceptionReason.cs → src/Moq/MockExceptionReason.cs
diff --git a/Source/MockExtensions.cs → src/Moq/MockExtensions.cs b/Source/MockExtensions.cs → src/Moq/MockExtensions.cs
diff --git a/Source/MockRepository.cs → src/Moq/MockRepository.cs b/Source/MockRepository.cs → src/Moq/MockRepository.cs
diff --git a/Source/MockSequence.cs → src/Moq/MockSequence.cs b/Source/MockSequence.cs → src/Moq/MockSequence.cs
diff --git a/Source/MockWithWrappedMockObject.cs → src/Moq/MockWithWrappedMockObject.cs b/Source/MockWithWrappedMockObject.cs → src/Moq/MockWithWrappedMockObject.cs
diff --git a/Source/Moq.csproj → src/Moq/Moq.csproj b/Source/Moq.csproj → src/Moq/Moq.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
 		<AssemblyName>Moq</AssemblyName>
-		<AssemblyOriginatorKeyFile>../Moq.snk</AssemblyOriginatorKeyFile>
+		<AssemblyOriginatorKeyFile>..\..\Moq.snk</AssemblyOriginatorKeyFile>
 		<DebugSymbols>True</DebugSymbols>
 		<DebugType>full</DebugType>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> 

diff --git a/Source/Obsolete/IOccurrence.cs → src/Moq/Obsolete/IOccurrence.cs b/Source/Obsolete/IOccurrence.cs → src/Moq/Obsolete/IOccurrence.cs
diff --git a/Source/Obsolete/MatcherAttribute.cs → src/Moq/Obsolete/MatcherAttribute.cs b/Source/Obsolete/MatcherAttribute.cs → src/Moq/Obsolete/MatcherAttribute.cs
diff --git a/Source/Obsolete/Mock.Generic.Legacy.cs → src/Moq/Obsolete/Mock.Generic.Legacy.cs b/Source/Obsolete/Mock.Generic.Legacy.cs → src/Moq/Obsolete/Mock.Generic.Legacy.cs
diff --git a/Source/Obsolete/Mock.Legacy.cs → src/Moq/Obsolete/Mock.Legacy.cs b/Source/Obsolete/Mock.Legacy.cs → src/Moq/Obsolete/Mock.Legacy.cs
diff --git a/Source/Obsolete/MockExtensions.cs → src/Moq/Obsolete/MockExtensions.cs b/Source/Obsolete/MockExtensions.cs → src/Moq/Obsolete/MockExtensions.cs
diff --git a/Source/Obsolete/MockFactory.cs → src/Moq/Obsolete/MockFactory.cs b/Source/Obsolete/MockFactory.cs → src/Moq/Obsolete/MockFactory.cs
diff --git a/Source/Obsolete/ObsoleteMockExtensions.cs → src/Moq/Obsolete/ObsoleteMockExtensions.cs b/Source/Obsolete/ObsoleteMockExtensions.cs → src/Moq/Obsolete/ObsoleteMockExtensions.cs
diff --git a/Source/Obsolete/SequenceExtensions.cs → src/Moq/Obsolete/SequenceExtensions.cs b/Source/Obsolete/SequenceExtensions.cs → src/Moq/Obsolete/SequenceExtensions.cs
diff --git a/Source/PexProtector.cs → src/Moq/PexProtector.cs b/Source/PexProtector.cs → src/Moq/PexProtector.cs
diff --git a/Source/Properties/AssemblyInfo.cs → src/Moq/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs → src/Moq/Properties/AssemblyInfo.cs
diff --git a/Source/Properties/GlobalSuppressions.cs → src/Moq/Properties/GlobalSuppressions.cs b/Source/Properties/GlobalSuppressions.cs → src/Moq/Properties/GlobalSuppressions.cs
diff --git a/Source/Properties/Resources.Designer.cs → src/Moq/Properties/Resources.Designer.cs b/Source/Properties/Resources.Designer.cs → src/Moq/Properties/Resources.Designer.cs
diff --git a/Source/Properties/Resources.resx → src/Moq/Properties/Resources.resx b/Source/Properties/Resources.resx → src/Moq/Properties/Resources.resx
diff --git a/Source/PropertyGetterMethodCall.cs → src/Moq/PropertyGetterMethodCall.cs b/Source/PropertyGetterMethodCall.cs → src/Moq/PropertyGetterMethodCall.cs
diff --git a/Source/PropertySetterMethodCall.cs → src/Moq/PropertySetterMethodCall.cs b/Source/PropertySetterMethodCall.cs → src/Moq/PropertySetterMethodCall.cs
diff --git a/Source/Protected/IProtectedAsMock.cs → src/Moq/Protected/IProtectedAsMock.cs b/Source/Protected/IProtectedAsMock.cs → src/Moq/Protected/IProtectedAsMock.cs
diff --git a/Source/Protected/IProtectedMock.cs → src/Moq/Protected/IProtectedMock.cs b/Source/Protected/IProtectedMock.cs → src/Moq/Protected/IProtectedMock.cs
diff --git a/Source/Protected/ItExpr.cs → src/Moq/Protected/ItExpr.cs b/Source/Protected/ItExpr.cs → src/Moq/Protected/ItExpr.cs
diff --git a/Source/Protected/ProtectedAsMock.cs → src/Moq/Protected/ProtectedAsMock.cs b/Source/Protected/ProtectedAsMock.cs → src/Moq/Protected/ProtectedAsMock.cs
diff --git a/Source/Protected/ProtectedExtension.cs → src/Moq/Protected/ProtectedExtension.cs b/Source/Protected/ProtectedExtension.cs → src/Moq/Protected/ProtectedExtension.cs
diff --git a/Source/Protected/ProtectedMock.cs → src/Moq/Protected/ProtectedMock.cs b/Source/Protected/ProtectedMock.cs → src/Moq/Protected/ProtectedMock.cs
diff --git a/Source/ProxyFactories/CastleProxyFactory.cs → src/Moq/ProxyFactories/CastleProxyFactory.cs b/Source/ProxyFactories/CastleProxyFactory.cs → src/Moq/ProxyFactories/CastleProxyFactory.cs
diff --git a/Source/ProxyFactories/InterfaceProxy.cs → src/Moq/ProxyFactories/InterfaceProxy.cs b/Source/ProxyFactories/InterfaceProxy.cs → src/Moq/ProxyFactories/InterfaceProxy.cs
diff --git a/Source/ProxyFactories/ProxyFactory.cs → src/Moq/ProxyFactories/ProxyFactory.cs b/Source/ProxyFactories/ProxyFactory.cs → src/Moq/ProxyFactories/ProxyFactory.cs
diff --git a/Source/Range.cs → src/Moq/Range.cs b/Source/Range.cs → src/Moq/Range.cs
diff --git a/Source/ReturnsExtensions.Generated.cs → src/Moq/ReturnsExtensions.Generated.cs b/Source/ReturnsExtensions.Generated.cs → src/Moq/ReturnsExtensions.Generated.cs
diff --git a/Source/ReturnsExtensions.cs → src/Moq/ReturnsExtensions.cs b/Source/ReturnsExtensions.cs → src/Moq/ReturnsExtensions.cs
diff --git a/Source/ReturnsExtensions.tt → src/Moq/ReturnsExtensions.tt b/Source/ReturnsExtensions.tt → src/Moq/ReturnsExtensions.tt
diff --git a/Source/SequenceExtensions.cs → src/Moq/SequenceExtensions.cs b/Source/SequenceExtensions.cs → src/Moq/SequenceExtensions.cs
diff --git a/Source/SequenceMethodCall.cs → src/Moq/SequenceMethodCall.cs b/Source/SequenceMethodCall.cs → src/Moq/SequenceMethodCall.cs
diff --git a/Source/SetterMethodCall.cs → src/Moq/SetterMethodCall.cs b/Source/SetterMethodCall.cs → src/Moq/SetterMethodCall.cs
diff --git a/Source/SetupCollection.cs → src/Moq/SetupCollection.cs b/Source/SetupCollection.cs → src/Moq/SetupCollection.cs
diff --git a/Source/StringBuilderExtensions.cs → src/Moq/StringBuilderExtensions.cs b/Source/StringBuilderExtensions.cs → src/Moq/StringBuilderExtensions.cs
diff --git a/Source/Switches.cs → src/Moq/Switches.cs b/Source/Switches.cs → src/Moq/Switches.cs
diff --git a/Source/Times.cs → src/Moq/Times.cs b/Source/Times.cs → src/Moq/Times.cs
diff --git a/Source/Times.xdoc → src/Moq/Times.xdoc b/Source/Times.xdoc → src/Moq/Times.xdoc
diff --git a/Moq.Tests.VisualBasic/IssueReports.vb → tests/Moq.Tests.VisualBasic/IssueReports.vb b/Moq.Tests.VisualBasic/IssueReports.vb → tests/Moq.Tests.VisualBasic/IssueReports.vb
diff --git a/....VisualBasic/Moq.Tests.VisualBasic.vbproj → ....VisualBasic/Moq.Tests.VisualBasic.vbproj b/....VisualBasic/Moq.Tests.VisualBasic.vbproj → ....VisualBasic/Moq.Tests.VisualBasic.vbproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
-		<AssemblyOriginatorKeyFile>../Moq.snk</AssemblyOriginatorKeyFile>
+		<AssemblyOriginatorKeyFile>..\..\Moq.snk</AssemblyOriginatorKeyFile>
 		<DebugSymbols>True</DebugSymbols>
 		<DebugType>full</DebugType>
   </PropertyGroup>
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Source\Moq.csproj" />
+    <ProjectReference Include="..\..\src\Moq\Moq.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Moq.Tests/AsInterfaceFixture.cs → tests/Moq.Tests/AsInterfaceFixture.cs b/Moq.Tests/AsInterfaceFixture.cs → tests/Moq.Tests/AsInterfaceFixture.cs
diff --git a/Moq.Tests/CallbacksFixture.cs → tests/Moq.Tests/CallbacksFixture.cs b/Moq.Tests/CallbacksFixture.cs → tests/Moq.Tests/CallbacksFixture.cs
diff --git a/Moq.Tests/CaptureFixture.cs → tests/Moq.Tests/CaptureFixture.cs b/Moq.Tests/CaptureFixture.cs → tests/Moq.Tests/CaptureFixture.cs
diff --git a/Moq.Tests/CaptureMatchFixture.cs → tests/Moq.Tests/CaptureMatchFixture.cs b/Moq.Tests/CaptureMatchFixture.cs → tests/Moq.Tests/CaptureMatchFixture.cs
diff --git a/Moq.Tests/ConditionalSetupFixture.cs → tests/Moq.Tests/ConditionalSetupFixture.cs b/Moq.Tests/ConditionalSetupFixture.cs → tests/Moq.Tests/ConditionalSetupFixture.cs
diff --git a/...ests/CustomDefaultValueProviderFixture.cs → ...ests/CustomDefaultValueProviderFixture.cs b/...ests/CustomDefaultValueProviderFixture.cs → ...ests/CustomDefaultValueProviderFixture.cs
diff --git a/Moq.Tests/CustomMatcherFixture.cs → tests/Moq.Tests/CustomMatcherFixture.cs b/Moq.Tests/CustomMatcherFixture.cs → tests/Moq.Tests/CustomMatcherFixture.cs
diff --git a/Moq.Tests/DefaultValueProviderFixture.cs → .../Moq.Tests/DefaultValueProviderFixture.cs b/Moq.Tests/DefaultValueProviderFixture.cs → .../Moq.Tests/DefaultValueProviderFixture.cs
diff --git a/Moq.Tests/Demo.cs → tests/Moq.Tests/Demo.cs b/Moq.Tests/Demo.cs → tests/Moq.Tests/Demo.cs
diff --git a/...Tests/EmptyDefaultValueProviderFixture.cs → ...Tests/EmptyDefaultValueProviderFixture.cs b/...Tests/EmptyDefaultValueProviderFixture.cs → ...Tests/EmptyDefaultValueProviderFixture.cs
diff --git a/Moq.Tests/ExpressionExtensionsFixture.cs → .../Moq.Tests/ExpressionExtensionsFixture.cs b/Moq.Tests/ExpressionExtensionsFixture.cs → .../Moq.Tests/ExpressionExtensionsFixture.cs
diff --git a/Moq.Tests/ExtensibilityFixture.cs → tests/Moq.Tests/ExtensibilityFixture.cs b/Moq.Tests/ExtensibilityFixture.cs → tests/Moq.Tests/ExtensibilityFixture.cs
diff --git a/Moq.Tests/ExtensionsFixture.cs → tests/Moq.Tests/ExtensionsFixture.cs b/Moq.Tests/ExtensionsFixture.cs → tests/Moq.Tests/ExtensionsFixture.cs
diff --git a/...ests/GeneratedReturnsExtensionsFixture.cs → ...ests/GeneratedReturnsExtensionsFixture.cs b/...ests/GeneratedReturnsExtensionsFixture.cs → ...ests/GeneratedReturnsExtensionsFixture.cs
diff --git a/Moq.Tests/InvocationsFixture.cs → tests/Moq.Tests/InvocationsFixture.cs b/Moq.Tests/InvocationsFixture.cs → tests/Moq.Tests/InvocationsFixture.cs
diff --git a/Moq.Tests/Linq/MockRepositoryQuerying.cs → .../Moq.Tests/Linq/MockRepositoryQuerying.cs b/Moq.Tests/Linq/MockRepositoryQuerying.cs → .../Moq.Tests/Linq/MockRepositoryQuerying.cs
diff --git a/Moq.Tests/Linq/QueryableMocksFixture.cs → ...s/Moq.Tests/Linq/QueryableMocksFixture.cs b/Moq.Tests/Linq/QueryableMocksFixture.cs → ...s/Moq.Tests/Linq/QueryableMocksFixture.cs
diff --git a/Moq.Tests/Linq/SupportedQuerying.cs → tests/Moq.Tests/Linq/SupportedQuerying.cs b/Moq.Tests/Linq/SupportedQuerying.cs → tests/Moq.Tests/Linq/SupportedQuerying.cs
diff --git a/Moq.Tests/Linq/UnsupportedQuerying.cs → tests/Moq.Tests/Linq/UnsupportedQuerying.cs b/Moq.Tests/Linq/UnsupportedQuerying.cs → tests/Moq.Tests/Linq/UnsupportedQuerying.cs
diff --git a/...pOrFallbackDefaultValueProviderFixture.cs → ...pOrFallbackDefaultValueProviderFixture.cs b/...pOrFallbackDefaultValueProviderFixture.cs → ...pOrFallbackDefaultValueProviderFixture.cs
diff --git a/Moq.Tests/MatcherAttributeFixture.cs → tests/Moq.Tests/MatcherAttributeFixture.cs b/Moq.Tests/MatcherAttributeFixture.cs → tests/Moq.Tests/MatcherAttributeFixture.cs
diff --git a/Moq.Tests/Matchers/AnyMatcherFixture.cs → ...s/Moq.Tests/Matchers/AnyMatcherFixture.cs b/Moq.Tests/Matchers/AnyMatcherFixture.cs → ...s/Moq.Tests/Matchers/AnyMatcherFixture.cs
diff --git a/Moq.Tests/MatchersFixture.cs → tests/Moq.Tests/MatchersFixture.cs b/Moq.Tests/MatchersFixture.cs → tests/Moq.Tests/MatchersFixture.cs
diff --git a/Moq.Tests/MockBehaviorFixture.cs → tests/Moq.Tests/MockBehaviorFixture.cs b/Moq.Tests/MockBehaviorFixture.cs → tests/Moq.Tests/MockBehaviorFixture.cs
diff --git a/Moq.Tests/MockDefaultValueProviderFixture.cs → ....Tests/MockDefaultValueProviderFixture.cs b/Moq.Tests/MockDefaultValueProviderFixture.cs → ....Tests/MockDefaultValueProviderFixture.cs
diff --git a/Moq.Tests/MockFixture.cs → tests/Moq.Tests/MockFixture.cs b/Moq.Tests/MockFixture.cs → tests/Moq.Tests/MockFixture.cs
diff --git a/Moq.Tests/MockRepositoryFixture.cs → tests/Moq.Tests/MockRepositoryFixture.cs b/Moq.Tests/MockRepositoryFixture.cs → tests/Moq.Tests/MockRepositoryFixture.cs
diff --git a/Moq.Tests/MockSequenceFixture.cs → tests/Moq.Tests/MockSequenceFixture.cs b/Moq.Tests/MockSequenceFixture.cs → tests/Moq.Tests/MockSequenceFixture.cs
diff --git a/Moq.Tests/MockedDelegatesFixture.cs → tests/Moq.Tests/MockedDelegatesFixture.cs b/Moq.Tests/MockedDelegatesFixture.cs → tests/Moq.Tests/MockedDelegatesFixture.cs
diff --git a/Moq.Tests/MockedEventsFixture.cs → tests/Moq.Tests/MockedEventsFixture.cs b/Moq.Tests/MockedEventsFixture.cs → tests/Moq.Tests/MockedEventsFixture.cs
diff --git a/Moq.Tests/MockedFixture.cs → tests/Moq.Tests/MockedFixture.cs b/Moq.Tests/MockedFixture.cs → tests/Moq.Tests/MockedFixture.cs
diff --git a/Moq.Tests/Moq.Tests.csproj → tests/Moq.Tests/Moq.Tests.csproj b/Moq.Tests/Moq.Tests.csproj → tests/Moq.Tests/Moq.Tests.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
 		<AssemblyName>Moq.Tests</AssemblyName>
-		<AssemblyOriginatorKeyFile>../Moq.snk</AssemblyOriginatorKeyFile>
+		<AssemblyOriginatorKeyFile>..\..\Moq.snk</AssemblyOriginatorKeyFile>
 		<DebugSymbols>True</DebugSymbols>
 		<DebugType>full</DebugType>
 		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -26,7 +26,7 @@
 		<PackageReference Include="System.ValueTuple" Version="4.4.0" />
 		<PackageReference Include="xunit" Version="2.3.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-		<ProjectReference Include="..\Source\Moq.csproj" />
+		<ProjectReference Include="..\..\src\Moq\Moq.csproj" />
 		<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

diff --git a/Moq.Tests/OccurrenceFixture.cs → tests/Moq.Tests/OccurrenceFixture.cs b/Moq.Tests/OccurrenceFixture.cs → tests/Moq.Tests/OccurrenceFixture.cs
diff --git a/Moq.Tests/OutRefFixture.cs → tests/Moq.Tests/OutRefFixture.cs b/Moq.Tests/OutRefFixture.cs → tests/Moq.Tests/OutRefFixture.cs
diff --git a/Moq.Tests/Pex/Moq.UnitTests.Pex.csproj → tests/Moq.Tests/Pex/Moq.UnitTests.Pex.csproj b/Moq.Tests/Pex/Moq.UnitTests.Pex.csproj → tests/Moq.Tests/Pex/Moq.UnitTests.Pex.csproj
@@ -49,7 +49,7 @@
 		<Compile Include="ShouldMatchPredicateArgument.cs" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\..\Source\Moq.csproj">
+		<ProjectReference Include="..\..\..\src\Moq\Moq.csproj">
 			<Project>{1C91AC30-5977-4BE5-BA67-8EB186C03514}</Project>
 			<Name>Moq</Name>
 		</ProjectReference>

diff --git a/Moq.Tests/Pex/Moq.UnitTests.Pex.sln → tests/Moq.Tests/Pex/Moq.UnitTests.Pex.sln b/Moq.Tests/Pex/Moq.UnitTests.Pex.sln → tests/Moq.Tests/Pex/Moq.UnitTests.Pex.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.UnitTests.Pex", "Moq.UnitTests.Pex.csproj", "{662DD403-EFFD-4804-A29D-2E1F80D92835}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq", "..\..\Source\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq", "..\..\..\src\Moq\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Moq.Tests/Pex/ShouldExpectCallReturn.cs → ...s/Moq.Tests/Pex/ShouldExpectCallReturn.cs b/Moq.Tests/Pex/ShouldExpectCallReturn.cs → ...s/Moq.Tests/Pex/ShouldExpectCallReturn.cs
diff --git a/...Tests/Pex/ShouldExpectCallWithArgument.cs → ...Tests/Pex/ShouldExpectCallWithArgument.cs b/...Tests/Pex/ShouldExpectCallWithArgument.cs → ...Tests/Pex/ShouldExpectCallWithArgument.cs
diff --git a/...uldExpectCallWithReferenceLazyEvaluate.cs → ...uldExpectCallWithReferenceLazyEvaluate.cs b/...uldExpectCallWithReferenceLazyEvaluate.cs → ...uldExpectCallWithReferenceLazyEvaluate.cs
diff --git a/...ts/Pex/ShouldExpectReturnPropertyValue.cs → ...ts/Pex/ShouldExpectReturnPropertyValue.cs b/...ts/Pex/ShouldExpectReturnPropertyValue.cs → ...ts/Pex/ShouldExpectReturnPropertyValue.cs
diff --git a/...Tests/Pex/ShouldMatchPredicateArgument.cs → ...Tests/Pex/ShouldMatchPredicateArgument.cs b/...Tests/Pex/ShouldMatchPredicateArgument.cs → ...Tests/Pex/ShouldMatchPredicateArgument.cs
diff --git a/Moq.Tests/Properties/AssemblyInfo.cs → tests/Moq.Tests/Properties/AssemblyInfo.cs b/Moq.Tests/Properties/AssemblyInfo.cs → tests/Moq.Tests/Properties/AssemblyInfo.cs
diff --git a/Moq.Tests/PropertiesFixture.cs → tests/Moq.Tests/PropertiesFixture.cs b/Moq.Tests/PropertiesFixture.cs → tests/Moq.Tests/PropertiesFixture.cs
diff --git a/Moq.Tests/ProtectedAsMockFixture.cs → tests/Moq.Tests/ProtectedAsMockFixture.cs b/Moq.Tests/ProtectedAsMockFixture.cs → tests/Moq.Tests/ProtectedAsMockFixture.cs
diff --git a/Moq.Tests/ProtectedMockFixture.cs → tests/Moq.Tests/ProtectedMockFixture.cs b/Moq.Tests/ProtectedMockFixture.cs → tests/Moq.Tests/ProtectedMockFixture.cs
diff --git a/Moq.Tests/RecursiveMocksFixture.cs → tests/Moq.Tests/RecursiveMocksFixture.cs b/Moq.Tests/RecursiveMocksFixture.cs → tests/Moq.Tests/RecursiveMocksFixture.cs
diff --git a/Moq.Tests/Regressions/FluentMockIssues.cs → ...Moq.Tests/Regressions/FluentMockIssues.cs b/Moq.Tests/Regressions/FluentMockIssues.cs → ...Moq.Tests/Regressions/FluentMockIssues.cs
diff --git a/Moq.Tests/Regressions/IssueReportsFixture.cs → ....Tests/Regressions/IssueReportsFixture.cs b/Moq.Tests/Regressions/IssueReportsFixture.cs → ....Tests/Regressions/IssueReportsFixture.cs
diff --git a/Moq.Tests/Regressions/StreamFixture.cs → tests/Moq.Tests/Regressions/StreamFixture.cs b/Moq.Tests/Regressions/StreamFixture.cs → tests/Moq.Tests/Regressions/StreamFixture.cs
diff --git a/Moq.Tests/ReturnsExtensionsFixture.cs → tests/Moq.Tests/ReturnsExtensionsFixture.cs b/Moq.Tests/ReturnsExtensionsFixture.cs → tests/Moq.Tests/ReturnsExtensionsFixture.cs
diff --git a/Moq.Tests/ReturnsFixture.cs → tests/Moq.Tests/ReturnsFixture.cs b/Moq.Tests/ReturnsFixture.cs → tests/Moq.Tests/ReturnsFixture.cs
diff --git a/Moq.Tests/ReturnsValidationFixture.cs → tests/Moq.Tests/ReturnsValidationFixture.cs b/Moq.Tests/ReturnsValidationFixture.cs → tests/Moq.Tests/ReturnsValidationFixture.cs
diff --git a/Moq.Tests/SequenceExtensionsFixture.cs → tests/Moq.Tests/SequenceExtensionsFixture.cs b/Moq.Tests/SequenceExtensionsFixture.cs → tests/Moq.Tests/SequenceExtensionsFixture.cs
diff --git a/...ests/SequentialActionExtensionsFixture.cs → ...ests/SequentialActionExtensionsFixture.cs b/...ests/SequentialActionExtensionsFixture.cs → ...ests/SequentialActionExtensionsFixture.cs
diff --git a/Moq.Tests/StubExtensionsFixture.cs → tests/Moq.Tests/StubExtensionsFixture.cs b/Moq.Tests/StubExtensionsFixture.cs → tests/Moq.Tests/StubExtensionsFixture.cs
diff --git a/Moq.Tests/TimesFixture.cs → tests/Moq.Tests/TimesFixture.cs b/Moq.Tests/TimesFixture.cs → tests/Moq.Tests/TimesFixture.cs
diff --git a/Moq.Tests/VerifyFixture.cs → tests/Moq.Tests/VerifyFixture.cs b/Moq.Tests/VerifyFixture.cs → tests/Moq.Tests/VerifyFixture.cs