Skip to content

Commit f048b28

Browse files
jbogardjbogard
committed
Merge branch 'develop'
2 parents 7b882fb + 432572f commit f048b28

File tree

467 files changed

+81741
-10173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

467 files changed

+81741
-10173
lines changed

‎.gitattributes‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
*.doc diff=astextplain
2-
*.DOC diff=astextplain
3-
*.docx diff=astextplain
4-
*.DOCX diff=astextplain
5-
*.dot diff=astextplain
6-
*.DOT diff=astextplain
7-
*.pdf diff=astextplain
8-
*.PDF diff=astextplain
9-
*.rtf diff=astextplain
10-
*.RTF diff=astextplain
11-
12-
*.jpg binary
13-
*.png binary
14-
*.gif binary
15-
16-
core.eol crlf
17-
18-
*.cs diff=csharp
19-
20-
*.csproj merge=union
21-
*.vbproj merge=union
22-
*.fsproj merge=union
23-
*.dbproj merge=union
24-
*.sln merge=union
1+
*.doc diff=astextplain
2+
*.DOC diff=astextplain
3+
*.docx diff=astextplain
4+
*.DOCX diff=astextplain
5+
*.dot diff=astextplain
6+
*.DOT diff=astextplain
7+
*.pdf diff=astextplain
8+
*.PDF diff=astextplain
9+
*.rtf diff=astextplain
10+
*.RTF diff=astextplain
11+
12+
*.jpg binary
13+
*.png binary
14+
*.gif binary
15+
16+
* text=auto
17+
*.sln text eol=crlf
18+
19+
*.cs diff=csharp
20+
21+
*.csproj merge=union
22+
*.vbproj merge=union
23+
*.fsproj merge=union
24+
*.dbproj merge=union
25+
*.sln merge=union

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ _ReSharper*
1010
*.resharper.user
1111
*.suo
1212
*.cache
13-
TestResult.xml
13+
TestResult.xml
14+
AppPackages/
15+
*.bak
16+
packages

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ AutoMapper is a simple little library built to solve a deceptively complex probl
77

88
How do I get started?
99
--------------------------------
10-
Check out the [getting started guide](/AutoMapper/AutoMapper/wiki/Getting-started). When you're done there, the [wiki](/AutoMapper/AutoMapper/wiki/Getting-started) goes in to the nitty-gritty details. Finally, check out the [dnrTV episode](http://www.dnrtv.com/default.aspx?showNum=155) for a full walkthrough. If you have questions, you can post them to the [Mailing List](http://groups.google.com/group/automapper-users).
10+
Check out the [getting started guide](https://github.com/AutoMapper/AutoMapper/wiki/Getting-started). When you're done there, the [wiki](https://github.com/AutoMapper/AutoMapper/wiki) goes in to the nitty-gritty details. Finally, check out the [dnrTV episode](http://www.dnrtv.com/default.aspx?showNum=155) for a full walkthrough. If you have questions, you can post them to the [Mailing List](http://groups.google.com/group/automapper-users).
1111

1212
Where can I get it?
1313
--------------------------------
1414
First, [install NuGet](http://docs.nuget.org/docs/start-here/installing-nuget). Then, install AutoMapper from the package manager console:
1515

1616
PM> Install-Package AutoMapper
1717

18-
AutoMapper is Copyright © 2008-2012 [Jimmy Bogard](http://jimmybogard.lostechies.com) and other contributors under the [MIT license](LICENSE.txt).
18+
AutoMapper is Copyright © 2008-2012 [Jimmy Bogard](http://jimmybogard.lostechies.com) and other contributors under the [MIT license](LICENSE.txt).

‎default.ps1‎

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ properties {
99
$test_dir = "$build_dir\test"
1010
$result_dir = "$build_dir\results"
1111
$lib_dir = "$base_dir\lib"
12-
$pkgVersion = if ($env:build_number -ne $NULL) { $env:build_number } else { '2.2.1' }
13-
$version = $pkgVersion -replace "-.*$", ""
14-
$buildNumber = $version + '.0'
12+
$pkgVersion = if ($env:build_number -ne $NULL) { $env:build_number } else { '2.3.0' }
13+
$assemblyVersion = $pkgVersion -replace "\.[0-9]*-.*$", ".0.0"
14+
$assemblyFileVersion = $pkgVersion -replace "-[^0-9]*", "."
1515
$global:config = "debug"
1616
$framework_dir = Get-FrameworkDirectory
1717
}
@@ -32,22 +32,28 @@ task release {
3232
}
3333

3434
task compile -depends clean {
35-
exec { msbuild /t:Clean /t:Build /p:Configuration=Automated$config /v:q /p:NoWarn=1591 /nologo $source_dir\AutoMapper.sln }
35+
exec { msbuild /t:Clean /t:Build /p:Configuration=$config /v:q /p:NoWarn=1591 /nologo $source_dir\AutoMapper.sln }
3636
}
3737

3838
task commonAssemblyInfo {
3939
$commit = if ($env:BUILD_VCS_NUMBER -ne $NULL) { $env:BUILD_VCS_NUMBER } else { git log -1 --pretty=format:%H }
40-
create-commonAssemblyInfo "$buildNumber" "$commit" "$source_dir\CommonAssemblyInfo.cs"
40+
create-commonAssemblyInfo "$commit" "$source_dir\CommonAssemblyInfo.cs"
4141
}
4242

4343
task test {
4444
create_directory "$build_dir\results"
45-
exec { & $tools_dir\nunit\nunit-console-x86.exe $build_dir/$config/UnitTests/AutoMapper.UnitTests.dll /nologo /nodots /xml=$result_dir\AutoMapper.xml }
45+
exec { & $lib_dir\xunit.net\xunit.console.clr4.x86.exe $source_dir/UnitTests/bin/NET4/$config/AutoMapper.UnitTests.Net4.dll /xml $result_dir\AutoMapper.UnitTests.Net4.xml }
46+
exec { & $tools_dir\statlight\statlight.exe -x $source_dir/UnitTests/bin/SL4/$config/AutoMapper.UnitTests.xap -d $source_dir/UnitTests/bin/SL4/$config/AutoMapper.UnitTests.SL4.dll --ReportOutputFile=$result_dir\AutoMapper.UnitTests.SL4.xml --ReportOutputFileType=NUnit }
47+
exec { & $lib_dir\xunit.net\xunit.console.clr4.x86.exe $source_dir/UnitTests/bin/WinRT/$config/AutoMapper.UnitTests.WinRT.dll /xml $result_dir\AutoMapper.UnitTests.WinRT.xml }
48+
exec { & $lib_dir\xunit.net\xunit.console.clr4.x86.exe $source_dir/UnitTests/bin/WP8/$config/AutoMapper.UnitTests.WP8.dll /xml $result_dir\AutoMapper.UnitTests.WP8.xml }
4649
}
4750

4851
task dist {
4952
create_directory $dist_dir
50-
copy_files "$build_dir\$config\AutoMapper" "$dist_dir\net40-client"
53+
copy_files "$source_dir\AutoMapper\bin\Net4\$config" "$dist_dir\net40"
54+
copy_files "$source_dir\AutoMapper\bin\sl4\$config" "$dist_dir\sl4"
55+
copy_files "$source_dir\AutoMapper\bin\wp75\$config" "$dist_dir\wp71"
56+
copy_files "$source_dir\AutoMapper\bin\WinRT\$config" "$dist_dir\windows8"
5157
create-nuspec "$pkgVersion" "AutoMapper.nuspec"
5258
}
5359

@@ -88,12 +94,7 @@ function global:copy_files($source, $destination, $exclude = @()) {
8894
Get-ChildItem $source -Recurse -Exclude $exclude | Copy-Item -Destination {Join-Path $destination $_.FullName.Substring($source.length)}
8995
}
9096

91-
function global:run_nunit ($test_assembly)
92-
{
93-
exec { & $tools_dir\nunit\nunit-console-x86.exe $test_dir$test_assembly /nologo /nodots /xml=$result_dir$test_assembly.xml }
94-
}
95-
96-
function global:create-commonAssemblyInfo($version, $commit, $filename)
97+
function global:create-commonAssemblyInfo($commit, $filename)
9798
{
9899
$date = Get-Date
99100
"using System;
@@ -110,9 +111,8 @@ using System.Runtime.InteropServices;
110111
// </auto-generated>
111112
//------------------------------------------------------------------------------
112113
113-
[assembly: ComVisibleAttribute(false)]
114-
[assembly: AssemblyVersionAttribute(""$version"")]
115-
[assembly: AssemblyFileVersionAttribute(""$version"")]
114+
[assembly: AssemblyVersionAttribute(""$assemblyVersion"")]
115+
[assembly: AssemblyFileVersionAttribute(""$assemblyFileVersion"")]
116116
[assembly: AssemblyCopyrightAttribute(""Copyright Jimmy Bogard 2008-" + $date.Year + """)]
117117
[assembly: AssemblyProductAttribute(""AutoMapper"")]
118118
[assembly: AssemblyTrademarkAttribute(""AutoMapper"")]
@@ -138,9 +138,29 @@ function global:create-nuspec($version, $fileName)
138138
<description>A convention-based object-object mapper. AutoMapper uses a fluent configuration API to define an object-object mapping strategy. AutoMapper uses a convention-based matching algorithm to match up source to destination values. Currently, AutoMapper is geared towards model projection scenarios to flatten complex object models to DTOs and other simple objects, whose design is better suited for serialization, communication, messaging, or simply an anti-corruption layer between the domain and application layer.</description>
139139
</metadata>
140140
<files>
141-
<file src=""$dist_dir\net40-client\AutoMapper.dll"" target=""lib\net40"" />
142-
<file src=""$dist_dir\net40-client\AutoMapper.pdb"" target=""lib\net40"" />
143-
<file src=""$dist_dir\net40-client\AutoMapper.xml"" target=""lib\net40"" />
141+
<file src=""$dist_dir\net40\AutoMapper.dll"" target=""lib\portable-windows8+net40+wp71+sl4"" />
142+
<file src=""$dist_dir\net40\AutoMapper.pdb"" target=""lib\portable-windows8+net40+wp71+sl4"" />
143+
<file src=""$dist_dir\net40\AutoMapper.xml"" target=""lib\portable-windows8+net40+wp71+sl4"" />
144+
<file src=""$dist_dir\net40\AutoMapper.dll"" target=""lib\net40"" />
145+
<file src=""$dist_dir\net40\AutoMapper.pdb"" target=""lib\net40"" />
146+
<file src=""$dist_dir\net40\AutoMapper.xml"" target=""lib\net40"" />
147+
<file src=""$dist_dir\net40\AutoMapper.Net4.dll"" target=""lib\net40"" />
148+
<file src=""$dist_dir\net40\AutoMapper.Net4.pdb"" target=""lib\net40"" />
149+
<file src=""$dist_dir\sl4\AutoMapper.dll"" target=""lib\sl4"" />
150+
<file src=""$dist_dir\sl4\AutoMapper.pdb"" target=""lib\sl4"" />
151+
<file src=""$dist_dir\sl4\AutoMapper.xml"" target=""lib\sl4"" />
152+
<file src=""$dist_dir\sl4\AutoMapper.SL4.dll"" target=""lib\sl4"" />
153+
<file src=""$dist_dir\sl4\AutoMapper.SL4.pdb"" target=""lib\sl4"" />
154+
<file src=""$dist_dir\wp71\AutoMapper.dll"" target=""lib\wp71"" />
155+
<file src=""$dist_dir\wp71\AutoMapper.pdb"" target=""lib\wp71"" />
156+
<file src=""$dist_dir\wp71\AutoMapper.xml"" target=""lib\wp71"" />
157+
<file src=""$dist_dir\wp71\AutoMapper.WP75.dll"" target=""lib\wp71"" />
158+
<file src=""$dist_dir\wp71\AutoMapper.WP75.pdb"" target=""lib\wp71"" />
159+
<file src=""$dist_dir\windows8\AutoMapper.dll"" target=""lib\windows8"" />
160+
<file src=""$dist_dir\windows8\AutoMapper.pdb"" target=""lib\windows8"" />
161+
<file src=""$dist_dir\windows8\AutoMapper.xml"" target=""lib\windows8"" />
162+
<file src=""$dist_dir\windows8\AutoMapper.WinRT.dll"" target=""lib\windows8"" />
163+
<file src=""$dist_dir\windows8\AutoMapper.WinRT.pdb"" target=""lib\windows8"" />
144164
<file src=""**\*.cs"" target=""src"" />
145165
</files>
146166
</package>" | out-file $build_dir\$fileName -encoding "ASCII"

‎lib/xunit.net/EULA.txt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
2+
3+
1. Definitions
4+
5+
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
6+
7+
A "contribution" is the original software, or any additions or changes to the software.
8+
9+
A "contributor" is any person that distributes its contribution under this license.
10+
11+
"Licensed patents" are a contributor's patent claims that read directly on its contribution.
12+
13+
2. Grant of Rights
14+
15+
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
16+
17+
(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
18+
19+
3. Conditions and Limitations
20+
21+
(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
22+
23+
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
24+
25+
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
26+
27+
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
28+
29+
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

‎lib/xunit.net/HTML.xslt‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
3+
<xsl:output method="html"/>
4+
<xsl:template match="/">
5+
<xsl:text disable-output-escaping="yes"><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">]]></xsl:text>
6+
<html>
7+
<head>
8+
<title>
9+
xUnit.net Test Results - <xsl:value-of select="@name"/>
10+
</title>
11+
<style type="text/css">
12+
body { font-family: Calibri, Verdana, Arial, sans-serif; background-color: White; color: Black; }
13+
h2,h3,h4,h5 { margin: 0; padding: 0; }
14+
h3 { font-weight: normal; }
15+
h5 { font-weight: normal; font-style: italic; margin-bottom: 0.75em; }
16+
pre { font-family: Consolas; font-size: 85%; margin: 0 0 0 1em; padding: 0; }
17+
.divided { border-top: solid 1px #f0f5fa; padding-top: 0.5em; }
18+
.row, .altrow { padding: 0.1em 0.3em; }
19+
.row { background-color: #f0f5fa; }
20+
.altrow { background-color: #e1ebf4; }
21+
.success, .failure, .skipped { font-family: Arial Unicode MS; font-weight: normal; float: left; width: 1em; display: block; }
22+
.success { color: #0c0; }
23+
.failure { color: #c00; }
24+
.skipped { color: #cc0; }
25+
.timing { float: right; }
26+
.indent { margin: 0.25em 0 0.5em 2em; }
27+
.clickable { cursor: pointer; }
28+
.testcount { font-size: 85%; }
29+
</style>
30+
<script language="javascript">
31+
function ToggleClass(id) {
32+
var elem = document.getElementById(id);
33+
if (elem.style.display == "none") {
34+
elem.style.display = "block";
35+
}
36+
else {
37+
elem.style.display = "none";
38+
}
39+
}
40+
</script>
41+
</head>
42+
<body>
43+
<xsl:apply-templates/>
44+
</body>
45+
</html>
46+
</xsl:template>
47+
48+
<xsl:template match="assemblies">
49+
<xsl:apply-templates/>
50+
</xsl:template>
51+
52+
<xsl:template match="assembly">
53+
<h3 class="divided"><b>Results for <xsl:value-of select="@name"/></b></h3>
54+
<div>
55+
Tests run: <a href="#all"><b><xsl:value-of select="@total"/></b></a> &#160;
56+
Failures: <a href="#failures"><b><xsl:value-of select="@failed"/></b></a>,
57+
Skipped: <a href="#skipped"><b><xsl:value-of select="@skipped"/></b></a>,
58+
Run time: <b><xsl:value-of select="@time"/>s</b>
59+
</div>
60+
<xsl:if test="class/test[@result='Fail']">
61+
<br />
62+
<h2><a name="failures"></a>Failed tests</h2>
63+
<xsl:apply-templates select="class/test[@result='Fail']"><xsl:sort select="@name"/></xsl:apply-templates>
64+
</xsl:if>
65+
<xsl:if test="class/failure">
66+
<br />
67+
<h2><a name="failures"></a>Failed fixtures</h2>
68+
<xsl:apply-templates select="class/failure"><xsl:sort select="../@name"/></xsl:apply-templates>
69+
</xsl:if>
70+
<xsl:if test="@skipped > 0">
71+
<br />
72+
<h2><a name="skipped"></a>Skipped tests</h2>
73+
<xsl:apply-templates select="class/test[@result='Skip']"><xsl:sort select="@name"/></xsl:apply-templates>
74+
</xsl:if>
75+
<br />
76+
<h2><a name="all"></a>All tests</h2>
77+
<h5>Click test class name to expand/collapse test details</h5>
78+
<xsl:apply-templates select="class"><xsl:sort select="@name"/></xsl:apply-templates>
79+
<br /><h5>Results generated <xsl:value-of select="@run-date"/> at <xsl:value-of select="@run-time"/></h5>
80+
</xsl:template>
81+
82+
<xsl:template match="test">
83+
<div>
84+
<xsl:attribute name="class"><xsl:if test="(position() mod 2 = 0)">alt</xsl:if>row</xsl:attribute>
85+
<xsl:if test="@result!='Skip'"><span class="timing"><xsl:value-of select="@time"/>s</span></xsl:if>
86+
<xsl:if test="@result='Skip'"><span class="timing">Skipped</span><span class="skipped">&#x2762;</span></xsl:if>
87+
<xsl:if test="@result='Fail'"><span class="failure">&#x2718;</span></xsl:if>
88+
<xsl:if test="@result='Pass'"><span class="success">&#x2714;</span></xsl:if>
89+
&#160;<xsl:value-of select="@name"/>
90+
<xsl:if test="child::node()/message"> : <xsl:value-of select="child::node()/message"/></xsl:if>
91+
<br clear="all" />
92+
<xsl:if test="failure/stack-trace">
93+
<pre><xsl:value-of select="failure/stack-trace"/></pre>
94+
</xsl:if>
95+
<xsl:if test="output">
96+
<h4>Output</h4>
97+
<pre><xsl:value-of select="output"/></pre>
98+
</xsl:if>
99+
</div>
100+
</xsl:template>
101+
102+
<xsl:template match="failure">
103+
<span class="failure">&#x2718;</span> <xsl:value-of select="../@name"/> : <xsl:value-of select="message"/><br clear="all"/>
104+
Stack Trace:<br />
105+
<pre><xsl:value-of select="stack-trace"/></pre>
106+
</xsl:template>
107+
108+
<xsl:template match="class">
109+
<h3>
110+
<span class="timing"><xsl:value-of select="@time"/>s</span>
111+
<span class="clickable">
112+
<xsl:attribute name="onclick">ToggleClass('class<xsl:value-of select="position()"/>')</xsl:attribute>
113+
<xsl:attribute name="ondblclick">ToggleClass('class<xsl:value-of select="position()"/>')</xsl:attribute>
114+
<xsl:if test="@failed > 0"><span class="failure">&#x2718;</span></xsl:if>
115+
<xsl:if test="@failed = 0"><span class="success">&#x2714;</span></xsl:if>
116+
&#160;<xsl:value-of select="@name"/>
117+
&#160;<span class="testcount">(<xsl:value-of select="@total"/>&#160;test<xsl:if test="@total > 1">s</xsl:if>)</span>
118+
</span>
119+
<br clear="all" />
120+
</h3>
121+
<div class="indent">
122+
<xsl:if test="@failed = 0"><xsl:attribute name="style">display: none;</xsl:attribute></xsl:if>
123+
<xsl:attribute name="id">class<xsl:value-of select="position()"/></xsl:attribute>
124+
<xsl:apply-templates select="test"><xsl:sort select="@name"/></xsl:apply-templates>
125+
</div>
126+
</xsl:template>
127+
128+
</xsl:stylesheet>

0 commit comments

Comments
 (0)