Skip to content

Commit ff15caa

Browse files
committed
Updated tests to be still compatible with resharper runner.
1 parent 7b40c6e commit ff15caa

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

Build/Build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if(Test-Path .\Output) {
1010
# Visual Studio 2015
1111
$msbuild = "c:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe";
1212
# Compile the solution - the distributionrelease configuration contains installer, which is not normal configurations
13-
invoke-expression "$msbuild ..\Source\Terminals.sln /m /p:configuration=DistributionRelease /p:Platform='Any CPU' /t:rebuild" | Tee-Object $logFile -Append;
13+
invoke-expression "$msbuild ..\Source\Terminals.sln /m /p:configuration=DistributionRelease /p:Platform='Any CPU' /toolsversion:4.0 /t:rebuild" | Tee-Object $logFile -Append;
1414

1515
.\PackOutput.ps1 | Tee-Object $logFile -Append;
1616

Source/Tests/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
<entityFramework>
88
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
99
</entityFramework>
10-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration>
10+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

Source/Tests/Tests.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>Tests</RootNamespace>
1313
<AssemblyName>Tests</AssemblyName>
14-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
14+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1515
<FileAlignment>512</FileAlignment>
1616
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717
<SccProjectName>SAK</SccProjectName>
@@ -70,6 +70,10 @@
7070
<SpecificVersion>False</SpecificVersion>
7171
<HintPath>..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
7272
</Reference>
73+
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Microsoft.VisualStudio.QualityTools.UnitTestFramework.Updated.15.0.26228\lib\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
75+
<Private>True</Private>
76+
</Reference>
7377
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7478
<HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
7579
</Reference>

Source/Tests/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="5.0.0" targetFramework="net40" requireReinstallation="true" />
3+
<package id="EntityFramework" version="5.0.0" targetFramework="net40" />
44
<package id="log4net" version="2.0.0" targetFramework="net40" />
5+
<package id="Microsoft.VisualStudio.QualityTools.UnitTestFramework.Updated" version="15.0.26228" targetFramework="net40" />
56
<package id="Moq" version="4.2.1408.0717" targetFramework="net40" />
6-
<package id="MSTest.TestFramework" version="1.1.18" targetFramework="net451" />
77
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
88
</packages>

0 commit comments

Comments
 (0)