Migrate to Central Package Management (OrchardCMS#16235)

--------- Co-authored-by: Mike Alhayek <[email protected]> Co-authored-by: Zoltán Lehóczky <[email protected]> Co-authored-by: Sébastien Ros <[email protected]>
giannik · Jun 9, 2024 · 7f36f40 · 7f36f40
1 parent 9e08ed6
commit 7f36f40
Show file tree

Hide file tree

Showing 18 changed files with 153 additions and 202 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
@@ -52,7 +52,7 @@ Update everything in the [Translations project](https://github.com/OrchardCMS/Or
 
 - [ ] Update .po files with [PoExtractor](https://github.com/lukaskabrt/PoExtractor). This will also update [Crowdin](https://crowdin.com/project/orchard-core).
 - [ ] Publish the new version on NuGet.
-- [ ] Update the `OrchardCore.Translations.All` package reference in the main repo's _src/OrchardCore.Build/Dependencies.props_ file to refer to the new NuGet package.
+- [ ] Update the `OrchardCore.Translations.All` package reference in the main repo's _./Dependencies.Packages.props_ file to refer to the new NuGet package.
 
 ### Publish the release
 

diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ build/
 app.publish/
 [Bb]in/
 [Oo]bj/
+*.binlog
 
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,7 @@
 <Project>
 
+  <Import Project="src\OrchardCore.Build\TargetFrameworks.props" />
+
   <PropertyGroup>
     <!-- https://aka.ms/vs-build-acceleration -->
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,129 @@
+<Project>
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <!-- Special case - this property is used by a DotNetCliToolReference -->
+    <DotNetXunitVersion>2.3.0</DotNetXunitVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageVersion Include="AngleSharp" Version="1.1.2" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.104.11" />
+    <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.7" />
+    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.101.60" />
+    <PackageVersion Include="Azure.Communication.Email" Version="1.0.1" />
+    <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
+    <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
+    <PackageVersion Include="Azure.Identity" Version="1.11.3" />
+    <PackageVersion Include="Azure.Search.Documents" Version="11.5.1" />
+    <PackageVersion Include="Azure.Storage.Blobs" Version="12.20.0" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageVersion Include="Castle.Core" Version="5.1.1" />
+    <PackageVersion Include="DocumentFormat.OpenXml" Version="3.0.2" />
+    <PackageVersion Include="Fluid.Core" Version="2.10.0" />
+    <PackageVersion Include="GraphQL" Version="7.8.0" />
+    <PackageVersion Include="GraphQL.DataLoader" Version="7.8.0" />
+    <PackageVersion Include="GraphQL.MicrosoftDI" Version="7.8.0" />
+    <PackageVersion Include="GraphQL.SystemTextJson" Version="7.8.0" />
+    <PackageVersion Include="Jint" Version="3.1.2" />
+    <PackageVersion Include="JsonPath.Net" Version="1.1.0" />
+    <PackageVersion Include="HtmlSanitizer" Version="8.1.860-beta" />
+    <PackageVersion Include="Irony" Version="1.5.1" />
+    <PackageVersion Include="libphonenumber-csharp" Version="8.13.38" />
+    <PackageVersion Include="Lorem.Universal.NET" Version="4.0.80" />
+    <PackageVersion Include="Lucene.Net" Version="4.8.0-beta00016" />
+    <PackageVersion Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
+    <PackageVersion Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
+    <PackageVersion Include="Lucene.Net.Spatial" Version="4.8.0-beta00016" />
+    <PackageVersion Include="MailKit" Version="4.6.0" />
+    <PackageVersion Include="Markdig" Version="0.36.2" />
+    <PackageVersion Include="MessagePack" Version="2.2.60" />
+    <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.3" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.5.0" />
+    <PackageVersion Include="Microsoft.Identity.Web" Version="2.19.0" />
+
+    <!--
+      Important: the version of the Microsoft.IdentityModel.Protocols.OpenIdConnect package MUST
+      match the IdentityModel version transitively referenced by OpenIddict to ensure we don't
+      accidentally end up referencing inconsistent versions (which is not supported by IM).
+
+      See https://github.com/OrchardCMS/OrchardCore/pull/16057 for more information.
+    -->
+
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.5.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="MimeKit" Version="4.6.0" />
+    <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
+    <PackageVersion Include="Moq" Version="4.20.70" />
+    <PackageVersion Include="ncrontab" Version="3.3.3" />
+    <PackageVersion Include="NEST" Version="7.17.5" />
+    <PackageVersion Include="NJsonSchema" Version="11.0.0" />
+    <PackageVersion Include="NLog.Web.AspNetCore" Version="5.3.11" />
+    <PackageVersion Include="NodaTime" Version="3.1.11" />
+    <PackageVersion Include="OpenIddict.Core" Version="5.6.0" />
+    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.6.0" />
+    <PackageVersion Include="OpenIddict.Server.DataProtection" Version="5.6.0" />
+    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.6.0" />
+    <PackageVersion Include="OpenIddict.Validation.DataProtection" Version="5.6.0" />
+    <PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="5.6.0" />
+    <PackageVersion Include="OrchardCore.Translations.All" Version="1.8.0" />
+    <PackageVersion Include="PdfPig" Version="0.1.8" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageVersion Include="Shortcodes" Version="1.3.3" />
+    <PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
+    <PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="3.1.2" />
+    <PackageVersion Include="SixLabors.ImageSharp.Web.Providers.AWS" Version="3.1.2" />
+    <PackageVersion Include="StackExchange.Redis" Version="2.7.33" />
+    <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
+    <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
+    <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
+    <PackageVersion Include="xunit" Version="2.8.1" />
+    <PackageVersion Include="xunit.analyzers" Version="1.14.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
+    <PackageVersion Include="YesSql" Version="5.0.0" />
+    <PackageVersion Include="YesSql.Abstractions" Version="5.0.0" />
+    <PackageVersion Include="YesSql.Core" Version="5.0.0" />
+    <PackageVersion Include="YesSql.Filters.Abstractions" Version="5.0.0" />
+    <PackageVersion Include="YesSql.Filters.Query" Version="5.0.0" />
+    <PackageVersion Include="ZString" Version="2.6.0" />
+  </ItemGroup>
+
+  <!-- These versions are used for the NuGet packages that are dependent on the current TFM -->
+  <!-- Versions are preset for the default TFM (there may be no TFM in an evaluation phase) -->
+  <PropertyGroup>
+    <AspNetCorePackagesVersion>8.0.6</AspNetCorePackagesVersion>
+    <MicrosoftExtensionsPackagesVersion>8.0.6</MicrosoftExtensionsPackagesVersion>
+  </PropertyGroup>
+
+  <!-- When dual-targeting frameworks, add both of them to CommonTargetFrameworks above, when add PropertyGroups like
+  below. -->
+  <!--<PropertyGroup Condition="$(TargetFramework) == 'net7.0'">
+    <AspNetCorePackagesVersion>7.0.14</AspNetCorePackagesVersion>
+    <MicrosoftExtensionsPackagesVersion>7.0.14</MicrosoftExtensionsPackagesVersion>
+  </PropertyGroup>-->
+
+  <!-- 'Microsoft.AspNetCore' packages that are not included in the ASP.NET Core shared framework -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="$(AspNetCorePackagesVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="$(AspNetCorePackagesVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="$(AspNetCorePackagesVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspNetCorePackagesVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="$(AspNetCorePackagesVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="$(AspNetCorePackagesVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="$(AspNetCorePackagesVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCorePackagesVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="$(AspNetCorePackagesVersion)" />
+  </ItemGroup>
+
+  <!-- 'Microsoft.Extensions' packages that are not included in the ASP.NET Core shared framework -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(MicrosoftExtensionsPackagesVersion)" />
+    <!-- Microsoft.Extensions.Http.Resilience is not here because it diverged from the common Microsoft.Extensions versioning. -->
+  </ItemGroup>
+
+</Project>
diff --git a/OrchardCore.sln b/OrchardCore.sln
@@ -214,13 +214,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Https", "src\Or
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{184139CF-C4AB-4FBE-AE19-54C8B3FE5C5E}"
 	ProjectSection(SolutionItems) = preProject
-		src\OrchardCore.Build\Dependencies.AspNetCore.props = src\OrchardCore.Build\Dependencies.AspNetCore.props
-		src\OrchardCore.Build\Dependencies.props = src\OrchardCore.Build\Dependencies.props
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		src\OrchardCore\Directory.Build.targets = src\OrchardCore\Directory.Build.targets
 		NuGet.config = NuGet.config
 		src\OrchardCore.Build\OrchardCore.Commons.props = src\OrchardCore.Build\OrchardCore.Commons.props
 		src\OrchardCore.Build\OrchardCore.Commons.targets = src\OrchardCore.Build\OrchardCore.Commons.targets
+		src\OrchardCore.Build\TargetFrameworks.props = src\OrchardCore.Build\TargetFrameworks.targets
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Email", "src\OrchardCore.Modules\OrchardCore.Email\OrchardCore.Email.csproj", "{B3E9EC5B-171E-43FB-8620-7FC24D0A985A}"

diff --git a/src/OrchardCore.Build/Dependencies.AspNetCore.props b/src/OrchardCore.Build/Dependencies.AspNetCore.props
diff --git a/src/OrchardCore.Build/Dependencies.props b/src/OrchardCore.Build/Dependencies.props
diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props
@@ -1,7 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="Dependencies.props" />
-
   <PropertyGroup>
     <LangVersion>12.0</LangVersion>
     <VersionPrefix>2.0.0</VersionPrefix>