Using Oracle.ManagedDataAccess

quartznet · Mar 25, 2016 · 8044c51 · 8044c51
1 parent b03aa02
commit 8044c51
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Quartz.build b/Quartz.build
@@ -592,7 +592,7 @@
 	<property name="nunit-dll" value="packages/NUnit.2.6.3/lib/nunit.framework.dll" />
 	<property name="rhino-mocks-dll" value="packages/RhinoMocks.3.6.1/lib/net/Rhino.Mocks.dll" />
     <property name="topshelf-dll" value="packages/TopShelf.3.1.4/lib/net40-full/Topshelf.dll" />
-	<property name="oracle-odp-managed-dll" value="packages/odp.net.managed.121.1.1/lib/net40/Oracle.ManagedDataAccess.dll" />
+	<property name="oracle-odp-managed-dll" value="packages/Oracle.ManagedDataAccess.12.1.2400/lib/net40/Oracle.ManagedDataAccess.dll" />
 
 	<if test="${target.framework == '3.5'}">
 		<property name="topshelf-dll" value="packages/TopShelf.3.1.4/lib/net35/Topshelf.dll" />

diff --git a/src/Quartz.Tests.Integration/Quartz.Tests.Integration.2010.csproj b/src/Quartz.Tests.Integration/Quartz.Tests.Integration.2010.csproj
@@ -93,8 +93,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Oracle.ManagedDataAccess">
-      <HintPath>../../packages/odp.net.managed.121.1.1/lib/net40/Oracle.ManagedDataAccess.dll</HintPath>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Oracle.ManagedDataAccess.12.1.2400\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>

diff --git a/src/Quartz.Tests.Integration/packages.config b/src/Quartz.Tests.Integration/packages.config
@@ -4,6 +4,6 @@
   <package id="Common.Logging.Core" version="3.0.0" targetFramework="net40" />
   <package id="FirebirdSql.Data.FirebirdClient" version="4.5.0.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
-  <package id="odp.net.managed" version="121.1.1" targetFramework="net40" />
+  <package id="Oracle.ManagedDataAccess" version="12.1.2400" targetFramework="net45" userInstalled="true" />
   <package id="RhinoMocks" version="3.6.1" />
 </packages>
diff --git a/src/Quartz.Tests.Unit/Quartz.Tests.Unit.2010.csproj b/src/Quartz.Tests.Unit/Quartz.Tests.Unit.2010.csproj
@@ -93,8 +93,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Oracle.ManagedDataAccess">
-      <HintPath>../../packages/odp.net.managed.121.1.1/lib/net40/Oracle.ManagedDataAccess.dll</HintPath>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Oracle.ManagedDataAccess.12.1.2400\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/src/Quartz.Tests.Unit/packages.config b/src/Quartz.Tests.Unit/packages.config
@@ -3,6 +3,6 @@
   <package id="Common.Logging" version="3.0.0" targetFramework="net40" />
   <package id="Common.Logging.Core" version="3.0.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
-  <package id="odp.net.managed" version="121.1.1" targetFramework="net40" />
+  <package id="Oracle.ManagedDataAccess" version="12.1.2400" targetFramework="net45" userInstalled="true" />
   <package id="RhinoMocks" version="3.6.1" />
 </packages>