Use PackageLineup to manage PackageReference versions

- Removes Version attribute from PackageReference. - Add reference to two PackageLineup's. - Pin remaining floating versions to specific versions.
2017-08-30 12:24:07 -07:00 · 2017-08-30 12:24:07 -07:00 · 80289f0591
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,5 +1,4 @@
 <Project>
-  <Import Project="build\dependencies.props" />
  <Import Project="version.xml" />

  <PropertyGroup>
--- 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>
+  </packageSources>
 </configuration>
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -1,30 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <InternalAspNetCoreSdkVersion>2.1.1-*</InternalAspNetCoreSdkVersion>
-    <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
-    <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
-    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-  </PropertyGroup>
-  <!-- AspNetCore Versions -->
-  <PropertyGroup>
-    <AspNetCoreVersion>2.1.0-*</AspNetCoreVersion>
-  </PropertyGroup>
-  <!-- Partner Versions-->
-  <PropertyGroup>
-    <RoslynVersion>2.3.1</RoslynVersion>
-    <JsonNetVersion>10.0.1</JsonNetVersion>
-    <MicrosoftBuildVersion>15.3.409</MicrosoftBuildVersion>
-    <NuGetFrameworksVersion>4.0.0-*</NuGetFrameworksVersion>
-  </PropertyGroup>
-  <!-- Dependencies for Test Project -->
-  <PropertyGroup>
-    <TestSdkVersion>15.3.0</TestSdkVersion>
-    <MoqVersion>4.7.49</MoqVersion>
-    <XunitVersion>2.3.0-beta4-build3742</XunitVersion>
-    <DotNetProjectModelVersion>1.0.0-*</DotNetProjectModelVersion>
-  </PropertyGroup>
-  <!-- MSBuild used by CLI currently uses the 9.0.1 version. -->
-  <PropertyGroup>
-    <JsonNetLegacyVersion>9.0.1</JsonNetLegacyVersion>
-  </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/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -2,6 +2,6 @@
  <Import Project="..\Directory.Build.props" />

  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
+    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" />
  </ItemGroup>
 </Project>
--- a/src/VS.Web.CG.Contracts/VS.Web.CG.Contracts.csproj
+++ b/src/VS.Web.CG.Contracts/VS.Web.CG.Contracts.csproj
@ -11,7 +11,7 @@
  </PropertyGroup>

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

 </Project>
--- a/src/VS.Web.CG.Core/VS.Web.CG.Core.csproj
+++ b/src/VS.Web.CG.Core/VS.Web.CG.Core.csproj
@ -12,9 +12,9 @@

  <ItemGroup>
    <ProjectReference Include="..\VS.Web.CG.Templating\VS.Web.CG.Templating.csproj" />
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Newtonsoft.Json" />
  </ItemGroup>

 </Project>
--- a/src/VS.Web.CG.Design/VS.Web.CG.Design.csproj
+++ b/src/VS.Web.CG.Design/VS.Web.CG.Design.csproj
@ -18,7 +18,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
  </ItemGroup>

 </Project>
--- a/src/VS.Web.CG.EFCore/VS.Web.CG.EFCore.csproj
+++ b/src/VS.Web.CG.EFCore/VS.Web.CG.EFCore.csproj
@ -17,7 +17,7 @@
       without adding EntityFrameworkCore dependency.
       https://github.com/aspnet/scaffolding/issues/434
       -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="All" />
  </ItemGroup>

  <ItemGroup>
--- a/src/VS.Web.CG.Msbuild/VS.Web.CG.Msbuild.csproj
+++ b/src/VS.Web.CG.Msbuild/VS.Web.CG.Msbuild.csproj
@ -18,11 +18,13 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetLegacyVersion)" />
-    <PackageReference Include="NuGet.Frameworks" Version="$(NuGetFrameworksVersion)" />
+    <PackageReference Include="Microsoft.Build" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" PrivateAssets="All">
+      <!-- This version needs to line up with what is bundled in MSBuild -->
+      <NoWarn>KRB4002</NoWarn>
+    </PackageReference>
+    <PackageReference Include="NuGet.Frameworks" PrivateAssets="All" />
  </ItemGroup>

 </Project>
--- a/src/VS.Web.CG.Templating/VS.Web.CG.Templating.csproj
+++ b/src/VS.Web.CG.Templating/VS.Web.CG.Templating.csproj
@ -15,8 +15,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
  </ItemGroup>

 </Project>
--- a/src/VS.Web.CG.Tools/VS.Web.CG.Tools.csproj
+++ b/src/VS.Web.CG.Tools/VS.Web.CG.Tools.csproj
@ -28,11 +28,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
-    <PackageReference Include="NuGet.Frameworks" Version="$(NuGetFrameworksVersion)" />
+    <PackageReference Include="Microsoft.Build.Runtime" />
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="NuGet.Frameworks" />
  </ItemGroup>

  <ItemGroup>
--- a/src/VS.Web.CG.Utils/VS.Web.CG.Utils.csproj
+++ b/src/VS.Web.CG.Utils/VS.Web.CG.Utils.csproj
@ -24,9 +24,9 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
-    <PackageReference Include="NuGet.Frameworks" Version="$(NuGetFrameworksVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="NuGet.Frameworks" />
  </ItemGroup>

 </Project>
--- a/src/VS.Web.CG/VS.Web.CG.csproj
+++ b/src/VS.Web.CG/VS.Web.CG.csproj
@ -15,8 +15,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
  </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/E2E_Test/E2E_Test.csproj
+++ b/test/E2E_Test/E2E_Test.csproj
@ -13,8 +13,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="NuGet.Frameworks" Version="$(NuGetFrameworksVersion)" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
+    <PackageReference Include="NuGet.Frameworks" />
  </ItemGroup>

 </Project>
--- a/test/Ext.ProjectModel.Tests/Ext.ProjectModel.Tests.csproj
+++ b/test/Ext.ProjectModel.Tests/Ext.ProjectModel.Tests.csproj
@ -23,9 +23,12 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="$(DotNetProjectModelVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Build.Runtime" />
+    <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-1-003177">
+      <!-- TODO stop using project.json era API -->
+      <NoWarn>KRB4002</NoWarn>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
  </ItemGroup>

 </Project>
--- a/test/TestApps/ModelTypesLocatorTestWebApp/ModelTypesLocatorTestWebApp.csproj
+++ b/test/TestApps/ModelTypesLocatorTestWebApp/ModelTypesLocatorTestWebApp.csproj
@ -5,16 +5,16 @@

  <ItemGroup>
    <ProjectReference Include="..\ModelTypesLocatorTestClassLibrary\ModelTypesLocatorTestClassLibrary.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
  </ItemGroup>

 </Project>
--- a/test/VS.Web.CG.EFCore.Test/VS.Web.CG.EFCore.Test.csproj
+++ b/test/VS.Web.CG.EFCore.Test/VS.Web.CG.EFCore.Test.csproj
@ -24,13 +24,16 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="$(DotNetProjectModelVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Build.Runtime" />
+    <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-1-003177" >
+      <!-- TODO stop using project.json era API -->
+      <NoWarn>KRB4002</NoWarn>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
  </ItemGroup>

 </Project>
--- a/test/VS.Web.CG.MSBuild.Test/VS.Web.CG.MSBuild.Test.csproj
+++ b/test/VS.Web.CG.MSBuild.Test/VS.Web.CG.MSBuild.Test.csproj
@ -18,8 +18,9 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Build.Runtime" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
+    <PackageReference Include="NuGet.Frameworks" />
  </ItemGroup>

 </Project>
--- a/test/VS.Web.CG.Sources.Test/VS.Web.CG.Sources.Test.csproj
+++ b/test/VS.Web.CG.Sources.Test/VS.Web.CG.Sources.Test.csproj
@ -23,9 +23,12 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildVersion)" />
-    <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="$(DotNetProjectModelVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Build.Runtime" />
+    <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-1-003177">
+      <!-- TODO stop using project.json era API -->
+      <NoWarn>KRB4002</NoWarn>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
  </ItemGroup>

 </Project>
--- a/test/VS.Web.CG.Templating.Test/VS.Web.CG.Templating.Test.csproj
+++ b/test/VS.Web.CG.Templating.Test/VS.Web.CG.Templating.Test.csproj
@ -11,7 +11,10 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="$(DotNetProjectModelVersion)" />
+    <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-1-003177">
+      <!-- TODO stop using project.json era API -->
+      <NoWarn>KRB4002</NoWarn>
+    </PackageReference>
  </ItemGroup>

 </Project>