diff --git a/.gitignore b/.gitignore index 40a8499c..1d48da87 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .nuget .vs +.idea out bin obj diff --git a/NuGet.Config b/NuGet.Config index e5223c16..5f995b42 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,6 +3,8 @@ + + - + \ No newline at end of file diff --git a/README.md b/README.md index af7326ca..8622a043 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # moq + The most popular and friendly mocking framework for .NET [![Build status](https://ci.appveyor.com/api/projects/status/cm308wecf8ekyv33/branch/master?svg=true)](https://ci.appveyor.com/project/MobileEssentials/moq/branch/master) diff --git a/build.proj b/build.proj index f55c3f1f..a37769df 100644 --- a/build.proj +++ b/build.proj @@ -76,7 +76,12 @@ - + + + + + + diff --git a/src/Moq.sln b/src/Moq.sln index 85c53d0a..7a07b983 100644 --- a/src/Moq.sln +++ b/src/Moq.sln @@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets GitInfo.txt = GitInfo.txt + ..\NuGet.Config = ..\NuGet.Config + ..\README.md = ..\README.md EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stunts", "Stunts\Stunts\Stunts.csproj", "{AE46AE30-8002-4F2C-B368-44546B1D71D8}" @@ -53,6 +55,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1DBDFC27 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stunts.Tests", "Stunts\Stunts.Tests\Stunts.Tests.csproj", "{EDBDA217-CA42-4C82-826F-7D990185EC0F}" EndProject +Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "Stunts.Package", "Stunts\Stunts.Package\Stunts.Package.nuproj", "{91F9A526-E62C-491B-8774-88A61BDF1E1A}" +EndProject +Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "Moq.Package", "Moq\Moq.Package\Moq.Package.nuproj", "{DCF0DC23-917D-4615-969A-6FAA863034C3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -103,6 +109,14 @@ Global {EDBDA217-CA42-4C82-826F-7D990185EC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDBDA217-CA42-4C82-826F-7D990185EC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU {EDBDA217-CA42-4C82-826F-7D990185EC0F}.Release|Any CPU.Build.0 = Release|Any CPU + {91F9A526-E62C-491B-8774-88A61BDF1E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {91F9A526-E62C-491B-8774-88A61BDF1E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {91F9A526-E62C-491B-8774-88A61BDF1E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {91F9A526-E62C-491B-8774-88A61BDF1E1A}.Release|Any CPU.Build.0 = Release|Any CPU + {DCF0DC23-917D-4615-969A-6FAA863034C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCF0DC23-917D-4615-969A-6FAA863034C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCF0DC23-917D-4615-969A-6FAA863034C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DCF0DC23-917D-4615-969A-6FAA863034C3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -114,6 +128,7 @@ Global {0271D7C1-1A51-4148-944C-1DB4D1946B9C} = {EEC3EC48-ACB2-4D25-B592-F360F676BE45} {1DBDFC27-21EC-4EAC-B51B-84EDC8DBB9D5} = {2093478C-CEA6-4034-BCDE-EDC7A5DD4532} {EDBDA217-CA42-4C82-826F-7D990185EC0F} = {EEC3EC48-ACB2-4D25-B592-F360F676BE45} + {91F9A526-E62C-491B-8774-88A61BDF1E1A} = {EEC3EC48-ACB2-4D25-B592-F360F676BE45} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DA4CFD03-827D-482B-9304-83456D2A8115} diff --git a/src/Moq/Moq.Package/Moq.Package.nuproj b/src/Moq/Moq.Package/Moq.Package.nuproj new file mode 100644 index 00000000..b23fb330 --- /dev/null +++ b/src/Moq/Moq.Package/Moq.Package.nuproj @@ -0,0 +1,29 @@ + + + + + dcf0dc23-917d-4615-969a-6faa863034c3 + + + Moq + Moq + The most popular and friendly mocking framework for .NET + The most popular and friendly mocking framework for .NET + moq mocking mock + + + PackageReference + netstandard1.0 + net11;net20;net35;net40;net403;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcore;netcore45;netcore451;netcore50;win8;win81;win10;sl4;sl5;wp;wp7;wp75;wp8;wp81;wpa81;uap;uap10;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netcoreapp1.0;netcoreapp2.0;monoandroid;monotouch;monomac;xamarinios;xamarinmac;xamarinpsthree;xamarinpsfour;xamarinpsvita;xamarinwatchos;xamarintvos;xamarinxboxthreesixty;xamarinxboxone + + + + + + PrimaryOutputKind=Analyzers + + + + + + \ No newline at end of file diff --git a/src/Moq/Moq.Sdk/DefaultMock.cs b/src/Moq/Moq.Sdk/DefaultMock.cs index ebcc64de..90c81994 100644 --- a/src/Moq/Moq.Sdk/DefaultMock.cs +++ b/src/Moq/Moq.Sdk/DefaultMock.cs @@ -33,9 +33,9 @@ public DefaultMock(IStunt stunt) public IList Invocations { get; } = new List(); /// + [DebuggerBrowsable(DebuggerBrowsableState.Never)] public object Object => stunt; - //[DebuggerDisplay("", Name = "State", Type = nameof(MockState))] /// public MockState State { get; } = new MockState(); diff --git a/src/Moq/Moq.Sdk/Moq.Sdk.csproj b/src/Moq/Moq.Sdk/Moq.Sdk.csproj index 49487773..b88770e1 100644 --- a/src/Moq/Moq.Sdk/Moq.Sdk.csproj +++ b/src/Moq/Moq.Sdk/Moq.Sdk.csproj @@ -23,8 +23,4 @@ - - - - \ No newline at end of file diff --git a/src/Moq/Moq.Tests/Moq.Tests.csproj b/src/Moq/Moq.Tests/Moq.Tests.csproj index 18bf7c13..15590ac8 100644 --- a/src/Moq/Moq.Tests/Moq.Tests.csproj +++ b/src/Moq/Moq.Tests/Moq.Tests.csproj @@ -1,20 +1,16 @@  - net471 true true - false false - - @@ -22,22 +18,19 @@ - - - - - - - + + + + + + - - @@ -46,5 +39,4 @@ - \ No newline at end of file diff --git a/src/Moq/Moq.Tests/MoqTests.cs b/src/Moq/Moq.Tests/MoqTests.cs index e7fa0310..e31cd982 100644 --- a/src/Moq/Moq.Tests/MoqTests.cs +++ b/src/Moq/Moq.Tests/MoqTests.cs @@ -15,7 +15,7 @@ public class MoqTests public void CanRaiseEvents() { var calculator = Mock.Of().Named("calculator"); - + var raised = false; EventHandler handler = (sender, args) => raised = true; @@ -106,7 +106,6 @@ public void CanSetupMethodWithDifferentArgumentsViaReturns() calculator.Add(2, 3).Returns(5); calculator.Add(10, Any()).Returns(10); - calculator.Add(Any(i => i > 20), Any()).Returns(20); Assert.Equal(5, calculator.Add(2, 3)); diff --git a/src/Moq/Moq/Moq.csproj b/src/Moq/Moq/Moq.csproj index e8a1ffc0..bd5439ee 100644 --- a/src/Moq/Moq/Moq.csproj +++ b/src/Moq/Moq/Moq.csproj @@ -2,10 +2,11 @@ netstandard2.0 + Moq.Core + false - diff --git a/src/Samples/Moq.CSharp/Moq.CSharp.csproj b/src/Samples/Moq.CSharp/Moq.CSharp.csproj index fa482238..73bdafce 100644 --- a/src/Samples/Moq.CSharp/Moq.CSharp.csproj +++ b/src/Samples/Moq.CSharp/Moq.CSharp.csproj @@ -14,12 +14,12 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Samples/Moq.VisualBasic/Moq.VisualBasic.vbproj b/src/Samples/Moq.VisualBasic/Moq.VisualBasic.vbproj index 6664f226..d8725027 100644 --- a/src/Samples/Moq.VisualBasic/Moq.VisualBasic.vbproj +++ b/src/Samples/Moq.VisualBasic/Moq.VisualBasic.vbproj @@ -18,12 +18,12 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Samples/Stunts.CSharp/Stunts.CSharp.csproj b/src/Samples/Stunts.CSharp/Stunts.CSharp.csproj index 08dca9bc..fcef2436 100644 --- a/src/Samples/Stunts.CSharp/Stunts.CSharp.csproj +++ b/src/Samples/Stunts.CSharp/Stunts.CSharp.csproj @@ -12,10 +12,10 @@ - - - - + + + + \ No newline at end of file diff --git a/src/Samples/Stunts.VisualBasic/Stunts.VisualBasic.vbproj b/src/Samples/Stunts.VisualBasic/Stunts.VisualBasic.vbproj index 20f4093f..bcfaed13 100644 --- a/src/Samples/Stunts.VisualBasic/Stunts.VisualBasic.vbproj +++ b/src/Samples/Stunts.VisualBasic/Stunts.VisualBasic.vbproj @@ -13,10 +13,10 @@ - - - - + + + + \ No newline at end of file diff --git a/src/Stunts/Stunts.Analyzer/Stunts.Analyzer.csproj b/src/Stunts/Stunts.Analyzer/Stunts.Analyzer.csproj index 5d0b22e3..8139dbcd 100644 --- a/src/Stunts/Stunts.Analyzer/Stunts.Analyzer.csproj +++ b/src/Stunts/Stunts.Analyzer/Stunts.Analyzer.csproj @@ -4,9 +4,16 @@ netstandard2.0 Stunts true - Analyzers + Analyzers + + + + PrimaryOutputKind=$(PrimaryOutputKind) + + + diff --git a/src/Stunts/Stunts.Internal/Stunts.Internal.csproj b/src/Stunts/Stunts.Internal/Stunts.Internal.csproj index fbc5118b..0f826a3e 100644 --- a/src/Stunts/Stunts.Internal/Stunts.Internal.csproj +++ b/src/Stunts/Stunts.Internal/Stunts.Internal.csproj @@ -12,7 +12,7 @@ true $(MSBuildProjectDirectory)\RoslynInternalKey.Private.snk - Analyzers + Analyzers \ No newline at end of file diff --git a/src/Stunts/Stunts.Package/Readme.txt b/src/Stunts/Stunts.Package/Readme.txt deleted file mode 100644 index 3421219e..00000000 --- a/src/Stunts/Stunts.Package/Readme.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Stunts.Package Readme - -Building this project will create a .nupkg containing just this Readme file. - -It's always a good idea to provide a more useful package to your users, -alongside a nice descriptive Readme like this one that will open automatically -when they add your package to a project. - -Happy nugetizing! \ No newline at end of file diff --git a/src/Stunts/Stunts.Package/Stunts.Package.nuproj b/src/Stunts/Stunts.Package/Stunts.Package.nuproj index 21cc40d0..2a41919d 100644 --- a/src/Stunts/Stunts.Package/Stunts.Package.nuproj +++ b/src/Stunts/Stunts.Package/Stunts.Package.nuproj @@ -6,34 +6,20 @@ Stunts - 1.0.0 Stunts - kzu - kzu "Dynamic proxies" that can run everywhere, including mobile! Design-time generated classes whose behavior can be configured dynamically at run-time with arbitrary behaviors (a.k.a. "proxies"). - - - https://github.com/moq/moq/ - https://github.com/moq/moq/blob/master/LICENSE - Copyright © 2017 Moq Team netstandard proxy runtime dynamic PackageReference netstandard1.0 net11;net20;net35;net40;net403;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcore;netcore45;netcore451;netcore50;win8;win81;win10;sl4;sl5;wp;wp7;wp75;wp8;wp81;wpa81;uap;uap10;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netcoreapp1.0;netcoreapp2.0;monoandroid;monotouch;monomac;xamarinios;xamarinmac;xamarinpsthree;xamarinpsfour;xamarinpsvita;xamarinwatchos;xamarintvos;xamarinxboxthreesixty;xamarinxboxone - Debug - bin\$(Configuration)\ - - - - - + PrimaryOutputKind=Analyzers diff --git a/src/Stunts/Stunts.Sdk/Stunts.Sdk.csproj b/src/Stunts/Stunts.Sdk/Stunts.Sdk.csproj index 96a6f29a..518a59ea 100644 --- a/src/Stunts/Stunts.Sdk/Stunts.Sdk.csproj +++ b/src/Stunts/Stunts.Sdk/Stunts.Sdk.csproj @@ -5,8 +5,24 @@ Stunts true 7.1 + Lib + false + + Stunts.Sdk + 1.0.0 + Stunts.Sdk + kzu + kzu + Allows extending Stunts code analyzers and code fixes to generate custom "Dynamic proxies" that can run everywhere, including mobile! + $(Summary) + https://github.com/moq/moq/ + https://github.com/moq/moq/blob/master/LICENSE + Copyright © 2017 Moq Team + netstandard proxy runtime dynamic + + @@ -15,6 +31,13 @@ + + + + PrimaryOutputKind=$(PrimaryOutputKind) + + + @@ -35,4 +58,17 @@ + + + + + + + + + <_NonePackageFile Include="@(PackageFile)" Condition="'%(Kind)' == 'None' and '%(ReferenceSourceTarget)' == 'ProjectReference'" /> + + + + \ No newline at end of file diff --git a/src/Stunts/Stunts/Stunts.csproj b/src/Stunts/Stunts/Stunts.csproj index 8c78ebbc..65bfa715 100644 --- a/src/Stunts/Stunts/Stunts.csproj +++ b/src/Stunts/Stunts/Stunts.csproj @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/build/PackageReferences.targets b/src/build/PackageReferences.targets index 438d42df..fec91d07 100644 --- a/src/build/PackageReferences.targets +++ b/src/build/PackageReferences.targets @@ -1,7 +1,7 @@ - 15.* + 15.* 2.3.1 2.3.1 @@ -9,19 +9,19 @@ - + - + - - + + - - + + diff --git a/src/build/Packaging.props b/src/build/Packaging.props index 31f4c959..c8adf373 100644 --- a/src/build/Packaging.props +++ b/src/build/Packaging.props @@ -1,7 +1,26 @@ - - false + + kzu + kzu + + 1.0.0 + https://github.com/moq/moq/ + https://github.com/moq/moq/blob/master/LICENSE + Copyright © 2017 Daniel Cazzulino + + + + Debug + bin\$(Configuration)\ + false - + + false + + + + + + \ No newline at end of file diff --git a/src/build/Settings.props b/src/build/Settings.props index 65ab76b4..a0697329 100644 --- a/src/build/Settings.props +++ b/src/build/Settings.props @@ -1,6 +1,6 @@ - + @@ -11,14 +11,6 @@ true $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\')) - $(RootPath)bin\ - $(BaseOutputPath)$(Configuration)\ - $(BaseOutputPath)obj\ - $(BaseIntermediateOutputPath)$(MSBuildProjectName)\ - $(BaseIntermediateOutputPath)$(Configuration) - - - false true @@ -26,6 +18,8 @@ true + + true diff --git a/src/build/Settings.targets b/src/build/Settings.targets index 3c812e4d..090848cf 100644 --- a/src/build/Settings.targets +++ b/src/build/Settings.targets @@ -1,7 +1,7 @@ - + @@ -24,6 +24,24 @@ + + + + + + <_ToDelete Include="$(TEMP)\packages\$(PackageId)*.nupkg" /> + + + + + + + +