From 7ac0e06abf822738437dba3bfc5b3b01325045f7 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 31 Oct 2017 19:37:33 -0700 Subject: [PATCH] Pin tool and package versions to make builds more repeatable --- .gitignore | 1 - Directory.Build.props | 6 +-- Directory.Build.targets | 17 ++------ NuGet.config | 1 + build/dependencies.props | 42 +++++++++++++++++++ build/repo.props | 8 +++- korebuild-lock.txt | 2 + korebuild.json | 4 ++ .../DatabaseErrorPageSample.csproj | 6 +-- .../DeveloperExceptionPageSample.csproj | 4 +- samples/ElmPageSample/ElmPageSample.csproj | 4 +- .../ExceptionHandlerSample.csproj | 6 +-- .../HealthChecksSample.csproj | 6 +-- .../MiddlewareAnalysisSample.csproj | 8 ++-- .../StatusCodePagesSample.csproj | 4 +- .../WelcomePageSample.csproj | 4 +- src/Directory.Build.props | 4 +- ...icrosoft.AspNetCore.Diagnostics.Elm.csproj | 11 ++--- ...ore.Diagnostics.EntityFrameworkCore.csproj | 6 +-- ...AspNetCore.Diagnostics.HealthChecks.csproj | 6 +-- .../Microsoft.AspNetCore.Diagnostics.csproj | 22 +++++----- ...osoft.AspNetCore.MiddlewareAnalysis.csproj | 6 +-- ...Extensions.Diagnostics.HealthChecks.csproj | 4 +- .../Diagnostics.EFCore.FunctionalTests.csproj | 14 +++---- .../Diagnostics.FunctionalTests.csproj | 12 +++--- test/Directory.Build.props | 4 +- ...agnostics.EntityFrameworkCore.Tests.csproj | 12 +++--- ...Core.Diagnostics.HealthChecks.Tests.csproj | 10 ++--- ...rosoft.AspNetCore.Diagnostics.Tests.csproj | 18 ++++---- ...AspNetCore.MiddlewareAnalysis.Tests.csproj | 14 +++---- ...ions.Diagnostics.HealthChecks.Tests.csproj | 8 ++-- version.props | 11 +++++ version.xml | 8 ---- 33 files changed, 170 insertions(+), 123 deletions(-) create mode 100644 build/dependencies.props create mode 100644 korebuild-lock.txt create mode 100644 korebuild.json create mode 100644 version.props delete mode 100644 version.xml diff --git a/.gitignore b/.gitignore index 7e9c96c..cac0c59 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,6 @@ launchSettings.json .build/ .testPublish/ global.json -korebuild-lock.txt # Rider and friends .idea/ diff --git a/Directory.Build.props b/Directory.Build.props index 64ddcb2..8396829 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,6 @@ - - + + + Microsoft ASP.NET Core @@ -9,7 +10,6 @@ $(MSBuildThisFileDirectory)build\Key.snk true true - $(VersionSuffix)-$(BuildNumber) true diff --git a/Directory.Build.targets b/Directory.Build.targets index bc118fd..e83ff95 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,14 +1,5 @@ - - - - <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh - <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd - <_BootstrapperError> - Package references have not been pinned. Run './$(_BootstrapperFile) /t:Pin'. - Also, you can run './$(_BootstrapperFile) /t:Restore' which will pin *and* restore packages. '$(_BootstrapperFile)' can be found in '$(MSBuildThisFileDirectory)'. - - - - - + + + $(MicrosoftNETCoreApp20PackageVersion) + diff --git a/NuGet.config b/NuGet.config index 20060c9..4e8a1f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,7 @@ + diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 0000000..182a917 --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,42 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + 2.1.0-preview1-15549 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.1.0-preview1-27483 + 2.0.0 + 15.3.0 + 4.7.49 + 10.0.1 + 4.4.1 + 1.5.0 + 2.3.0 + 2.3.0 + + + diff --git a/build/repo.props b/build/repo.props index 85ccd4b..0d07ca3 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,7 +1,11 @@  - - + + + + Internal.AspNetCore.Universe.Lineup + https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json + diff --git a/korebuild-lock.txt b/korebuild-lock.txt new file mode 100644 index 0000000..45463cc --- /dev/null +++ b/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.1.0-preview1-15549 +commithash:f570e08585fec510dd60cd4bfe8795388b757a95 diff --git a/korebuild.json b/korebuild.json new file mode 100644 index 0000000..bd5d51a --- /dev/null +++ b/korebuild.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", + "channel": "dev" +} diff --git a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj index 2fa5055..1b8f6e7 100644 --- a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj +++ b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj index 1545175..bca7f32 100644 --- a/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj +++ b/samples/DeveloperExceptionPageSample/DeveloperExceptionPageSample.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/samples/ElmPageSample/ElmPageSample.csproj b/samples/ElmPageSample/ElmPageSample.csproj index d4c31a7..a60ae67 100644 --- a/samples/ElmPageSample/ElmPageSample.csproj +++ b/samples/ElmPageSample/ElmPageSample.csproj @@ -9,7 +9,7 @@ - - + + diff --git a/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj b/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj index 8f28479..6e75509 100644 --- a/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj +++ b/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/samples/HealthChecksSample/HealthChecksSample.csproj b/samples/HealthChecksSample/HealthChecksSample.csproj index 1eade53..19ef793 100644 --- a/samples/HealthChecksSample/HealthChecksSample.csproj +++ b/samples/HealthChecksSample/HealthChecksSample.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj index 4b5161e..c5ee1a2 100644 --- a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj +++ b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/samples/StatusCodePagesSample/StatusCodePagesSample.csproj b/samples/StatusCodePagesSample/StatusCodePagesSample.csproj index 1545175..bca7f32 100644 --- a/samples/StatusCodePagesSample/StatusCodePagesSample.csproj +++ b/samples/StatusCodePagesSample/StatusCodePagesSample.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/samples/WelcomePageSample/WelcomePageSample.csproj b/samples/WelcomePageSample/WelcomePageSample.csproj index 1545175..bca7f32 100644 --- a/samples/WelcomePageSample/WelcomePageSample.csproj +++ b/samples/WelcomePageSample/WelcomePageSample.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9d9a3de..4b89a43 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ - + - + diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj index cc01b38..cf8074a 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj @@ -2,7 +2,8 @@ ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs. - 0.4.0 + $(ExperimentalProjectVersionPrefix) + false netstandard2.0 $(NoWarn);CS1591 true @@ -14,10 +15,10 @@ - - - - + + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj index 43d3860..5e29b79 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj b/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj index 18befec..76a24a4 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics.HealthChecks/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj @@ -16,9 +16,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj index 80b7489..b91c2a0 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj @@ -17,17 +17,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj index f7fb61b..c4a3ad1 100644 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj +++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/Microsoft.Extensions.Diagnostics.HealthChecks/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/Microsoft.Extensions.Diagnostics.HealthChecks/Microsoft.Extensions.Diagnostics.HealthChecks.csproj index bc1ecc7..56f70f7 100644 --- a/src/Microsoft.Extensions.Diagnostics.HealthChecks/Microsoft.Extensions.Diagnostics.HealthChecks.csproj +++ b/src/Microsoft.Extensions.Diagnostics.HealthChecks/Microsoft.Extensions.Diagnostics.HealthChecks.csproj @@ -12,8 +12,8 @@ Microsoft.Extensions.Diagnostics.HealthChecks.IHealthChecksBuilder diagnostics;healthchecks - - + + diff --git a/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj b/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj index ac13510..8b8d4f7 100644 --- a/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj +++ b/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj @@ -12,13 +12,13 @@ - - - - - - - + + + + + + + diff --git a/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj b/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj index 38bc3d6..b831570 100644 --- a/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj +++ b/test/Diagnostics.FunctionalTests/Diagnostics.FunctionalTests.csproj @@ -20,12 +20,12 @@ - - - - - - + + + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 9d9a3de..4b89a43 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,7 +1,7 @@ - + - + diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj index 54182bc..6e87dbb 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj @@ -10,12 +10,12 @@ - - - - - - + + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj index e575aea..3173a73 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj +++ b/test/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests/Microsoft.AspNetCore.Diagnostics.HealthChecks.Tests.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj index c4dc55d..bd405b6 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj @@ -17,15 +17,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj index 1747fb4..438a65b 100644 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/Microsoft.AspNetCore.MiddlewareAnalysis.Tests.csproj @@ -11,13 +11,13 @@ - - - - - - - + + + + + + + diff --git a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj b/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj index d6a1b4e..3e012be 100644 --- a/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj +++ b/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/version.props b/version.props new file mode 100644 index 0000000..d1791a6 --- /dev/null +++ b/version.props @@ -0,0 +1,11 @@ + + + 2.1.0 + 0.4.0 + preview1 + $(VersionPrefix) + $(VersionPrefix)-$(VersionSuffix)-final + t000 + $(VersionSuffix)-$(BuildNumber) + + diff --git a/version.xml b/version.xml deleted file mode 100644 index 3c05022..0000000 --- a/version.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - dev - 2.1.0 - preview1 - -