From c5f23334814f5caffcd0616329b8984f3171d34e Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 31 Oct 2017 13:00:27 -0700 Subject: [PATCH] Pin tool and package versions to make build more repeatable --- .gitignore | 1 - Directory.Build.props | 4 +- Directory.Build.targets | 17 ++----- NuGet.config | 1 + build/dependencies.props | 47 +++++++++++++++++++ build/repo.props | 10 ++-- korebuild-lock.txt | 2 + korebuild.json | 4 ++ .../GenericHostSample.csproj | 6 +-- samples/GenericWebHost/GenericWebHost.csproj | 6 +-- samples/SampleStartups/SampleStartups.csproj | 6 +-- src/Directory.Build.props | 4 +- ...oft.AspNetCore.Hosting.Abstractions.csproj | 2 +- ...NetCore.Hosting.Server.Abstractions.csproj | 4 +- .../Microsoft.AspNetCore.Hosting.csproj | 28 +++++------ ...spNetCore.Server.IntegrationTesting.csproj | 21 +++++---- ...oft.Extensions.Hosting.Abstractions.csproj | 8 ++-- .../Microsoft.Extensions.Hosting.csproj | 8 ++-- test/Directory.Build.props | 14 +++--- ...re.Certificates.Configuration.Tests.csproj | 4 +- ....AspNetCore.Hosting.FunctionalTests.csproj | 2 +- .../Microsoft.AspNetCore.Hosting.Tests.csproj | 6 +-- ...Microsoft.AspNetCore.TestHost.Tests.csproj | 2 +- .../Microsoft.Extensions.Hosting.Tests.csproj | 6 +-- .../BuildWebHostPatternTestSite.csproj | 2 +- .../IStartupInjectionAssemblyName.csproj | 2 +- ...rosoft.AspNetCore.Hosting.TestSites.csproj | 8 ++-- version.props | 11 +++++ version.xml | 8 ---- 29 files changed, 148 insertions(+), 96 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 6f07fc4e..edc40932 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,3 @@ project.lock.json .build/ .testPublish/ global.json -korebuild-lock.txt diff --git a/Directory.Build.props b/Directory.Build.props index c57ce5d1..e1eb80e5 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 bc118fd9..e83ff95e 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 20060c93..4e8a1f6d 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 00000000..70b94c61 --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,47 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + 2.1.0-preview1-15549 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.0.0 + 1.0.1 + 15.3.0 + 4.7.49 + 1.4.0 + 3.2.0 + 4.4.1 + 1.5.0 + 2.3.0 + 2.3.0 + + + diff --git a/build/repo.props b/build/repo.props index 734d7f4f..abfcf72d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,8 +1,12 @@ - + - - + + + + 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 00000000..45463cc7 --- /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 00000000..bd5d51a5 --- /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/GenericHostSample/GenericHostSample.csproj b/samples/GenericHostSample/GenericHostSample.csproj index 2f60b84b..41c8b5a3 100644 --- a/samples/GenericHostSample/GenericHostSample.csproj +++ b/samples/GenericHostSample/GenericHostSample.csproj @@ -16,9 +16,9 @@ - - - + + + diff --git a/samples/GenericWebHost/GenericWebHost.csproj b/samples/GenericWebHost/GenericWebHost.csproj index 35eb7056..3a69a4ed 100644 --- a/samples/GenericWebHost/GenericWebHost.csproj +++ b/samples/GenericWebHost/GenericWebHost.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/samples/SampleStartups/SampleStartups.csproj b/samples/SampleStartups/SampleStartups.csproj index dcf0c7b0..4063c346 100644 --- a/samples/SampleStartups/SampleStartups.csproj +++ b/samples/SampleStartups/SampleStartups.csproj @@ -11,8 +11,8 @@ - - - + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9d9a3de3..4b89a431 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ - + - + diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj index 55741560..a023842b 100644 --- a/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj index 0dfb99bb..2e9fa385 100644 --- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj b/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj index 0a8c25a9..67f91522 100644 --- a/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj +++ b/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj @@ -13,20 +13,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj index e55a11f7..d9914f99 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj @@ -2,7 +2,8 @@ ASP.NET Core helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing. - 0.5.0 + $(ExperimentalProjectVersionPrefix) + false netstandard2.0 $(NoWarn);CS1591 true @@ -15,15 +16,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj index 8780a85b..19024d2f 100644 --- a/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/src/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.csproj b/src/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.csproj index 743f8aca..98b16842 100644 --- a/src/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.csproj +++ b/src/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.csproj @@ -14,10 +14,10 @@ - - - - + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 3a86391d..8a1b153e 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,12 +1,12 @@ - + - - - - - - + + + + + + diff --git a/test/Microsoft.AspNetCore.Certificates.Configuration.Tests/Microsoft.AspNetCore.Certificates.Configuration.Tests.csproj b/test/Microsoft.AspNetCore.Certificates.Configuration.Tests/Microsoft.AspNetCore.Certificates.Configuration.Tests.csproj index c4e43873..5ce7950f 100644 --- a/test/Microsoft.AspNetCore.Certificates.Configuration.Tests/Microsoft.AspNetCore.Certificates.Configuration.Tests.csproj +++ b/test/Microsoft.AspNetCore.Certificates.Configuration.Tests/Microsoft.AspNetCore.Certificates.Configuration.Tests.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj index 3c45459a..8abf2de6 100644 --- a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj b/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj index 104977a0..551003ba 100644 --- a/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj +++ b/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj b/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj index 9e086c69..2cac5438 100644 --- a/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj +++ b/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Microsoft.Extensions.Hosting.Tests/Microsoft.Extensions.Hosting.Tests.csproj b/test/Microsoft.Extensions.Hosting.Tests/Microsoft.Extensions.Hosting.Tests.csproj index 90f00d3e..1e95f53c 100644 --- a/test/Microsoft.Extensions.Hosting.Tests/Microsoft.Extensions.Hosting.Tests.csproj +++ b/test/Microsoft.Extensions.Hosting.Tests/Microsoft.Extensions.Hosting.Tests.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/test/TestAssets/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj b/test/TestAssets/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj index b23a3613..22a9aaf3 100644 --- a/test/TestAssets/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj +++ b/test/TestAssets/BuildWebHostPatternTestSite/BuildWebHostPatternTestSite.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/TestAssets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj b/test/TestAssets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj index 1dd73b69..efd90785 100644 --- a/test/TestAssets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj +++ b/test/TestAssets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/TestAssets/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj b/test/TestAssets/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj index 060694e2..a345c897 100644 --- a/test/TestAssets/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj +++ b/test/TestAssets/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/version.props b/version.props new file mode 100644 index 00000000..dd9ba18b --- /dev/null +++ b/version.props @@ -0,0 +1,11 @@ + + + 2.1.0 + 0.5.0 + preview1 + $(VersionPrefix) + $(VersionPrefix)-$(VersionSuffix)-final + t000 + $(VersionSuffix)-$(BuildNumber) + + diff --git a/version.xml b/version.xml deleted file mode 100644 index 3c05022b..00000000 --- a/version.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - dev - 2.1.0 - preview1 - -