Skip to content

Commit 3058c05

Browse files
natemcmasterSteveSandersonMS
natemcmaster
authored and
SteveSandersonMS
committed
Unify dependency versions across all non-template projects
1 parent 821ad85 commit 3058c05

File tree

15 files changed

+91
-65
lines changed

15 files changed

+91
-65
lines changed

src/build/Key.snk renamed to build/Key.snk

File renamed without changes.

src/build/common.props renamed to build/common.props

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<Project>
2+
3+
<Import Project="dependencies.props" />
4+
25
<PropertyGroup>
36
<Product>Microsoft ASP.NET Core</Product>
47
<RepositoryUrl>https://github.com/aspnet/javascriptservices</RepositoryUrl>
58
<RepositoryType>git</RepositoryType>
69
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
710
<SignAssembly>true</SignAssembly>
811
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
9-
</PropertyGroup>
10-
11-
<PropertyGroup>
12-
<NetStandardImplicitPackageVersion>1.6.1-*</NetStandardImplicitPackageVersion>
1312
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1413
</PropertyGroup>
1514

1615
<ItemGroup>
1716
<PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.1-*" PrivateAssets="All" />
1817
</ItemGroup>
19-
</Project>
18+
</Project>

‎build/dependencies.props‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project>
2+
<PropertyGroup>
3+
<AspNetCoreVersion>1.1.0</AspNetCoreVersion>
4+
<AspNetCoreMvcVersion>1.1.1</AspNetCoreMvcVersion>
5+
<AspNetCoreToolsVersion>1.0.0-msbuild3-final</AspNetCoreToolsVersion>
6+
<AutoMapperVersion>5.0.2</AutoMapperVersion>
7+
<CoreFxVersion>4.3.0</CoreFxVersion>
8+
<JsonNetVersion>9.0.1</JsonNetVersion>
9+
<MicrosoftDataflowVersion>4.5.24</MicrosoftDataflowVersion>
10+
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
11+
<ThreadingDataflowVersion>4.7.0</ThreadingDataflowVersion>
12+
</PropertyGroup>
13+
</Project>

‎samples/angular/MusicStore/MusicStore.csproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3+
<Import Project="..\..\..\build\dependencies.props" />
4+
35
<PropertyGroup>
46
<TargetFramework>netcoreapp1.1</TargetFramework>
57
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -11,14 +13,14 @@
1113
</ItemGroup>
1214

1315
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.0" />
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
17-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="1.1.0" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
20-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.0" />
21-
<PackageReference Include="AutoMapper" Version="5.0.2" />
16+
<PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
17+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
19+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="$(AspNetCoreVersion)" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
22+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(AspNetCoreVersion)" />
23+
<PackageReference Include="AutoMapper" Version="$(AutoMapperVersion)" />
2224
</ItemGroup>
2325

2426
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">

‎samples/misc/LatencyTest/LatencyTest.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\..\build\dependencies.props" />
4+
35
<PropertyGroup>
46
<TargetFramework>netcoreapp1.1</TargetFramework>
57
<IsPackable>false</IsPackable>
@@ -11,7 +13,7 @@
1113
</ItemGroup>
1214

1315
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.0" />
16+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
1517
</ItemGroup>
1618

1719
</Project>

‎samples/misc/NodeServicesExamples/NodeServicesExamples.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3+
<Import Project="..\..\..\build\dependencies.props" />
4+
35
<PropertyGroup>
46
<TargetFramework>netcoreapp1.1</TargetFramework>
57
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -10,11 +12,11 @@
1012
<ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
1113
</ItemGroup>
1214

13-
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
16-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
17-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
1820
</ItemGroup>
1921

2022
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">

‎samples/misc/Webpack/Webpack.csproj‎

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

3+
<Import Project="..\..\..\build\dependencies.props" />
4+
35
<PropertyGroup>
46
<TargetFramework>netcoreapp1.1</TargetFramework>
57
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -11,10 +13,10 @@
1113
</ItemGroup>
1214

1315
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
16-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
17-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
16+
<PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
1820
</ItemGroup>
1921

2022
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">

‎samples/react/MusicStore/MusicStore.csproj‎

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

3+
<Import Project="..\..\..\build\dependencies.props" />
4+
35
<PropertyGroup>
46
<TargetFramework>netcoreapp1.1</TargetFramework>
57
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -15,14 +17,14 @@
1517
</ItemGroup>
1618

1719
<ItemGroup>
18-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
19-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.0" />
20-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="1.1.0" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
24-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.0" />
25-
<PackageReference Include="AutoMapper" Version="5.0.2" />
20+
<PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
21+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
22+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
23+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="$(AspNetCoreVersion)" />
25+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
26+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(AspNetCoreVersion)" />
27+
<PackageReference Include="AutoMapper" Version="$(AutoMapperVersion)" />
2628
</ItemGroup>
2729

2830
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
@@ -31,7 +33,7 @@
3133
</Target>
3234

3335
<ItemGroup>
34-
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0-msbuild3-final" />
36+
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="$(AspNetCoreToolsVersion)" />
3537
</ItemGroup>
3638

3739
</Project>

‎samples/react/ReactGrid/ReactGrid.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

3+
<Import Project="..\..\..\build\dependencies.props" />
4+
35
<PropertyGroup>
46
<TargetFramework>netcoreapp1.1</TargetFramework>
57
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -11,9 +13,9 @@
1113
</ItemGroup>
1214

1315
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
16-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
16+
<PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCoreVersion)" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
18+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
1719
</ItemGroup>
1820

1921
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">

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

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

3-
<Import Project="..\build\common.props" />
3+
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
66
<Description>Helpers for building Angular 2 applications on ASP.NET Core.</Description>
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="1.1.0" />
19+
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="$(AspNetCoreVersion)" />
2020
</ItemGroup>
2121

2222
</Project>

0 commit comments

Comments
 (0)