From 0a26791e029ca159ab4d34cc8995e5a4539debbd Mon Sep 17 00:00:00 2001 From: stakx Date: Sat, 14 Oct 2017 10:00:11 +0200 Subject: [PATCH] Remove ClassLibrary1 and ClassLibrary2 projects --- .../ClassLibrary1/ClassLibrary1.csproj | 23 ----------- Moq.Tests/Library/ClassLibrary1/Foo.cs | 27 ------------- Moq.Tests/Library/ClassLibrary1/Foo.snk | Bin 596 -> 0 bytes .../ClassLibrary1/Properties/AssemblyInfo.cs | 36 ------------------ Moq.Tests/Library/ClassLibrary2/Bar.cs | 22 ----------- Moq.Tests/Library/ClassLibrary2/Bar.snk | Bin 596 -> 0 bytes .../ClassLibrary2/ClassLibrary2.csproj | 23 ----------- .../ClassLibrary2/Properties/AssemblyInfo.cs | 36 ------------------ Moq.Tests/MockFixture.cs | 6 --- Moq.Tests/Moq.Tests.csproj | 4 +- Moq.Tests/Regressions/IssueReportsFixture.cs | 23 ----------- Moq.sln | 22 +---------- 12 files changed, 2 insertions(+), 220 deletions(-) delete mode 100644 Moq.Tests/Library/ClassLibrary1/ClassLibrary1.csproj delete mode 100644 Moq.Tests/Library/ClassLibrary1/Foo.cs delete mode 100644 Moq.Tests/Library/ClassLibrary1/Foo.snk delete mode 100644 Moq.Tests/Library/ClassLibrary1/Properties/AssemblyInfo.cs delete mode 100644 Moq.Tests/Library/ClassLibrary2/Bar.cs delete mode 100644 Moq.Tests/Library/ClassLibrary2/Bar.snk delete mode 100644 Moq.Tests/Library/ClassLibrary2/ClassLibrary2.csproj delete mode 100644 Moq.Tests/Library/ClassLibrary2/Properties/AssemblyInfo.cs diff --git a/Moq.Tests/Library/ClassLibrary1/ClassLibrary1.csproj b/Moq.Tests/Library/ClassLibrary1/ClassLibrary1.csproj deleted file mode 100644 index 9455d094e..000000000 --- a/Moq.Tests/Library/ClassLibrary1/ClassLibrary1.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net45;netstandard1.3 - ClassLibrary1 - Foo.snk - true - true - false - - - - $(DefineConstants);DESKTOP;FEATURE_CAS;FEATURE_CODEDOM;FEATURE_COM;FEATURE_SERIALIZATION - - - $(DefineConstants);NETCORE - - - - - - - diff --git a/Moq.Tests/Library/ClassLibrary1/Foo.cs b/Moq.Tests/Library/ClassLibrary1/Foo.cs deleted file mode 100644 index 552e4a430..000000000 --- a/Moq.Tests/Library/ClassLibrary1/Foo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] - -namespace ClassLibrary1 -{ - internal interface IFooInternal : IFoo - { - DateTime When { get; set; } - } - - public interface IFoo - { - int Id { get; set; } - } - - public class Foo : IFoo - { - public int Id { get; set; } - public string Value { get; set; } - } -} diff --git a/Moq.Tests/Library/ClassLibrary1/Foo.snk b/Moq.Tests/Library/ClassLibrary1/Foo.snk deleted file mode 100644 index 083cc7c23a439f476e9adf3b6094f7b3ea188dd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098$xcWP>NF5eHv)QgcYCU@XXbFBc<8S6< z89ERWVyXgbX#&FkBo-tDEGa59*;KDzhQC=+aVY(jN&=XkYxr|r)0yR%J0*JNZ`%om zrW4Jv@?2aZY;*0*_QXHDiWzC2M%|~V-Mifv8W|Ki!TZWsPL|>zJ`On*^;?>jaT}q_ z^``B_eO|XuJ<#Ztltgl}jnVn@HPFr+tll=64RS-nK-oeo3MP|h^k{@wy=0}`Pn!|y zv0yN#*!%Z0_=nD$)#j^SI>;WHfTu4~jE4{O0TdqW1^_ud;Lj(s-^buCI7amZQQ_y( z{MCIFhp``obmo(Qn-e*yGJ633EwaaH#6I8q9|(=Xh<^86Yz4wS@CmfO22Rbf)W+Zs zYP%gVT1)fkCOkYqH04DR))nAr!}>}3I2O7C7xrn!Am(*7BTwP^*q+YcuZej}zu~K~ zO3Yz5LHRLF6y5b;l%a=S_tgYkcT*BAC-a-u_ruDz(;V%u8`2 zMQAnqFxpkFFlhK;=w3=Yua3v^Sq|TRw^yn;9^UTbb^csyzo$iIEYIrRK_0btN-Vf+ zN=Zaa(N&94VJRx1eNDWlJPC`<#_tN^}S?7~}gS>lZDZUXWQN$pF%)T^-)q i#Og=r-cJpeJdyCykBD^3p#q^d_+1k@_5rUxcHnygA0QI| diff --git a/Moq.Tests/Library/ClassLibrary1/Properties/AssemblyInfo.cs b/Moq.Tests/Library/ClassLibrary1/Properties/AssemblyInfo.cs deleted file mode 100644 index d65e7d133..000000000 --- a/Moq.Tests/Library/ClassLibrary1/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ClassLibrary1")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("ClassLibrary1")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("88163159-e1e3-4b4f-a7e5-96c91d3a680a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Moq.Tests/Library/ClassLibrary2/Bar.cs b/Moq.Tests/Library/ClassLibrary2/Bar.cs deleted file mode 100644 index 13f708c96..000000000 --- a/Moq.Tests/Library/ClassLibrary2/Bar.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using ClassLibrary1; -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] - -namespace ClassLibrary2 -{ - public interface IBar : IFoo - { - DateTimeOffset When { get; set; } - } - - public class Bar : Foo - { - public DateTimeOffset When { get; set; } - } -} diff --git a/Moq.Tests/Library/ClassLibrary2/Bar.snk b/Moq.Tests/Library/ClassLibrary2/Bar.snk deleted file mode 100644 index f0c9fe0d70195a4288e7fd8dc4fa5da5a4e6ed29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096qQ}KTvbv49ySCGO?P9Aa7+Xvm#sQB9& zGW6c(wT2&1kCIsbJ!42auV|WOYG!{q3Z8pkmzKa=8xmc`p<_uDA2rVJ&*S3BJIBKX zPztoM2S;%`N|ka6SIzN1#WieRMAOyHM2ZUMa*EYla9lxhhrxYe!2~sy<;Tjmb78R0 zk2x9df$pL8c})LeY>@8G%Ep|wQ_x(^RmowubhVh zL8~UOFwZ|MMgE`9KH+=|Zr;7UeEzkiz1DrH18v7f=M|Q>js4$V{tYHMdU^bHUE>+^ zwCJ72znJ{KFIv>3QGafSXv5LI=#SG2<3o36&;6pAAuqxS5Fu|TlfwR*3&=Y|_g;YKGLEXel3|C1(s0OV1oc8XxS>rAT&M!xY z!(q!{bqVJw6n4M%^;j{}+;bQSA?`3jJ3E@oPiPZiIO^2-Ji~gsl5wuDL-BRDms+)$ zw@0V_B6%=q)hZ|^jLGtrTih#_DPdNQc#mX{eZt@oXP%9)g?>@q#!I3oOqBNwx9etl iG#OoJZJF)~W3rXrl;hXb%}R#`h*IVM0!oR$p<0j - - - net45;netstandard1.3 - ClassLibrary2 - Bar.snk - true - true - false - - - - $(DefineConstants);DESKTOP;FEATURE_CAS;FEATURE_CODEDOM;FEATURE_COM;FEATURE_SERIALIZATION - - - $(DefineConstants);NETCORE - - - - - - - diff --git a/Moq.Tests/Library/ClassLibrary2/Properties/AssemblyInfo.cs b/Moq.Tests/Library/ClassLibrary2/Properties/AssemblyInfo.cs deleted file mode 100644 index 75972f752..000000000 --- a/Moq.Tests/Library/ClassLibrary2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ClassLibrary2")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("ClassLibrary2")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9ea84dc4-84f9-40b0-966d-5483a6916fca")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Moq.Tests/MockFixture.cs b/Moq.Tests/MockFixture.cs index 454e2a9e6..88655568a 100644 --- a/Moq.Tests/MockFixture.cs +++ b/Moq.Tests/MockFixture.cs @@ -897,12 +897,6 @@ public void DistinguishesSameMethodsWithDifferentGenericArguments() Assert.Equal(3, mock.Object.Generic()); } - [Fact] - public void CanCreateMockOfInternalInterface() - { - Assert.NotNull(new Mock().Object); - } - /// /// Mostly testing that these casts compile, but also that there are no runtime failures. /// diff --git a/Moq.Tests/Moq.Tests.csproj b/Moq.Tests/Moq.Tests.csproj index 9e0e5058b..6799c48a2 100644 --- a/Moq.Tests/Moq.Tests.csproj +++ b/Moq.Tests/Moq.Tests.csproj @@ -24,8 +24,6 @@ - - @@ -40,7 +38,7 @@ - + diff --git a/Moq.Tests/Regressions/IssueReportsFixture.cs b/Moq.Tests/Regressions/IssueReportsFixture.cs index 0377e607b..bdae1de10 100644 --- a/Moq.Tests/Regressions/IssueReportsFixture.cs +++ b/Moq.Tests/Regressions/IssueReportsFixture.cs @@ -3185,29 +3185,6 @@ private void SetupOperationStub(Func valueFunction) #endregion - #region #273 - - public class _273 - { - [Fact] - public void WhenMockingAnExternalInterface_ThenItWorks() - { - Assert.NotNull(new Mock().Object); - Assert.NotNull(Mock.Of()); - Assert.NotNull(new Mock().Object); - Assert.NotNull(new Mock().Object); - Assert.NotNull(Mock.Of()); - Assert.NotNull(new Mock().Object); - Assert.NotNull(new Mock().Object); - } - - public class Baz : ClassLibrary2.Bar - { - } - } - - #endregion - #region #325 public class _325 diff --git a/Moq.sln b/Moq.sln index 7c9e620d5..c1361f767 100644 --- a/Moq.sln +++ b/Moq.sln @@ -18,11 +18,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq", "Source\Moq.csproj", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Tests", "Moq.Tests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary1", "Moq.Tests\Library\ClassLibrary1\ClassLibrary1.csproj", "{A417D76E-32C9-45B7-81C7-299032CE8E77}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary2", "Moq.Tests\Library\ClassLibrary2\ClassLibrary2.csproj", "{D1099DEF-1A3F-4F94-A871-449DAAB2D890}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Moq.Tests.VisualBasic", "Moq.Tests.VisualBasic\Moq.Tests.VisualBasic.vbproj", "{840A8B2E-3D4B-4521-A61A-0291562CDC8B}" +Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Moq.Tests.VisualBasic", "Moq.Tests.VisualBasic\Moq.Tests.VisualBasic.vbproj", "{840A8B2E-3D4B-4521-A61A-0291562CDC8B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -48,22 +44,6 @@ Global {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|Any CPU.Build.0 = Release|Any CPU {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.ActiveCfg = Release|Any CPU {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.Build.0 = Release|Any CPU - {A417D76E-32C9-45B7-81C7-299032CE8E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A417D76E-32C9-45B7-81C7-299032CE8E77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A417D76E-32C9-45B7-81C7-299032CE8E77}.Debug|x86.ActiveCfg = Debug|Any CPU - {A417D76E-32C9-45B7-81C7-299032CE8E77}.Debug|x86.Build.0 = Debug|Any CPU - {A417D76E-32C9-45B7-81C7-299032CE8E77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A417D76E-32C9-45B7-81C7-299032CE8E77}.Release|Any CPU.Build.0 = Release|Any CPU - {A417D76E-32C9-45B7-81C7-299032CE8E77}.Release|x86.ActiveCfg = Release|Any CPU - {A417D76E-32C9-45B7-81C7-299032CE8E77}.Release|x86.Build.0 = Release|Any CPU - {D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Debug|x86.ActiveCfg = Debug|Any CPU - {D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Debug|x86.Build.0 = Debug|Any CPU - {D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Release|Any CPU.Build.0 = Release|Any CPU - {D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Release|x86.ActiveCfg = Release|Any CPU - {D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Release|x86.Build.0 = Release|Any CPU {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|Any CPU.Build.0 = Debug|Any CPU {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|x86.ActiveCfg = Debug|Any CPU