diff --git a/src/ImageProcessor.Web/ImageProcessor.Web.csproj b/src/ImageProcessor.Web/ImageProcessor.Web.csproj
index b248d70323..23e8324469 100644
--- a/src/ImageProcessor.Web/ImageProcessor.Web.csproj
+++ b/src/ImageProcessor.Web/ImageProcessor.Web.csproj
@@ -38,33 +38,6 @@
AnyCPU
prompt
-
- true
- bin\x86\Debug\
- DEBUG;TRACE
- full
- x86
- prompt
- MinimumRecommendedRules.ruleset
-
-
- bin\x86\Release\
- TRACE
- true
- pdbonly
- x86
- prompt
- MinimumRecommendedRules.ruleset
-
-
- true
- bin\x86\All\
- DEBUG;TRACE
- full
- x86
- prompt
- MinimumRecommendedRules.ruleset
-
..\packages\Csharp-Sqlite.3.7.7.1\lib\net40\Community.CsharpSqlite.dll
@@ -133,7 +106,7 @@
xcopy /y "$(TargetPath)" "$(SolutionDir)\Test\Test\bin"
xcopy /y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)\Test\Test\bin"
-
+
+
\ No newline at end of file
diff --git a/src/ImageProcessor.Web/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/Properties/AssemblyInfo.cs
index b589725b26..6df2b8c836 100644
--- a/src/ImageProcessor.Web/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor.Web/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.2.1.0")]
-[assembly: AssemblyFileVersion("2.2.1.0")]
+[assembly: AssemblyVersion("2.2.2.0")]
+[assembly: AssemblyFileVersion("2.2.2.0")]
diff --git a/src/ImageProcessor.Web/packages.config b/src/ImageProcessor.Web/packages.config
index fab979975c..dd66534240 100644
--- a/src/ImageProcessor.Web/packages.config
+++ b/src/ImageProcessor.Web/packages.config
@@ -3,6 +3,6 @@
-
+
\ No newline at end of file
diff --git a/src/ImageProcessor.sln b/src/ImageProcessor.sln
index f9fbad00cc..0065fe3575 100644
--- a/src/ImageProcessor.sln
+++ b/src/ImageProcessor.sln
@@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Local.testsettings = Local.testsettings
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Web_NET45", "ImageProcessor.Web\ImageProcessor.Web_NET45.csproj", "{D011A778-59C8-4BFA-A770-C350216BF161}"
+EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = ImageProcessor.vsmdi
@@ -35,22 +37,19 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Any CPU.ActiveCfg = All|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Any CPU.Build.0 = All|Any CPU
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Mixed Platforms.ActiveCfg = All|x86
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Mixed Platforms.Build.0 = All|x86
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|x86.ActiveCfg = All|x86
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|x86.Build.0 = All|x86
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Mixed Platforms.ActiveCfg = All|Any CPU
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|Mixed Platforms.Build.0 = All|Any CPU
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.All|x86.ActiveCfg = All|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Mixed Platforms.Build.0 = Debug|x86
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|x86.ActiveCfg = Debug|x86
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|x86.Build.0 = Debug|x86
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Debug|x86.ActiveCfg = Debug|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|Any CPU.Build.0 = Release|Any CPU
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|Mixed Platforms.Build.0 = Release|x86
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|x86.ActiveCfg = Release|x86
- {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|x86.Build.0 = Release|x86
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}.Release|x86.ActiveCfg = Release|Any CPU
{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Any CPU.ActiveCfg = All|Any CPU
{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Any CPU.Build.0 = All|Any CPU
{30327C08-7574-4D7E-AC95-6A58753C6855}.All|Mixed Platforms.ActiveCfg = All|x86
@@ -71,22 +70,19 @@ Global
{30327C08-7574-4D7E-AC95-6A58753C6855}.Release|x86.Build.0 = Release|x86
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Any CPU.ActiveCfg = All|Any CPU
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Any CPU.Build.0 = All|Any CPU
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Mixed Platforms.ActiveCfg = All|x86
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Mixed Platforms.Build.0 = All|x86
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|x86.ActiveCfg = All|x86
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|x86.Build.0 = All|x86
+ {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Mixed Platforms.ActiveCfg = All|Any CPU
+ {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|Mixed Platforms.Build.0 = All|Any CPU
+ {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.All|x86.ActiveCfg = All|Any CPU
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Mixed Platforms.Build.0 = Debug|x86
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|x86.ActiveCfg = Debug|x86
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|x86.Build.0 = Debug|x86
+ {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Debug|x86.ActiveCfg = Debug|Any CPU
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Release|Any CPU.Build.0 = Release|Any CPU
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Release|Mixed Platforms.Build.0 = Release|x86
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Release|x86.ActiveCfg = Release|x86
- {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Release|x86.Build.0 = Release|x86
+ {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}.Release|x86.ActiveCfg = Release|Any CPU
{39911A38-CA06-413C-80AA-39EF60CE984F}.All|Any CPU.ActiveCfg = Release|Any CPU
{39911A38-CA06-413C-80AA-39EF60CE984F}.All|Any CPU.Build.0 = Release|Any CPU
{39911A38-CA06-413C-80AA-39EF60CE984F}.All|Mixed Platforms.ActiveCfg = Release|x86
@@ -120,6 +116,21 @@ Global
{23CE0FC0-9E59-4C93-A604-A4A98A6284D1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{23CE0FC0-9E59-4C93-A604-A4A98A6284D1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{23CE0FC0-9E59-4C93-A604-A4A98A6284D1}.Release|x86.ActiveCfg = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.All|Any CPU.ActiveCfg = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.All|Any CPU.Build.0 = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.All|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.All|Mixed Platforms.Build.0 = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.All|x86.ActiveCfg = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {D011A778-59C8-4BFA-A770-C350216BF161}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/ImageProcessor/ImageProcessor.csproj b/src/ImageProcessor/ImageProcessor.csproj
index 780c16b2e8..3d2a3f197c 100644
--- a/src/ImageProcessor/ImageProcessor.csproj
+++ b/src/ImageProcessor/ImageProcessor.csproj
@@ -44,37 +44,6 @@
false
true
-
- true
- bin\x86\Debug\
- DEBUG;TRACE
- bin\Debug\ImageProcessor.XML
- full
- x86
- prompt
- MinimumRecommendedRules.ruleset
-
-
- bin\x86\Release\
- TRACE
- bin\Release\ImageProcessor.XML
- true
- pdbonly
- x86
- prompt
- MinimumRecommendedRules.ruleset
-
-
- true
- bin\x86\All\
- DEBUG;TRACE
- bin\Debug\ImageProcessor.XML
- full
- x86
- prompt
- MinimumRecommendedRules.ruleset
- false
-
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/tools/Microsoft.Bcl.Build.Tasks.dll b/src/packages/Microsoft.Bcl.Build.1.0.5/tools/Microsoft.Bcl.Build.Tasks.dll
deleted file mode 100644
index 329fe8cc91..0000000000
Binary files a/src/packages/Microsoft.Bcl.Build.1.0.5/tools/Microsoft.Bcl.Build.Tasks.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/License.rtf.REMOVED.git-id b/src/packages/Microsoft.Bcl.Build.1.0.6/License.rtf.REMOVED.git-id
similarity index 100%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/License.rtf.REMOVED.git-id
rename to src/packages/Microsoft.Bcl.Build.1.0.6/License.rtf.REMOVED.git-id
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/Microsoft.Bcl.Build.1.0.5.nupkg b/src/packages/Microsoft.Bcl.Build.1.0.6/Microsoft.Bcl.Build.1.0.6.nupkg
similarity index 64%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/Microsoft.Bcl.Build.1.0.5.nupkg
rename to src/packages/Microsoft.Bcl.Build.1.0.6/Microsoft.Bcl.Build.1.0.6.nupkg
index 54f6df75b5..877b98a370 100644
Binary files a/src/packages/Microsoft.Bcl.Build.1.0.5/Microsoft.Bcl.Build.1.0.5.nupkg and b/src/packages/Microsoft.Bcl.Build.1.0.6/Microsoft.Bcl.Build.1.0.6.nupkg differ
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/Microsoft.Bcl.Build.1.0.5.nuspec b/src/packages/Microsoft.Bcl.Build.1.0.6/Microsoft.Bcl.Build.1.0.6.nuspec
similarity index 95%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/Microsoft.Bcl.Build.1.0.5.nuspec
rename to src/packages/Microsoft.Bcl.Build.1.0.6/Microsoft.Bcl.Build.1.0.6.nuspec
index bf160cc2a0..b5991c755d 100644
--- a/src/packages/Microsoft.Bcl.Build.1.0.5/Microsoft.Bcl.Build.1.0.5.nuspec
+++ b/src/packages/Microsoft.Bcl.Build.1.0.6/Microsoft.Bcl.Build.1.0.6.nuspec
@@ -2,7 +2,7 @@
Microsoft.Bcl.Build
- 1.0.5
+ 1.0.6
Microsoft BCL Build Components
Microsoft
Microsoft
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/content/net40/_._ b/src/packages/Microsoft.Bcl.Build.1.0.6/content/net40/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/content/net40/_._
rename to src/packages/Microsoft.Bcl.Build.1.0.6/content/net40/_._
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/content/netcore45/_._ b/src/packages/Microsoft.Bcl.Build.1.0.6/content/netcore45/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/content/netcore45/_._
rename to src/packages/Microsoft.Bcl.Build.1.0.6/content/netcore45/_._
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/content/portable-net40+win8+sl4+wp71/_._ b/src/packages/Microsoft.Bcl.Build.1.0.6/content/portable-net40+win8+sl4+wp71/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/content/portable-net40+win8+sl4+wp71/_._
rename to src/packages/Microsoft.Bcl.Build.1.0.6/content/portable-net40+win8+sl4+wp71/_._
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/content/sl4-windowsphone71/_._ b/src/packages/Microsoft.Bcl.Build.1.0.6/content/sl4-windowsphone71/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/content/sl4-windowsphone71/_._
rename to src/packages/Microsoft.Bcl.Build.1.0.6/content/sl4-windowsphone71/_._
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/content/sl4/_._ b/src/packages/Microsoft.Bcl.Build.1.0.6/content/sl4/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/content/sl4/_._
rename to src/packages/Microsoft.Bcl.Build.1.0.6/content/sl4/_._
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/tools/Install.ps1 b/src/packages/Microsoft.Bcl.Build.1.0.6/tools/Install.ps1
similarity index 65%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/tools/Install.ps1
rename to src/packages/Microsoft.Bcl.Build.1.0.6/tools/Install.ps1
index 66af151303..bafe46eaea 100644
--- a/src/packages/Microsoft.Bcl.Build.1.0.5/tools/Install.ps1
+++ b/src/packages/Microsoft.Bcl.Build.1.0.6/tools/Install.ps1
@@ -9,9 +9,9 @@ param($installPath, $toolsPath, $package, $project)
$msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
# Make the path to the targets file relative.
- $projectUri = new-object Uri('file://' + $project.FullName)
- $targetUri = new-object Uri('file://' + $targetsFile)
- $relativePath = $projectUri.MakeRelativeUri($targetUri).ToString().Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
+ $projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
+ $targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
+ $relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
# Add the import and save the project
$msbuild.Xml.AddImport($relativePath) | out-null
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.6/tools/Microsoft.Bcl.Build.Tasks.dll b/src/packages/Microsoft.Bcl.Build.1.0.6/tools/Microsoft.Bcl.Build.Tasks.dll
new file mode 100644
index 0000000000..9d0b5567ab
Binary files /dev/null and b/src/packages/Microsoft.Bcl.Build.1.0.6/tools/Microsoft.Bcl.Build.Tasks.dll differ
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/tools/Microsoft.Bcl.Build.targets b/src/packages/Microsoft.Bcl.Build.1.0.6/tools/Microsoft.Bcl.Build.targets
similarity index 100%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/tools/Microsoft.Bcl.Build.targets
rename to src/packages/Microsoft.Bcl.Build.1.0.6/tools/Microsoft.Bcl.Build.targets
diff --git a/src/packages/Microsoft.Bcl.Build.1.0.5/tools/Uninstall.ps1 b/src/packages/Microsoft.Bcl.Build.1.0.6/tools/Uninstall.ps1
similarity index 77%
rename from src/packages/Microsoft.Bcl.Build.1.0.5/tools/Uninstall.ps1
rename to src/packages/Microsoft.Bcl.Build.1.0.6/tools/Uninstall.ps1
index e43af29de2..90f0df6d07 100644
--- a/src/packages/Microsoft.Bcl.Build.1.0.5/tools/Uninstall.ps1
+++ b/src/packages/Microsoft.Bcl.Build.1.0.6/tools/Uninstall.ps1
@@ -7,7 +7,9 @@ param($installPath, $toolsPath, $package, $project)
$msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
$importToRemove = $msbuild.Xml.Imports | Where-Object { $_.Project.Endswith($package.Id + '.targets') }
- # Add the import and save the project
- $msbuild.Xml.RemoveChild($importToRemove) | out-null
- $project.Save()
-
\ No newline at end of file
+ if ($importToRemove)
+ {
+ # Remove the import and save the project
+ $msbuild.Xml.RemoveChild($importToRemove) | out-null
+ $project.Save()
+ }