Skip to content
This repository was archived by the owner on Nov 6, 2018. It is now read-only.

Commit 51e14a6

Browse files
author
Nate McMaster
committed
Pin tool and package versions to make builds more repeatable
Part of aspnet/Universe#575
1 parent 2341bfa commit 51e14a6

14 files changed

+59
-41
lines changed

Diff for: ‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ project.lock.json
3434
*.nuget.props
3535
*.nuget.targets
3636
global.json
37-
korebuild-lock.txt

Diff for: ‎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 .NET Extensions</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

Diff for: ‎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>

Diff for: ‎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>

Diff for: ‎build/dependencies.props

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-27488</MicrosoftAspNetCoreTestingPackageVersion>
8+
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.1.0-preview1-27488</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
9+
<MicrosoftExtensionsPrimitivesPackageVersion>2.1.0-preview1-27488</MicrosoftExtensionsPrimitivesPackageVersion>
10+
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
11+
<MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
12+
<MoqPackageVersion>4.7.49</MoqPackageVersion>
13+
<XunitAnalyzersPackageVersion>0.7.0</XunitAnalyzersPackageVersion>
14+
<XunitPackageVersion>2.3.0</XunitPackageVersion>
15+
<XunitRunnerVisualStudioPackageVersion>2.3.0</XunitRunnerVisualStudioPackageVersion>
16+
</PropertyGroup>
17+
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
18+
</Project>

Diff for: ‎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>

Diff for: ‎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

Diff for: ‎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+
}

Diff for: ‎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>
@@ -7,6 +7,6 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" />
10+
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
1111
</ItemGroup>
1212
</Project>

Diff for: ‎src/FS.Abstractions/FS.Abstractions.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Microsoft.Extensions.FileProviders.IFileProvider</Description>
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Extensions.Primitives" />
19+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" />
2020
</ItemGroup>
2121

2222
</Project>

Diff for: ‎src/FS.Globbing/FS.Globbing.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
1414
</ItemGroup>
1515

1616
</Project>

Diff for: ‎test/Directory.Build.props

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

44
<ItemGroup>
5-
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" />
6-
<PackageReference Include="Microsoft.AspNetCore.Testing" />
7-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
8-
<PackageReference Include="Moq" />
9-
<PackageReference Include="xunit" />
10-
<PackageReference Include="xunit.analyzers" />
11-
<PackageReference Include="xunit.runner.visualstudio" />
5+
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
6+
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
8+
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
9+
<PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
10+
<PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersPackageVersion)" />
11+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
1212
</ItemGroup>
1313
</Project>

Diff for: ‎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>

Diff for: ‎version.xml

-8
This file was deleted.

0 commit comments

Comments
 (0)