| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272 |
- commit b8c11805640cf3ad367a54370d295ab59a6b6534
- Author: Nate McMaster <[email protected]>
- Date: Wed Nov 1 17:24:27 2017 -0700
- Pin tool and package versions to make builds more repeatable
-
- Part of aspnet/Universe#575
- diff --git a/.gitignore b/.gitignore
- index 8338b0c3ba8..aba684a0761 100644
- --- a/.gitignore
- +++ b/.gitignore
- @@ -41,4 +41,3 @@ launchSettings.json
- .vscode/
- TestResults/
- global.json
- -korebuild-lock.txt
- diff --git a/Directory.Build.props b/Directory.Build.props
- index f75adf7e4d6..a060aa3b00b 100644
- --- a/Directory.Build.props
- +++ b/Directory.Build.props
- @@ -1,2 +1,7 @@
- <Project>
- + <Import Project="build\dependencies.props" />
- +
- + <PropertyGroup>
- + <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- + </PropertyGroup>
- </Project>
- diff --git a/Directory.Build.targets b/Directory.Build.targets
- index bc118fd907b..e83ff95e395 100644
- --- a/Directory.Build.targets
- +++ b/Directory.Build.targets
- @@ -1,14 +1,5 @@
- -<Project InitialTargets="EnsureKoreBuildRestored">
- - <Target Name="EnsureKoreBuildRestored" Condition=" '$(KoreBuildRestoreTargetsImported)' != 'true' AND '$(MSBuildProjectName)' != 'BenchmarkDotNet.Autogenerated'">
- - <PropertyGroup>
- - <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh</_BootstrapperFile>
- - <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd</_BootstrapperFile>
- - <_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)'.
- - </_BootstrapperError>
- - </PropertyGroup>
- -
- - <Error Code="KRB1001" Text="$(_BootstrapperError.Trim())" />
- - </Target>
- +<Project>
- + <PropertyGroup>
- + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
- + </PropertyGroup>
- </Project>
- diff --git a/NuGet.config b/NuGet.config
- index 20060c934e4..4e8a1f6de15 100644
- --- a/NuGet.config
- +++ b/NuGet.config
- @@ -3,6 +3,7 @@
- <packageSources>
- <clear />
- <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
- + <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
- <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
- </packageSources>
- </configuration>
- diff --git a/build/dependencies.props b/build/dependencies.props
- new file mode 100644
- index 00000000000..99233f667ca
- --- /dev/null
- +++ b/build/dependencies.props
- @@ -0,0 +1,44 @@
- +<Project>
- + <PropertyGroup>
- + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- + </PropertyGroup>
- + <PropertyGroup Label="Package Versions">
- + <MicrosoftAspNetCoreAllPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreAllPackageVersion>
- + <MicrosoftAspNetCoreAspNetCoreModulePackageVersion>1.0.0-pre-10141</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
- + <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
- + <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
- + <MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>
- + <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
- + <MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
- + <MicrosoftAspNetCoreIdentityPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreIdentityPackageVersion>
- + <MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreMvcPackageVersion>
- + <MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
- + <MicrosoftAspNetCorePackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCorePackageVersion>
- + <MicrosoftAspNetCoreServerHttpSysPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreServerHttpSysPackageVersion>
- + <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.0-preview1-27498</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
- + <MicrosoftAspNetCoreSessionPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreSessionPackageVersion>
- + <MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreStaticFilesPackageVersion>
- + <MicrosoftAspNetCoreWebUtilitiesPackageVersion>2.1.0-preview1-27498</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
- + <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.0-preview1-27498</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
- + <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.0-preview1-27498</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
- + <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.0-preview1-27498</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
- + <MicrosoftExtensionsConfigurationBinderPackageVersion>2.1.0-preview1-27498</MicrosoftExtensionsConfigurationBinderPackageVersion>
- + <MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.1.0-preview1-27498</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
- + <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.1.0-preview1-27498</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
- + <MicrosoftExtensionsConfigurationJsonPackageVersion>2.1.0-preview1-27498</MicrosoftExtensionsConfigurationJsonPackageVersion>
- + <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>2.1.0-preview1-27498</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
- + <MicrosoftExtensionsLoggingConsolePackageVersion>2.1.0-preview1-27498</MicrosoftExtensionsLoggingConsolePackageVersion>
- + <MicrosoftExtensionsLoggingPackageVersion>2.1.0-preview1-27498</MicrosoftExtensionsLoggingPackageVersion>
- + <MicrosoftExtensionsLoggingTestingPackageVersion>2.1.0-preview1-27498</MicrosoftExtensionsLoggingTestingPackageVersion>
- + <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
- + <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
- + <SystemDataSqlClientPackageVersion>4.4.0</SystemDataSqlClientPackageVersion>
- + <XunitPackageVersion>2.3.0</XunitPackageVersion>
- + <XunitRunnerVisualStudioPackageVersion>2.3.0</XunitRunnerVisualStudioPackageVersion>
- + </PropertyGroup>
- + <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
- +</Project>
- diff --git a/build/repo.props b/build/repo.props
- index 13fe1c296ab..b55e651b87d 100644
- --- a/build/repo.props
- +++ b/build/repo.props
- @@ -1,6 +1,7 @@
- <Project>
- - <ItemGroup>
- - <PackageLineup Include="Internal.AspNetCore.Universe.Lineup" Version="2.1.0-*" />
- - <PackageLineup Include="Internal.AspNetCore.Partners.Lineup" Version="2.1.0-*" />
- - </ItemGroup>
- + <PropertyGroup>
- + <!-- These properties are use by the automation that updates dependencies.props -->
- + <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
- + <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json</LineupPackageRestoreSource>
- + </PropertyGroup>
- </Project>
- diff --git a/korebuild-lock.txt b/korebuild-lock.txt
- new file mode 100644
- index 00000000000..36d80560371
- --- /dev/null
- +++ b/korebuild-lock.txt
- @@ -0,0 +1,2 @@
- +version:2.1.0-preview1-15550
- +commithash:0dd080d0d87b4d1966ec0af9961dc8bacc04f84f
- diff --git a/korebuild.json b/korebuild.json
- new file mode 100644
- index 00000000000..bd5d51a51b0
- --- /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/MusicStore/MusicStore.csproj b/samples/MusicStore/MusicStore.csproj
- index 7ec4df776fb..061c48f9f45 100644
- --- a/samples/MusicStore/MusicStore.csproj
- +++ b/samples/MusicStore/MusicStore.csproj
- @@ -15,30 +15,30 @@
- </ItemGroup>
-
- <ItemGroup>
- - <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" />
- + <PackageReference Include="Microsoft.AspNetCore.AspNetCoreModule" Version="$(MicrosoftAspNetCoreAspNetCoreModulePackageVersion)" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETCoreApp' AND '$(Configuration)' == 'RuntimeStore' ">
- - <PackageReference Include="Microsoft.AspNetCore.All" />
- + <PackageReference Include="Microsoft.AspNetCore.All" Version="$(MicrosoftAspNetCoreAllPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' OR '$(Configuration)' != 'RuntimeStore' ">
- - <PackageReference Include="Microsoft.AspNetCore" />
- - <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" />
- - <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" />
- - <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" />
- - <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" />
- - <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
- - <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" />
- - <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" />
- - <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
- - <PackageReference Include="Microsoft.AspNetCore.Mvc" />
- - <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" PrivateAssets="All" />
- - <PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" />
- - <PackageReference Include="Microsoft.AspNetCore.Session" />
- - <PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
- - <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
- - <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
- - <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />
- + <PackageReference Include="Microsoft.AspNetCore" Version="$(MicrosoftAspNetCorePackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="$(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="$(MicrosoftAspNetCoreAuthenticationGooglePackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="$(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="$(MicrosoftAspNetCoreAuthenticationTwitterPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" PrivateAssets="All" Version="$(MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="$(MicrosoftAspNetCoreServerHttpSysPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Session" Version="$(MicrosoftAspNetCoreSessionPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
- + <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
- + <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
- </ItemGroup>
- </Project>
- diff --git a/test/Directory.Build.props b/test/Directory.Build.props
- index f900c4aeb54..6bb1f5a6601 100644
- --- a/test/Directory.Build.props
- +++ b/test/Directory.Build.props
- @@ -2,8 +2,8 @@
- <Import Project="..\Directory.Build.props" />
-
- <ItemGroup>
- - <PackageReference Include="Microsoft.NET.Test.Sdk" />
- - <PackageReference Include="xunit" />
- - <PackageReference Include="xunit.runner.visualstudio" />
- + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
- + <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
- + <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
- </ItemGroup>
- </Project>
- diff --git a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
- index f4b5a500aa5..6ca1a3b5d37 100644
- --- a/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
- +++ b/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
- @@ -14,20 +14,20 @@
- </ItemGroup>
-
- <ItemGroup>
- - <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" />
- - <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
- - <PackageReference Include="Microsoft.AspNetCore.Identity" />
- - <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" />
- - <PackageReference Include="Microsoft.AspNetCore.WebUtilities" />
- - <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
- - <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
- - <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
- - <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
- - <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
- - <PackageReference Include="Microsoft.Extensions.Logging.Console" />
- - <PackageReference Include="Microsoft.Extensions.Logging" />
- - <PackageReference Include="Microsoft.Extensions.Logging.Testing" />
- - <PackageReference Include="System.Data.SqlClient" />
- + <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="$(MicrosoftAspNetCoreAuthenticationCookiesPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Identity" Version="$(MicrosoftAspNetCoreIdentityPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
- + <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="$(MicrosoftAspNetCoreWebUtilitiesPackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
- + <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
- </ItemGroup>
-
- </Project>
- diff --git a/test/MusicStore.Test/MusicStore.Test.csproj b/test/MusicStore.Test/MusicStore.Test.csproj
- index 82798c9d9e1..81246dd5444 100644
- --- a/test/MusicStore.Test/MusicStore.Test.csproj
- +++ b/test/MusicStore.Test/MusicStore.Test.csproj
- @@ -9,8 +9,8 @@
- </ItemGroup>
-
- <ItemGroup>
- - <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" />
- - <PackageReference Include="Microsoft.Extensions.Logging.Testing" />
- + <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="$(MicrosoftAspNetCoreAuthenticationCorePackageVersion)" />
- + <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
- </ItemGroup>
-
- </Project>
|