Skip to content
This repository was archived by the owner on Nov 2, 2018. It is now read-only.

Commit 2a016ab

Browse files
committed
Converted test projects to run on netcoreapp2.0
1 parent 6f46039 commit 2a016ab

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

DependencyInjection.sln

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26228.4
3+
VisualStudioVersion = 15.0.26228.9
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D26F6F80-63EE-4081-A814-EF3DBABE24D9}"
66
EndProject
@@ -20,7 +20,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
2020
EndProject
2121
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Specification.Tests", "src\Microsoft.Extensions.DependencyInjection.Specification.Tests\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj", "{B9395B0F-E8E3-4913-BABF-E71A76F21231}"
2222
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.DependencyInjection.Performance", "test\Microsoft.Extensions.DependencyInjection.Performance\Microsoft.Extensions.DependencyInjection.Performance.csproj", "{2AB56E17-8ADC-4763-B298-79BFECC351A8}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Performance", "test\Microsoft.Extensions.DependencyInjection.Performance\Microsoft.Extensions.DependencyInjection.Performance.csproj", "{2AB56E17-8ADC-4763-B298-79BFECC351A8}"
24+
EndProject
25+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{483CFA4B-18DB-404D-BCA0-E39E6734733F}"
26+
ProjectSection(SolutionItems) = preProject
27+
build\common.props = build\common.props
28+
build\dependencies.props = build\dependencies.props
29+
build\repo.props = build\repo.props
30+
EndProjectSection
2431
EndProject
2532
Global
2633
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -98,5 +105,6 @@ Global
98105
{4E959D3B-2E0D-4296-B22C-D428DED294F0} = {D26F6F80-63EE-4081-A814-EF3DBABE24D9}
99106
{B9395B0F-E8E3-4913-BABF-E71A76F21231} = {D26F6F80-63EE-4081-A814-EF3DBABE24D9}
100107
{2AB56E17-8ADC-4763-B298-79BFECC351A8} = {88B347C1-CCEC-4827-9564-FFF07C9BF7C7}
108+
{483CFA4B-18DB-404D-BCA0-E39E6734733F} = {39447DAF-CDD6-456F-B473-1E9A9D21ADF5}
101109
EndGlobalSection
102110
EndGlobal

build/dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<CoreFxVersion>4.3.0</CoreFxVersion>
66
<MoqVersion>4.7.1</MoqVersion>
77
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
8+
<RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
89
<TestSdkVersion>15.0.0</TestSdkVersion>
910
<XunitVersion>2.2.0</XunitVersion>
1011
</PropertyGroup>

test/Microsoft.Extensions.DependencyInjection.Performance/Microsoft.Extensions.DependencyInjection.Performance.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp1.1</TargetFramework>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
<OutputType>Exe</OutputType>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
99
<IsPackable>false</IsPackable>

test/Microsoft.Extensions.DependencyInjection.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
7-
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
6+
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
7+
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
88
</PropertyGroup>
99

1010
<ItemGroup>

0 commit comments

Comments
 (0)