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

Commit a0269fb

Browse files
author
Nate McMaster
committed
Use PackageLineup to manage PackageReference versions
1 parent 64ed1c7 commit a0269fb

File tree

12 files changed

+51
-37
lines changed

12 files changed

+51
-37
lines changed

‎Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project>
2-
<Import Project="build\dependencies.props" />
32
<Import Project="version.xml" />
43

54
<PropertyGroup>

‎Directory.Build.targets

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,14 @@
1-
<Project>
1+
<Project InitialTargets="EnsureKoreBuildRestored">
2+
<Target Name="EnsureKoreBuildRestored" Condition=" '$(KoreBuildRestoreTargetsImported)' != 'true' AND '$(MSBuildProjectName)' != 'BenchmarkDotNet.Autogenerated'">
3+
<PropertyGroup>
4+
<_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh</_BootstrapperFile>
5+
<_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd</_BootstrapperFile>
6+
<_BootstrapperError>
7+
Package references have not been pinned. Run './$(_BootstrapperFile) /t:Pin'.
8+
Also, you can run './$(_BootstrapperFile) /t:Restore' which will pin *and* restore packages. '$(_BootstrapperFile)' can be found in '$(MSBuildThisFileDirectory)'.
9+
</_BootstrapperError>
10+
</PropertyGroup>
11+
12+
<Error Code="KRB1001" Text="$(_BootstrapperError.Trim())" />
13+
</Target>
214
</Project>

‎NuGet.config

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<packageSources>
44
<clear />
55
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
6-
<add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
76
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
87
</packageSources>
9-
</configuration>
8+
</configuration>

‎build/dependencies.props

-11
This file was deleted.

‎build/repo.props

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageLineup Include="Internal.AspNetCore.Universe.Lineup" Version="2.1.0-*" />
4+
<PackageLineup Include="Internal.AspNetCore.Partners.Lineup" Version="2.1.0-*" />
5+
</ItemGroup>
6+
</Project>

‎samples/misc/LatencyTest/LatencyTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
1616
</ItemGroup>
1717

1818
</Project>

‎samples/misc/NodeServicesExamples/NodeServicesExamples.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCoreVersion)" />
15-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
16-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
17-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
18-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
19-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
14+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" />
15+
<PackageReference Include="Microsoft.AspNetCore.Hosting" />
16+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc" />
18+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" />
19+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
2121
</ItemGroup>
2222

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

‎samples/misc/Webpack/Webpack.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCoreVersion)" />
15-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
16-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
17-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
18-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
19-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
14+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" />
15+
<PackageReference Include="Microsoft.AspNetCore.Hosting" />
16+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc" />
18+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" />
19+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
2121
</ItemGroup>
2222

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

‎src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
11+
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" />
1212
</ItemGroup>
1313
</Project>

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

1313
<ItemGroup>
1414
<ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
15-
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(ThreadingDataflowVersion)" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="System.Threading.Tasks.Dataflow" />
1619
</ItemGroup>
1720

1821
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
16-
<PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
14+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
16+
<PackageReference Include="Newtonsoft.Json" />
1717
</ItemGroup>
1818

1919
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">

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

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@
88
<ItemGroup>
99
<None Remove="node_modules\**\*" />
1010
<EmbeddedResource Include="Content\**\*" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
1114
<ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
12-
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="$(AspNetCoreVersion)" />
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="$(AspNetCoreVersion)" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" />
19+
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
1420
</ItemGroup>
1521

1622
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">

0 commit comments

Comments
 (0)