Skip to content

Commit a2b196d

Browse files
Backport upgrade vulnerable test dependencies
Backport nhibernate#3544
1 parent a9366ac commit a2b196d

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

build-common/NHibernate.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
<NhAppTargetFrameworks Condition ="$(NhAppTargetFrameworks) == ''">net461;netcoreapp2.0;netcoreapp2.1</NhAppTargetFrameworks>
1717
<NhLibTargetFrameworks Condition ="$(NhLibTargetFrameworks) == ''">net461;netcoreapp2.0;netstandard2.0</NhLibTargetFrameworks>
18+
<RuntimeFrameworkVersion Condition="'$(TargetFramework)' == 'netcoreapp2.0'">2.0.3</RuntimeFrameworkVersion>
19+
<RuntimeFrameworkVersion Condition="'$(TargetFramework)' == 'netcoreapp2.1'">2.1.29</RuntimeFrameworkVersion>
1820
<NhNetFx>false</NhNetFx>
1921
<NhNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</NhNetFx>
2022
<DefineConstants Condition="$(NhNetFx) AND $(NhVbNet) == ''" >NETFX;$(DefineConstants)</DefineConstants>

src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<TargetFrameworks>$(NhAppTargetFrameworks)</TargetFrameworks>
99
<IsTestProject>true</IsTestProject>
1010
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
11+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
1112
<OptionExplicit>On</OptionExplicit>
1213
<OptionStrict>On</OptionStrict>
1314
</PropertyGroup>

src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<TargetFrameworks>$(NhAppTargetFrameworks)</TargetFrameworks>
66
<IsTestProject>true</IsTestProject>
77
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
8+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
89
<ContentSQLiteInteropFiles>true</ContentSQLiteInteropFiles>
910
</PropertyGroup>
1011
<PropertyGroup Condition="$(NhNetCoreApp)">
@@ -54,11 +55,11 @@
5455
</Compile>
5556
</ItemGroup>
5657
<ItemGroup>
57-
<PackageReference Include="log4net" Version="2.0.8" />
58+
<PackageReference Include="log4net" Version="2.0.15" />
5859
<PackageReference Include="Microsoft.AspNetCore.OData" Version="7.3.0" />
59-
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.0.19269.1" />
60+
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.1.5" />
6061
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.109.2" />
61-
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.11" />
62+
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.14" />
6263
<PackageReference Include="NSubstitute" Version="3.1.0" />
6364
<PackageReference Include="NUnit" Version="3.13.2" />
6465
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
@@ -78,7 +79,7 @@
7879
</ItemGroup>
7980
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
8081
<PackageReference Include="System.CodeDom" Version="4.4.0" />
81-
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
82+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
8283
<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
8384
<PackageReference Include="System.Data.Odbc" Version="4.5.0" />
8485
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
@@ -87,7 +88,7 @@
8788
</ItemGroup>
8889
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
8990
<PackageReference Include="System.CodeDom" Version="4.4.0" />
90-
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
91+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
9192
<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
9293
<PackageReference Include="System.Data.Odbc" Version="4.5.0" />
9394
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />

src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<TargetFrameworks>$(NhAppTargetFrameworks)</TargetFrameworks>
77
<IsTestProject>true</IsTestProject>
88
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
9+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
910
</PropertyGroup>
1011
<PropertyGroup Condition="$(NhNetCoreApp)">
1112
<OutputType>Exe</OutputType>

0 commit comments

Comments
 (0)