Enable central package versions management

Directory.Build.props

@@ -8,6 +8,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DebugSymbols>true</DebugSymbols>
     <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)eng\CodeAnalysis.ruleset</CodeAnalysisRuleset>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -66,9 +67,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" PrivateAssets="All" Version="$(FxCopVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Condition=" '$(OS)' != 'Windows_NT' "
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Condition=" '$(OS)' != 'Windows_NT' " PrivateAssets="All" />
-                      PrivateAssets="All" Version="$(ReferenceAssembliesVersion)" />
   </ItemGroup>
 
   <ItemGroup>

Directory.Packages.props

@@ -0,0 +1,65 @@
+<Project>
+
+  <ItemGroup>
+    <PackageVersion Include="AngleSharp" Version="0.14.0" />
+    <PackageVersion Include="EntityFramework" Version="6.4.0" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2019.1.3" />
+    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.6.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.6.0" />
+    <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
+    <PackageVersion Include="Microsoft.Owin.Security" Version="4.1.0" />
+    <PackageVersion Include="Microsoft.Owin.Testing" Version="4.1.0" />
+    <PackageVersion Include="MongoDB.Bson" Version="2.9.0" />
+    <PackageVersion Include="MongoDB.Driver" Version="2.9.0" />
+    <PackageVersion Include="Moq" Version="4.13.1" />
+    <PackageVersion Include="Portable.BouncyCastle" Version="1.8.6.7" />
+    <PackageVersion Include="System.Collections.Immutable" Version="1.7.0" />
+    <PackageVersion Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageVersion Include="System.Linq.Async" Version="4.1.1" />
+    <PackageVersion Include="System.Net.Http.Json" Version="3.2.1" />
+    <PackageVersion Include="System.Text.Json" Version="4.7.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' Or
+                         '$(TargetFramework)' == 'netstandard2.0' Or
+                         '$(TargetFramework)' == 'netcoreapp2.1'">
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="2.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="2.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.Primitives" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.WebEncoders" Version="3.1.0" />
+  </ItemGroup>
+
+</Project>

OpenIddict.sln

@@ -76,6 +76,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{F6F3C8E0-B
 		build.sh = build.sh
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
+		Directory.Packages.props = Directory.Packages.props
 		global.json = global.json
 		LICENSE.md = LICENSE.md
 		NuGet.config = NuGet.config
@@ -101,7 +102,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Server.AspNetCor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Server.Owin.IntegrationTests", "test\OpenIddict.Server.Owin.IntegrationTests\OpenIddict.Server.Owin.IntegrationTests.csproj", "{E62124D4-3660-4590-B4D1-787168BBBEDD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIddict.Server.Tests", "test\OpenIddict.Server.Tests\OpenIddict.Server.Tests.csproj", "{D94B10D3-3DD3-4829-B305-17C48833AB33}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenIddict.Server.Tests", "test\OpenIddict.Server.Tests\OpenIddict.Server.Tests.csproj", "{D94B10D3-3DD3-4829-B305-17C48833AB33}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

eng/Versions.props

@@ -5,48 +5,4 @@
     <PreReleaseVersionLabel>beta2</PreReleaseVersionLabel>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <AspNetCoreVersion Condition=" '$(TargetFramework)' == 'net461' Or
-                                   '$(TargetFramework)' == 'net472' Or
-                                   '$(TargetFramework)' == 'netstandard2.0' Or
-                                   '$(TargetFramework)' == 'netcoreapp2.1' ">2.1.0</AspNetCoreVersion>
-    <AspNetCoreVersion Condition=" '$(TargetFramework)' == 'netstandard2.1' Or
-                                   '$(TargetFramework)' == 'netcoreapp3.1' ">3.1.0</AspNetCoreVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ExtensionsVersion Condition=" '$(TargetFramework)' == 'net461' Or
-                                   '$(TargetFramework)' == 'net472' Or
-                                   '$(TargetFramework)' == 'netcoreapp2.1' Or
-                                   '$(TargetFramework)' == 'netstandard2.0' ">2.1.0</ExtensionsVersion>
-    <ExtensionsVersion Condition=" '$(TargetFramework)' == 'netstandard2.1' Or
-                                   '$(TargetFramework)' == 'netcoreapp3.1' ">3.1.0</ExtensionsVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <EntityFrameworkCoreVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.1.0</EntityFrameworkCoreVersion>
-    <EntityFrameworkCoreVersion Condition=" '$(TargetFramework)' == 'netstandard2.1' ">3.1.0</EntityFrameworkCoreVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <AngleSharpVersion>0.14.0</AngleSharpVersion>
-    <BclAsyncInterfacesVersion>1.1.1</BclAsyncInterfacesVersion>
-    <BclHashCodeVersion>1.1.0</BclHashCodeVersion>
-    <BouncyCastleVersion>1.8.6.7</BouncyCastleVersion>
-    <DataAnnotationsVersion>4.7.0</DataAnnotationsVersion>
-    <EntityFrameworkVersion>6.4.0</EntityFrameworkVersion>
-    <FxCopVersion>3.0.0</FxCopVersion>
-    <JetBrainsVersion>2019.1.3</JetBrainsVersion>
-    <IdentityModelVersion>6.6.0</IdentityModelVersion>
-    <ImmutableCollectionsVersion>1.7.0</ImmutableCollectionsVersion>
-    <LinqAsyncVersion>4.1.1</LinqAsyncVersion>
-    <MongoDbVersion>2.9.0</MongoDbVersion>
-    <MoqVersion>4.13.1</MoqVersion>
-    <OwinVersion>4.1.0</OwinVersion>
-    <ReferenceAssembliesVersion>1.0.0</ReferenceAssembliesVersion>
-    <SystemNetHttpJsonVersion>3.2.1</SystemNetHttpJsonVersion>
-    <SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
-    <TasksExtensionsVersion>4.5.4</TasksExtensionsVersion>
-  </PropertyGroup>
-
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.4.20258.7",
+    "dotnet": "3.1.301",
     "runtimes": {
       "aspnetcore": [
         "2.1.19",

samples/Mvc.Client/Mvc.Client.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
   </ItemGroup>
 
 </Project>

samples/Mvc.Server/Mvc.Server.csproj

@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.Abstractions/OpenIddict.Abstractions.csproj

@@ -9,18 +9,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
-    <PackageReference Include="Microsoft.Extensions.Primitives" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Primitives" />
-    <PackageReference Include="System.Collections.Immutable" Version="$(ImmutableCollectionsVersion)" />
+    <PackageReference Include="System.Collections.Immutable" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="$(DataAnnotationsVersion)" />
+    <PackageReference Include="System.ComponentModel.Annotations" />
-    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(BclAsyncInterfacesVersion)" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" />
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="$(BclHashCodeVersion)" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="$(TasksExtensionsVersion)" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.Core/OpenIddict.Core.csproj

@@ -14,14 +14,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Portable.BouncyCastle" Version="$(BouncyCastleVersion)" />
+    <PackageReference Include="Portable.BouncyCastle" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.1' ">

src/OpenIddict.EntityFramework/OpenIddict.EntityFramework.csproj

@@ -15,8 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="$(EntityFrameworkVersion)" />
+    <PackageReference Include="EntityFramework" />
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj

@@ -15,8 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
   </ItemGroup>
 
   <ItemGroup>

src/OpenIddict.MongoDb.Models/OpenIddict.MongoDb.Models.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Bson" Version="$(MongoDbVersion)" />
+    <PackageReference Include="MongoDB.Bson" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.MongoDb/OpenIddict.MongoDb.csproj

@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="MongoDB.Driver" Version="$(MongoDbVersion)" />
+    <PackageReference Include="MongoDB.Driver" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.Server.AspNetCore/OpenIddict.Server.AspNetCore.csproj

@@ -18,13 +18,13 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">

src/OpenIddict.Server.DataProtection/OpenIddict.Server.DataProtection.csproj

@@ -18,11 +18,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.Server.Owin/OpenIddict.Server.Owin.csproj

@@ -14,10 +14,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
-    <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.WebEncoders" />
-    <PackageReference Include="Microsoft.Owin.Security" Version="$(OwinVersion)" />
+    <PackageReference Include="Microsoft.Owin.Security" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.Server/OpenIddict.Server.csproj

@@ -17,15 +17,15 @@ To use the server feature on ASP.NET Core or OWIN/Katana, reference the OpenIddi
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(IdentityModelVersion)" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or
                          '$(TargetFramework)' == 'net472' Or
                          '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Portable.BouncyCastle" Version="$(BouncyCastleVersion)" />
+    <PackageReference Include="Portable.BouncyCastle" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' != 'net461' ">

src/OpenIddict.Validation.AspNetCore/OpenIddict.Validation.AspNetCore.csproj

@@ -18,11 +18,11 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.Validation.DataProtection/OpenIddict.Validation.DataProtection.csproj

@@ -18,11 +18,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.Validation.Owin/OpenIddict.Validation.Owin.csproj

@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
-    <PackageReference Include="Microsoft.Owin.Security" Version="$(OwinVersion)" />
+    <PackageReference Include="Microsoft.Owin.Security" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.Validation.ServerIntegration/OpenIddict.Validation.ServerIntegration.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

src/OpenIddict.Validation.SystemNetHttp/OpenIddict.Validation.SystemNetHttp.csproj

@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" />
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
+    <PackageReference Include="System.Net.Http.Json" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">

src/OpenIddict.Validation/OpenIddict.Validation.csproj

@@ -17,9 +17,9 @@ To use the validation feature on ASP.NET Core or OWIN/Katana, reference the Open
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityModelVersion)" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' != 'net461' And '$(TargetFramework)' != 'netstandard2.0' ">

test/OpenIddict.Abstractions.Tests/OpenIddict.Abstractions.Tests.csproj

@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="Moq" />
   </ItemGroup>
 
 </Project>

test/OpenIddict.Core.Tests/OpenIddict.Core.Tests.csproj

@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="Moq" />
   </ItemGroup>
 
 </Project>

test/OpenIddict.EntityFramework.Tests/OpenIddict.EntityFramework.Tests.csproj

@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="Moq" />
   </ItemGroup>
 
 </Project>

test/OpenIddict.EntityFrameworkCore.Tests/OpenIddict.EntityFrameworkCore.Tests.csproj

@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="Moq" />
   </ItemGroup>
 
 </Project>

test/OpenIddict.MongoDb.Tests/OpenIddict.MongoDb.Tests.csproj

@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="Moq" />
   </ItemGroup>
 
 </Project>

test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddict.Server.AspNetCore.IntegrationTests.csproj

@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">

test/OpenIddict.Server.IntegrationTests/OpenIddict.Server.IntegrationTests.csproj

@@ -15,10 +15,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="$(AngleSharpVersion)" />
+    <PackageReference Include="AngleSharp" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="Moq" />
-    <PackageReference Include="System.Linq.Async" Version="$(LinqAsyncVersion)" />
+    <PackageReference Include="System.Linq.Async" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">

test/OpenIddict.Server.Owin.IntegrationTests/OpenIddict.Server.Owin.IntegrationTests.csproj

@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Owin.Testing" Version="$(OwinVersion)" />
+    <PackageReference Include="Microsoft.Owin.Testing" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">

test/OpenIddict.Server.Tests/OpenIddict.Server.Tests.csproj

@@ -10,16 +10,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="Moq" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionsVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\OpenIddict.Server\OpenIddict.Server.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' Or 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net461' ">
-                         '$(TargetFramework)' == 'net461' ">
     <Reference Include="System.Net.Http" />
   </ItemGroup>