diff --git a/.gitignore b/.gitignore index 2fc43e4a10..3fd18e8e1f 100644 --- a/.gitignore +++ b/.gitignore @@ -167,6 +167,7 @@ pip-log.txt build/_BuildOutput/ build/*.nupkg +build/TestResult.xml *.db _site/ \ No newline at end of file diff --git a/build/Build.ImageProcessor.Plugins.WebP.proj b/build/Build.ImageProcessor.Plugins.WebP.proj deleted file mode 100644 index c2fca90fde..0000000000 --- a/build/Build.ImageProcessor.Plugins.WebP.proj +++ /dev/null @@ -1,54 +0,0 @@ - - - .\ - - - - - - - - Release - _BuildOutput\ - False - $(MSBuildProjectDirectory)\$(BuildFolder) - $(BuildFolderAbsolutePath)ImageProcessor.Plugins.WebP\lib\net45 - ..\src\Plugins\ImageProcessor\ImageProcessor.Plugins.WebP\ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/Build.ImageProcessor.Web.proj b/build/Build.ImageProcessor.Web.proj deleted file mode 100644 index ae6936faf0..0000000000 --- a/build/Build.ImageProcessor.Web.proj +++ /dev/null @@ -1,57 +0,0 @@ - - - .\ - - - - - - - - Release - _BuildOutput\ - False - ..\..\..\build\$(BuildFolder) - $(MSBuildProjectDirectory)\$(BuildFolder) - $(BuildFolder)bin\ - $(BuildFolderRelativeToProjects)bin\ - $(BuildFolderAbsolutePath)ImageProcessor.Web\lib\net45 - ..\src\ImageProcessor.Web\ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/Build.ImageProcessor.proj b/build/Build.ImageProcessor.proj deleted file mode 100644 index 134c1ed9fe..0000000000 --- a/build/Build.ImageProcessor.proj +++ /dev/null @@ -1,54 +0,0 @@ - - - .\ - - - - - - - - Release - _BuildOutput\ - False - $(MSBuildProjectDirectory)\$(BuildFolder) - $(BuildFolderAbsolutePath)ImageProcessor\lib\net45 - ..\src\ImageProcessor\ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/Build.bat b/build/Build.bat index deb60032ff..9fbd8906f5 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -1,34 +1,3 @@ -@ECHO OFF +@echo off -SET version=2.0.1.0 -SET webversion=4.0.0.0 -SET webconfigversion=2.0.0.0 -SET webppluginversion=1.0.1.0 -SET cairpluginversion=1.0.0.0 - -ECHO Building ImageProcessor %version%, ImageProcessor.Web %webversion%, ImageProcessor.Web.Config %webconfigversion% - -ECHO Building ImageProcessor.Plugins.WebP %webppluginversion%, ImageProcessor.Plugins.Cair %cairpluginversion% - -ECHO Removing _BuildOutput directory so everything is nice and clean -RD _BuildOutput /q /s - -%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.ImageProcessor.proj" /p:BUILD_RELEASE=%version% /p:BUILD_COMMENT=%comment% -%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.ImageProcessor.Web.proj" /p:BUILD_RELEASE=%webversion% /p:BUILD_COMMENT=%comment% -%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.ImageProcessor.Plugins.WebP.proj" /p:BUILD_RELEASE=%webppluginversion% /p:BUILD_COMMENT=%comment% -%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.ImageProcessor.Plugins.Cair.proj" /p:BUILD_RELEASE=%cairpluginversion% /p:BUILD_COMMENT=%comment% - -ECHO Packing the NuGet release files -..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.nuspec -Version %version% -..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.Web.nuspec -Version %webversion% -..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.Web.Config.nuspec -Version %webconfigversion% -..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.Plugins.WebP.nuspec -Version %webppluginversion% -..\src\.nuget\NuGet.exe pack NuSpecs\ImageProcessor.Plugins.Cair.nuspec -Version %cairpluginversion% -PAUSE - -IF ERRORLEVEL 1 GOTO :showerror - -GOTO :EOF - -:showerror -PAUSE +powershell "Import-Module %~dp0\psake.psm1 ; Invoke-Psake %~dp0\build.ps1 ; exit $LASTEXITCODE" \ No newline at end of file diff --git a/build/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll.REMOVED.git-id b/build/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll.REMOVED.git-id deleted file mode 100644 index 0dc5124b53..0000000000 --- a/build/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -77bafe8ba867a1618b8735200289f6fad68b825e \ No newline at end of file diff --git a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets b/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets deleted file mode 100644 index 875d7c4c84..0000000000 --- a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - $(MSBuildExtensionsPath)\MSBuildCommunityTasks - $(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.chm.REMOVED.git-id b/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.chm.REMOVED.git-id deleted file mode 100644 index 0863f2d0fa..0000000000 --- a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.chm.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -e9cfb77efd964e4fb6659c0c2cc9bc934b7edb17 \ No newline at end of file diff --git a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll.REMOVED.git-id b/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll.REMOVED.git-id deleted file mode 100644 index 0c5894f4d6..0000000000 --- a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -3d1dbd357f5e4ae47bf017d4227811bd052b5347 \ No newline at end of file diff --git a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.xml.REMOVED.git-id b/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.xml.REMOVED.git-id deleted file mode 100644 index 7bdd152c52..0000000000 --- a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.xml.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -0ddc819937fec260f50b99350f7643feced88342 \ No newline at end of file diff --git a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.xsd.REMOVED.git-id b/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.xsd.REMOVED.git-id deleted file mode 100644 index c226e06db1..0000000000 --- a/build/MSBuildCommunityTasks/MSBuild.Community.Tasks.xsd.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -14f9e4c08f357d1b2f185dbe24df292ce74ef064 \ No newline at end of file diff --git a/build/MSBuildCommunityTasks/Sample.proj b/build/MSBuildCommunityTasks/Sample.proj deleted file mode 100644 index 3b52ad68c9..0000000000 --- a/build/MSBuildCommunityTasks/Sample.proj +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - list = new List(); - list.Add("Happy"); - list.Add("New"); - list.Add("Year"); - Console.WriteLine("Hello MSBuild Community Scripting World."); - foreach(string s in list) - { - Console.WriteLine(s); - } - } - ]]> - - - - -