diff --git a/Directory.Build.props b/Directory.Build.props index 31836f5593..7dc417e7bf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,4 @@  - diff --git a/Directory.Build.targets b/Directory.Build.targets index f75adf7e4d..bc118fd907 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,2 +1,14 @@ - + + + + <_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)'. + + + + + diff --git a/NuGet.config b/NuGet.config index 4e8a1f6de1..20060c934e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index 340f109f60..0000000000 --- a/build/dependencies.props +++ /dev/null @@ -1,15 +0,0 @@ - - - 2.1.0-* - 4.4.1-* - 4.4.0-* - 2.1.1-* - 4.7.49 - 2.0.0-* - 2.0.0-* - 2.0.0-* - 15.3.0 - 2.3.0-beta4-build3742 - 1.5.0-* - - diff --git a/build/repo.props b/build/repo.props index 71c3d37a49..85ccd4b1f3 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,5 +1,7 @@ - + + + diff --git a/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj b/samples/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj index 5fa0404c3e..2fa5055ea2 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 18fc8411ea..15451758a7 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 f2d899dd52..d4c31a7c07 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 4b7c54ea5f..8f284792c3 100644 --- a/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj +++ b/samples/ExceptionHandlerSample/ExceptionHandlerSample.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj b/samples/MiddlewareAnalysisSample/MiddlewareAnalysisSample.csproj index 2099bf887c..4b5161e703 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 18fc8411ea..15451758a7 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 18fc8411ea..15451758a7 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 d704a37df9..9d9a3de33a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,6 +2,6 @@ - + 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 7bec65fbc5..cc01b389d6 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj @@ -14,11 +14,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 846b972d3e..43d38609f6 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj @@ -13,10 +13,9 @@ - - - - + + + diff --git a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj index 6533278d4a..80b748986b 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj +++ b/src/Microsoft.AspNetCore.Diagnostics/Microsoft.AspNetCore.Diagnostics.csproj @@ -17,19 +17,17 @@ - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj b/src/Microsoft.AspNetCore.MiddlewareAnalysis/Microsoft.AspNetCore.MiddlewareAnalysis.csproj index 77aed6b073..f7fb61bd6b 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/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj b/test/Diagnostics.EFCore.FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj index 4271068ca3..ac1351053c 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 9a66bf2afb..38bc3d649c 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 d704a37df9..9d9a3de33a 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,6 +2,6 @@ - + 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 ef4a1a7187..e265c2fbe5 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.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj b/test/Microsoft.AspNetCore.Diagnostics.Tests/Microsoft.AspNetCore.Diagnostics.Tests.csproj index 4704c8e7ab..86fb30f123 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 0c017a5e11..1747fb4ec5 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 @@ - - - - - - - + + + + + + +