Skip to content

Commit 4b30958

Browse files
dougbudougbu
committed
Build tests targeting .NET 4.5.2
- precondition for other tool upgrades; xUnit in particular does not support older framework versions No-op `test` target in Microsoft.TestCommon project
1 parent 634c9d2 commit 4b30958

File tree

33 files changed

+291
-273
lines changed

33 files changed

+291
-273
lines changed

‎src/Directory.Build.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<Import Project="..\Directory.Build.props" />
3+
4+
<PropertyGroup>
5+
<IsPackable>true</IsPackable>
6+
<IsTestProject>false</IsTestProject>
7+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
8+
</PropertyGroup>
9+
</Project>

‎src/System.Net.Http.Formatting.NetCore/System.Net.Http.Formatting.NetCore.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
1818
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1919
<NoWarn>1591</NoWarn>
20-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
2120
</PropertyGroup>
2221
<ItemGroup>
2322
<Compile Include="..\CommonAssemblyInfo.cs">

‎test/Directory.Build.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<Import Project="..\Directory.Build.props" />
3+
4+
<PropertyGroup>
5+
<IsPackable>false</IsPackable>
6+
<IsTestProject>true</IsTestProject>
7+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
8+
</PropertyGroup>
9+
</Project>

‎test/Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
</ItemGroup>
99

1010
<!-- Override AppDomains default (set in xunit.runner.json). Need them with this runner. -->
11-
<xunit AppDomains="true" Assemblies="@(TestAssembly)"/>
11+
<xunit AppDomains="true" Assemblies="@(TestAssembly)" Condition="$(IsTestProject)"/>
1212
</Target>
1313
</Project>

‎test/Microsoft.AspNet.Facebook.Test/packages.config‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
4-
<package id="Facebook" version="6.4.2" targetFramework="net45" />
5-
<package id="Moq" version="4.5.21" targetFramework="net45" />
6-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
7-
<package id="xunit" version="2.1.0" targetFramework="net45" />
8-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
9-
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
10-
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
11-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
12-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
13-
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
3+
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
4+
<package id="Facebook" version="6.4.2" targetFramework="net452" />
5+
<package id="Moq" version="4.5.21" targetFramework="net452" />
6+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
7+
<package id="xunit" version="2.1.0" targetFramework="net452" />
8+
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
9+
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
10+
<package id="xunit.core" version="2.1.0" targetFramework="net452" />
11+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
12+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
13+
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
1414
</packages>

‎test/Microsoft.TestCommon/Microsoft.TestCommon.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<AppDesignerFolder>Properties</AppDesignerFolder>
88
<RootNamespace>Microsoft.TestCommon</RootNamespace>
99
<AssemblyName>Microsoft.TestCommon</AssemblyName>
10+
<IsTestProject>false</IsTestProject>
1011
<OutputPath>..\..\bin\$(Configuration)\Test\</OutputPath>
1112
</PropertyGroup>
1213
<ItemGroup>

‎test/Microsoft.TestCommon/packages.config‎

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

‎test/Microsoft.Web.Helpers.Test/packages.config‎

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

‎test/Microsoft.Web.Mvc.Test/packages.config‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
4-
<package id="Moq" version="4.5.21" targetFramework="net45" />
5-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
6-
<package id="xunit" version="2.1.0" targetFramework="net45" />
7-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
8-
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
9-
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
10-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
11-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
12-
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
3+
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
4+
<package id="Moq" version="4.5.21" targetFramework="net452" />
5+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
6+
<package id="xunit" version="2.1.0" targetFramework="net452" />
7+
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
8+
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
9+
<package id="xunit.core" version="2.1.0" targetFramework="net452" />
10+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
11+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
12+
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
1313
</packages>

‎test/Microsoft.Web.WebPages.OAuth.Test/packages.config‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
4-
<package id="DotNetOpenAuth.AspNet" version="4.0.3.12153" targetFramework="net45" />
5-
<package id="DotNetOpenAuth.Core" version="4.0.3.12153" targetFramework="net45" />
6-
<package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.3.12153" targetFramework="net45" />
7-
<package id="DotNetOpenAuth.OAuth.Core" version="4.0.3.12153" targetFramework="net45" />
8-
<package id="DotNetOpenAuth.OpenId.Core" version="4.0.3.12153" targetFramework="net45" />
9-
<package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.3.12153" targetFramework="net45" />
10-
<package id="Moq" version="4.5.21" targetFramework="net45" />
11-
<package id="xunit" version="2.1.0" targetFramework="net45" />
12-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
13-
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
14-
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
15-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
16-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
17-
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
3+
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
4+
<package id="DotNetOpenAuth.AspNet" version="4.0.3.12153" targetFramework="net452" />
5+
<package id="DotNetOpenAuth.Core" version="4.0.3.12153" targetFramework="net452" />
6+
<package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.3.12153" targetFramework="net452" />
7+
<package id="DotNetOpenAuth.OAuth.Core" version="4.0.3.12153" targetFramework="net452" />
8+
<package id="DotNetOpenAuth.OpenId.Core" version="4.0.3.12153" targetFramework="net452" />
9+
<package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.3.12153" targetFramework="net452" />
10+
<package id="Moq" version="4.5.21" targetFramework="net452" />
11+
<package id="xunit" version="2.1.0" targetFramework="net452" />
12+
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
13+
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
14+
<package id="xunit.core" version="2.1.0" targetFramework="net452" />
15+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
16+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
17+
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
1818
</packages>

0 commit comments

Comments
 (0)