Skip to content

Commit 2d98a18

Browse files
author
Nate McMaster
committed
Pin tool and package versions to make builds more repeatable
Part of aspnet/Universe#575
1 parent e583a17 commit 2d98a18

17 files changed

+76
-55
lines changed

‎.gitignore

-4
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@ nuget.exe
2424
*.ncrunchsolution
2525
*.*sdf
2626
*.ipch
27-
2827
.vs/
2928
npm-debug.log
3029
/.build/
31-
3230
.vscode/
33-
3431
global.json
35-
korebuild-lock.txt

‎Directory.Build.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
<Project>
2-
<Import Project="version.xml" />
1+
<Project>
2+
<Import Project="version.props" />
3+
<Import Project="build\dependencies.props" />
34

45
<PropertyGroup>
56
<Product>Microsoft ASP.NET Core</Product>
@@ -9,7 +10,6 @@
910
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
1011
<SignAssembly>true</SignAssembly>
1112
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
12-
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
1313
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1414
</PropertyGroup>
1515
</Project>

‎Directory.Build.targets

+4-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
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>
1+
<Project>
2+
<PropertyGroup>
3+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
4+
</PropertyGroup>
145
</Project>

‎NuGet.config

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
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" />
67
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
78
</packageSources>
89
</configuration>

‎build/dependencies.props

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project>
2+
<PropertyGroup>
3+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
4+
</PropertyGroup>
5+
<PropertyGroup Label="Package Versions">
6+
<InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15549</InternalAspNetCoreSdkPackageVersion>
7+
<MicrosoftAspNetCoreDiagnosticsPackageVersion>2.1.0-preview1-27478</MicrosoftAspNetCoreDiagnosticsPackageVersion>
8+
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.1.0-preview1-27478</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
9+
<MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-27478</MicrosoftAspNetCoreHostingPackageVersion>
10+
<MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-27478</MicrosoftAspNetCoreMvcPackageVersion>
11+
<MicrosoftAspNetCoreMvcTagHelpersPackageVersion>2.1.0-preview1-27478</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
12+
<MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>2.1.0-preview1-27478</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
13+
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview1-27478</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
14+
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.1.0-preview1-27478</MicrosoftAspNetCoreServerKestrelPackageVersion>
15+
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-preview1-27478</MicrosoftAspNetCoreStaticFilesPackageVersion>
16+
<MicrosoftExtensionsDependencyInjectionPackageVersion>2.1.0-preview1-27478</MicrosoftExtensionsDependencyInjectionPackageVersion>
17+
<MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-27478</MicrosoftExtensionsLoggingConsolePackageVersion>
18+
<MicrosoftExtensionsLoggingDebugPackageVersion>2.1.0-preview1-27478</MicrosoftExtensionsLoggingDebugPackageVersion>
19+
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
20+
<NewtonsoftJsonPackageVersion>10.0.1</NewtonsoftJsonPackageVersion>
21+
<SystemThreadingTasksDataflowPackageVersion>4.8.0</SystemThreadingTasksDataflowPackageVersion>
22+
</PropertyGroup>
23+
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
24+
</Project>

‎build/repo.props

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<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>
2+
<PropertyGroup>
3+
<!-- These properties are use by the automation that updates dependencies.props -->
4+
<LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
5+
<LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json</LineupPackageRestoreSource>
6+
</PropertyGroup>
67
</Project>

‎korebuild-lock.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
version:2.1.0-preview1-15549
2+
commithash:f570e08585fec510dd60cd4bfe8795388b757a95

‎korebuild.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
3+
"channel": "dev"
4+
}

‎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" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
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" />
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" />
14+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
15+
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
16+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
18+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
19+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
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" />
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" />
14+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
15+
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
16+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
18+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
19+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
2121
</ItemGroup>
2222

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

‎src/Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22
<Import Project="..\Directory.Build.props" />
33

44
<PropertyGroup>
@@ -8,6 +8,6 @@
88
</PropertyGroup>
99

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="System.Threading.Tasks.Dataflow" />
18+
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowPackageVersion)" />
1919
</ItemGroup>
2020

2121
<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" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
16-
<PackageReference Include="Newtonsoft.Json" />
14+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
16+
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
1717
</ItemGroup>
1818

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" />
19-
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="$(MicrosoftAspNetCoreMvcTagHelpersPackageVersion)" />
19+
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="$(MicrosoftAspNetCoreMvcViewFeaturesPackageVersion)" />
2020
</ItemGroup>
2121

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

‎version.props

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
<PropertyGroup>
3+
<VersionPrefix>2.1.0</VersionPrefix>
4+
<VersionSuffix>preview1</VersionSuffix>
5+
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
6+
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
7+
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
8+
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
9+
</PropertyGroup>
10+
</Project>

‎version.xml

-8
This file was deleted.

0 commit comments

Comments
 (0)