Skip to content

D
Dapper
Commit bd847fff authored by Marc Gravell's avatar Marc Gravell
Browse files
Options

Fix the refs to make CoreCLR build/test/etc

parent 5576a3ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1949 additions and 748 deletions
Dapper.DNX.Tests/Dapper.DNX.Tests.xproj
View file @ bd847fff
......@@ -4,21 +4,18 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b6eae030-3119-49c0-adb5-39e25ba60c4c</ProjectGuid>
<ProjectGuid>2ad7e470-9ac1-4f0a-a8c6-f19eea00593f</ProjectGuid>
<RootNamespace>Dapper.DNX.Tests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AssemblyName>Dapper.DNX.Tests</AssemblyName>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
\ No newline at end of file
Dapper.DNX.Tests/Properties/launchSettings.json deleted 100644 → 0
View file @ 5576a3ed
{
"profiles": {}
}
\ No newline at end of file
Dapper.DNX.Tests/project.json
View file @ bd847fff
{
"version": "1.0.0-*",
"description": "Dapper.DNX.Tests Console Application",
"authors": [ "marc gravell" ],
"tags": [ "" ],
"projectUrl": "",
"licenseUrl": "",
"compile": [
"../Tests/Tests.cs",
"../Tests/Program.cs",
"../Tests/Assert.cs",
"../DapperTests NET45/Tests.cs"
],
"dependencies": {
"Dapper": "1.43-*"
},
"commands": {
"Dapper.DNX.Tests": "Dapper.DNX.Tests"
},
"compile": [ "../Tests/Tests.cs", "../Tests/Program.cs", "../Tests/Assert.cs", "../DapperTests NET45/Tests.cs" ],
"compilationOptions": { "define": [ "NOEXTERNALS" ] },
"frameworks": {
"net45": {
"net45": {
"compilationOptions": { "define": [ "ASYNC" ], "warningsAsErrors": true },
"dependencies": {
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0",
"System.Xml": "4.0.0.0"
}
},
"net40": {
"dependencies": {
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0",
"System.Xml": "4.0.0.0"
......@@ -32,19 +39,16 @@
"System.Data": "4.0.0.0",
"System.Xml": "4.0.0.0"
}
},
"dnxcore50": {
"compilationOptions": { "define": [ "ASYNC" ], "warningsAsErrors": true },
"compilationOptions": { "define": [ "ASYNC" ] },
"dependencies": {
"System.Console": "4.0.0-beta-*",
"System.Reflection": "4.0.10",
"System.Linq": "4.0.0",
"System.Data.Common": "4.0.0",
"System.Data.SqlClient": "4.0.0-beta-*",
"System.Threading": "4.0.10",
"System.Threading.Thread": "4.0.0-beta-*",
"System.Reflection.TypeExtensions": "4.0.0"
"Microsoft.CSharp": "4.0.1-beta-23225",
"System.Collections": "4.0.11-beta-23225",
"System.Console": "4.0.0-beta-23225",
"System.Linq": "4.0.1-beta-23225",
"System.Threading": "4.0.11-beta-23225",
"System.Data.SqlClient": "4.0.0-beta-23225"
}
}
}
......
Dapper.DNX.Tests/project.lock.json
View file @ bd847fff
This diff is collapsed.
Dapper.DNX.sln
View file @ bd847fff
......@@ -5,8 +5,6 @@ VisualStudioVersion = 14.0.24606.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dapper", "Dapper\Dapper.xproj", "{088D8CC4-E71E-44B6-9B87-4060B043983D}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dapper.DNX.Tests", "Dapper.DNX.Tests\Dapper.DNX.Tests.xproj", "{B6EAE030-3119-49C0-ADB5-39E25BA60C4C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{03340C6E-4176-4C42-9C76-D5DFC79D1A22}"
ProjectSection(SolutionItems) = preProject
Tests\Assert.cs = Tests\Assert.cs
......@@ -17,6 +15,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{03340C6E
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{ECD7C7BC-176D-49E7-8DB2-FCF248702F87}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{48B0D0A6-D527-457F-AFDB-9D7DBF277E04}"
ProjectSection(SolutionItems) = preProject
Dapper.DNX.Tests\global.json = Dapper.DNX.Tests\global.json
Dapper\global.json = Dapper\global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dapper.DNX.Tests", "Dapper.DNX.Tests\Dapper.DNX.Tests.xproj", "{2AD7E470-9AC1-4F0A-A8C6-F19EEA00593F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -27,10 +33,10 @@ Global
{088D8CC4-E71E-44B6-9B87-4060B043983D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{088D8CC4-E71E-44B6-9B87-4060B043983D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{088D8CC4-E71E-44B6-9B87-4060B043983D}.Release|Any CPU.Build.0 = Release|Any CPU
{B6EAE030-3119-49C0-ADB5-39E25BA60C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6EAE030-3119-49C0-ADB5-39E25BA60C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6EAE030-3119-49C0-ADB5-39E25BA60C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6EAE030-3119-49C0-ADB5-39E25BA60C4C}.Release|Any CPU.Build.0 = Release|Any CPU
{2AD7E470-9AC1-4F0A-A8C6-F19EEA00593F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2AD7E470-9AC1-4F0A-A8C6-F19EEA00593F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2AD7E470-9AC1-4F0A-A8C6-F19EEA00593F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2AD7E470-9AC1-4F0A-A8C6-F19EEA00593F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
Dapper/global.json 0 → 100644
View file @ bd847fff
{
"sdk": {
"version": "1.0.0-beta7"
}
}
Dapper/project.json
View file @ bd847fff
{
"authors": [ "Sam Saffron", "Marc Gravell" ],
"owners": [ "Sam Saffron", "Marc Gravell" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"summary": "A high performance Micro-ORM",
"description": "A high performance Micro-ORM supporting Sql Server, MySQL, Sqlite, SqlCE, Firebird etc..",
"version": "1.43-beta1",
"compile": [ "../Dapper NET40/*.cs", "../Dapper NET45/*.cs" ],
"title": "Dapper dot net",
"tags": [ "orm", "sql", "micro-orm" ],
"frameworks": {
"net45": {
"compilationOptions": { "define": [ "ASYNC" ], "warningsAsErrors": true },
"dependencies": {
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0"
}
},
"net40": {
"compilationOptions": { "warningsAsErrors": true },
"dependencies": {
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0"
}
},
"dnx451": {
"compilationOptions": { "define": [ "ASYNC" ], "warningsAsErrors": true },
"dependencies": {
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0"
}
},
"dnxcore50": {
"compilationOptions": { "define": [ "ASYNC"], "warningsAsErrors": true },
"dependencies": {
"System.Text.RegularExpressions": "4.0.10",
"System.Collections": "4.0.10",
"System.Collections.Concurrent": "4.0.10",
"System.Linq": "4.0.0",
"System.Threading": "4.0.10",
"Microsoft.CSharp": "4.0.0",
"System.Reflection": "4.0.10",
"System.Reflection.Emit": "4.0.0",
"System.Reflection.Emit.ILGeneration": "4.0.0",
"System.Reflection.Emit.Lightweight": "4.0.0",
"System.Reflection.TypeExtensions": "4.0.0",
"System.Data.Common": "4.0.0",
"System.Runtime.Extensions": "4.0.10",
"System.Text.Encoding.CodePages": "4.0.0",
"System.Globalization": "4.0.10"
}
}
"authors": [ "Sam Saffron", "Marc Gravell" ],
"owners": [ "Sam Saffron", "Marc Gravell" ],
"projectUrl": "https://github.com/StackExchange/dapper-dot-net",
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
"summary": "A high performance Micro-ORM",
"description": "A high performance Micro-ORM supporting Sql Server, MySQL, Sqlite, SqlCE, Firebird etc..",
"version": "1.43-beta1",
"compile": [ "../Dapper NET40/*.cs", "../Dapper NET45/*.cs" ],
"title": "Dapper dot net",
"tags": [ "orm", "sql", "micro-orm" ],
"dependencies": { },
"frameworks": {
"net45": {
"compilationOptions": {
"define": [ "ASYNC" ],
"warningsAsErrors": true
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0"
}
},
"net40": {
"compilationOptions": { "warningsAsErrors": true },
"frameworkAssemblies": {
"System.Data": "4.0.0.0"
}
},
"dnx451": {
"compilationOptions": {
"define": [ "ASYNC" ],
"warningsAsErrors": true
},
"frameworkAssemblies": {
"System.Data": "4.0.0.0"
}
},
"dnxcore50": {
"compilationOptions": {
"define": [ "ASYNC" ],
"warningsAsErrors": true
},
"dependencies": {
"Microsoft.CSharp": "4.0.1-beta-*",
"System.Collections": "4.0.11-beta-*",
"System.Collections.Concurrent": "4.0.11-beta-*",
"System.Console": "4.0.0-beta-*",
"System.Linq": "4.0.1-beta-*",
"System.Threading": "4.0.11-beta-*",
"System.Data.SqlClient": "4.0.0-*",
"System.Reflection.Emit.ILGeneration": "4.0.1-beta-*",
"System.Reflection.Emit.Lightweight": "4.0.1-beta-*",
"System.Reflection.TypeExtensions": "4.0.1-beta-*",
"System.Text.RegularExpressions": "4.0.11-beta-*"
},
"dependencies2": {
"System.Text.RegularExpressions": "4.0.10",
"System.Collections": "4.0.10",
"System.Collections.Concurrent": "4.0.10",
"System.Linq": "4.0.0",
"System.Threading": "4.0.10",
"Microsoft.CSharp": "4.0.0",
"System.Reflection": "4.0.10",
"System.Reflection.Emit": "4.0.0",
"System.Reflection.Emit.ILGeneration": "4.0.0",
"System.Reflection.Emit.Lightweight": "4.0.0",
"System.Reflection.TypeExtensions": "4.0.0",
"System.Data.Common": "4.0.0",
"System.Runtime.Extensions": "4.0.10",
"System.Text.Encoding.CodePages": "4.0.0",
"System.Globalization": "4.0.10"
}
}
}
}
Dapper/project.lock.json
View file @ bd847fff
This diff is collapsed.
Tests/Program.cs
View file @ bd847fff
......@@ -70,9 +70,9 @@ static void RunPerformanceTests()
static void Main()
{
#if DNXCORE50
Console.WriteLine("CoreCLR");
Console.WriteLine("CoreCLR");
#else
Console.WriteLine(Environment.Version);
Console.WriteLine(".NET: " + Environment.Version);
#endif
#if DEBUG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment