diff --git a/build/Build.ImageProcessor.Web.proj b/build/Build.ImageProcessor.Web.proj index ab35a64e4..ae6936faf 100644 --- a/build/Build.ImageProcessor.Web.proj +++ b/build/Build.ImageProcessor.Web.proj @@ -2,15 +2,15 @@ .\ - - - - - + Release _BuildOutput\ @@ -19,42 +19,39 @@ $(MSBuildProjectDirectory)\$(BuildFolder) $(BuildFolder)bin\ $(BuildFolderRelativeToProjects)bin\ - $(BuildFolderAbsolutePath)ImageProcessor.Web\lib\net40 - $(BuildFolderAbsolutePath)ImageProcessor.Web\lib\net45 + $(BuildFolderAbsolutePath)ImageProcessor.Web\lib\net45 ..\src\ImageProcessor.Web\ - - + - - - - + + - + - - - + + + - + - \ No newline at end of file + diff --git a/build/Build.ImageProcessor.proj b/build/Build.ImageProcessor.proj index 930275286..134c1ed9f 100644 --- a/build/Build.ImageProcessor.proj +++ b/build/Build.ImageProcessor.proj @@ -2,53 +2,53 @@ .\ - - - - - + Release _BuildOutput\ False $(MSBuildProjectDirectory)\$(BuildFolder) - $(BuildFolderAbsolutePath)ImageProcessor\lib\ + $(BuildFolderAbsolutePath)ImageProcessor\lib\net45 ..\src\ImageProcessor\ - - + - + - + - + - - + + - + - \ No newline at end of file + diff --git a/build/Build.bat b/build/Build.bat index 21c4eb0a4..a1c73ad56 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -6,10 +6,6 @@ SET webconfigversion=2.0.0.0 ECHO Building ImageProcessor %version%, ImageProcess.Web %webversion% and ImageProcess.Web.Config %webconfigversion% -ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise you'd have to run build.cmd twice -SET nuGetFolder=%CD%\..\src\packages\ -..\src\.nuget\NuGet.exe install ..\src\ImageProcessor.Web\NET4\packages.config -OutputDirectory %nuGetFolder% - ECHO Removing _BuildOutput directory so everything is nice and clean RD _BuildOutput /q /s diff --git a/build/NuSpecs/ImageProcessor.Web.Config.nuspec b/build/NuSpecs/ImageProcessor.Web.Config.nuspec index f2c7f8412..f2fb1aeb8 100644 --- a/build/NuSpecs/ImageProcessor.Web.Config.nuspec +++ b/build/NuSpecs/ImageProcessor.Web.Config.nuspec @@ -20,10 +20,6 @@ Feedback is always welcome en-GB Image Imaging ASP Performance Processing HttpModule Cache Resize Rotate RoundedCorners Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg Bitmap Png WebP Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated - - - - @@ -31,9 +27,9 @@ Feedback is always welcome - - - + + + - \ No newline at end of file + diff --git a/build/NuSpecs/ImageProcessor.Web.nuspec b/build/NuSpecs/ImageProcessor.Web.nuspec index f9421c49f..7ce0d9848 100644 --- a/build/NuSpecs/ImageProcessor.Web.nuspec +++ b/build/NuSpecs/ImageProcessor.Web.nuspec @@ -13,8 +13,6 @@ Methods include: Resize, Rotate, Rounded Corners, Flip, Crop, Watermark, Filter, Saturation, Brightness, Contrast, Quality, Format, Vignette, Gaussian Blur, Gaussian Sharpen, and Transparency. -This package also requires Microsoft.Bcl.Async on .NET 4.0 which will be added on install if applicable. - If you use ImageProcessor please get in touch via my twitter @james_m_south Feedback is always welcome @@ -24,11 +22,6 @@ Feedback is always welcome en-GB Image Imaging ASP Performance Processing HttpModule Cache Resize AutoRotate Rotate RoundedCorners Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg Bitmap Png WebP Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated EXIF - - - - - @@ -36,7 +29,6 @@ Feedback is always welcome - - \ No newline at end of file + diff --git a/build/NuSpecs/ImageProcessor.nuspec b/build/NuSpecs/ImageProcessor.nuspec index 8fd164479..2b9c8af53 100644 --- a/build/NuSpecs/ImageProcessor.nuspec +++ b/build/NuSpecs/ImageProcessor.nuspec @@ -9,13 +9,12 @@ http://imageprocessor.org http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png false - Image Processor is an easy to use and extend processing library written in C#. Its fluent API makes common imaging tasks very simple to perform. + Image Processor is an easy to use and extend processing library written in C#. Its fluent API makes common imaging tasks very simple to perform. Methods include; Resize, Rotate, Rounded Corners, Flip, Crop, Watermark, Filter, Saturation, Brightness, Contrast, Quality, Format, Vignette, Gaussian Blur, Gaussian Sharpen, and Transparency. If you use ImageProcessor please get in touch on my twitter @james_m_south. - Feedback is always welcome. A library for manipulating image files written in C#. @@ -24,6 +23,6 @@ Feedback is always welcome. Image Imaging ASP Performance Processing Resize AutoRotate Rotate RoundedCorners Flip Crop Filter Effects Quality Watermark Alpha Vignette Saturation Brightness Contrast Gif Jpg Jpeg Bitmap Png WebP Fluent GDI Gaussian Blur Sharpen Tint Quantizer Animated EXIF - + - \ No newline at end of file + diff --git a/src/ImageProcessor.Web.UnitTests/ImageProcessor.Web.UnitTests.csproj b/src/ImageProcessor.Web.UnitTests/ImageProcessor.Web.UnitTests.csproj index 357f3b11d..d89506079 100644 --- a/src/ImageProcessor.Web.UnitTests/ImageProcessor.Web.UnitTests.csproj +++ b/src/ImageProcessor.Web.UnitTests/ImageProcessor.Web.UnitTests.csproj @@ -8,7 +8,7 @@ Properties ImageProcessor.Web.UnitTests ImageProcessor.Web.UnitTests - v4.5.1 + v4.5 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -18,6 +18,7 @@ UnitTest ..\ true + true @@ -61,9 +62,9 @@ - + {d011a778-59c8-4bfa-a770-c350216bf161} - ImageProcessor.Web_NET45 + ImageProcessor.Web {3b5dd734-fb7a-487d-8ce6-55e7af9aea7e} diff --git a/src/ImageProcessor.Web/NET45/Caching/CacheIndexer.cs b/src/ImageProcessor.Web/Caching/CacheIndexer.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Caching/CacheIndexer.cs rename to src/ImageProcessor.Web/Caching/CacheIndexer.cs diff --git a/src/ImageProcessor.Web/NET45/Caching/CachedImage.cs b/src/ImageProcessor.Web/Caching/CachedImage.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Caching/CachedImage.cs rename to src/ImageProcessor.Web/Caching/CachedImage.cs diff --git a/src/ImageProcessor.Web/NET45/Caching/DiskCache.cs b/src/ImageProcessor.Web/Caching/DiskCache.cs similarity index 99% rename from src/ImageProcessor.Web/NET45/Caching/DiskCache.cs rename to src/ImageProcessor.Web/Caching/DiskCache.cs index c6300c64d..21fdc974a 100644 --- a/src/ImageProcessor.Web/NET45/Caching/DiskCache.cs +++ b/src/ImageProcessor.Web/Caching/DiskCache.cs @@ -17,7 +17,6 @@ namespace ImageProcessor.Web.Caching using System.IO; using System.Linq; using System.Threading.Tasks; - using System.Web; using System.Web.Hosting; using ImageProcessor.Web.Configuration; diff --git a/src/ImageProcessor.Web/NET45/Caching/MemCache.cs b/src/ImageProcessor.Web/Caching/MemCache.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Caching/MemCache.cs rename to src/ImageProcessor.Web/Caching/MemCache.cs diff --git a/src/ImageProcessor.Web/NET45/Configuration/ImageCacheSection.cs b/src/ImageProcessor.Web/Configuration/ImageCacheSection.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Configuration/ImageCacheSection.cs rename to src/ImageProcessor.Web/Configuration/ImageCacheSection.cs diff --git a/src/ImageProcessor.Web/NET45/Configuration/ImageProcessingSection.cs b/src/ImageProcessor.Web/Configuration/ImageProcessingSection.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Configuration/ImageProcessingSection.cs rename to src/ImageProcessor.Web/Configuration/ImageProcessingSection.cs diff --git a/src/ImageProcessor.Web/NET45/Configuration/ImageProcessorConfiguration.cs b/src/ImageProcessor.Web/Configuration/ImageProcessorConfiguration.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Configuration/ImageProcessorConfiguration.cs rename to src/ImageProcessor.Web/Configuration/ImageProcessorConfiguration.cs diff --git a/src/ImageProcessor.Web/NET45/Configuration/ImageSecuritySection.cs b/src/ImageProcessor.Web/Configuration/ImageSecuritySection.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Configuration/ImageSecuritySection.cs rename to src/ImageProcessor.Web/Configuration/ImageSecuritySection.cs diff --git a/src/ImageProcessor.Web/NET45/Configuration/Resources/cache.config b/src/ImageProcessor.Web/Configuration/Resources/cache.config similarity index 100% rename from src/ImageProcessor.Web/NET45/Configuration/Resources/cache.config rename to src/ImageProcessor.Web/Configuration/Resources/cache.config diff --git a/src/ImageProcessor.Web/NET45/Configuration/Resources/processing.config b/src/ImageProcessor.Web/Configuration/Resources/processing.config similarity index 100% rename from src/ImageProcessor.Web/NET45/Configuration/Resources/processing.config rename to src/ImageProcessor.Web/Configuration/Resources/processing.config diff --git a/src/ImageProcessor.Web/NET45/Configuration/Resources/security.config b/src/ImageProcessor.Web/Configuration/Resources/security.config similarity index 100% rename from src/ImageProcessor.Web/NET45/Configuration/Resources/security.config rename to src/ImageProcessor.Web/Configuration/Resources/security.config diff --git a/src/ImageProcessor.Web/NET45/Extensions/DirectoryInfoExtensions.cs b/src/ImageProcessor.Web/Extensions/DirectoryInfoExtensions.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Extensions/DirectoryInfoExtensions.cs rename to src/ImageProcessor.Web/Extensions/DirectoryInfoExtensions.cs diff --git a/src/ImageProcessor.Web/NET45/Extensions/StringExtensions.cs b/src/ImageProcessor.Web/Extensions/StringExtensions.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Extensions/StringExtensions.cs rename to src/ImageProcessor.Web/Extensions/StringExtensions.cs diff --git a/src/ImageProcessor.Web/NET45/Helpers/AsyncDeDuperLock.cs b/src/ImageProcessor.Web/Helpers/AsyncDeDuperLock.cs similarity index 99% rename from src/ImageProcessor.Web/NET45/Helpers/AsyncDeDuperLock.cs rename to src/ImageProcessor.Web/Helpers/AsyncDeDuperLock.cs index c6896c3a0..f436b5442 100644 --- a/src/ImageProcessor.Web/NET45/Helpers/AsyncDeDuperLock.cs +++ b/src/ImageProcessor.Web/Helpers/AsyncDeDuperLock.cs @@ -54,7 +54,6 @@ namespace ImageProcessor.Web.Helpers return releaser; } -#if NET45 && !__MonoCS__ /// /// The lock async. /// @@ -92,7 +91,7 @@ namespace ImageProcessor.Web.Helpers TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); } -#endif + /// /// The disposable scope. /// diff --git a/src/ImageProcessor.Web/NET45/Helpers/CommonParameterParserUtility.cs b/src/ImageProcessor.Web/Helpers/CommonParameterParserUtility.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Helpers/CommonParameterParserUtility.cs rename to src/ImageProcessor.Web/Helpers/CommonParameterParserUtility.cs diff --git a/src/ImageProcessor.Web/NET45/Helpers/ImageHelpers.cs b/src/ImageProcessor.Web/Helpers/ImageHelpers.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Helpers/ImageHelpers.cs rename to src/ImageProcessor.Web/Helpers/ImageHelpers.cs diff --git a/src/ImageProcessor.Web/NET45/Helpers/NativeMethods.cs b/src/ImageProcessor.Web/Helpers/NativeMethods.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Helpers/NativeMethods.cs rename to src/ImageProcessor.Web/Helpers/NativeMethods.cs diff --git a/src/ImageProcessor.Web/NET45/Helpers/RemoteFile.cs b/src/ImageProcessor.Web/Helpers/RemoteFile.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Helpers/RemoteFile.cs rename to src/ImageProcessor.Web/Helpers/RemoteFile.cs diff --git a/src/ImageProcessor.Web/NET45/Helpers/ResourceHelpers.cs b/src/ImageProcessor.Web/Helpers/ResourceHelpers.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Helpers/ResourceHelpers.cs rename to src/ImageProcessor.Web/Helpers/ResourceHelpers.cs diff --git a/src/ImageProcessor.Web/NET45/Helpers/TaskHelpers.cs b/src/ImageProcessor.Web/Helpers/TaskHelpers.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Helpers/TaskHelpers.cs rename to src/ImageProcessor.Web/Helpers/TaskHelpers.cs diff --git a/src/ImageProcessor.Web/NET45/HttpModules/ImageProcessingModule.cs b/src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs similarity index 97% rename from src/ImageProcessor.Web/NET45/HttpModules/ImageProcessingModule.cs rename to src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs index d7b15e7e1..82f82d012 100644 --- a/src/ImageProcessor.Web/NET45/HttpModules/ImageProcessingModule.cs +++ b/src/ImageProcessor.Web/HttpModules/ImageProcessingModule.cs @@ -175,8 +175,6 @@ namespace ImageProcessor.Web.HttpModules } #endregion -#if NET45 && !__MonoCS__ - /// /// Occurs when the user for the current request has been authorized. /// @@ -195,21 +193,6 @@ namespace ImageProcessor.Web.HttpModules return this.ProcessImageAsync(context); } -#else - - /// - /// Occurs when the user for the current request has been authorized. - /// - /// The source of the event. - /// An EventArgs that contains the event data. - private async void PostAuthorizeRequest(object sender, EventArgs e) - { - HttpContext context = ((HttpApplication)sender).Context; - await this.ProcessImageAsync(context); - } - -#endif - /// /// Occurs just before ASP.NET send HttpHeaders to the client. /// diff --git a/src/ImageProcessor.Web/NET45/ImageFactoryExtensions.cs b/src/ImageProcessor.Web/ImageFactoryExtensions.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/ImageFactoryExtensions.cs rename to src/ImageProcessor.Web/ImageFactoryExtensions.cs diff --git a/src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj b/src/ImageProcessor.Web/ImageProcessor.Web.csproj similarity index 98% rename from src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj rename to src/ImageProcessor.Web/ImageProcessor.Web.csproj index 6d4694400..7b6612b12 100644 --- a/src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj +++ b/src/ImageProcessor.Web/ImageProcessor.Web.csproj @@ -87,7 +87,7 @@ - + {3b5dd734-fb7a-487d-8ce6-55e7af9aea7e} ImageProcessor diff --git a/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj b/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj deleted file mode 100644 index 601953a5e..000000000 --- a/src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj +++ /dev/null @@ -1,226 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {4F7050F2-465F-4E10-8DB2-2FB97AC6AA43} - Library - Properties - ImageProcessor.Web - ImageProcessor.Web - v4.0 - 512 - ..\..\ - true - - - true - full - false - bin\Debug\ - TRACE;DEBUG;USE_CSHARP_SQLITE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;USE_CSHARP_SQLITE - prompt - 4 - - - true - bin\All\ - TRACE;DEBUG;USE_CSHARP_SQLITE - full - AnyCPU - prompt - - - - - False - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - False - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - False - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - - - - - ..\..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.IO.dll - True - - - - ..\..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Runtime.dll - - - - ..\..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Threading.Tasks.dll - - - - - - - - - CacheIndexer.cs - - - - MemCache.cs - - - ImageCacheSection.cs - - - ImageProcessingSection.cs - - - ImageProcessorConfiguration.cs - - - ImageSecuritySection.cs - - - DirectoryInfoExtensions.cs - - - StringExtensions.cs - - - AsyncDeDuperLock.cs - - - CommonParameterParserUtility.cs - - - ImageHelpers.cs - - - NativeMethods.cs - - - - ResourceHelpers.cs - - - - - - Alpha.cs - - - AutoRotate.cs - - - BackgroundColor.cs - - - Brightness.cs - - - Contrast.cs - - - Crop.cs - - - Filter.cs - - - Flip.cs - - - Format.cs - - - GaussianBlur.cs - - - GaussianSharpen.cs - - - IWebGraphicsProcessor.cs - - - Quality.cs - - - Resize.cs - - - Rotate.cs - - - RoundedCorners.cs - - - Saturation.cs - - - Tint.cs - - - Vignette.cs - - - Watermark.cs - - - - - - {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E} - ImageProcessor - - - - - Configuration\Resources\cache.config - - - Configuration\Resources\processing.config - - - Configuration\Resources\security.config - - - Designer - - - Designer - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ImageProcessor.Web/NET4/app.config b/src/ImageProcessor.Web/NET4/app.config deleted file mode 100644 index 31d365ae5..000000000 --- a/src/ImageProcessor.Web/NET4/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/ImageProcessor.Web/NET4/packages.config b/src/ImageProcessor.Web/NET4/packages.config deleted file mode 100644 index c7068f590..000000000 --- a/src/ImageProcessor.Web/NET4/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/ImageProcessor.Web/NET45/Processors/Alpha.cs b/src/ImageProcessor.Web/Processors/Alpha.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Alpha.cs rename to src/ImageProcessor.Web/Processors/Alpha.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/AutoRotate.cs b/src/ImageProcessor.Web/Processors/AutoRotate.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/AutoRotate.cs rename to src/ImageProcessor.Web/Processors/AutoRotate.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/BackgroundColor.cs b/src/ImageProcessor.Web/Processors/BackgroundColor.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/BackgroundColor.cs rename to src/ImageProcessor.Web/Processors/BackgroundColor.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Brightness.cs b/src/ImageProcessor.Web/Processors/Brightness.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Brightness.cs rename to src/ImageProcessor.Web/Processors/Brightness.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Contrast.cs b/src/ImageProcessor.Web/Processors/Contrast.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Contrast.cs rename to src/ImageProcessor.Web/Processors/Contrast.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Crop.cs b/src/ImageProcessor.Web/Processors/Crop.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Crop.cs rename to src/ImageProcessor.Web/Processors/Crop.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Filter.cs b/src/ImageProcessor.Web/Processors/Filter.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Filter.cs rename to src/ImageProcessor.Web/Processors/Filter.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Flip.cs b/src/ImageProcessor.Web/Processors/Flip.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Flip.cs rename to src/ImageProcessor.Web/Processors/Flip.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Format.cs b/src/ImageProcessor.Web/Processors/Format.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Format.cs rename to src/ImageProcessor.Web/Processors/Format.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/GaussianBlur.cs b/src/ImageProcessor.Web/Processors/GaussianBlur.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/GaussianBlur.cs rename to src/ImageProcessor.Web/Processors/GaussianBlur.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/GaussianSharpen.cs b/src/ImageProcessor.Web/Processors/GaussianSharpen.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/GaussianSharpen.cs rename to src/ImageProcessor.Web/Processors/GaussianSharpen.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/IWebGraphicsProcessor.cs b/src/ImageProcessor.Web/Processors/IWebGraphicsProcessor.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/IWebGraphicsProcessor.cs rename to src/ImageProcessor.Web/Processors/IWebGraphicsProcessor.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Quality.cs b/src/ImageProcessor.Web/Processors/Quality.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Quality.cs rename to src/ImageProcessor.Web/Processors/Quality.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Resize.cs b/src/ImageProcessor.Web/Processors/Resize.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Resize.cs rename to src/ImageProcessor.Web/Processors/Resize.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Rotate.cs b/src/ImageProcessor.Web/Processors/Rotate.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Rotate.cs rename to src/ImageProcessor.Web/Processors/Rotate.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/RoundedCorners.cs b/src/ImageProcessor.Web/Processors/RoundedCorners.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/RoundedCorners.cs rename to src/ImageProcessor.Web/Processors/RoundedCorners.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Saturation.cs b/src/ImageProcessor.Web/Processors/Saturation.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Saturation.cs rename to src/ImageProcessor.Web/Processors/Saturation.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Tint.cs b/src/ImageProcessor.Web/Processors/Tint.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Tint.cs rename to src/ImageProcessor.Web/Processors/Tint.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Vignette.cs b/src/ImageProcessor.Web/Processors/Vignette.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Vignette.cs rename to src/ImageProcessor.Web/Processors/Vignette.cs diff --git a/src/ImageProcessor.Web/NET45/Processors/Watermark.cs b/src/ImageProcessor.Web/Processors/Watermark.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Processors/Watermark.cs rename to src/ImageProcessor.Web/Processors/Watermark.cs diff --git a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/Properties/AssemblyInfo.cs similarity index 100% rename from src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs rename to src/ImageProcessor.Web/Properties/AssemblyInfo.cs diff --git a/src/ImageProcessor.Web/NET45/Settings.StyleCop b/src/ImageProcessor.Web/Settings.StyleCop similarity index 100% rename from src/ImageProcessor.Web/NET45/Settings.StyleCop rename to src/ImageProcessor.Web/Settings.StyleCop diff --git a/src/ImageProcessor.sln b/src/ImageProcessor.sln index 8ad0ed4e9..23483c741 100644 --- a/src/ImageProcessor.sln +++ b/src/ImageProcessor.sln @@ -18,17 +18,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1E656C EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor", "ImageProcessor\ImageProcessor.csproj", "{3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web.Tests", "Web.Test\Web.Tests.csproj", "{23CE0FC0-9E59-4C93-A604-A4A98A6284D1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Website_MVC_NET4", "TestWebsites\NET4\Test_Website_MVC_NET4.csproj", "{30327C08-7574-4D7E-AC95-6A58753C6855}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Website_MVC_NET45", "TestWebsites\NET45\Test_Website_NET45\Test_Website_MVC_NET45.csproj", "{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Web_NET4", "ImageProcessor.Web\NET4\ImageProcessor.Web_NET4.csproj", "{4F7050F2-465F-4E10-8DB2-2FB97AC6AA43}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Web_NET45", "ImageProcessor.Web\NET45\ImageProcessor.Web_NET45.csproj", "{D011A778-59C8-4BFA-A770-C350216BF161}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Web", "ImageProcessor.Web\ImageProcessor.Web.csproj", "{D011A778-59C8-4BFA-A770-C350216BF161}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Website_Webforms_NET45", "TestWebsites\NET45\Test_Website_Webforms_NET45\Test_Website_Webforms_NET45.csproj", "{8DA47D8C-DB1A-4D82-843F-896AB9C3B3D2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Plugins.WebP", "Plugins\ImageProcessor\ImageProcessor.Plugins.WebP\ImageProcessor.Plugins.WebP.csproj", "{2CF69699-959A-44DC-A281-4E2596C25043}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessorConsole", "ImageProcessorConsole\ImageProcessorConsole.csproj", "{7BF5274B-56A7-4B62-8105-E9BDF25BAFE7}" EndProject @@ -36,8 +28,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Web.UnitTest EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.UnitTests", "ImageProcessor.UnitTests\ImageProcessor.UnitTests.csproj", "{633B1C4C-4823-47BE-9A01-A665F3118C8C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageProcessor.Plugins.WebP", "Plugins\ImageProcessor\ImageProcessor.Plugins.WebP\ImageProcessor.Plugins.WebP.csproj", "{2CF69699-959A-44DC-A281-4E2596C25043}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web.Tests", "Web.Test\Web.Tests.csproj", "{23CE0FC0-9E59-4C93-A604-A4A98A6284D1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Website_MVC", "TestWebsites\MVC\Test_Website_MVC.csproj", "{F6A208E9-C18F-43E9-B051-3C6EED30FDAF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Website_Webforms", "TestWebsites\WebForms\Test_Website_Webforms.csproj", "{8DA47D8C-DB1A-4D82-843F-896AB9C3B3D2}" EndProject + Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Any CPU = All|Any CPU @@ -80,24 +77,6 @@ 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 - {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 - {30327C08-7574-4D7E-AC95-6A58753C6855}.All|Mixed Platforms.Build.0 = All|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.All|x86.ActiveCfg = All|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.All|x86.Build.0 = All|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|x86.ActiveCfg = Debug|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.Debug|x86.Build.0 = Debug|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Any CPU.Build.0 = Release|Any CPU - {30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.Release|Mixed Platforms.Build.0 = Release|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.Release|x86.ActiveCfg = Release|x86 - {30327C08-7574-4D7E-AC95-6A58753C6855}.Release|x86.Build.0 = Release|x86 {F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.All|Any CPU.ActiveCfg = Release|Any CPU {F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.All|Any CPU.Build.0 = Release|Any CPU {F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.All|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -113,21 +92,6 @@ Global {F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F6A208E9-C18F-43E9-B051-3C6EED30FDAF}.Release|x86.ActiveCfg = Release|Any CPU - {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|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|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|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 {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 diff --git a/src/ImageProcessor.sln.DotSettings b/src/ImageProcessor.sln.DotSettings index 4970d0c6c..824137ce2 100644 --- a/src/ImageProcessor.sln.DotSettings +++ b/src/ImageProcessor.sln.DotSettings @@ -11,6 +11,7 @@ JPEGDC JPEGQ LPI + MD OECF REF SRGB diff --git a/src/ImageProcessor/Configuration/ImageProcessorBootstrapper.cs b/src/ImageProcessor/Configuration/ImageProcessorBootstrapper.cs index 4cffe51eb..e2d61b54a 100644 --- a/src/ImageProcessor/Configuration/ImageProcessorBootstrapper.cs +++ b/src/ImageProcessor/Configuration/ImageProcessorBootstrapper.cs @@ -132,7 +132,7 @@ namespace ImageProcessor.Configuration // Store root assembly (level 0) directly into results list stack.Push(assembly.ToString()); - // Do a preorder, non-recursive traversal + // Do a pre-order, non-recursive traversal while (stack.Count > 0) { string info = (string)stack.Pop(); diff --git a/src/ImageProcessor/ImageProcessor.csproj b/src/ImageProcessor/ImageProcessor.csproj index ed1aa9c64..9d163d5c7 100644 --- a/src/ImageProcessor/ImageProcessor.csproj +++ b/src/ImageProcessor/ImageProcessor.csproj @@ -1,5 +1,6 @@  - + + Debug AnyCPU @@ -8,12 +9,12 @@ Properties ImageProcessor ImageProcessor - v4.0 + v4.5 512 ..\ true - Client - False + + true @@ -24,6 +25,7 @@ prompt 4 bin\Debug\ImageProcessor.XML + false pdbonly @@ -33,6 +35,7 @@ prompt 4 bin\Release\ImageProcessor.XML + false true @@ -46,6 +49,7 @@ true 4 false + false diff --git a/src/Plugins/ImageProcessor/ImageProcessor.Plugins.WebP/ImageProcessor.Plugins.WebP.csproj b/src/Plugins/ImageProcessor/ImageProcessor.Plugins.WebP/ImageProcessor.Plugins.WebP.csproj index 0c8976d8f..c1721713e 100644 --- a/src/Plugins/ImageProcessor/ImageProcessor.Plugins.WebP/ImageProcessor.Plugins.WebP.csproj +++ b/src/Plugins/ImageProcessor/ImageProcessor.Plugins.WebP/ImageProcessor.Plugins.WebP.csproj @@ -9,9 +9,10 @@ Properties ImageProcessor.Plugins.WebP ImageProcessor.Plugins.WebP - v4.0 + v4.5 512 - Client + + true @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +31,7 @@ TRACE prompt 4 + false diff --git a/src/TestWebsites/NET45/Test_Website_NET45/App_Start/FilterConfig.cs b/src/TestWebsites/MVC/App_Start/FilterConfig.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/App_Start/FilterConfig.cs rename to src/TestWebsites/MVC/App_Start/FilterConfig.cs diff --git a/src/TestWebsites/NET45/Test_Website_NET45/App_Start/RouteConfig.cs b/src/TestWebsites/MVC/App_Start/RouteConfig.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/App_Start/RouteConfig.cs rename to src/TestWebsites/MVC/App_Start/RouteConfig.cs diff --git a/src/TestWebsites/NET45/Test_Website_NET45/App_Start/WebApiConfig.cs b/src/TestWebsites/MVC/App_Start/WebApiConfig.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/App_Start/WebApiConfig.cs rename to src/TestWebsites/MVC/App_Start/WebApiConfig.cs diff --git a/src/TestWebsites/NET4/Content/responsive.min.css.REMOVED.git-id b/src/TestWebsites/MVC/Content/responsive.min.css.REMOVED.git-id similarity index 100% rename from src/TestWebsites/NET4/Content/responsive.min.css.REMOVED.git-id rename to src/TestWebsites/MVC/Content/responsive.min.css.REMOVED.git-id diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Controllers/HomeController.cs b/src/TestWebsites/MVC/Controllers/HomeController.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Controllers/HomeController.cs rename to src/TestWebsites/MVC/Controllers/HomeController.cs diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Global.asax b/src/TestWebsites/MVC/Global.asax similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Global.asax rename to src/TestWebsites/MVC/Global.asax diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Global.asax.cs b/src/TestWebsites/MVC/Global.asax.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Global.asax.cs rename to src/TestWebsites/MVC/Global.asax.cs diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Properties/AssemblyInfo.cs b/src/TestWebsites/MVC/Properties/AssemblyInfo.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Properties/AssemblyInfo.cs rename to src/TestWebsites/MVC/Properties/AssemblyInfo.cs diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_MVC_NET45.csproj b/src/TestWebsites/MVC/Test_Website_MVC.csproj similarity index 97% rename from src/TestWebsites/NET45/Test_Website_NET45/Test_Website_MVC_NET45.csproj rename to src/TestWebsites/MVC/Test_Website_MVC.csproj index c2118914f..9cdaaaad9 100644 --- a/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_MVC_NET45.csproj +++ b/src/TestWebsites/MVC/Test_Website_MVC.csproj @@ -151,15 +151,15 @@ - + {d011a778-59c8-4bfa-a770-c350216bf161} - ImageProcessor.Web_NET45 + ImageProcessor.Web - + {3b5dd734-fb7a-487d-8ce6-55e7af9aea7e} ImageProcessor - + {2cf69699-959a-44dc-a281-4e2596c25043} ImageProcessor.Plugins.WebP diff --git a/src/TestWebsites/NET4/Views/Home/Bmp.cshtml b/src/TestWebsites/MVC/Views/Home/Bmp.cshtml similarity index 100% rename from src/TestWebsites/NET4/Views/Home/Bmp.cshtml rename to src/TestWebsites/MVC/Views/Home/Bmp.cshtml diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/External.cshtml b/src/TestWebsites/MVC/Views/Home/External.cshtml similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Views/Home/External.cshtml rename to src/TestWebsites/MVC/Views/Home/External.cshtml diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Gif.cshtml b/src/TestWebsites/MVC/Views/Home/Gif.cshtml similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Gif.cshtml rename to src/TestWebsites/MVC/Views/Home/Gif.cshtml diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml b/src/TestWebsites/MVC/Views/Home/Index.cshtml similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml rename to src/TestWebsites/MVC/Views/Home/Index.cshtml diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Png.cshtml b/src/TestWebsites/MVC/Views/Home/Png.cshtml similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Png.cshtml rename to src/TestWebsites/MVC/Views/Home/Png.cshtml diff --git a/src/TestWebsites/NET4/Views/Home/Png8.cshtml b/src/TestWebsites/MVC/Views/Home/Png8.cshtml similarity index 100% rename from src/TestWebsites/NET4/Views/Home/Png8.cshtml rename to src/TestWebsites/MVC/Views/Home/Png8.cshtml diff --git a/src/TestWebsites/NET4/Views/Home/Tiff.cshtml b/src/TestWebsites/MVC/Views/Home/Tiff.cshtml similarity index 100% rename from src/TestWebsites/NET4/Views/Home/Tiff.cshtml rename to src/TestWebsites/MVC/Views/Home/Tiff.cshtml diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/WebP.cshtml b/src/TestWebsites/MVC/Views/Home/WebP.cshtml similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Views/Home/WebP.cshtml rename to src/TestWebsites/MVC/Views/Home/WebP.cshtml diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Shared/_Layout.cshtml b/src/TestWebsites/MVC/Views/Shared/_Layout.cshtml similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Views/Shared/_Layout.cshtml rename to src/TestWebsites/MVC/Views/Shared/_Layout.cshtml diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Web.config b/src/TestWebsites/MVC/Views/Web.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Views/Web.config rename to src/TestWebsites/MVC/Views/Web.config diff --git a/src/TestWebsites/NET4/Views/_ViewStart.cshtml b/src/TestWebsites/MVC/Views/_ViewStart.cshtml similarity index 100% rename from src/TestWebsites/NET4/Views/_ViewStart.cshtml rename to src/TestWebsites/MVC/Views/_ViewStart.cshtml diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Web.Debug.config b/src/TestWebsites/MVC/Web.Debug.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Web.Debug.config rename to src/TestWebsites/MVC/Web.Debug.config diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Web.Release.config b/src/TestWebsites/MVC/Web.Release.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Web.Release.config rename to src/TestWebsites/MVC/Web.Release.config diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Web.config b/src/TestWebsites/MVC/Web.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/Web.config rename to src/TestWebsites/MVC/Web.config diff --git a/src/TestWebsites/NET4/config/imageprocessor/cache.config b/src/TestWebsites/MVC/config/imageprocessor/cache.config similarity index 100% rename from src/TestWebsites/NET4/config/imageprocessor/cache.config rename to src/TestWebsites/MVC/config/imageprocessor/cache.config diff --git a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config b/src/TestWebsites/MVC/config/imageprocessor/processing.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config rename to src/TestWebsites/MVC/config/imageprocessor/processing.config diff --git a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config b/src/TestWebsites/MVC/config/imageprocessor/security.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config rename to src/TestWebsites/MVC/config/imageprocessor/security.config diff --git a/src/TestWebsites/NET45/Test_Website_NET45/packages.config b/src/TestWebsites/MVC/packages.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/packages.config rename to src/TestWebsites/MVC/packages.config diff --git a/src/TestWebsites/NET4/Controllers/HomeController.cs b/src/TestWebsites/NET4/Controllers/HomeController.cs deleted file mode 100644 index 88b37915f..000000000 --- a/src/TestWebsites/NET4/Controllers/HomeController.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; - -namespace Test.Controllers -{ - public class HomeController : Controller - { - // - // GET: /Home/ - - public ActionResult Index() - { - return this.View(); - } - - public ActionResult Png() - { - return this.View(); - } - - public ActionResult Png8() - { - return this.View(); - } - - public ActionResult Gif() - { - return this.View(); - } - - public ActionResult Bmp() - { - return View(); - } - - public ActionResult Tiff() - { - return View(); - } - - public ActionResult External() - { - return this.View(); - } - - } -} diff --git a/src/TestWebsites/NET4/Global.asax b/src/TestWebsites/NET4/Global.asax deleted file mode 100644 index 5798265d5..000000000 --- a/src/TestWebsites/NET4/Global.asax +++ /dev/null @@ -1 +0,0 @@ -<%@ Application Codebehind="Global.asax.cs" Inherits="Test.MvcApplication" Language="C#" %> diff --git a/src/TestWebsites/NET4/Global.asax.cs b/src/TestWebsites/NET4/Global.asax.cs deleted file mode 100644 index 1d151b372..000000000 --- a/src/TestWebsites/NET4/Global.asax.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; -using System.Web.Routing; - -namespace Test -{ - // Note: For instructions on enabling IIS6 or IIS7 classic mode, - // visit http://go.microsoft.com/?LinkId=9394801 - - public class MvcApplication : System.Web.HttpApplication - { - public static void RegisterGlobalFilters(GlobalFilterCollection filters) - { - filters.Add(new HandleErrorAttribute()); - } - - public static void RegisterRoutes(RouteCollection routes) - { - routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); - - routes.MapRoute( - "Default", // Route name - "{controller}/{action}/{id}", // URL with parameters - new { controller = "Home", action = "Index", id = UrlParameter.Optional } // Parameter defaults - ); - - } - - protected void Application_Start() - { - AreaRegistration.RegisterAllAreas(); - - RegisterGlobalFilters(GlobalFilters.Filters); - RegisterRoutes(RouteTable.Routes); - } - } -} \ No newline at end of file diff --git a/src/TestWebsites/NET4/Properties/AssemblyInfo.cs b/src/TestWebsites/NET4/Properties/AssemblyInfo.cs deleted file mode 100644 index 499251b9f..000000000 --- a/src/TestWebsites/NET4/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Test")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("34f4c859-67cc-40d2-97ae-27e8c7157052")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/TestWebsites/NET4/Scripts/img.srcsect.pollyfill.js b/src/TestWebsites/NET4/Scripts/img.srcsect.pollyfill.js deleted file mode 100644 index 9eaa4e2ed..000000000 --- a/src/TestWebsites/NET4/Scripts/img.srcsect.pollyfill.js +++ /dev/null @@ -1,103 +0,0 @@ -(function ($) { - // http: //www.whatwg.org/specs/web-apps/current-work/multipage/embedded-content-1.html#attr-img-srcset - - // Regexes for matching queries. - var rSrc = /[^\s]+/, - rWidth = /(\d+)w/, - rRatio = /(\d+)x/; - - // Detect retina display - // http: //www.quirksmode.org/blog/archives/2012/06/devicepixelrati.html - var pixelRatio = (window.devicePixelRatio || 1); - - // Cache the images as theres no point querying them twice. - var imageList = []; - - // http://lodash.com/docs/#debounce - var debounce = function (func, wait, immediate) { - var args, - result, - thisArg, - timeoutId; - - function delayed() { - timeoutId = null; - if (!immediate) { - func.apply(thisArg, args); - } - } - - return function () { - var isImmediate = immediate && !timeoutId; - args = arguments; - thisArg = this; - - clearTimeout(timeoutId); - timeoutId = setTimeout(delayed, wait); - - if (isImmediate) { - result = func.apply(thisArg, args); - } - return result; - }; - }; - - var getImgSrc = function (image) { - var imgSrc = null, imgWidth = 0, i, - imgSrcParts = image.attributes["srcset"].nodeValue.split(","), - len = imgSrcParts.length, - width = $(window).width(); - - for (i = 0; i < len; i += 1) { - - // This is just a rough play on the algorithm. - var newImgSrc = imgSrcParts[i].match(rSrc)[0], - newImgWidth = rWidth.test(imgSrcParts[i]) ? parseInt(imgSrcParts[i].match(rWidth)[1], 10) : 1, // Use 1 for truthy - newPixelRatio = rRatio.test(imgSrcParts[i]) ? parseInt(imgSrcParts[i].match(rRatio)[1], 10) : 1; - - if ((newImgWidth > imgWidth && width > newImgWidth && newPixelRatio === pixelRatio)) { - - imgWidth = newImgWidth || imgWidth; - imgSrc = newImgSrc; - } - } - - // Return null - return imgSrc; - }; - - $(window).resize(function () { - - $.each(imageList, function () { - var self = this, - checkImage = function () { - var src = getImgSrc(self); - - if (src) { - self.src = src; - } - - }, - lazyCheck = debounce(checkImage, 100); - - // Run debounced - lazyCheck(); - - }); - - }); - - $(window).load(function () { - $("img[srcset]").each(function () { - - var src = getImgSrc(this); - - if (src) { - this.src = src; - } - - imageList.push(this); - }); - }); - -} (jQuery)); \ No newline at end of file diff --git a/src/TestWebsites/NET4/Test_Website_MVC_NET4.csproj b/src/TestWebsites/NET4/Test_Website_MVC_NET4.csproj deleted file mode 100644 index 6158a3bce..000000000 --- a/src/TestWebsites/NET4/Test_Website_MVC_NET4.csproj +++ /dev/null @@ -1,246 +0,0 @@ - - - - - Debug - AnyCPU - - - 2.0 - {30327C08-7574-4D7E-AC95-6A58753C6855} - {E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - Test - Test - v4.0 - false - false - - - - - 4.0 - - - - - ..\..\ - true - true - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\ - TRACE - prompt - 4 - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - - - - - False - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - False - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - False - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - - ..\..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.IO.dll - - - - ..\..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Runtime.dll - - - ..\..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Threading.Tasks.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - Global.asax - - - - - - - - - Designer - - - Web.config - - - Web.config - - - - - - - - - - - - {4f7050f2-465f-4e10-8db2-2fb97ac6aa43} - ImageProcessor.Web_NET4 - - - {3B5DD734-FB7A-487D-8CE6-55E7AF9AEA7E} - ImageProcessor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - true - bin\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - bin\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - False - True - 21961 - / - - - False - False - - - False - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/TestWebsites/NET4/Views/Home/External.cshtml b/src/TestWebsites/NET4/Views/Home/External.cshtml deleted file mode 100644 index 220d6a0a9..000000000 --- a/src/TestWebsites/NET4/Views/Home/External.cshtml +++ /dev/null @@ -1,14 +0,0 @@ -@{ - ViewBag.Title = "External"; -} -

External

-
-
-
- -
-
- -
-
-
diff --git a/src/TestWebsites/NET4/Views/Home/Gif.cshtml b/src/TestWebsites/NET4/Views/Home/Gif.cshtml deleted file mode 100644 index cb7c3ba25..000000000 --- a/src/TestWebsites/NET4/Views/Home/Gif.cshtml +++ /dev/null @@ -1,99 +0,0 @@ -@{ - ViewBag.Title = "Gif"; -} -
-

Gif

-
-
-
-

Resized

- -
-
-

Cropped

- -
-
-
-
-

Filter

-
-
-

blackwhite

- -
-
-

comic

- -
-
-
-
-

lomograph

- -
-
-

greyscale

- -
-
-
-
-

polaroid

- -
-
-

sepia

- -
-
-
-
-

gotham

- -
-
-

hisatch

- -
-
-
-
-

losatch

- -
-
-
-
-
-
-

Watermark

- -
-
-

Format

- -
-
-
-
-
-
-

Rotate

- -
-
-

Quality

- -
-
-
-
-
-
-

Alpha

- -
-
-
-
diff --git a/src/TestWebsites/NET4/Views/Home/Index.cshtml b/src/TestWebsites/NET4/Views/Home/Index.cshtml deleted file mode 100644 index adde1b4a6..000000000 --- a/src/TestWebsites/NET4/Views/Home/Index.cshtml +++ /dev/null @@ -1,191 +0,0 @@ -@{ - ViewBag.Title = "Home Page"; -} -
-

Jpg

-
-
-
-

Resized

- -

Foreign language test.

- - -
-
-

Cropped

- -
-
-
-
-
-

Reside Pad

-
- -
-
- -
-
-
-
-
-

Resize Crop

-
- -
-
- -
-
-
-
-
-

Resize Max

-
- -
-
- -
-
-
-
-
-

Resize Stretch

-
- -
-
- -
-
-
-
-

Filter

-
-
-

blackwhite

- -
-
-

comic

- -
-
-
-
-

lomograph

- -
-
-

greyscale

- -
-
-
-
-

polaroid

- -
-
-

sepia

- -
-
-
-
-

gotham

- -
-
-

hisatch

- -
-
-
-
-

losatch

- -
-
-
-
-
-
-

Watermark

- -
-
-

Format

- -
-
-
-
-
-
-

Rotate

- -
-
-

Quality

- -
-
-
-
-
-
-

Alpha

- -
-
-

Remote

-
-
-
-
-
-
-

Flip - horizontal

- -
-
-

Flip - vertical

- -
-
-
-
- - -
-

Color Profiles

- @*
-
-
-

CMYK original jpg

- -
-
-

sRGB original jpg

- -
-
-
*@ -
-
-
-

CMYK resized jpg

- -
- -
-

sRGB resized jpg

- -
-
-
-
diff --git a/src/TestWebsites/NET4/Views/Home/Png.cshtml b/src/TestWebsites/NET4/Views/Home/Png.cshtml deleted file mode 100644 index d01e7ae8c..000000000 --- a/src/TestWebsites/NET4/Views/Home/Png.cshtml +++ /dev/null @@ -1,99 +0,0 @@ -@{ - ViewBag.Title = "Png"; -} -
-

Png

-
-
-
-

Resized

- -
-
-

Cropped

- -
-
-
-
-

Filter

-
-
-

blackwhite

- -
-
-

comic

- -
-
-
-
-

lomograph

- -
-
-

greyscale

- -
-
-
-
-

polaroid

- -
-
-

sepia

- -
-
-
-
-

gotham

- -
-
-

hisatch

- -
-
-
-
-

losatch

- -
-
-
-
-
-
-

Watermark

- -
-
-

Format

- -
-
-
-
-
-
-

Rotate

- -
-
-

Quality

- -
-
-
-
-
-
-

Alpha

- -
-
-
-
diff --git a/src/TestWebsites/NET4/Views/Shared/_Layout.cshtml b/src/TestWebsites/NET4/Views/Shared/_Layout.cshtml deleted file mode 100644 index 2a812b676..000000000 --- a/src/TestWebsites/NET4/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - @ViewBag.Title - - - - -
-
-

ImageProcessor NET4

-
- -
- @RenderBody() -
-
- - diff --git a/src/TestWebsites/NET4/Views/Web.config b/src/TestWebsites/NET4/Views/Web.config deleted file mode 100644 index a4def2a3d..000000000 --- a/src/TestWebsites/NET4/Views/Web.config +++ /dev/null @@ -1,58 +0,0 @@ - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TestWebsites/NET4/Web.Debug.config b/src/TestWebsites/NET4/Web.Debug.config deleted file mode 100644 index 2c6dd51a7..000000000 --- a/src/TestWebsites/NET4/Web.Debug.config +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/TestWebsites/NET4/Web.Release.config b/src/TestWebsites/NET4/Web.Release.config deleted file mode 100644 index 4122d79bf..000000000 --- a/src/TestWebsites/NET4/Web.Release.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/TestWebsites/NET4/Web.config b/src/TestWebsites/NET4/Web.config deleted file mode 100644 index 52384bc51..000000000 --- a/src/TestWebsites/NET4/Web.config +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/TestWebsites/NET4/config/imageprocessor/processing.config b/src/TestWebsites/NET4/config/imageprocessor/processing.config deleted file mode 100644 index 9628cf652..000000000 --- a/src/TestWebsites/NET4/config/imageprocessor/processing.config +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TestWebsites/NET4/config/imageprocessor/security.config b/src/TestWebsites/NET4/config/imageprocessor/security.config deleted file mode 100644 index 44fbb5d64..000000000 --- a/src/TestWebsites/NET4/config/imageprocessor/security.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/TestWebsites/NET4/packages.config b/src/TestWebsites/NET4/packages.config deleted file mode 100644 index c7068f590..000000000 --- a/src/TestWebsites/NET4/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Content/responsive.min.css.REMOVED.git-id b/src/TestWebsites/NET45/Test_Website_NET45/Content/responsive.min.css.REMOVED.git-id deleted file mode 100644 index bcf841f2a..000000000 --- a/src/TestWebsites/NET45/Test_Website_NET45/Content/responsive.min.css.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -e0fbb23ec0c6b4a6980ac29f0c71b82ff900eebc \ No newline at end of file diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Bmp.cshtml b/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Bmp.cshtml deleted file mode 100644 index 26b21ad46..000000000 --- a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Bmp.cshtml +++ /dev/null @@ -1,100 +0,0 @@ -@{ - ViewBag.Title = "Bmp"; -} - -
-

Bmp

-
-
-
-

Resized

- -
-
-

Cropped

- -
-
-
-
-

Filter

-
-
-

blackwhite

- -
-
-

comic

- -
-
-
-
-

lomograph

- -
-
-

greyscale

- -
-
-
-
-

polaroid

- -
-
-

sepia

- -
-
-
-
-

gotham

- -
-
-

hisatch

- -
-
-
-
-

losatch

- -
-
-
-
-
-
-

Watermark

- -
-
-

Format

- -
-
-
-
-
-
-

Rotate

- -
-
-

Quality

- -
-
-
-
-
-
-

Alpha

- -
-
-
-
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Png8.cshtml b/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Png8.cshtml deleted file mode 100644 index 8784c836f..000000000 --- a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Png8.cshtml +++ /dev/null @@ -1,100 +0,0 @@ -@{ - ViewBag.Title = "Png8"; -} - -
-

Png8

-
-
-
-

Resized

- -
-
-

Cropped

- -
-
-
-
-

Filter

-
-
-

blackwhite

- -
-
-

comic

- -
-
-
-
-

lomograph

- -
-
-

greyscale

- -
-
-
-
-

polaroid

- -
-
-

sepia

- -
-
-
-
-

gotham

- -
-
-

hisatch

- -
-
-
-
-

losatch

- -
-
-
-
-
-
-

Watermark

- -
-
-

Format

- -
-
-
-
-
-
-

Rotate

- -
-
-

Quality

- -
-
-
-
-
-
-

Alpha

- -
-
-
-
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Tiff.cshtml b/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Tiff.cshtml deleted file mode 100644 index 091e068fb..000000000 --- a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Tiff.cshtml +++ /dev/null @@ -1,99 +0,0 @@ -@{ - ViewBag.Title = "Tiff"; -} -
-

Tiff

-
-
-
-

Resized

- -
-
-

Cropped

- -
-
-
-
-

Filter

-
-
-

blackwhite

- -
-
-

comic

- -
-
-
-
-

lomograph

- -
-
-

greyscale

- -
-
-
-
-

polaroid

- -
-
-

sepia

- -
-
-
-
-

gotham

- -
-
-

hisatch

- -
-
-
-
-

losatch

- -
-
-
-
-
-
-

Watermark

- -
-
-

Format

- -
-
-
-
-
-
-

Rotate

- -
-
-

Quality

- -
-
-
-
-
-
-

Alpha

- -
-
-
-
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/_ViewStart.cshtml b/src/TestWebsites/NET45/Test_Website_NET45/Views/_ViewStart.cshtml deleted file mode 100644 index efda124b1..000000000 --- a/src/TestWebsites/NET45/Test_Website_NET45/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "~/Views/Shared/_Layout.cshtml"; -} \ No newline at end of file diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/cache.config b/src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/cache.config deleted file mode 100644 index e4a9c5e9a..000000000 --- a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/cache.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/About.aspx b/src/TestWebsites/WebForms/About.aspx similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/About.aspx rename to src/TestWebsites/WebForms/About.aspx diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/About.aspx.cs b/src/TestWebsites/WebForms/About.aspx.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/About.aspx.cs rename to src/TestWebsites/WebForms/About.aspx.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/About.aspx.designer.cs b/src/TestWebsites/WebForms/About.aspx.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/About.aspx.designer.cs rename to src/TestWebsites/WebForms/About.aspx.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Login.aspx b/src/TestWebsites/WebForms/Account/Login.aspx similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Login.aspx rename to src/TestWebsites/WebForms/Account/Login.aspx diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Login.aspx.cs b/src/TestWebsites/WebForms/Account/Login.aspx.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Login.aspx.cs rename to src/TestWebsites/WebForms/Account/Login.aspx.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Login.aspx.designer.cs b/src/TestWebsites/WebForms/Account/Login.aspx.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Login.aspx.designer.cs rename to src/TestWebsites/WebForms/Account/Login.aspx.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Manage.aspx b/src/TestWebsites/WebForms/Account/Manage.aspx similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Manage.aspx rename to src/TestWebsites/WebForms/Account/Manage.aspx diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Manage.aspx.cs b/src/TestWebsites/WebForms/Account/Manage.aspx.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Manage.aspx.cs rename to src/TestWebsites/WebForms/Account/Manage.aspx.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Manage.aspx.designer.cs b/src/TestWebsites/WebForms/Account/Manage.aspx.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Manage.aspx.designer.cs rename to src/TestWebsites/WebForms/Account/Manage.aspx.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/OpenAuthProviders.ascx b/src/TestWebsites/WebForms/Account/OpenAuthProviders.ascx similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/OpenAuthProviders.ascx rename to src/TestWebsites/WebForms/Account/OpenAuthProviders.ascx diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/OpenAuthProviders.ascx.cs b/src/TestWebsites/WebForms/Account/OpenAuthProviders.ascx.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/OpenAuthProviders.ascx.cs rename to src/TestWebsites/WebForms/Account/OpenAuthProviders.ascx.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/OpenAuthProviders.ascx.designer.cs b/src/TestWebsites/WebForms/Account/OpenAuthProviders.ascx.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/OpenAuthProviders.ascx.designer.cs rename to src/TestWebsites/WebForms/Account/OpenAuthProviders.ascx.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Register.aspx b/src/TestWebsites/WebForms/Account/Register.aspx similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Register.aspx rename to src/TestWebsites/WebForms/Account/Register.aspx diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Register.aspx.cs b/src/TestWebsites/WebForms/Account/Register.aspx.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Register.aspx.cs rename to src/TestWebsites/WebForms/Account/Register.aspx.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Register.aspx.designer.cs b/src/TestWebsites/WebForms/Account/Register.aspx.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Register.aspx.designer.cs rename to src/TestWebsites/WebForms/Account/Register.aspx.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/RegisterExternalLogin.aspx b/src/TestWebsites/WebForms/Account/RegisterExternalLogin.aspx similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/RegisterExternalLogin.aspx rename to src/TestWebsites/WebForms/Account/RegisterExternalLogin.aspx diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/RegisterExternalLogin.aspx.cs b/src/TestWebsites/WebForms/Account/RegisterExternalLogin.aspx.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/RegisterExternalLogin.aspx.cs rename to src/TestWebsites/WebForms/Account/RegisterExternalLogin.aspx.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/RegisterExternalLogin.aspx.designer.cs b/src/TestWebsites/WebForms/Account/RegisterExternalLogin.aspx.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/RegisterExternalLogin.aspx.designer.cs rename to src/TestWebsites/WebForms/Account/RegisterExternalLogin.aspx.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Web.config b/src/TestWebsites/WebForms/Account/Web.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Account/Web.config rename to src/TestWebsites/WebForms/Account/Web.config diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/App_Start/AuthConfig.cs b/src/TestWebsites/WebForms/App_Start/AuthConfig.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/App_Start/AuthConfig.cs rename to src/TestWebsites/WebForms/App_Start/AuthConfig.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/App_Start/BundleConfig.cs b/src/TestWebsites/WebForms/App_Start/BundleConfig.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/App_Start/BundleConfig.cs rename to src/TestWebsites/WebForms/App_Start/BundleConfig.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/App_Start/RouteConfig.cs b/src/TestWebsites/WebForms/App_Start/RouteConfig.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/App_Start/RouteConfig.cs rename to src/TestWebsites/WebForms/App_Start/RouteConfig.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Bundle.config b/src/TestWebsites/WebForms/Bundle.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Bundle.config rename to src/TestWebsites/WebForms/Bundle.config diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Contact.aspx b/src/TestWebsites/WebForms/Contact.aspx similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Contact.aspx rename to src/TestWebsites/WebForms/Contact.aspx diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Contact.aspx.cs b/src/TestWebsites/WebForms/Contact.aspx.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Contact.aspx.cs rename to src/TestWebsites/WebForms/Contact.aspx.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Contact.aspx.designer.cs b/src/TestWebsites/WebForms/Contact.aspx.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Contact.aspx.designer.cs rename to src/TestWebsites/WebForms/Contact.aspx.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Content/Site.css b/src/TestWebsites/WebForms/Content/Site.css similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Content/Site.css rename to src/TestWebsites/WebForms/Content/Site.css diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Default.aspx b/src/TestWebsites/WebForms/Default.aspx similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Default.aspx rename to src/TestWebsites/WebForms/Default.aspx diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Default.aspx.cs b/src/TestWebsites/WebForms/Default.aspx.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Default.aspx.cs rename to src/TestWebsites/WebForms/Default.aspx.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Default.aspx.designer.cs b/src/TestWebsites/WebForms/Default.aspx.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Default.aspx.designer.cs rename to src/TestWebsites/WebForms/Default.aspx.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Global.asax b/src/TestWebsites/WebForms/Global.asax similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Global.asax rename to src/TestWebsites/WebForms/Global.asax diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Global.asax.cs b/src/TestWebsites/WebForms/Global.asax.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Global.asax.cs rename to src/TestWebsites/WebForms/Global.asax.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Properties/AssemblyInfo.cs b/src/TestWebsites/WebForms/Properties/AssemblyInfo.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Properties/AssemblyInfo.cs rename to src/TestWebsites/WebForms/Properties/AssemblyInfo.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/DetailsView.js b/src/TestWebsites/WebForms/Scripts/WebForms/DetailsView.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/DetailsView.js rename to src/TestWebsites/WebForms/Scripts/WebForms/DetailsView.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/Focus.js b/src/TestWebsites/WebForms/Scripts/WebForms/Focus.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/Focus.js rename to src/TestWebsites/WebForms/Scripts/WebForms/Focus.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/GridView.js b/src/TestWebsites/WebForms/Scripts/WebForms/GridView.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/GridView.js rename to src/TestWebsites/WebForms/Scripts/WebForms/GridView.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjax.js.REMOVED.git-id b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjax.js.REMOVED.git-id similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjax.js.REMOVED.git-id rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjax.js.REMOVED.git-id diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxApplicationServices.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxComponentModel.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxCore.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxGlobalization.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxHistory.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxNetwork.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxSerialization.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxTimer.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxWebForms.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js b/src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MSAjax/MicrosoftAjaxWebServices.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/Menu.js b/src/TestWebsites/WebForms/Scripts/WebForms/Menu.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/Menu.js rename to src/TestWebsites/WebForms/Scripts/WebForms/Menu.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MenuStandards.js b/src/TestWebsites/WebForms/Scripts/WebForms/MenuStandards.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/MenuStandards.js rename to src/TestWebsites/WebForms/Scripts/WebForms/MenuStandards.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/SmartNav.js b/src/TestWebsites/WebForms/Scripts/WebForms/SmartNav.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/SmartNav.js rename to src/TestWebsites/WebForms/Scripts/WebForms/SmartNav.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/TreeView.js b/src/TestWebsites/WebForms/Scripts/WebForms/TreeView.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/TreeView.js rename to src/TestWebsites/WebForms/Scripts/WebForms/TreeView.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/WebForms.js b/src/TestWebsites/WebForms/Scripts/WebForms/WebForms.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/WebForms.js rename to src/TestWebsites/WebForms/Scripts/WebForms/WebForms.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/WebParts.js b/src/TestWebsites/WebForms/Scripts/WebForms/WebParts.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/WebParts.js rename to src/TestWebsites/WebForms/Scripts/WebForms/WebParts.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/WebUIValidation.js b/src/TestWebsites/WebForms/Scripts/WebForms/WebUIValidation.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/WebForms/WebUIValidation.js rename to src/TestWebsites/WebForms/Scripts/WebForms/WebUIValidation.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/_references.js b/src/TestWebsites/WebForms/Scripts/_references.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/_references.js rename to src/TestWebsites/WebForms/Scripts/_references.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/jquery-1.8.2.intellisense.js.REMOVED.git-id b/src/TestWebsites/WebForms/Scripts/jquery-1.8.2.intellisense.js.REMOVED.git-id similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/jquery-1.8.2.intellisense.js.REMOVED.git-id rename to src/TestWebsites/WebForms/Scripts/jquery-1.8.2.intellisense.js.REMOVED.git-id diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/modernizr-2.6.2.js b/src/TestWebsites/WebForms/Scripts/modernizr-2.6.2.js similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Scripts/modernizr-2.6.2.js rename to src/TestWebsites/WebForms/Scripts/modernizr-2.6.2.js diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master b/src/TestWebsites/WebForms/Site.Master similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master rename to src/TestWebsites/WebForms/Site.Master diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master.cs b/src/TestWebsites/WebForms/Site.Master.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master.cs rename to src/TestWebsites/WebForms/Site.Master.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master.designer.cs b/src/TestWebsites/WebForms/Site.Master.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Master.designer.cs rename to src/TestWebsites/WebForms/Site.Master.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Mobile.Master b/src/TestWebsites/WebForms/Site.Mobile.Master similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Mobile.Master rename to src/TestWebsites/WebForms/Site.Mobile.Master diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Mobile.Master.cs b/src/TestWebsites/WebForms/Site.Mobile.Master.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Mobile.Master.cs rename to src/TestWebsites/WebForms/Site.Mobile.Master.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Mobile.Master.designer.cs b/src/TestWebsites/WebForms/Site.Mobile.Master.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Site.Mobile.Master.designer.cs rename to src/TestWebsites/WebForms/Site.Mobile.Master.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Test_Website_Webforms_NET45.csproj b/src/TestWebsites/WebForms/Test_Website_Webforms.csproj similarity index 98% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Test_Website_Webforms_NET45.csproj rename to src/TestWebsites/WebForms/Test_Website_Webforms.csproj index 424aabccd..ddb6983ea 100644 --- a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Test_Website_Webforms_NET45.csproj +++ b/src/TestWebsites/WebForms/Test_Website_Webforms.csproj @@ -271,11 +271,11 @@ - + {d011a778-59c8-4bfa-a770-c350216bf161} - ImageProcessor.Web_NET45 + ImageProcessor.Web - + {3b5dd734-fb7a-487d-8ce6-55e7af9aea7e} ImageProcessor diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/ViewSwitcher.ascx b/src/TestWebsites/WebForms/ViewSwitcher.ascx similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/ViewSwitcher.ascx rename to src/TestWebsites/WebForms/ViewSwitcher.ascx diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/ViewSwitcher.ascx.cs b/src/TestWebsites/WebForms/ViewSwitcher.ascx.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/ViewSwitcher.ascx.cs rename to src/TestWebsites/WebForms/ViewSwitcher.ascx.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/ViewSwitcher.ascx.designer.cs b/src/TestWebsites/WebForms/ViewSwitcher.ascx.designer.cs similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/ViewSwitcher.ascx.designer.cs rename to src/TestWebsites/WebForms/ViewSwitcher.ascx.designer.cs diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.Debug.config b/src/TestWebsites/WebForms/Web.Debug.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.Debug.config rename to src/TestWebsites/WebForms/Web.Debug.config diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.Release.config b/src/TestWebsites/WebForms/Web.Release.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.Release.config rename to src/TestWebsites/WebForms/Web.Release.config diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config b/src/TestWebsites/WebForms/Web.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config rename to src/TestWebsites/WebForms/Web.config diff --git a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/cache.config b/src/TestWebsites/WebForms/config/imageprocessor/cache.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/cache.config rename to src/TestWebsites/WebForms/config/imageprocessor/cache.config diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/processing.config b/src/TestWebsites/WebForms/config/imageprocessor/processing.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/processing.config rename to src/TestWebsites/WebForms/config/imageprocessor/processing.config diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/security.config b/src/TestWebsites/WebForms/config/imageprocessor/security.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/config/imageprocessor/security.config rename to src/TestWebsites/WebForms/config/imageprocessor/security.config diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/favicon.ico b/src/TestWebsites/WebForms/favicon.ico similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/favicon.ico rename to src/TestWebsites/WebForms/favicon.ico diff --git a/src/TestWebsites/NET45/Test_Website_Webforms_NET45/packages.config b/src/TestWebsites/WebForms/packages.config similarity index 100% rename from src/TestWebsites/NET45/Test_Website_Webforms_NET45/packages.config rename to src/TestWebsites/WebForms/packages.config diff --git a/src/packages/repositories.config b/src/packages/repositories.config index 14108b962..3406fa91f 100644 --- a/src/packages/repositories.config +++ b/src/packages/repositories.config @@ -4,7 +4,9 @@ + + \ No newline at end of file