Skip to content

Commit 91f9fb6

Browse files
dotarjdotarj
authored
Merge pull request #5 from dotarj/refactor-new-project-structure
project.json -> .csproj
2 parents 546d912 + 4302b46 commit 91f9fb6

11 files changed

Lines changed: 101 additions & 178 deletions

File tree

‎Dapper.Mapper.sln‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,56 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26114.2
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{724F026A-E038-4B93-9681-0D04131FC77D}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BA786C7D-D613-40FC-9BCE-3FCD56E3F5A2}"
9-
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
11-
EndProjectSection
12-
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dapper.Mapper", "src\Dapper.Mapper\Dapper.Mapper.xproj", "{04126E1C-24F4-4B7C-BE1E-0D0169169A41}"
14-
EndProject
158
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A64FDBA4-A44D-42C6-97F7-CA7A58E9A5C6}"
169
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dapper.Mapper.Tests", "test\Dapper.Mapper.Tests\Dapper.Mapper.Tests.xproj", "{B981E5A4-7B91-4291-AFB8-FEC4CC236E41}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapper.Mapper", "src\Dapper.Mapper\Dapper.Mapper.csproj", "{2FC0A334-768C-4012-BEC7-33267BF7BC7D}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapper.Mapper.Tests", "test\Dapper.Mapper.Tests\Dapper.Mapper.Tests.csproj", "{1A0D905A-88DF-4417-97D3-3097AF7F7228}"
1813
EndProject
1914
Global
2015
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2116
Debug|Any CPU = Debug|Any CPU
2217
Release|Any CPU = Release|Any CPU
18+
Debug|x64 = Debug|x64
19+
Debug|x86 = Debug|x86
20+
Release|x64 = Release|x64
21+
Release|x86 = Release|x86
2322
EndGlobalSection
2423
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{04126E1C-24F4-4B7C-BE1E-0D0169169A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{04126E1C-24F4-4B7C-BE1E-0D0169169A41}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{04126E1C-24F4-4B7C-BE1E-0D0169169A41}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{04126E1C-24F4-4B7C-BE1E-0D0169169A41}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{B981E5A4-7B91-4291-AFB8-FEC4CC236E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{B981E5A4-7B91-4291-AFB8-FEC4CC236E41}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{B981E5A4-7B91-4291-AFB8-FEC4CC236E41}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{B981E5A4-7B91-4291-AFB8-FEC4CC236E41}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Debug|x64.ActiveCfg = Debug|x64
27+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Debug|x64.Build.0 = Debug|x64
28+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Debug|x86.ActiveCfg = Debug|x86
29+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Debug|x86.Build.0 = Debug|x86
30+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Release|x64.ActiveCfg = Release|x64
33+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Release|x64.Build.0 = Release|x64
34+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Release|x86.ActiveCfg = Release|x86
35+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D}.Release|x86.Build.0 = Release|x86
36+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Debug|x64.ActiveCfg = Debug|x64
39+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Debug|x64.Build.0 = Debug|x64
40+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Debug|x86.ActiveCfg = Debug|x86
41+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Debug|x86.Build.0 = Debug|x86
42+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Release|x64.ActiveCfg = Release|x64
45+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Release|x64.Build.0 = Release|x64
46+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Release|x86.ActiveCfg = Release|x86
47+
{1A0D905A-88DF-4417-97D3-3097AF7F7228}.Release|x86.Build.0 = Release|x86
3348
EndGlobalSection
3449
GlobalSection(SolutionProperties) = preSolution
3550
HideSolutionNode = FALSE
3651
EndGlobalSection
3752
GlobalSection(NestedProjects) = preSolution
38-
{04126E1C-24F4-4B7C-BE1E-0D0169169A41} = {724F026A-E038-4B93-9681-0D04131FC77D}
39-
{B981E5A4-7B91-4291-AFB8-FEC4CC236E41} = {A64FDBA4-A44D-42C6-97F7-CA7A58E9A5C6}
53+
{2FC0A334-768C-4012-BEC7-33267BF7BC7D} = {724F026A-E038-4B93-9681-0D04131FC77D}
54+
{1A0D905A-88DF-4417-97D3-3097AF7F7228} = {A64FDBA4-A44D-42C6-97F7-CA7A58E9A5C6}
4055
EndGlobalSection
4156
EndGlobal

‎global.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎nuget.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
6+
</packageSources>
7+
</configuration>

‎src/Dapper.Mapper/Dapper.Mapper.csproj‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Dapper.Mapper is an extension to Dapper multi mapping which figures out the relationships between the returned objects and automatically assigns them. Instead of explicitly writing this: 'var employee = connection.Query&lt;Employee, Department, Employee&gt;(sql, (employee, department) =&gt; employee.Department = department; return employee;);' Dapper.Mapper allows you to write this: 'var employee = connection.Query&lt;Employee, Department&gt;(sql);'.</Description>
5+
<AssemblyTitle>Dapper.Mapper</AssemblyTitle>
6+
<VersionPrefix>1.50.1</VersionPrefix>
7+
<Authors>Arjen Post</Authors>
8+
<TargetFrameworks>net40;net45;net451;netstandard1.3</TargetFrameworks>
9+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10+
<AssemblyName>Dapper.Mapper</AssemblyName>
11+
<PackageId>Dapper.Mapper</PackageId>
12+
<PackageTags>orm;sql;micro-orm;dapper</PackageTags>
13+
<PackageProjectUrl>https://github.com/dotarj/Dapper.Mapper</PackageProjectUrl>
14+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
15+
<RepositoryType>git</RepositoryType>
16+
<RepositoryUrl>https://github.com/dotarj/Dapper.Mapper</RepositoryUrl>
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Include="Dapper" Version="1.50.1" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net451' ">
24+
<Reference Include="Microsoft.CSharp" />
25+
</ItemGroup>
26+
27+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'netstandard1.3' ">
28+
<DefineConstants>$(DefineConstants);ASYNC</DefineConstants>
29+
</PropertyGroup>
30+
31+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
32+
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
33+
</PropertyGroup>
34+
35+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
36+
<PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
37+
</ItemGroup>
38+
39+
</Project>

‎src/Dapper.Mapper/Dapper.Mapper.xproj‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Dapper.Mapper/Properties/AssemblyInfo.cs‎

100644100755
Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
using System.Reflection;
21
using System.Runtime.CompilerServices;
3-
using System.Runtime.InteropServices;
42

5-
// General Information about an assembly is controlled through the following
6-
// set of attributes. Change these attribute values to modify the information
7-
// associated with an assembly.
8-
[assembly: AssemblyConfiguration("")]
9-
[assembly: AssemblyCompany("Arjen Post")]
10-
[assembly: AssemblyProduct("Dapper.Mapper")]
11-
[assembly: AssemblyTrademark("")]
12-
[assembly: AssemblyCopyright("Copyright © Arjen Post 2016")]
13-
[assembly: AssemblyTitle("Dapper.Mapper")]
14-
15-
// Setting ComVisible to false makes the types in this assembly not visible
16-
// to COM components. If you need to access a type in this assembly from
17-
// COM, set the ComVisible attribute to true on that type.
18-
[assembly: ComVisible(false)]
19-
20-
// The following GUID is for the ID of the typelib if this project is exposed to COM
21-
[assembly: Guid("04126e1c-24f4-4b7c-be1e-0d0169169a41")]
223
[assembly: InternalsVisibleTo("Dapper.Mapper.Tests")]

‎src/Dapper.Mapper/project.json‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎test/Dapper.Mapper.Tests/Dapper.Mapper.Tests.csproj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<ProjectReference Include="..\..\src\Dapper.Mapper\Dapper.Mapper.csproj" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
14+
<PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
16+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
17+
</ItemGroup>
18+
19+
</Project>

‎test/Dapper.Mapper.Tests/Dapper.Mapper.Tests.xproj‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎test/Dapper.Mapper.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)