Skip to content

Commit 5a895a2

Browse files
authored
Merge pull request #56 from f7q/feature/dotnet1_1
update dotnet sdk 1.1
2 parents e5d48d5 + bc75df6 commit 5a895a2

File tree

5 files changed

+23
-18
lines changed

5 files changed

+23
-18
lines changed

build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var buildArtifacts = Directory("./artifacts/packages");
99

1010
var isAppVeyor = AppVeyor.IsRunningOnAppVeyor;
1111
var isWindows = IsRunningOnWindows();
12-
var netcore = "netcoreapp1.0";
12+
var netcore = "netcoreapp1.1";
1313
var netstandard = "netstandard1.6";
1414

1515

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "src", "test" ],
33
"sdk": {
4-
"version": "1.0.4"
4+
"version": "1.1.0"
55
}
66
}
Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>LearningCSharp.Service</AssemblyName>
77
<OutputType>Exe</OutputType>
88
<PackageId>LearningCSharp.Service</PackageId>
9-
<RuntimeFrameworkVersion>1.0.5</RuntimeFrameworkVersion>
10-
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
9+
<RuntimeFrameworkVersion>1.1.2</RuntimeFrameworkVersion>
1110
</PropertyGroup>
1211

1312
<ItemGroup>
@@ -17,15 +16,15 @@
1716
</ItemGroup>
1817

1918
<ItemGroup>
20-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.4" />
21-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.3" />
22-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.4" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.0.2" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
26-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
27-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
19+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
20+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
21+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
25+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
26+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
27+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
2928
</ItemGroup>
3029

3130
</Project>

test/LearningCSharp.Test/LearningCSharp.Test.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<AssemblyName>LearningCSharp.Test</AssemblyName>
77
<PackageId>LearningCSharp.Test</PackageId>
88
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
99
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net451+win8</PackageTargetFallback>
10-
<RuntimeFrameworkVersion>1.0.5</RuntimeFrameworkVersion>
10+
<RuntimeFrameworkVersion>1.1.2</RuntimeFrameworkVersion>
11+
<IsPackable>false</IsPackable>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
15-
<PackageReference Include="System.Diagnostics.Contracts" Version="4.0.1" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
16+
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
1617
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
1718
<PackageReference Include="xunit" Version="2.2.0" />
1819
<PackageReference Include="xunit.runners" Version="2.0.0" />
1920
</ItemGroup>
2021

22+
<ItemGroup>
23+
<ProjectReference Include="..\..\src\LearningCSharp.Service\LearningCSharp.Service.csproj" />
24+
</ItemGroup>
25+
2126
<ItemGroup>
2227
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
2328
</ItemGroup>

test/LearningCSharp.Test/UnitTest1.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Collections.Generic;
99
using System.IO;
1010
using System.Linq;
11+
using LearningCSharp.Service;
1112

1213
namespace LearningCSharp.Test
1314
{

0 commit comments

Comments
 (0)