Skip to content

Commit e49bc67

Browse files
lilithlilith
committed
Upgrade FastScaling to VS2015, net452, and xunit 2.1
1 parent 080cf18 commit e49bc67

File tree

5 files changed

+36
-31
lines changed

5 files changed

+36
-31
lines changed

‎Plugins/FastScaling/ImageResizer.Plugins.FastScaling.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -20,36 +20,36 @@
2020
</ItemGroup>
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{9B97D952-2969-4F46-9758-9E712CDF3F72}</ProjectGuid>
23-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
23+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2424
<Keyword>ManagedCProj</Keyword>
2525
<RootNamespace>ImageResizerPluginsFastScaling</RootNamespace>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>DynamicLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v120</PlatformToolset>
31+
<PlatformToolset>v140</PlatformToolset>
3232
<CLRSupport>true</CLRSupport>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
3737
<UseDebugLibraries>true</UseDebugLibraries>
38-
<PlatformToolset>v120</PlatformToolset>
38+
<PlatformToolset>v140</PlatformToolset>
3939
<CLRSupport>true</CLRSupport>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>false</UseDebugLibraries>
45-
<PlatformToolset>v120</PlatformToolset>
45+
<PlatformToolset>v140</PlatformToolset>
4646
<CLRSupport>true</CLRSupport>
4747
<CharacterSet>Unicode</CharacterSet>
4848
</PropertyGroup>
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5050
<ConfigurationType>DynamicLibrary</ConfigurationType>
5151
<UseDebugLibraries>false</UseDebugLibraries>
52-
<PlatformToolset>v120</PlatformToolset>
52+
<PlatformToolset>v140</PlatformToolset>
5353
<CLRSupport>true</CLRSupport>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>

‎Plugins/FastScaling/NativeFastScaling/NativeFastScaling.Test/NativeFastScaling.Test.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -27,26 +27,26 @@
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v120</PlatformToolset>
30+
<PlatformToolset>v140</PlatformToolset>
3131
<CharacterSet>Unicode</CharacterSet>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v120</PlatformToolset>
36+
<PlatformToolset>v140</PlatformToolset>
3737
<CharacterSet>Unicode</CharacterSet>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4040
<ConfigurationType>Application</ConfigurationType>
4141
<UseDebugLibraries>false</UseDebugLibraries>
42-
<PlatformToolset>v120</PlatformToolset>
42+
<PlatformToolset>v140</PlatformToolset>
4343
<WholeProgramOptimization>true</WholeProgramOptimization>
4444
<CharacterSet>Unicode</CharacterSet>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v120</PlatformToolset>
49+
<PlatformToolset>v140</PlatformToolset>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
5151
<CharacterSet>Unicode</CharacterSet>
5252
</PropertyGroup>

‎Plugins/FastScaling/NativeFastScaling/NativeFastScaling.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -26,26 +26,26 @@
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2727
<ConfigurationType>StaticLibrary</ConfigurationType>
2828
<UseDebugLibraries>true</UseDebugLibraries>
29-
<PlatformToolset>v120</PlatformToolset>
29+
<PlatformToolset>v140</PlatformToolset>
3030
<CharacterSet>Unicode</CharacterSet>
3131
</PropertyGroup>
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3333
<ConfigurationType>StaticLibrary</ConfigurationType>
3434
<UseDebugLibraries>true</UseDebugLibraries>
35-
<PlatformToolset>v120</PlatformToolset>
35+
<PlatformToolset>v140</PlatformToolset>
3636
<CharacterSet>Unicode</CharacterSet>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3939
<ConfigurationType>StaticLibrary</ConfigurationType>
4040
<UseDebugLibraries>false</UseDebugLibraries>
41-
<PlatformToolset>v120</PlatformToolset>
41+
<PlatformToolset>v140</PlatformToolset>
4242
<WholeProgramOptimization>true</WholeProgramOptimization>
4343
<CharacterSet>Unicode</CharacterSet>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4646
<ConfigurationType>StaticLibrary</ConfigurationType>
4747
<UseDebugLibraries>false</UseDebugLibraries>
48-
<PlatformToolset>v120</PlatformToolset>
48+
<PlatformToolset>v140</PlatformToolset>
4949
<WholeProgramOptimization>true</WholeProgramOptimization>
5050
<CharacterSet>Unicode</CharacterSet>
5151
</PropertyGroup>

‎Tests/ImageResizer.Plugins.FastScaling.Tests/ImageResizer.Plugins.FastScaling.Tests.csproj

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\Packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\Packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,9 +9,11 @@
109
<AppDesignerFolder>Properties</AppDesignerFolder>
1110
<RootNamespace>ImageResizer.Plugins.FastScaling.Tests</RootNamespace>
1211
<AssemblyName>ImageResizer.Plugins.FastScaling.Tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1413
<FileAlignment>512</FileAlignment>
15-
<NuGetPackageImportStamp>d62e5888</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>
15+
</NuGetPackageImportStamp>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1819
<DebugSymbols>true</DebugSymbols>
@@ -63,13 +64,17 @@
6364
<SpecificVersion>False</SpecificVersion>
6465
<HintPath>..\..\Packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
6566
</Reference>
66-
<Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
67-
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\Packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
67+
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
68+
<HintPath>..\..\Packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
69+
<Private>True</Private>
6970
</Reference>
70-
<Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\Packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
71+
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
72+
<HintPath>..\..\Packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
73+
<Private>True</Private>
74+
</Reference>
75+
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
76+
<HintPath>..\..\Packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
77+
<Private>True</Private>
7378
</Reference>
7479
</ItemGroup>
7580
<ItemGroup>
@@ -102,5 +107,4 @@
102107
<Target Name="AfterBuild">
103108
</Target>
104109
-->
105-
</Project>
106-
110+
</Project>

‎Tests/ImageResizer.Plugins.FastScaling.Tests/packages.config

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit" version="2.0.0" targetFramework="net45" />
3+
<package id="xunit" version="2.1.0" targetFramework="net452" />
44
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
5-
<package id="xunit.assert" version="2.0.0" targetFramework="net45" />
6-
<package id="xunit.core" version="2.0.0" targetFramework="net45" />
7-
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
5+
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
6+
<package id="xunit.core" version="2.1.0" targetFramework="net452" />
7+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
8+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
89
</packages>

0 commit comments

Comments
 (0)