Skip to content

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‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project>
2-
<ImportProject="build\dependencies.props" />
32
<ImportProject="version.xml" />
43

54
<PropertyGroup>

‎Directory.Build.targets‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,14 @@
1-
<Project>
1+
<ProjectInitialTargets="EnsureKoreBuildRestored">
2+
<TargetName="EnsureKoreBuildRestored"Condition=" '$(KoreBuildRestoreTargetsImported)' != 'true' AND '$(MSBuildProjectName)' != 'BenchmarkDotNet.Autogenerated'">
3+
<PropertyGroup>
4+
<_BootstrapperFileCondition=" $([MSBuild]::IsOSUnixLike()) ">build.sh</_BootstrapperFile>
5+
<_BootstrapperFileCondition="! $([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+
<ErrorCode="KRB1001"Text="$(_BootstrapperError.Trim())" />
13+
</Target>
214
</Project>

‎NuGet.config‎

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

‎build/dependencies.props‎

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

‎build/repo.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageLineupInclude="Internal.AspNetCore.Universe.Lineup"Version="2.1.0-*" />
4+
<PackageLineupInclude="Internal.AspNetCore.Partners.Lineup"Version="2.1.0-*" />
5+
</ItemGroup>
6+
</Project>

‎samples/misc/LatencyTest/LatencyTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

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

1818
</Project>

‎samples/misc/NodeServicesExamples/NodeServicesExamples.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
</ItemGroup>
1212

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

2323
<TargetName="PrepublishScript"BeforeTargets="PrepareForPublish">

‎samples/misc/Webpack/Webpack.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
</ItemGroup>
1212

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

2323
<TargetName="PrepublishScript"BeforeTargets="PrepareForPublish">

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
</PropertyGroup>
99

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

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

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

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

0 commit comments

Comments
(0)