Use PackageLineup to manage PackageReference versions

2017-08-29 12:24:03 -07:00 · 2017-08-29 12:24:03 -07:00 · 9461009174
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,5 +1,4 @@
 <Project>
-  <Import Project="build\dependencies.props" />
  <Import Project="version.xml" />

  <PropertyGroup>
@ -13,8 +12,4 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>

-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -1,2 +1,14 @@
-<Project>
+<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>
--- a/NuGet.config
+++ b/NuGet.config
@ -3,7 +3,6 @@
  <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>
--- a/README.md
+++ b/README.md
@ -1,18 +1,18 @@
 Logging
 =======

-**Package**: `Microsoft.Extensions.Logging`  
-NuGet (`master`): [![](http://img.shields.io/nuget/v/Microsoft.Extensions.Logging.svg?style=flat-square)](http://www.nuget.org/packages/Microsoft.Extensions.Logging) [![](http://img.shields.io/nuget/dt/Microsoft.Extensions.Logging.svg?style=flat-square)](http://www.nuget.org/packages/Microsoft.Extensions.Logging)  
+**Package**: `Microsoft.Extensions.Logging`
+NuGet (`master`): [![](http://img.shields.io/nuget/v/Microsoft.Extensions.Logging.svg?style=flat-square)](http://www.nuget.org/packages/Microsoft.Extensions.Logging) [![](http://img.shields.io/nuget/dt/Microsoft.Extensions.Logging.svg?style=flat-square)](http://www.nuget.org/packages/Microsoft.Extensions.Logging)
 MyGet (`dev`): [![](http://img.shields.io/dotnet.myget/aspnetcore-dev/v/Microsoft.Extensions.Logging.svg?style=flat-square)](https://dotnet.myget.org/feed/aspnetcore-dev/package/nuget/Microsoft.Extensions.Logging)

-AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/i0hdtuq4m6pwfp2s/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Logging/branch/dev)  
+AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/i0hdtuq4m6pwfp2s/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Logging/branch/dev)
 Travis:   [![Travis](https://travis-ci.org/aspnet/Logging.svg?branch=dev)](https://travis-ci.org/aspnet/Logging)

 Common logging abstractions and a few implementations. Refer to the [wiki](https://github.com/aspnet/Logging/wiki) for more information

 This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.

-### Providers
+## Providers

 Community projects adapt _Microsoft.Extensions.Logging_ for use with different back-ends.

@ -21,3 +21,12 @@ Community projects adapt _Microsoft.Extensions.Logging_ for use with different b
 * [Loggr](https://github.com/imobile3/Loggr.Extensions.Logging) - provider for the Loggr service
 * [NLog](https://github.com/NLog/NLog.Extensions.Logging) - provider for the NLog library
 * [Graylog](https://github.com/mattwcole/gelf-extensions-logging) - provider for the Graylog service
+
+## 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.
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -1,17 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <AspNetCoreVersion>2.1.0-*</AspNetCoreVersion>
-    <CoreFxVersion>4.4.0-*</CoreFxVersion>
-    <InternalAspNetCoreSdkVersion>2.1.1-*</InternalAspNetCoreSdkVersion>
-    <JsonNetVersion>10.0.1</JsonNetVersion>
-    <MoqVersion>4.7.49</MoqVersion>
-    <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
-    <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
-    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    <SerilogExtensionsLoggingVersion>1.4.0</SerilogExtensionsLoggingVersion>
-    <SerilogFileSinkVersion>3.2.0</SerilogFileSinkVersion>
-    <TestSdkVersion>15.3.0</TestSdkVersion>
-    <XunitVersion>2.3.0-beta4-build3742</XunitVersion>
-    <XunitAbstractionsVersion>2.0.1</XunitAbstractionsVersion>
-  </PropertyGroup>
-</Project>
--- a/build/repo.props
+++ b/build/repo.props
@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup>
+    <PackageLineup Include="Internal.AspNetCore.Universe.Lineup" Version="2.1.0-*" />
+    <PackageLineup Include="Internal.AspNetCore.Partners.Lineup" Version="2.1.0-*" />
+  </ItemGroup>
+</Project>
--- a/samples/SampleApp/SampleApp.csproj
+++ b/samples/SampleApp/SampleApp.csproj
@ -16,10 +16,10 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
  </ItemGroup>

  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -7,6 +7,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
+    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" />
  </ItemGroup>
 </Project>
--- a/src/Microsoft.Extensions.Logging.AzureAppServices/Microsoft.Extensions.Logging.AzureAppServices.csproj
+++ b/src/Microsoft.Extensions.Logging.AzureAppServices/Microsoft.Extensions.Logging.AzureAppServices.csproj
@ -13,10 +13,10 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />

-    <PackageReference Include="System.ValueTuple" Version="$(CoreFxVersion)" />
+    <PackageReference Include="System.ValueTuple" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.csproj
+++ b/src/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.csproj
@ -10,7 +10,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.csproj
+++ b/src/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.csproj
@ -11,7 +11,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.csproj
+++ b/src/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.csproj
@ -11,7 +11,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
+    <PackageReference Include="Newtonsoft.Json" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.Extensions.Logging.Testing/Microsoft.Extensions.Logging.Testing.csproj
+++ b/src/Microsoft.Extensions.Logging.Testing/Microsoft.Extensions.Logging.Testing.csproj
@ -14,11 +14,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="xunit.abstractions" Version="$(XunitAbstractionsVersion)" />
-    <PackageReference Include="xunit.assert" Version="$(XunitVersion)" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="$(SerilogExtensionsLoggingVersion)" />
-    <PackageReference Include="Serilog.Sinks.File" Version="$(SerilogFileSinkVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="xunit.abstractions" />
+    <PackageReference Include="xunit.assert" />
+    <PackageReference Include="Serilog.Extensions.Logging" />
+    <PackageReference Include="Serilog.Sinks.File" />
  </ItemGroup>

 </Project>
--- a/src/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.csproj
+++ b/src/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.csproj
@ -11,8 +11,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Options" />
  </ItemGroup>

 </Project>
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@ -2,11 +2,11 @@
  <Import Project="..\Directory.Build.props" />

  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
  </ItemGroup>
 </Project>
--- a/test/Microsoft.Extensions.Logging.Test/Microsoft.Extensions.Logging.Test.csproj
+++ b/test/Microsoft.Extensions.Logging.Test/Microsoft.Extensions.Logging.Test.csproj
@ -14,8 +14,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
  </ItemGroup>

  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">