Skip to content

Commit d728d40

Browse files
rojiroji
committed
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
1 parent 8c068e9 commit d728d40

16 files changed

Lines changed: 64 additions & 37 deletions

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install:
1818
- powershell .build\setup_appveyor.ps1
1919
# The following can be used to install a custom version of .NET Core
2020
- ps: Invoke-WebRequest -Uri "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1" -OutFile "install-dotnet.ps1"
21-
- ps: .\install-dotnet.ps1 -Version 3.0.100-rc1-014190 -InstallDir "dotnetcli"
21+
- ps: .\install-dotnet.ps1 -Version 3.0.100 -InstallDir "dotnetcli"
2222
services:
2323
- postgresql111
2424
before_build:

‎Directory.Build.props‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,10 @@
3333
<SignAssembly>true</SignAssembly>
3434
</PropertyGroup>
3535

36-
<!-- Dependency versions -->
37-
<PropertyGroup>
38-
<NodaTimeVersion>2.4.6</NodaTimeVersion>
39-
</PropertyGroup>
40-
4136
<!-- Reference .NET Framework reference assemblies, allows building on environments without .NET Framework installed
4237
(e.g. Linux). Gets ignored on non-framework TFMs. -->
4338
<ItemGroup>
44-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
39+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
4540
</ItemGroup>
4641

4742
</Project>

‎Directory.Build.targets‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
4+
<PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.3" />
5+
<PackageReference Update="System.Memory" Version="4.5.3" />
6+
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
7+
<PackageReference Update="System.Text.Json" Version="4.6.0" />
8+
<PackageReference Update="SourceLink.Create.CommandLine" Version="2.8.3" />
9+
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" />
10+
11+
<!-- Plugins -->
12+
<PackageReference Update="NetTopologySuite.IO.PostGIS" Version="2.0.0" />
13+
<PackageReference Update="NodaTime" Version="2.4.7" />
14+
<PackageReference Update="GeoJSON.Net" Version="1.1.73" />
15+
<PackageReference Update="Newtonsoft.Json" Version="12.0.2" />
16+
17+
<!-- Tests -->
18+
<PackageReference Update="NUnit" Version="3.12.0" />
19+
<PackageReference Update="NLog" Version="4.6.7" />
20+
<PackageReference Update="Microsoft.CSharp" Version="4.6.0" />
21+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />
22+
<PackageReference Update="NUnit3TestAdapter" Version="3.15.1" />
23+
<PackageReference Update="xunit" Version="2.4.1" />
24+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
25+
<PackageReference Update="AdoNet.Specification.Tests" Version="2.0.0-alpha3" />
26+
27+
<!-- Benchmarks -->
28+
<PackageReference Update="BenchmarkDotNet" Version="0.11.5" />
29+
<PackageReference Update="Microsoft.Data.SqlClient" Version="1.0.19249.1" />
30+
<PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.11.5" />
31+
</ItemGroup>
32+
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-rc1-014190"
3+
"version": "3.0.100"
44
}
55
}

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99
<!-- Debug configuration -->
1010
<ItemGroup>
11-
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.1" PrivateAssets="All" />
11+
<PackageReference Include="SourceLink.Create.CommandLine" PrivateAssets="All" />
1212
</ItemGroup>
1313
</Project>

‎src/Npgsql.GeoJSON/Npgsql.GeoJSON.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<SignAssembly>false</SignAssembly>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="GeoJSON.Net" Version="1.1.73" />
10+
<PackageReference Include="GeoJSON.Net" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="../Npgsql/Npgsql.csproj" />

‎src/Npgsql.Json.NET/Npgsql.Json.NET.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
9+
<PackageReference Include="Newtonsoft.Json" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\Npgsql\Npgsql.csproj" />

‎src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<NoWarn>NU5104</NoWarn>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="NetTopologySuite.IO.PostGIS" Version="2.0.0" />
10+
<PackageReference Include="NetTopologySuite.IO.PostGIS" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="../Npgsql/Npgsql.csproj" />

‎src/Npgsql.NodaTime/Npgsql.NodaTime.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="NodaTime" Version="$(NodaTimeVersion)" />
9+
<PackageReference Include="NodaTime" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\Npgsql\Npgsql.csproj" />

‎src/Npgsql/Npgsql.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-rc1.19456.4" />
12+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
1313
</ItemGroup>
1414
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
1515
<Reference Include="System.Transactions" Pack="false" />
1616
<Reference Include="System.DirectoryServices" Pack="false" />
1717
</ItemGroup>
1818
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'netstandard2.0' ">
1919
<PackageReference Include="System.Memory" Version="4.5.3" />
20-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
20+
<PackageReference Include="System.Threading.Tasks.Extensions" />
2121
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
2222
</ItemGroup>
2323
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' ">
24-
<PackageReference Include="System.Text.Json" Version="4.6.0-rc1.19456.4" />
24+
<PackageReference Include="System.Text.Json" Version="4.6.0" />
2525
</ItemGroup>
2626
</Project>

0 commit comments

Comments
 (0)