Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit 244deca

Browse files
SteveSandersonMSSteveSandersonMS
committed
Update libraries and samples to .NET Core 2.0
1 parent e081d5e commit 244deca

File tree

16 files changed

+31
-36
lines changed

16 files changed

+31
-36
lines changed

‎build/common.props

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project>
2-
32
<Import Project="dependencies.props" />
4-
<Import Project="version.props" />
3+
<Import Project="..\version.props" />
54

65
<PropertyGroup>
76
<Product>Microsoft ASP.NET Core</Product>
@@ -10,11 +9,14 @@
109
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
1110
<SignAssembly>true</SignAssembly>
1211
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
13-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1412
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
1513
</PropertyGroup>
1614

1715
<ItemGroup>
1816
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
1917
</ItemGroup>
18+
19+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
20+
<PackageReference Include="NETStandard.Library" Version="$(BundledNETStandardPackageVersion)" />
21+
</ItemGroup>
2022
</Project>

‎build/dependencies.props

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<Project>
22
<PropertyGroup>
3-
<AspNetCoreVersion>1.1.0</AspNetCoreVersion>
4-
<AspNetCoreMvcVersion>1.1.1</AspNetCoreMvcVersion>
5-
<AspNetCoreToolsVersion>1.0.0-msbuild3-final</AspNetCoreToolsVersion>
3+
<AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
64
<AutoMapperVersion>5.0.2</AutoMapperVersion>
75
<CoreFxVersion>4.3.0</CoreFxVersion>
6+
<InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
87
<JsonNetVersion>10.0.1</JsonNetVersion>
9-
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
10-
<MicrosoftDataflowVersion>4.5.24</MicrosoftDataflowVersion>
11-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
8+
<NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
129
<ThreadingDataflowVersion>4.7.0</ThreadingDataflowVersion>
1310
</PropertyGroup>
1411
</Project>

‎build/version.props

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎samples/angular/MusicStore/MusicStore.csproj

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

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

‎samples/misc/LatencyTest/LatencyTest.csproj

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

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

‎samples/misc/NodeServicesExamples/NodeServicesExamples.csproj

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

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

‎samples/misc/Webpack/Webpack.csproj

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

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

‎samples/react/MusicStore/MusicStore.csproj

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

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp1.1</TargetFramework>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
@@ -31,9 +31,4 @@
3131
<Exec Command="npm install" />
3232
<Exec Command="node node_modules/webpack/bin/webpack.js" />
3333
</Target>
34-
35-
<ItemGroup>
36-
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="$(AspNetCoreToolsVersion)" />
37-
</ItemGroup>
38-
3934
</Project>

‎samples/react/ReactGrid/ReactGrid.csproj

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

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

‎src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<Description>Helpers for building Angular applications on ASP.NET Core.</Description>
7-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
88
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
99
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
1010
</PropertyGroup>

‎src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<Description>Socket-based RPC for Microsoft.AspNetCore.NodeServices.</Description>
7-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
88
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
99
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
1010
</PropertyGroup>
@@ -17,11 +17,11 @@
1717
<ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
1818
</ItemGroup>
1919

20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
20+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
2121
<PackageReference Include="Microsoft.Tpl.Dataflow" Version="$(MicrosoftDataflowVersion)" />
2222
</ItemGroup>
2323

24-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
2525
<PackageReference Include="System.IO.Pipes" Version="$(CoreFxVersion)" />
2626
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(ThreadingDataflowVersion)" />
2727
</ItemGroup>

‎src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<Description>Invoke Node.js modules at runtime in ASP.NET Core applications.</Description>
7-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
88
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
99
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
1010
</PropertyGroup>
@@ -19,7 +19,7 @@
1919
<PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
2020
</ItemGroup>
2121

22-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
22+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
2323
<PackageReference Include="System.Diagnostics.Process" Version="$(CoreFxVersion)" />
2424
<PackageReference Include="System.IO.FileSystem.Watcher" Version="$(CoreFxVersion)" />
2525
<PackageReference Include="System.Runtime.Loader" Version="$(CoreFxVersion)" />

‎src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<Description>Helpers for building React applications on ASP.NET Core.</Description>
7-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
88
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
99
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
1010
</PropertyGroup>

‎src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
7-
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
88
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
99
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
1010
</PropertyGroup>

‎templates/WebApplicationBasic/WebApplicationBasic.csproj

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

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp1.1</TargetFramework>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCoreVersion)" />
17-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreMvcVersion)" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
1818
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
1919
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
2020
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />

‎version.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix. -->
2+
<Project>
3+
<PropertyGroup>
4+
<VersionPrefix>2.0.0</VersionPrefix>
5+
<VersionSuffix>preview2</VersionSuffix>
6+
</PropertyGroup>
7+
</Project>

0 commit comments

Comments
 (0)