From 2e4bc548f5921d2f4250314373473e453f3ca95b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 31 Oct 2017 19:18:14 -0700 Subject: [PATCH] Pin tool and package versions to make builds more repeatable (#7013) --- .gitignore | 1 - Directory.Build.props | 4 +- Directory.Build.targets | 17 +--- NuGet.config | 1 + README.md | 7 +- ...icrosoft.AspNetCore.Mvc.Performance.csproj | 2 +- build/dependencies.props | 82 +++++++++++++++++++ build/repo.props | 10 ++- korebuild-lock.txt | 2 + korebuild.json | 4 + samples/MvcSandbox/MvcSandbox.csproj | 14 ++-- src/Directory.Build.props | 4 +- ...crosoft.AspNetCore.Mvc.Abstractions.csproj | 12 +-- ...icrosoft.AspNetCore.Mvc.ApiExplorer.csproj | 6 +- .../Microsoft.AspNetCore.Mvc.Core.csproj | 38 ++++----- .../Microsoft.AspNetCore.Mvc.Cors.csproj | 2 +- ...soft.AspNetCore.Mvc.DataAnnotations.csproj | 8 +- ...soft.AspNetCore.Mvc.Formatters.Json.csproj | 4 +- ...osoft.AspNetCore.Mvc.Formatters.Xml.csproj | 4 +- ...crosoft.AspNetCore.Mvc.Localization.csproj | 8 +- .../Microsoft.AspNetCore.Mvc.Razor.csproj | 20 ++--- ...Microsoft.AspNetCore.Mvc.RazorPages.csproj | 8 +- ...Microsoft.AspNetCore.Mvc.TagHelpers.csproj | 14 ++-- .../Microsoft.AspNetCore.Mvc.Testing.csproj | 4 +- ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj | 24 +++--- ...oft.AspNetCore.Mvc.WebApiCompatShim.csproj | 6 +- .../Microsoft.AspNetCore.Mvc.csproj | 4 +- test/Directory.Build.props | 12 +-- ...ft.AspNetCore.Mvc.Abstractions.Test.csproj | 2 +- .../Microsoft.AspNetCore.Mvc.Core.Test.csproj | 10 +-- .../Microsoft.AspNetCore.Mvc.Cors.Test.csproj | 4 +- ...AspNetCore.Mvc.DataAnnotations.Test.csproj | 6 +- ...AspNetCore.Mvc.Formatters.Json.Test.csproj | 6 +- ....AspNetCore.Mvc.Formatters.Xml.Test.csproj | 2 +- ...soft.AspNetCore.Mvc.FunctionalTests.csproj | 12 +-- ...oft.AspNetCore.Mvc.IntegrationTests.csproj | 4 +- ...ft.AspNetCore.Mvc.Localization.Test.csproj | 2 +- ...Microsoft.AspNetCore.Mvc.Razor.Test.csproj | 8 +- ...soft.AspNetCore.Mvc.RazorPages.Test.csproj | 6 +- ...soft.AspNetCore.Mvc.TagHelpers.Test.csproj | 8 +- .../Microsoft.AspNetCore.Mvc.Test.csproj | 6 +- ...Microsoft.AspNetCore.Mvc.TestCommon.csproj | 10 +-- ...pNetCore.Mvc.TestDiagnosticListener.csproj | 2 +- ...ft.AspNetCore.Mvc.ViewFeatures.Test.csproj | 4 +- ...AspNetCore.Mvc.WebApiCompatShimTest.csproj | 6 +- .../ApiExplorerWebSite.csproj | 6 +- .../ApplicationModelWebSite.csproj | 6 +- .../WebSites/BasicWebSite/BasicWebSite.csproj | 10 +-- .../ControllersFromServicesWebSite.csproj | 8 +- test/WebSites/CorsWebSite/CorsWebSite.csproj | 8 +- .../ErrorPageMiddlewareWebSite.csproj | 8 +- .../WebSites/FilesWebSite/FilesWebSite.csproj | 8 +- .../FiltersWebSite/FiltersWebSite.csproj | 10 +-- .../FormatterWebSite/FormatterWebSite.csproj | 6 +- .../HtmlGenerationWebSite.csproj | 6 +- ...PageExecutionInstrumentationWebSite.csproj | 8 +- .../RazorPagesWebSite.csproj | 8 +- .../WebSites/RazorWebSite/RazorWebSite.csproj | 10 +-- .../RoutingWebSite/RoutingWebSite.csproj | 6 +- .../SecurityWebSite/SecurityWebSite.csproj | 6 +- .../SimpleWebSite/SimpleWebSite.csproj | 4 +- .../TagHelpersWebSite.csproj | 6 +- .../VersioningWebSite.csproj | 6 +- .../WebApiCompatShimWebSite.csproj | 6 +- .../XmlFormattersWebSite.csproj | 6 +- version.props | 10 +++ version.xml | 8 -- 67 files changed, 329 insertions(+), 251 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 f56609a1b3..482e61881b 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,4 @@ node_modules .vscode/ global.json BenchmarkDotNet.Artifacts/ -korebuild-lock.txt .idea/ diff --git a/Directory.Build.props b/Directory.Build.props index 765ce438b5..8fb3efd4bf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,6 @@  - + + Microsoft ASP.NET Core MVC @@ -9,7 +10,6 @@ $(MSBuildThisFileDirectory)build\Key.snk true true - $(VersionSuffix)-$(BuildNumber) true diff --git a/Directory.Build.targets b/Directory.Build.targets index bc118fd907..e83ff95e39 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 20060c934e..4e8a1f6de1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,7 @@ + diff --git a/README.md b/README.md index c3c30b0da9..5f1a65e649 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,4 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge ## Building from source -To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. - -Before opening this project in Visual Studio or VS Code, execute `build.cmd /t:Restore` (Windows) or `./build.sh /t:Restore` (Linux/macOS). -This will execute only the part of the build script that downloads and initializes a few required build tools and packages. - -See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. +To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj index 49bc12cb10..0c2945d238 100644 --- a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj +++ b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj @@ -13,7 +13,7 @@ - + diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 0000000000..ad87f79f1e --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,82 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + 0.10.9 + 2.1.0-preview1-15549 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 5.2.2 + 2.3.1 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.0.0 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.1.0-preview1-27474 + 2.0.0 + 2.1.0-preview1-27474 + 15.3.0 + 4.7.49 + 1.0.1 + 4.4.0 + 4.4.1 + 4.4.0 + 0.7.0 + 2.3.0 + 2.3.0 + + + diff --git a/build/repo.props b/build/repo.props index 89cfc6dae2..81506abe27 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,9 +1,13 @@ - + - - + + + + 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 0000000000..45463cc71e --- /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 0000000000..bd5d51a51b --- /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/MvcSandbox/MvcSandbox.csproj b/samples/MvcSandbox/MvcSandbox.csproj index 850475ea18..736ed880a2 100644 --- a/samples/MvcSandbox/MvcSandbox.csproj +++ b/samples/MvcSandbox/MvcSandbox.csproj @@ -8,13 +8,13 @@ - - - - - - - + + + + + + + - - - dev - 2.1.0 - preview1 - -