Skip to content

Commit 8e34310

Browse files
author
Christian Junk
committed
Cleanup.
1 parent 2580a50 commit 8e34310

File tree

8 files changed

+55
-15
lines changed

8 files changed

+55
-15
lines changed

‎NHibernate.JetDriver.png‎

5.86 KB
Loading

‎src/NHibernate.JetDriver.Tests/NHibernate.JetDriver.Tests.csproj‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,44 @@
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
36+
<DebugSymbols>true</DebugSymbols>
37+
<OutputPath>bin\x86\Debug\</OutputPath>
38+
<DefineConstants>DEBUG;TRACE</DefineConstants>
39+
<DebugType>full</DebugType>
40+
<PlatformTarget>x86</PlatformTarget>
41+
<ErrorReport>prompt</ErrorReport>
42+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
43+
</PropertyGroup>
44+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
45+
<OutputPath>bin\x86\Release\</OutputPath>
46+
<DefineConstants>TRACE</DefineConstants>
47+
<Optimize>true</Optimize>
48+
<DebugType>pdbonly</DebugType>
49+
<PlatformTarget>x86</PlatformTarget>
50+
<ErrorReport>prompt</ErrorReport>
51+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
52+
</PropertyGroup>
3553
<ItemGroup>
3654
<Reference Include="Antlr3.Runtime, Version=3.1.0.39271, Culture=neutral, PublicKeyToken=3a9cab8f8d22bfb7, processorArchitecture=MSIL">
3755
<SpecificVersion>False</SpecificVersion>
3856
<HintPath>..\..\lib\net\2.0\Antlr3.Runtime.dll</HintPath>
3957
</Reference>
58+
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Castle.Core.3.3.0\lib\net40-client\Castle.Core.dll</HintPath>
60+
<Private>True</Private>
61+
</Reference>
4062
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
4163
<HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
4264
<Private>True</Private>
4365
</Reference>
44-
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
45-
<HintPath>..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
66+
<Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
67+
<HintPath>..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll</HintPath>
4668
<Private>True</Private>
4769
</Reference>
48-
<Reference Include="NHibernate.ByteCode.Castle, Version=2.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
49-
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\lib\net\2.0\NHibernate.ByteCode.Castle.dll</HintPath>
70+
<Reference Include="NHibernate.ByteCode.Castle, Version=4.0.3.4000, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\packages\NHibernate.ByteCode.Castle-v4.4.0.3.4000-rc2\lib\net40\NHibernate.ByteCode.Castle.dll</HintPath>
72+
<Private>True</Private>
5173
</Reference>
5274
<Reference Include="nunit.framework, Version=2.4.6.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
5375
<SpecificVersion>False</SpecificVersion>

‎src/NHibernate.JetDriver.Tests/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.1.0.4000" newVersion="4.1.0.4000" />
7+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

‎src/NHibernate.JetDriver.Tests/packages.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Castle.Core" version="3.3.0" targetFramework="net40" />
34
<package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
4-
<package id="NHibernate" version="4.1.1.4000" targetFramework="net40" />
5+
<package id="NHibernate" version="4.0.0.4000" targetFramework="net40" />
6+
<package id="NHibernate.ByteCode.Castle-v4" version="4.0.3.4000-rc2" targetFramework="net40" />
57
</packages>

‎src/NHibernate.JetDriver.sln‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.JetDriver-2.0", "NHibernate.JetDriver\NHibernate.JetDriver-2.0.csproj", "{3905D37C-CA49-4C13-99A4-4D815EFCAA56}"
77
EndProject
@@ -10,17 +10,27 @@ EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
13+
Debug|x86 = Debug|x86
1314
Release|Any CPU = Release|Any CPU
15+
Release|x86 = Release|x86
1416
EndGlobalSection
1517
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1618
{3905D37C-CA49-4C13-99A4-4D815EFCAA56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1719
{3905D37C-CA49-4C13-99A4-4D815EFCAA56}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{3905D37C-CA49-4C13-99A4-4D815EFCAA56}.Debug|x86.ActiveCfg = Debug|Any CPU
21+
{3905D37C-CA49-4C13-99A4-4D815EFCAA56}.Debug|x86.Build.0 = Debug|Any CPU
1822
{3905D37C-CA49-4C13-99A4-4D815EFCAA56}.Release|Any CPU.ActiveCfg = Release|Any CPU
1923
{3905D37C-CA49-4C13-99A4-4D815EFCAA56}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{3905D37C-CA49-4C13-99A4-4D815EFCAA56}.Release|x86.ActiveCfg = Release|Any CPU
25+
{3905D37C-CA49-4C13-99A4-4D815EFCAA56}.Release|x86.Build.0 = Release|Any CPU
2026
{408B5045-9B30-44BC-B10B-D2E2F17BC4FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2127
{408B5045-9B30-44BC-B10B-D2E2F17BC4FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{408B5045-9B30-44BC-B10B-D2E2F17BC4FE}.Debug|x86.ActiveCfg = Debug|x86
29+
{408B5045-9B30-44BC-B10B-D2E2F17BC4FE}.Debug|x86.Build.0 = Debug|x86
2230
{408B5045-9B30-44BC-B10B-D2E2F17BC4FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
2331
{408B5045-9B30-44BC-B10B-D2E2F17BC4FE}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{408B5045-9B30-44BC-B10B-D2E2F17BC4FE}.Release|x86.ActiveCfg = Release|x86
33+
{408B5045-9B30-44BC-B10B-D2E2F17BC4FE}.Release|x86.Build.0 = Release|x86
2434
EndGlobalSection
2535
GlobalSection(SolutionProperties) = preSolution
2636
HideSolutionNode = FALSE

‎src/NHibernate.JetDriver/AssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
[assembly: CLSCompliantAttribute(true)]
66
[assembly: AssemblyTitleAttribute("NHibernate.JetDriver")]
7-
[assembly: AssemblyDescriptionAttribute("The Jet driver and dialect for NHibernate 4.1.0.4000.")]
7+
[assembly: AssemblyDescriptionAttribute("The Jet driver and dialect for NHibernate 4.0.0.4000.")]
88
[assembly: AssemblyCompanyAttribute("NHibernate.org")]
99
[assembly: AssemblyProductAttribute("NHibernate.JetDriver")]
1010
[assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
1111

12-
[assembly: AssemblyVersionAttribute("4.1.0.4000")]
13-
[assembly: AssemblyInformationalVersionAttribute("4.1.0.4000")]
14-
[assembly: AssemblyFileVersionAttribute("1.0.0.0")]
12+
[assembly: AssemblyVersionAttribute("4.0.0.4000")]
13+
[assembly: AssemblyInformationalVersionAttribute("4.0.0.4000")]
14+
[assembly: AssemblyFileVersionAttribute("4.0.0.4000")]
1515

1616
[assembly: AssemblyDelaySignAttribute(false)]
1717
[assembly: AllowPartiallyTrustedCallers()]

‎src/NHibernate.JetDriver/NHibernate.JetDriver-2.0.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
8282
<Private>True</Private>
8383
</Reference>
84-
<Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
85-
<HintPath>..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll</HintPath>
84+
<Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
85+
<HintPath>..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll</HintPath>
8686
<Private>True</Private>
8787
</Reference>
8888
<Reference Include="System">
@@ -120,6 +120,12 @@
120120
<Compile Include="JetJoinFragment.cs">
121121
<SubType>Code</SubType>
122122
</Compile>
123+
<Compile Include="Schema\JetColumnMetadata.cs" />
124+
<Compile Include="Schema\JetDataBaseSchema.cs" />
125+
<Compile Include="Schema\JetDataTypes.cs" />
126+
<Compile Include="Schema\JetForeignKeyMetadata.cs" />
127+
<Compile Include="Schema\JetIndexMetadata.cs" />
128+
<Compile Include="Schema\JetTableMetadata.cs" />
123129
</ItemGroup>
124130
<ItemGroup>
125131
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">

‎src/NHibernate.JetDriver/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
44
<package id="log4net" version="2.0.3" targetFramework="net40" />
5-
<package id="NHibernate" version="4.1.1.4000" targetFramework="net40" />
5+
<package id="NHibernate" version="4.0.0.4000" targetFramework="net40" />
66
</packages>

0 commit comments

Comments
 (0)