Skip to content

Commit c6383fb

Browse files
jbogardjbogard
committed
Merge branch 'develop'
2 parents e61813a + d3b5bb5 commit c6383fb

File tree

5 files changed

+207
-109
lines changed

5 files changed

+207
-109
lines changed

‎default.ps1‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ properties {
1010
$result_dir = "$build_dir\results"
1111
$lib_dir = "$base_dir\lib"
1212
$pkgVersion = if ($env:build_number -ne $NULL) { $env:build_number } else { '0.0.0' }
13-
$assemblyVersion = $pkgVersion -replace "\.[0-9]*-.*$", ".0.0"
13+
$assemblyVersion = $pkgVersion -replace "\-.*$", ".0"
1414
$assemblyFileVersion = $pkgVersion -replace "-[^0-9]*", "."
1515
$global:config = "debug"
1616
$framework_dir = Get-FrameworkDirectory
@@ -33,6 +33,7 @@ task release {
3333

3434
task compile -depends clean {
3535
exec { msbuild /t:Clean /t:Build /p:Configuration=$config /v:q /p:NoWarn=1591 /nologo $source_dir\AutoMapper.sln }
36+
exec { msbuild /t:Clean /t:Build /p:Configuration=ReleaseWin8 /v:q /p:NoWarn=1591 /nologo $source_dir\AutoMapper.sln }
3637
}
3738

3839
task commonAssemblyInfo {
@@ -52,6 +53,7 @@ task dist {
5253
create_directory $build_dir
5354
create_directory $dist_dir
5455
copy_files "$source_dir\AutoMapper\bin\Net4\$config" "$dist_dir\net40"
56+
copy_files "$source_dir\AutoMapper\bin\Profile136\$config" "$dist_dir\Profile136"
5557
copy_files "$source_dir\AutoMapper\bin\sl5\$config" "$dist_dir\sl5"
5658
copy_files "$source_dir\AutoMapper\bin\wp8\$config" "$dist_dir\wp8"
5759
copy_files "$source_dir\AutoMapper\bin\wpa81\$config" "$dist_dir\wpa81"
@@ -115,6 +117,7 @@ using System.Runtime.InteropServices;
115117
// </auto-generated>
116118
//------------------------------------------------------------------------------
117119
120+
[assembly: CLSCompliant(true)]
118121
[assembly: AssemblyVersionAttribute(""$assemblyVersion"")]
119122
[assembly: AssemblyFileVersionAttribute(""$assemblyFileVersion"")]
120123
[assembly: AssemblyCopyrightAttribute(""Copyright Jimmy Bogard 2008-" + $date.Year + """)]
@@ -142,26 +145,29 @@ function global:create-nuspec($version, $fileName)
142145
<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>
143146
</metadata>
144147
<files>
148+
<file src=""$dist_dir\Profile136\AutoMapper.dll"" target=""lib\portable-windows8+net40+wp8+sl5+MonoAndroid+MonoTouch"" />
149+
<file src=""$dist_dir\Profile136\AutoMapper.pdb"" target=""lib\portable-windows8+net40+wp8+sl5+MonoAndroid+MonoTouch"" />
150+
<file src=""$dist_dir\Profile136\AutoMapper.xml"" target=""lib\portable-windows8+net40+wp8+sl5+MonoAndroid+MonoTouch"" />
145151
<file src=""$dist_dir\net40\AutoMapper.dll"" target=""lib\portable-windows8+net40+wp8+wpa81+sl5+MonoAndroid+MonoTouch"" />
146152
<file src=""$dist_dir\net40\AutoMapper.pdb"" target=""lib\portable-windows8+net40+wp8+wpa81+sl5+MonoAndroid+MonoTouch"" />
147153
<file src=""$dist_dir\net40\AutoMapper.xml"" target=""lib\portable-windows8+net40+wp8+wpa81+sl5+MonoAndroid+MonoTouch"" />
148-
<file src=""$dist_dir\net40\AutoMapper.dll"" target=""lib\net40"" />
149-
<file src=""$dist_dir\net40\AutoMapper.pdb"" target=""lib\net40"" />
150-
<file src=""$dist_dir\net40\AutoMapper.xml"" target=""lib\net40"" />
154+
<file src=""$dist_dir\Profile136\AutoMapper.dll"" target=""lib\net40"" />
155+
<file src=""$dist_dir\Profile136\AutoMapper.pdb"" target=""lib\net40"" />
156+
<file src=""$dist_dir\Profile136\AutoMapper.xml"" target=""lib\net40"" />
151157
<file src=""$dist_dir\net40\AutoMapper.Net4.dll"" target=""lib\net40"" />
152158
<file src=""$dist_dir\net40\AutoMapper.Net4.pdb"" target=""lib\net40"" />
153159
<file src=""$source_dir\install.ps1"" target=""tools\net40"" />
154160
<file src=""$source_dir\uninstall.ps1"" target=""tools\net40"" />
155-
<file src=""$dist_dir\net40\AutoMapper.dll"" target=""lib\sl5"" />
156-
<file src=""$dist_dir\net40\AutoMapper.pdb"" target=""lib\sl5"" />
157-
<file src=""$dist_dir\net40\AutoMapper.xml"" target=""lib\sl5"" />
161+
<file src=""$dist_dir\Profile136\AutoMapper.dll"" target=""lib\sl5"" />
162+
<file src=""$dist_dir\Profile136\AutoMapper.pdb"" target=""lib\sl5"" />
163+
<file src=""$dist_dir\Profile136\AutoMapper.xml"" target=""lib\sl5"" />
158164
<file src=""$dist_dir\sl5\AutoMapper.SL5.dll"" target=""lib\sl5"" />
159165
<file src=""$dist_dir\sl5\AutoMapper.SL5.pdb"" target=""lib\sl5"" />
160166
<file src=""$source_dir\install.ps1"" target=""tools\sl5"" />
161167
<file src=""$source_dir\uninstall.ps1"" target=""tools\sl5"" />
162-
<file src=""$dist_dir\wp8\AutoMapper.dll"" target=""lib\wp8"" />
163-
<file src=""$dist_dir\wp8\AutoMapper.pdb"" target=""lib\wp8"" />
164-
<file src=""$dist_dir\wp8\AutoMapper.xml"" target=""lib\wp8"" />
168+
<file src=""$dist_dir\Profile136\AutoMapper.dll"" target=""lib\wp8"" />
169+
<file src=""$dist_dir\Profile136\AutoMapper.pdb"" target=""lib\wp8"" />
170+
<file src=""$dist_dir\Profile136\AutoMapper.xml"" target=""lib\wp8"" />
165171
<file src=""$dist_dir\wp8\AutoMapper.WP8.dll"" target=""lib\wp8"" />
166172
<file src=""$dist_dir\wp8\AutoMapper.WP8.pdb"" target=""lib\wp8"" />
167173
<file src=""$source_dir\install.ps1"" target=""tools\wp8"" />
@@ -173,23 +179,23 @@ function global:create-nuspec($version, $fileName)
173179
<file src=""$dist_dir\wpa81\AutoMapper.WPA81.pdb"" target=""lib\wpa81"" />
174180
<file src=""$source_dir\install.ps1"" target=""tools\wpa81"" />
175181
<file src=""$source_dir\uninstall.ps1"" target=""tools\wpa81"" />
176-
<file src=""$dist_dir\net40\AutoMapper.dll"" target=""lib\windows8"" />
177-
<file src=""$dist_dir\net40\AutoMapper.pdb"" target=""lib\windows8"" />
178-
<file src=""$dist_dir\net40\AutoMapper.xml"" target=""lib\windows8"" />
182+
<file src=""$dist_dir\Profile136\AutoMapper.dll"" target=""lib\windows8"" />
183+
<file src=""$dist_dir\Profile136\AutoMapper.pdb"" target=""lib\windows8"" />
184+
<file src=""$dist_dir\Profile136\AutoMapper.xml"" target=""lib\windows8"" />
179185
<file src=""$dist_dir\windows8\AutoMapper.WinRT.dll"" target=""lib\windows8"" />
180186
<file src=""$dist_dir\windows8\AutoMapper.WinRT.pdb"" target=""lib\windows8"" />
181187
<file src=""$source_dir\install.ps1"" target=""tools\windows8"" />
182188
<file src=""$source_dir\uninstall.ps1"" target=""tools\windows8"" />
183-
<file src=""$dist_dir\MonoAndroid\AutoMapper.dll"" target=""lib\MonoAndroid"" />
184-
<file src=""$dist_dir\MonoAndroid\AutoMapper.pdb"" target=""lib\MonoAndroid"" />
185-
<file src=""$dist_dir\MonoAndroid\AutoMapper.xml"" target=""lib\MonoAndroid"" />
189+
<file src=""$dist_dir\Profile136\AutoMapper.dll"" target=""lib\MonoAndroid"" />
190+
<file src=""$dist_dir\Profile136\AutoMapper.pdb"" target=""lib\MonoAndroid"" />
191+
<file src=""$dist_dir\Profile136\AutoMapper.xml"" target=""lib\MonoAndroid"" />
186192
<file src=""$dist_dir\MonoAndroid\AutoMapper.Android.dll"" target=""lib\MonoAndroid"" />
187193
<file src=""$dist_dir\MonoAndroid\AutoMapper.Android.pdb"" target=""lib\MonoAndroid"" />
188194
<file src=""$source_dir\install.ps1"" target=""tools\MonoAndroid"" />
189195
<file src=""$source_dir\uninstall.ps1"" target=""tools\MonoAndroid"" />
190-
<file src=""$dist_dir\MonoTouch\AutoMapper.dll"" target=""lib\MonoTouch"" />
191-
<file src=""$dist_dir\MonoTouch\AutoMapper.pdb"" target=""lib\MonoTouch"" />
192-
<file src=""$dist_dir\MonoTouch\AutoMapper.xml"" target=""lib\MonoTouch"" />
196+
<file src=""$dist_dir\Profile136\AutoMapper.dll"" target=""lib\MonoTouch"" />
197+
<file src=""$dist_dir\Profile136\AutoMapper.pdb"" target=""lib\MonoTouch"" />
198+
<file src=""$dist_dir\Profile136\AutoMapper.xml"" target=""lib\MonoTouch"" />
193199
<file src=""$dist_dir\MonoTouch\AutoMapper.iOS.dll"" target=""lib\MonoTouch"" />
194200
<file src=""$dist_dir\MonoTouch\AutoMapper.iOS.pdb"" target=""lib\MonoTouch"" />
195201
<file src=""$source_dir\install.ps1"" target=""tools\MonoTouch"" />

0 commit comments

Comments
 (0)