Merge branch 'develop'

wonderfuer · Oct 22, 2015 · ab8e143 · ab8e143
2 parents e9517e2 + 3ab346b
commit ab8e143
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/default.ps1 b/default.ps1
@@ -26,6 +26,7 @@ task ci -depends clean, release, commonAssemblyInfo, local, dist
 task clean {
 	delete_directory "$build_dir"
 	delete_directory "$dist_dir"
+	delete_directory "$source_dir\artifacts"
 }
 
 task release {
@@ -60,17 +61,17 @@ task test-lite {
 task dist {
 	create_directory $build_dir
 	create_directory $dist_dir
-	copy_files "$source_dir\artifacts\bin\AutoMapper\$config\net45" "$dist_dir\net45"
-	copy_files "$source_dir\artifacts\bin\AutoMapper\$config\net40" "$dist_dir\net40"
-	copy_files "$source_dir\artifacts\bin\AutoMapper\$config\portable-net45+dnxcore50+win+wpa81+wp80+MonoAndroid10+Xamarin.iOS10+MonoTouch10" "$dist_dir\Portable"
+	copy_files "$source_dir\artifacts\bin\AutoMapper.CoreCLR\$config\net45" "$dist_dir\net45"
+	copy_files "$source_dir\artifacts\bin\AutoMapper.CoreCLR\$config\net40" "$dist_dir\net40"
+	copy_files "$source_dir\artifacts\bin\AutoMapper.CoreCLR\$config\portable-net45+dnxcore50+win+wpa81+wp80+MonoAndroid10+Xamarin.iOS10+MonoTouch10" "$dist_dir\Portable"
 	copy_files "$source_dir\AutoMapper.SL5\bin\$config" "$dist_dir\sl50"
-	copy_files "$source_dir\artifacts\bin\AutoMapper\$config\wp80" "$dist_dir\wp80"
-	copy_files "$source_dir\artifacts\bin\AutoMapper\$config\wpa81" "$dist_dir\wpa81"
-	copy_files "$source_dir\artifacts\bin\AutoMapper\$config\win" "$dist_dir\win"
+	copy_files "$source_dir\artifacts\bin\AutoMapper.CoreCLR\$config\wp80" "$dist_dir\wp80"
+	copy_files "$source_dir\artifacts\bin\AutoMapper.CoreCLR\$config\wpa81" "$dist_dir\wpa81"
+	copy_files "$source_dir\artifacts\bin\AutoMapper.CoreCLR\$config\win" "$dist_dir\win"
 	copy_files "$source_dir\AutoMapper.Android\bin\$config" "$dist_dir\MonoAndroid"
 	copy_files "$source_dir\AutoMapper.iOS\bin\$config" "$dist_dir\MonoTouch"
 	copy_files "$source_dir\AutoMapper.iOS10\bin\$config" "$dist_dir\Xamarin.iOS10"
-	copy_files "$source_dir\artifacts\bin\AutoMapper\$config\dotnet" "$dist_dir\dotnet"
+	copy_files "$source_dir\artifacts\bin\AutoMapper.CoreCLR\$config\dotnet" "$dist_dir\dotnet"
     create-nuspec "$pkgVersion" "AutoMapper.nuspec"
 	exec { & $base_dir\RefGen.exe ".NETPlatform,Version=v5.0" "dotnet" "$base_dir\AutoMapper.nuspec" "$source_dir\AutoMapper\AutoMapper.xproj" "$dist_dir\dotnet\AutoMapper.dll" }
 }