Merge pull request #2549 from OmniSharp/central-package-management

Move from Packages.props to NuGet Central Package Management
OmniSharp · Jul 6, 2023 · 2d582b0 · 2d582b0
2 parents 06fb372 + ca37dce
commit 2d582b0
Show file tree

Hide file tree

Showing 33 changed files with 179 additions and 208 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,8 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="OutDir;Configuration">
   <PropertyGroup>
     <RepositoryRootDirectory>$(MSBuildThisFileDirectory)</RepositoryRootDirectory>
+
+    <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
   </PropertyGroup>
 
   <Import Project="build\Settings.props" />

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -15,6 +15,4 @@
       <PackageReference Include="NuGet.Versioning" ExcludeAssets="all" PrivateAssets="all" />
   </ItemGroup>
 
-  <Import Project="build\Packages.props" />
-
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,118 @@
+<Project>
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+
+        <MicrosoftExtensionPackageVersion>7.0.0</MicrosoftExtensionPackageVersion>
+        <MicrosoftTestPackageVersion>17.6.0</MicrosoftTestPackageVersion>
+        <MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
+        <NuGetPackageVersion>6.7.0-preview.1.20</NuGetPackageVersion>
+        <RoslynPackageVersion>4.7.0-2.23274.2</RoslynPackageVersion>
+        <XunitPackageVersion>2.4.1</XunitPackageVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageVersion Include="BenchmarkDotNet" Version="0.12.1" />
+        <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" />
+
+        <PackageVersion Include="Cake.Scripting.Transport" Version="0.9.0" />
+
+        <PackageVersion Include="DiffPlex" Version="1.7.1" />
+
+        <PackageVersion Include="Dotnet.Script.DependencyModel" Version="1.4.0" />
+        <PackageVersion Include="Dotnet.Script.DependencyModel.NuGet" Version="1.4.0" />
+
+        <PackageVersion Include="ICSharpCode.Decompiler" Version="7.2.1.6856" />
+
+        <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
+
+        <PackageVersion Include="Microsoft.Build" Version="$(MSBuildPackageVersion)" />
+        <PackageVersion Include="Microsoft.Build.Framework" Version="$(MSBuildPackageVersion)" />
+        <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MSBuildPackageVersion)" />
+        <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
+
+        <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynPackageVersion)" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynPackageVersion)" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(RoslynPackageVersion)" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(RoslynPackageVersion)" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynPackageVersion)" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynPackageVersion)" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp" Version="$(RoslynPackageVersion)" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" Version="$(RoslynPackageVersion)" />
+
+        <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionPackageVersion)" />
+        <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionPackageVersion)" />
+
+        <PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
+
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestPackageVersion)" />
+        <PackageVersion Include="Microsoft.TestPlatform.TranslationLayer" Version="$(MicrosoftTestPackageVersion)" />
+        <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftTestPackageVersion)" />
+
+        <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.14.114" />
+        <PackageVersion Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.12" />
+
+        <!-- The two references below can be deleted once OmniSharp.Extensions.LanguageServer
+        references Nerdbank.Streams version >= 2.9. The Included versions are needed for compatibility
+        with Razor. -->
+        <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.5.22" />
+        <PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.0.65" />
+
+        <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+
+        <PackageVersion Include="NuGet.Common" Version="$(NuGetPackageVersion)" />
+        <PackageVersion Include="NuGet.Configuration" Version="$(NuGetPackageVersion)" />
+        <PackageVersion Include="NuGet.DependencyResolver.Core" Version="$(NuGetPackageVersion)" />
+        <PackageVersion Include="NuGet.Frameworks" Version="$(NuGetPackageVersion)" />
+        <PackageVersion Include="NuGet.LibraryModel" Version="$(NuGetPackageVersion)" />
+        <PackageVersion Include="NuGet.Packaging.Core" Version="$(NuGetPackageVersion)" />
+        <PackageVersion Include="NuGet.Packaging" Version="$(NuGetPackageVersion)" />
+        <PackageVersion Include="NuGet.ProjectModel" Version="$(NuGetPackageVersion)" />
+        <PackageVersion Include="NuGet.Protocol" Version="$(NuGetPackageVersion)" />
+        <PackageVersion Include="NuGet.Versioning" Version="$(NuGetPackageVersion)" />
+
+        <PackageVersion Include="OmniSharp.Extensions.LanguageServer" Version="0.19.7" />
+        <PackageVersion Include="OmniSharp.Extensions.LanguageProtocol.Testing" Version="0.19.7" />
+        <PackageVersion Include="OmniSharp.Extensions.JsonRpc" Version="0.19.7" />
+
+        <PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.0" />
+        <PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
+        <PackageVersion Include="System.ComponentModel.Composition" Version="7.0.0" />
+        <PackageVersion Include="System.Composition" Version="7.0.0" />
+        <PackageVersion Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+        <PackageVersion Include="System.Memory" Version="4.5.5" />
+        <PackageVersion Include="System.Reflection.Metadata" Version="7.0.0" />
+        <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
+        <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
+
+        <PackageVersion Include="System.Reactive" Version="5.0.0" />
+
+        <PackageVersion Include="System.Reflection.DispatchProxy" Version="4.5.1" />
+        <PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
+
+        <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
+        <PackageVersion Include="xunit" Version="$(XunitPackageVersion)" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+        <PackageVersion Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
+        <PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
+        <PackageVersion Include="Microsoft.AspNetCore.Http.Features" Version="2.2.0" />
+        <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
+    </ItemGroup>
+</Project>
diff --git a/NuGet.Config b/NuGet.Config
@@ -9,4 +9,51 @@
         <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
         <add key="OmniSharp" value="https://www.myget.org/F/omnisharp/api/v3/index.json" />
     </packageSources>
+    <packageSourceMapping>
+        <clear />
+        <packageSource key="NuGet">
+            <package pattern="Antlr4.*" />
+            <package pattern="BenchmarkDotNet" />
+            <package pattern="BenchmarkDotNet.*" />
+            <package pattern="Cake.*" />
+            <package pattern="DiffPlex" />
+            <package pattern="Dotnet.Script.*" />
+            <package pattern="Humanizer.Core" />
+            <package pattern="ICSharpCode.Decompiler" />
+            <package pattern="McMaster.Extensions.CommandLineUtils" />
+            <package pattern="MediatR" />
+            <package pattern="microsoft.*" />
+            <package pattern="Nerdbank.Streams" />
+            <package pattern="NETStandard.Library" />
+            <package pattern="Newtonsoft.Json" />
+            <package pattern="NuGet.*" />
+            <package pattern="OmniSharp.*" />
+            <package pattern="runtime.*" />
+            <package pattern="SQLitePCLRaw.*" />
+            <package pattern="system.*" />
+            <package pattern="xunit*" />
+            <package pattern="xunit.*" />
+            <!-- Needed for CI -->
+            <package pattern="GitVersion.CommandLine" />
+            <!-- Needed for benchmarks and test projects -->
+            <package pattern="CommandLineParser" />
+            <package pattern="FSharp.Core" />
+            <package pattern="Iced" />
+            <package pattern="MSTest.*" />
+            <package pattern="nunit" />
+            <package pattern="NUnit3TestAdapter" />
+            <package pattern="Perfolizer" />
+            <package pattern="StyleCop.Analyzers" />
+        </packageSource>
+        <packageSource key="dotnet-tools">
+            <package pattern="microsoft.*" />
+            <package pattern="NuGet.*" />
+        </packageSource>
+        <packageSource key="dotnet6">
+            <package pattern="microsoft.*" />
+        </packageSource>
+    </packageSourceMapping>
+    <disabledPackageSources>
+        <clear />
+    </disabledPackageSources>
 </configuration>
diff --git a/OmniSharp.sln b/OmniSharp.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31129.286
@@ -14,7 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 		NuGet.Config = NuGet.Config
 		tools\packages.config = tools\packages.config
-		build\Packages.props = build\Packages.props
 		build\Settings.props = build\Settings.props
 	EndProjectSection
 	ProjectSection(FolderGlobals) = preProject

diff --git a/build.cake b/build.cake
@@ -244,6 +244,7 @@ void BuildWithDotNetCli(BuildEnvironment env, string configuration)
                 .Append($"/bl:{logFileNameBase}.binlog;ProjectImports={projectImports}")
                 .Append($"/v:{Verbosity.Minimal.GetMSBuildVerbosityName()}")
                 .Append("/tl")
+                .Append("/graphBuild")
     };
 
     settings.AddFileLogger(