Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to centralized package management #3521

Merged
merged 1 commit into from Feb 16, 2021
Merged

Switch to centralized package management #3521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 9 additions & 13 deletions Directory.Build.props
View file
Open in desktop
@@ -1,9 +1,15 @@
<Project>
<PropertyGroup>
<VersionPrefix>6.0.0</VersionPrefix>
<LangVersion>9.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Nullable>enable</Nullable>
<AnalysisLevel>latest</AnalysisLevel>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Npgsql.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>

<!-- Packing -->
<Copyright>Copyright 2020 © The Npgsql Development Team</Copyright>
<Copyright>Copyright 2021 © The Npgsql Development Team</Copyright>
<Company>Npgsql</Company>
<PackageLicenseExpression>PostgreSQL</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/npgsql/npgsql</PackageProjectUrl>
Expand All @@ -13,17 +19,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<NoWarn>$(NoWarn);NU5105</NoWarn>

<!-- Language -->
<LangVersion>9.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Nullable>enable</Nullable>
<AnalysisLevel>latest</AnalysisLevel>

<!-- Other -->
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Npgsql.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<!-- In netstandard2.0, the BCL isn't annotated for nullability so we disable nullability there -->
Expand Down
33 changes: 0 additions & 33 deletions Directory.Build.targets
View file
Open in desktop

This file was deleted.

40 changes: 40 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
@@ -0,0 +1,40 @@
<Project>
<ItemGroup>
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.1" />

<PackageVersion Include="System.Text.Json" Version="4.6.0" />
<PackageVersion Include="System.Threading.Channels" Version="4.7.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageVersion Include="System.Memory" Version="4.5.4" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.0" />

<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" />

<!-- Plugins -->
<PackageVersion Include="NetTopologySuite.IO.PostGIS" Version="2.0.0" />
<PackageVersion Include="NodaTime" Version="3.0.1" />
<PackageVersion Include="GeoJSON.Net" Version="1.1.73" />
<PackageVersion Include="Newtonsoft.Json" Version="12.0.2" />

<!-- Tests -->
<PackageVersion Include="NUnit" Version="3.13.0" />
<PackageVersion Include="NLog" Version="4.6.7" />
<PackageVersion Include="Microsoft.CSharp" Version="4.6.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="3.17.0" />
<PackageVersion Include="xunit" Version="2.4.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageVersion Include="GitHubActionsTestLogger" Version="1.1.0" />
<PackageVersion Include="AdoNet.Specification.Tests" Version="2.0.0-alpha3" />

<!-- Benchmarks -->
<PackageVersion Include="BenchmarkDotNet" Version="0.12.1" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="1.0.19249.1" />
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Npgsql.sln
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
.github\workflows\build.yml = .github\workflows\build.yml
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.SourceGenerators", "src\Npgsql.SourceGenerators\Npgsql.SourceGenerators.csproj", "{63026A19-60B8-4906-81CB-216F30E8094B}"
Expand Down
4 changes: 2 additions & 2 deletions src/Npgsql.SourceGenerators/Npgsql.SourceGenerators.csproj
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
</ItemGroup>
</Project>
14 changes: 7 additions & 7 deletions src/Npgsql/Npgsql.csproj
View file
Open in desktop
Expand Up @@ -21,14 +21,14 @@
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
<PackageReference Include="System.Memory" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
<PackageReference Include="System.ValueTuple" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="Microsoft.Bcl.HashCode" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' ">
<PackageReference Include="System.Text.Json" Version="4.6.0" />
<PackageReference Include="System.Threading.Channels" Version="4.7.0" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.Threading.Channels" />
</ItemGroup>
</Project>