use central package management (#1949)

DapperLib · Aug 18, 2023 · 076bda6 · 076bda6
1 parent b7f3cfa
commit 076bda6
Show file tree

Hide file tree

Showing 15 changed files with 103 additions and 58 deletions.
diff --git a/Dapper.EntityFramework.StrongName/Dapper.EntityFramework.StrongName.csproj b/Dapper.EntityFramework.StrongName/Dapper.EntityFramework.StrongName.csproj
@@ -17,8 +17,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dapper.StrongName\Dapper.StrongName.csproj" />
-    <!-- note: 6.2.0 has regressions; don't force the update -->
-    <PackageReference Include="EntityFramework" Version="6.1.3" />
-    <PackageReference Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />
+    <PackageReference Include="EntityFramework" />
+    <PackageReference Include="Microsoft.SqlServer.Types" />
   </ItemGroup>
 </Project>
diff --git a/Dapper.EntityFramework/Dapper.EntityFramework.csproj b/Dapper.EntityFramework/Dapper.EntityFramework.csproj
@@ -11,11 +11,10 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dapper\Dapper.csproj" />
-    <!-- note: 6.2.0 has regressions; don't force the update -->
-    <PackageReference Include="EntityFramework" Version="6.1.3" />
-    <PackageReference Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />
+    <PackageReference Include="EntityFramework" />
+    <PackageReference Include="Microsoft.SqlServer.Types" />
 
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/Dapper.ProviderTools/Dapper.ProviderTools.csproj b/Dapper.ProviderTools/Dapper.ProviderTools.csproj
@@ -10,13 +10,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="Microsoft.CSharp" />

diff --git a/Dapper.Rainbow/Dapper.Rainbow.csproj b/Dapper.Rainbow/Dapper.Rainbow.csproj
@@ -14,7 +14,7 @@
     <ProjectReference Include="..\Dapper\Dapper.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="Microsoft.CSharp" />

diff --git a/Dapper.SqlBuilder/Dapper.SqlBuilder.csproj b/Dapper.SqlBuilder/Dapper.SqlBuilder.csproj
@@ -13,13 +13,13 @@
   <ItemGroup>
     <ProjectReference Include="..\Dapper\Dapper.csproj" />
 
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="Microsoft.CSharp" />

diff --git a/Dapper.StrongName/Dapper.StrongName.csproj b/Dapper.StrongName/Dapper.StrongName.csproj
@@ -17,6 +17,6 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" />
   </ItemGroup>
 </Project>
diff --git a/Dapper.sln b/Dapper.sln
@@ -7,9 +7,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		appveyor.yml = appveyor.yml
+		Build.csproj = Build.csproj
 		build.ps1 = build.ps1
 		Dapper.png = Dapper.png
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		global.json = global.json
 		docs\index.md = docs\index.md
 		License.txt = License.txt

diff --git a/Dapper/Dapper.csproj b/Dapper/Dapper.csproj
@@ -18,13 +18,13 @@
   <ItemGroup>
     <Folder Include="Properties\" />
 
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" />
   </ItemGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,9 +19,8 @@
     <DebugType>embedded</DebugType>
     <DefaultLanguage>en-US</DefaultLanguage>
     <IncludeSymbols>false</IncludeSymbols>
-
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-
     <LangVersion>9.0</LangVersion>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
@@ -38,9 +37,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
+    <PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
     <None Include="../Dapper.png" Visible="false" Pack="true">
       <PackagePath></PackagePath>
     </None>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,45 @@
+<Project>
+    <ItemGroup>
+      <!-- note: 6.2.0 has regressions; don't force the update -->
+      <PackageVersion Include="EntityFramework" Version="6.1.3" />
+      <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
+      <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
+      <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+      <PackageVersion Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />
+      <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
+      <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
+      <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+
+      <!-- tests -->
+      <PackageVersion Include="Belgrade.Sql.Client" Version="1.1.4" />
+      <PackageVersion Include="BenchmarkDotNet" Version="0.13.7" />
+      <PackageVersion Include="Dashing" Version="2.10.0" />
+      <PackageVersion Include="Dapper.Contrib" Version="2.0.78" />
+      <PackageVersion Include="DevExpress.Xpo" Version="23.1.4" />
+      <PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1" />
+      <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.2" />
+      <PackageVersion Include="Iesi.Collections" Version="4.0.5" />
+      <PackageVersion Include="linq2db.SqlServer" Version="3.7.0" />
+      <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.1" />
+      <PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.10" />
+      <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
+      <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+      <PackageVersion Include="Mighty" Version="3.2.0" />
+      <PackageVersion Include="MySqlConnector" Version="2.2.7" />
+      <PackageVersion Include="NHibernate" Version="5.4.5" />
+      <PackageVersion Include="Norm.net" Version="5.3.7" />
+      <PackageVersion Include="Npgsql" Version="7.0.4" />
+      <PackageVersion Include="PetaPoco" Version="5.1.306" />
+      <PackageVersion Include="RepoDb.SqlServer" Version="1.13.1" />
+      <PackageVersion Include="ServiceStack.OrmLite.SqlServer" Version="6.10.0" />
+      <PackageVersion Include="Snowflake.Data" Version="2.1.0" />
+      <PackageVersion Include="SqlMarshal" Version="0.4.4" />
+      <PackageVersion Include="SubSonic" Version="3.0.0.4" />
+      <PackageVersion Include="Susanoo.SqlServer" Version="1.2.4.2" />
+      <PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
+      <PackageVersion Include="System.Data.SQLite" Version="1.0.118" />
+      <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
+      <PackageVersion Include="xunit" Version="2.5.0" />
+      <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
+    </ItemGroup>
+</Project>
diff --git a/benchmarks/Dapper.Tests.Performance/Dapper.Tests.Performance.csproj b/benchmarks/Dapper.Tests.Performance/Dapper.Tests.Performance.csproj
@@ -8,25 +8,26 @@
     <NoWarn>$(NoWarn);IDE0063;IDE0034;IDE0059;IDE0060</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Dashing" Version="2.10.0" />
-    <PackageReference Include="Belgrade.Sql.Client" Version="1.1.4" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.6" />
-    <PackageReference Include="DevExpress.Xpo" Version="23.1.3" />
     <!--<PackageReference Include="BLToolkit" Version="4.3.6" />-->
-    <PackageReference Include="EntityFramework" Version="6.4.4" />
-    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1" />
-    <PackageReference Include="linq2db.SqlServer" Version="3.7.0" />
-    <PackageReference Include="MySqlConnector" Version="2.2.6" />
-    <PackageReference Include="NHibernate" Version="5.4.3" />
-    <PackageReference Include="Iesi.Collections" Version="4.0.5" />
-    <PackageReference Include="Mighty" Version="3.2.0" />
-    <PackageReference Include="Npgsql" Version="7.0.4" />
-    <PackageReference Include="PetaPoco" Version="5.1.306" />
-    <PackageReference Include="RepoDb.SqlServer" Version="1.13.1" />
-    <PackageReference Include="ServiceStack.OrmLite.SqlServer" Version="6.9.0" />
-    <PackageReference Include="SqlMarshal" Version="0.4.4" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageReference Include="System.Data.SQLite" Version="1.0.118" />
+
+    <PackageReference Include="Dashing" />
+    <PackageReference Include="Belgrade.Sql.Client" />
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="DevExpress.Xpo" />
+    <PackageReference Include="EntityFramework" VersionOverride="6.4.4"/>
+    <PackageReference Include="FirebirdSql.Data.FirebirdClient" />
+    <PackageReference Include="linq2db.SqlServer" />
+    <PackageReference Include="MySqlConnector" />
+    <PackageReference Include="NHibernate" />
+    <PackageReference Include="Iesi.Collections" />
+    <PackageReference Include="Mighty" />
+    <PackageReference Include="Npgsql" />
+    <PackageReference Include="PetaPoco" />
+    <PackageReference Include="RepoDb.SqlServer" />
+    <PackageReference Include="ServiceStack.OrmLite.SqlServer" />
+    <PackageReference Include="SqlMarshal" />
+    <PackageReference Include="System.Data.SqlClient" />
+    <PackageReference Include="System.Data.SQLite" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="NHibernate\*.xml" />
@@ -38,16 +39,16 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <ProjectReference Include="../../Dapper.EntityFramework/Dapper.EntityFramework.csproj" />
-    <PackageReference Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />
-    <PackageReference Include="SubSonic" Version="3.0.0.4" />
-    <PackageReference Include="Susanoo.SqlServer" Version="1.2.4.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[3.1.10]" />
+    <PackageReference Include="Microsoft.SqlServer.Types" />
+    <PackageReference Include="SubSonic" />
+    <PackageReference Include="Susanoo.SqlServer" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="[3.1.10]" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data.Linq" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
-    <PackageReference Include="Norm.net" Version="5.3.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="Norm.net" />
   </ItemGroup>
 </Project>
diff --git a/benchmarks/Directory.Build.props b/benchmarks/Directory.Build.props
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../../Dapper/Dapper.csproj" />
-    <PackageReference Include="Dapper.Contrib" Version="2.0.78" />
+    <PackageReference Include="Dapper.Contrib" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">

diff --git a/nuget.config b/nuget.config
@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="npgsql" value="https://www.myget.org/F/npgsql-unstable/api/v3/index.json" />
+    <!--<add key="npgsql" value="https://www.myget.org/F/npgsql-unstable/api/v3/index.json" />-->
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/tests/Dapper.Tests/Dapper.Tests.csproj b/tests/Dapper.Tests/Dapper.Tests.csproj
@@ -15,17 +15,17 @@
   <ItemGroup>
     <ProjectReference Include="../../Dapper.ProviderTools/Dapper.ProviderTools.csproj" />
     <ProjectReference Include="../../Dapper.SqlBuilder/Dapper.SqlBuilder.csproj" />
-    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.9" />
-    <PackageReference Include="MySqlConnector" Version="2.2.6" />
-    <PackageReference Include="Npgsql" Version="7.0.4" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="FirebirdSql.Data.FirebirdClient" />
+    <PackageReference Include="Microsoft.Data.SqlClient" />
+    <PackageReference Include="Microsoft.Data.Sqlite" />
+    <PackageReference Include="MySqlConnector" />
+    <PackageReference Include="Npgsql" />
+    <PackageReference Include="System.Data.SqlClient" />
+    <PackageReference Include="System.ValueTuple" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
-    <PackageReference Include="Snowflake.Data" Version="2.0.25" />
+    <PackageReference Include="Snowflake.Data" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net472'">

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -14,10 +14,10 @@
 
   <ItemGroup>
     <ProjectReference Include="../../Dapper/Dapper.csproj" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
+    <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">