Skip to content

Commit

Permalink
Merge Moq.Tests.csproj and Moq.NetCore.Tests.csproj
Browse files Browse the repository at this point in the history
  • Loading branch information
stakx committed Jul 15, 2017
1 parent cbdeb25 commit 0193882
Show file tree
Hide file tree
Showing 20 changed files with 99 additions and 442 deletions.
50 changes: 0 additions & 50 deletions Moq.NetCore.sln

This file was deleted.

4 changes: 2 additions & 2 deletions Moq.VisualBasicTests/project.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"dependencies": {
"Castle.Core": "4.1.1",
"xunit": "2.1.0",
"xunit.runner.visualstudio": "2.1.0"
"xunit": "2.3.0-beta3-build3705",
"xunit.runner.visualstudio": "2.3.0-beta3-build3705"
},
"frameworks": {
"net45": {}
Expand Down
26 changes: 15 additions & 11 deletions Moq.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26206.0
VisualStudioVersion = 15.0.26430.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5A5B8C3-D43F-43C6-AEC7-6FA7C35B8BE9}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -13,12 +13,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
packages.config = packages.config
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq", "Source\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq", "Source\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Tests", "UnitTests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Tests", "UnitTests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Moq.VisualBasicTests", "Moq.VisualBasicTests\Moq.VisualBasicTests.vbproj", "{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary1", "UnitTests\Library\ClassLibrary1\ClassLibrary1.csproj", "{A417D76E-32C9-45B7-81C7-299032CE8E77}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary2", "UnitTests\Library\ClassLibrary2\ClassLibrary2.csproj", "{D1099DEF-1A3F-4F94-A871-449DAAB2D890}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -29,24 +33,24 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|x86.ActiveCfg = Debug|Any CPU
{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.Build.0 = Release|Any CPU
{1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|x86.ActiveCfg = Release|Any CPU
{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|x86.ActiveCfg = Debug|Any CPU
{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
{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Debug|x86.ActiveCfg = Debug|Any CPU
{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Debug|x86.Build.0 = Debug|Any CPU
{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Release|Any CPU.Build.0 = Release|Any CPU
{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.Release|x86.ActiveCfg = Release|Any CPU
{95F2E2B2-2E06-4AC7-A86F-9B1B6369D4AD}.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A417D76E-32C9-45B7-81C7-299032CE8E77}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1099DEF-1A3F-4F94-A871-449DAAB2D890}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 0 additions & 1 deletion Source/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#endif

[assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
[assembly: InternalsVisibleTo("Moq.NetCore.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]

[assembly: CLSCompliant(true)]
Expand Down
Binary file removed UnitTests/ClassLibrary1.Silverlight.dll
Binary file not shown.
Binary file removed UnitTests/ClassLibrary1.dll
Binary file not shown.
Binary file removed UnitTests/ClassLibrary2.Silverlight.dll
Binary file not shown.
Binary file removed UnitTests/ClassLibrary2.dll
Binary file not shown.
28 changes: 0 additions & 28 deletions UnitTests/Library/ClassLibrary1.sln

This file was deleted.

21 changes: 0 additions & 21 deletions UnitTests/Library/ClassLibrary1/ClassLibrary1.NetCore.csproj

This file was deleted.

72 changes: 17 additions & 55 deletions UnitTests/Library/ClassLibrary1/ClassLibrary1.csproj
Original file line number Diff line number Diff line change
@@ -1,61 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{AD73DEAC-E669-4070-BE05-099F9F313007}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ClassLibrary1</RootNamespace>
<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
<AssemblyName>ClassLibrary1</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<OutputPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Moq.Tests.csproj))\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Foo.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Foo.snk</AssemblyOriginatorKeyFile>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
<DefineConstants>$(DefineConstants);DESKTOP;FEATURE_CAS;FEATURE_CODEDOM;FEATURE_COM;FEATURE_SERIALIZATION</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Foo.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Foo.snk" />
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Linq.Queryable" Version="4.0.1" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
1 change: 0 additions & 1 deletion UnitTests/Library/ClassLibrary1/Foo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
[assembly: InternalsVisibleTo("Moq.NetCore.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]

namespace ClassLibrary1
Expand Down
1 change: 0 additions & 1 deletion UnitTests/Library/ClassLibrary2/Bar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Moq.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
[assembly: InternalsVisibleTo("Moq.NetCore.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009f7a95086500f8f66d892174803850fed9c22225c2ccfff21f39c8af8abfa5415b1664efd0d8e0a6f7f2513b1c11659bd84723dc7900c3d481b833a73a2bcf1ed94c16c4be64d54352c86956c89930444e9ac15124d3693e3f029818e8410f167399d6b995324b635e95353ba97bfab856abbaeb9b40c9b160070c6325e22ddc")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]

namespace ClassLibrary2
Expand Down
22 changes: 0 additions & 22 deletions UnitTests/Library/ClassLibrary2/ClassLibrary2.NetCore.csproj

This file was deleted.

Loading

0 comments on commit 0193882

Please sign in to comment.