Skip to content
Permalink
Browse files

Update dependency versions

* Depend on 3.0.0 RTM versions
* Centralize dependency versions in single Directory.Build.targets
* Switch benchmarks to depend on MS.Data.SqlClient
  • Loading branch information...
roji committed Sep 24, 2019
1 parent 8c068e9 commit d728d40213f14321b79cfb13ecc97f6e3bff3ab8
@@ -18,7 +18,7 @@ install:
- powershell .build\setup_appveyor.ps1
# The following can be used to install a custom version of .NET Core
- ps: Invoke-WebRequest -Uri "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1" -OutFile "install-dotnet.ps1"
- ps: .\install-dotnet.ps1 -Version 3.0.100-rc1-014190 -InstallDir "dotnetcli"
- ps: .\install-dotnet.ps1 -Version 3.0.100 -InstallDir "dotnetcli"
services:
- postgresql111
before_build:
@@ -33,15 +33,10 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>

<!-- Dependency versions -->
<PropertyGroup>
<NodaTimeVersion>2.4.6</NodaTimeVersion>
</PropertyGroup>

<!-- Reference .NET Framework reference assemblies, allows building on environments without .NET Framework installed
(e.g. Linux). Gets ignored on non-framework TFMs. -->
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
</ItemGroup>

</Project>
@@ -0,0 +1,32 @@
<Project>
<ItemGroup>
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
<PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.3" />
<PackageReference Update="System.Memory" Version="4.5.3" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
<PackageReference Update="System.Text.Json" Version="4.6.0" />
<PackageReference Update="SourceLink.Create.CommandLine" Version="2.8.3" />
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" />

<!-- Plugins -->
<PackageReference Update="NetTopologySuite.IO.PostGIS" Version="2.0.0" />
<PackageReference Update="NodaTime" Version="2.4.7" />
<PackageReference Update="GeoJSON.Net" Version="1.1.73" />
<PackageReference Update="Newtonsoft.Json" Version="12.0.2" />

<!-- Tests -->
<PackageReference Update="NUnit" Version="3.12.0" />
<PackageReference Update="NLog" Version="4.6.7" />
<PackageReference Update="Microsoft.CSharp" Version="4.6.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Update="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Update="AdoNet.Specification.Tests" Version="2.0.0-alpha3" />

<!-- Benchmarks -->
<PackageReference Update="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Update="Microsoft.Data.SqlClient" Version="1.0.19249.1" />
<PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.11.5" />
</ItemGroup>
</Project>
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100-rc1-014190"
"version": "3.0.100"
}
}
@@ -8,6 +8,6 @@

<!-- Debug configuration -->
<ItemGroup>
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.1" PrivateAssets="All" />
<PackageReference Include="SourceLink.Create.CommandLine" PrivateAssets="All" />
</ItemGroup>
</Project>
@@ -7,7 +7,7 @@
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GeoJSON.Net" Version="1.1.73" />
<PackageReference Include="GeoJSON.Net" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../Npgsql/Npgsql.csproj" />
@@ -6,7 +6,7 @@
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Npgsql\Npgsql.csproj" />
@@ -7,7 +7,7 @@
<NoWarn>NU5104</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NetTopologySuite.IO.PostGIS" Version="2.0.0" />
<PackageReference Include="NetTopologySuite.IO.PostGIS" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../Npgsql/Npgsql.csproj" />
@@ -6,7 +6,7 @@
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NodaTime" Version="$(NodaTimeVersion)" />
<PackageReference Include="NodaTime" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Npgsql\Npgsql.csproj" />
@@ -9,18 +9,18 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-rc1.19456.4" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System.Transactions" Pack="false" />
<Reference Include="System.DirectoryServices" Pack="false" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
<PackageReference Include="System.Threading.Tasks.Extensions" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' ">
<PackageReference Include="System.Text.Json" Version="4.6.0-rc1.19456.4" />
<PackageReference Include="System.Text.Json" Version="4.6.0" />
</ItemGroup>
</Project>
@@ -1,7 +1,7 @@
using System.Data.SqlClient;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Columns;
using BenchmarkDotNet.Configs;
using Microsoft.Data.SqlClient;

// ReSharper disable UnusedMember.Global

@@ -1,7 +1,7 @@
using System.Data.SqlClient;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Columns;
using BenchmarkDotNet.Configs;
using Microsoft.Data.SqlClient;

// ReSharper disable UnusedMember.Global
// ReSharper disable MemberCanBePrivate.Global
@@ -7,16 +7,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
<PackageReference Include="BenchmarkDotNet" />
<PackageReference Include="Microsoft.Data.SqlClient" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="../../src/Npgsql/Npgsql.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.11.5" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
</ItemGroup>

</Project>
@@ -3,11 +3,11 @@
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NodaTime" Version="$(NodaTimeVersion)" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NLog" Version="4.5.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
<PackageReference Include="NodaTime" />
<PackageReference Include="NUnit" />
<PackageReference Include="NLog" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit3TestAdapter" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../../src/Npgsql/Npgsql.csproj" />
@@ -5,9 +5,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AdoNet.Specification.Tests" Version="2.0.0-alpha3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="AdoNet.Specification.Tests" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
</ItemGroup>
</Project>
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<ItemGroup>
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NLog" Version="4.5.11" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
<PackageReference Include="NUnit" />
<PackageReference Include="NLog" />
<PackageReference Include="Microsoft.CSharp" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NUnit3TestAdapter" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System.Transactions" />

0 comments on commit d728d40

Please sign in to comment.
You can’t perform that action at this time.