Skip to content

Commit faf94ed

Browse files
hazzikhazzik
committed
Update-Package -reinstall
1 parent 82efa06 commit faf94ed

File tree

8 files changed

+64
-34
lines changed

8 files changed

+64
-34
lines changed

‎src/NHibernate.DomainModel/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
3+
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net461" />
44
</packages>

‎src/NHibernate.Test.VisualBasic/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="2.6.4" targetFramework="net40" />
3+
<package id="NUnit" version="2.6.4" targetFramework="net461" />
44
</packages>

‎src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Prefer32Bit>false</Prefer32Bit>
6868
</PropertyGroup>
6969
<ItemGroup>
70-
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
70+
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL" Condition=" '$(Configuration)' == 'Debug' " >
7171
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
@@ -76,7 +76,7 @@
7676
<Private>True</Private>
7777
</Reference>
7878
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
79-
<HintPath>..\packages\log4net.2.0.5\lib\net40-full\log4net.dll</HintPath>
79+
<HintPath>..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
8282
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

‎src/NHibernate.Test/packages.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr" version="3.5.0.2" targetFramework="net40" />
4-
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
5-
<package id="log4net" version="2.0.5" targetFramework="net40" />
6-
<package id="NUnit" version="2.6.4" targetFramework="net40" />
7-
<package id="Remotion.Linq" version="1.13.183.0" targetFramework="net40" />
8-
<package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net40" />
3+
<package id="Antlr" version="3.5.0.2" targetFramework="net461" />
4+
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net461" />
5+
<package id="log4net" version="2.0.5" targetFramework="net461" />
6+
<package id="NUnit" version="2.6.4" targetFramework="net461" />
7+
<package id="Remotion.Linq" version="1.13.183.0" targetFramework="net461" />
8+
<package id="System.Linq.Dynamic" version="1.0.6" targetFramework="net461" />
99
</packages>

‎src/NHibernate.TestDatabaseSetup/App.config

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="hibernate-configuration"
5-
type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate" />
4+
<section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate"/>
5+
<section name="oracle.manageddataaccess.client"
6+
type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
67
</configSections>
78

89
<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
@@ -13,4 +14,33 @@
1314
</property>
1415
</session-factory>
1516
</hibernate-configuration>
16-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
17+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup><system.data>
18+
<DbProviderFactories>
19+
<remove invariant="FirebirdSql.Data.FirebirdClient"/>
20+
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird"
21+
type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient"/>
22+
<remove invariant="MySql.Data.MySqlClient"/><add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient"
23+
description=".Net Framework Data Provider for MySQL"
24+
type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
25+
<remove invariant="Oracle.ManagedDataAccess.Client"/>
26+
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver"
27+
type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
28+
</DbProviderFactories>
29+
</system.data>
30+
<runtime>
31+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
32+
<dependentAssembly>
33+
<publisherPolicy apply="no"/>
34+
<assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral"/>
35+
<bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.121.2.0"/>
36+
</dependentAssembly>
37+
</assemblyBinding>
38+
</runtime>
39+
<oracle.manageddataaccess.client>
40+
<version number="*">
41+
<dataSources>
42+
<dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) "/>
43+
</dataSources>
44+
</version>
45+
</oracle.manageddataaccess.client>
46+
</configuration>

‎src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,20 @@
6060
<Prefer32Bit>false</Prefer32Bit>
6161
</PropertyGroup>
6262
<ItemGroup>
63-
<Reference Include="FirebirdSql.Data.FirebirdClient">
64-
<HintPath>..\..\lib\teamcity\firebird\FirebirdSql.Data.FirebirdClient.dll</HintPath>
63+
<Reference Include="FirebirdSql.Data.FirebirdClient, Version=5.0.5.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
64+
<HintPath>..\packages\FirebirdSql.Data.FirebirdClient.5.0.5\lib\net45\FirebirdSql.Data.FirebirdClient.dll</HintPath>
65+
<Private>True</Private>
6566
</Reference>
6667
<Reference Include="Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Npgsql.2.2.7\lib\net40\Mono.Security.dll</HintPath>
68+
<HintPath>..\packages\Npgsql.2.2.7\lib\net45\Mono.Security.dll</HintPath>
6869
<Private>True</Private>
6970
</Reference>
7071
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
71-
<HintPath>..\packages\MySql.Data.6.9.9\lib\net40\MySql.Data.dll</HintPath>
72+
<HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
7273
<Private>True</Private>
7374
</Reference>
7475
<Reference Include="Npgsql, Version=2.2.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Npgsql.2.2.7\lib\net40\Npgsql.dll</HintPath>
76+
<HintPath>..\packages\Npgsql.2.2.7\lib\net45\Npgsql.dll</HintPath>
7677
<Private>True</Private>
7778
</Reference>
7879
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -89,7 +90,7 @@
8990
</Reference>
9091
<Reference Include="System.Data" />
9192
<Reference Include="System.Data.SQLite, Version=1.0.102.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
92-
<HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net40\System.Data.SQLite.dll</HintPath>
93+
<HintPath>..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net46\System.Data.SQLite.dll</HintPath>
9394
<Private>True</Private>
9495
</Reference>
9596
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
@@ -128,14 +129,13 @@
128129
xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8876.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"
129130
if not exist "$(TargetDir)x64" md "$(TargetDir)x64"
130131
xcopy /s /y "$(SolutionDir)packages\Oracle.ManagedDataAccess.12.1.2400\bin\x64\*.*" "$(TargetDir)x64"
131-
</PostBuildEvent>
132132
</PropertyGroup>
133-
<Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net40\System.Data.SQLite.Core.targets')" />
133+
<Import Project="..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" />
134134
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
135135
<PropertyGroup>
136136
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
137137
</PropertyGroup>
138-
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net40\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net40\System.Data.SQLite.Core.targets'))" />
138+
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.102.0\build\net46\System.Data.SQLite.Core.targets'))" />
139139
</Target>
140140
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
141141
Other similar extension points exist, see Microsoft.Common.targets.

‎src/NHibernate.TestDatabaseSetup/packages.config

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="FirebirdSql.Data.FirebirdClient" version="5.0.5" targetFramework="net40" />
4-
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net40" />
5-
<package id="MySql.Data" version="6.9.9" targetFramework="net40" />
6-
<package id="Npgsql" version="2.2.7" targetFramework="net40" />
7-
<package id="NUnit" version="2.6.4" targetFramework="net40" />
8-
<package id="Oracle.ManagedDataAccess" version="12.1.2400" targetFramework="net40" />
9-
<package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net40" />
3+
<package id="FirebirdSql.Data.FirebirdClient" version="5.0.5" targetFramework="net461" />
4+
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net461" />
5+
<package id="MySql.Data" version="6.9.9" targetFramework="net461" />
6+
<package id="Npgsql" version="2.2.7" targetFramework="net461" />
7+
<package id="NUnit" version="2.6.4" targetFramework="net461" />
8+
<package id="Oracle.ManagedDataAccess" version="12.1.2400" targetFramework="net461" />
9+
<package id="System.Data.SQLite.Core" version="1.0.102.0" targetFramework="net461" />
1010
</packages>

‎src/NHibernate/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr" version="3.5.0.2" targetFramework="net40" />
4-
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
5-
<package id="ILRepack" version="2.0.10" targetFramework="net40" />
6-
<package id="Remotion.Linq" version="1.13.183.0" targetFramework="net40" />
3+
<package id="Antlr" version="3.5.0.2" targetFramework="net461" />
4+
<package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net461" />
5+
<package id="ILRepack" version="2.0.10" targetFramework="net461" />
6+
<package id="Remotion.Linq" version="1.13.183.0" targetFramework="net461" />
77
</packages>

0 commit comments

Comments
 (0)