Build updates

Copied 2012 project files from master, modified for this branch. Copied Mono.Security files and organization from master.
npgsql · Dec 7, 2013 · 5a84a00 · 5a84a00
1 parent 75ae729
commit 5a84a00
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 60 deletions.
diff --git a/lib/Mono.Security.Protocol.Tls.dll → ...curity/2.0/Mono.Security.Protocol.Tls.dll b/lib/Mono.Security.Protocol.Tls.dll → ...curity/2.0/Mono.Security.Protocol.Tls.dll
diff --git a/lib/Mono.Security.Protocol.Tls.license → ...ty/2.0/Mono.Security.Protocol.Tls.license b/lib/Mono.Security.Protocol.Tls.license → ...ty/2.0/Mono.Security.Protocol.Tls.license
diff --git a/lib/Mono.Security.dll → lib/Mono.Security/2.0/Mono.Security.dll b/lib/Mono.Security.dll → lib/Mono.Security/2.0/Mono.Security.dll
diff --git a/lib/README → lib/Mono.Security/2.0/README b/lib/README → lib/Mono.Security/2.0/README
diff --git a/lib/Mono.Security/4.0/Mono.Security.dll b/lib/Mono.Security/4.0/Mono.Security.dll
diff --git a/src/Npgsql2012.csproj b/src/Npgsql2012.csproj
@@ -8,8 +8,6 @@
     <ProjectGuid>{9D13B739-62B1-4190-B386-7A9547304EB3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>Npgsql</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -35,45 +33,112 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-net45|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug4\</OutputPath>
+    <OutputPath>bin\Debug-net45\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;WINDOWS;UNMANAGED;NET35;NET40;NET45;ENTITIES</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug-net45\Npgsql.xml</DocumentationFile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-net45|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release-net45\</OutputPath>
+    <DefineConstants>TRACE;WINDOWS;UNMANAGED;NET35;NET40;NET45;ENTITIES</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release-net45\Npgsql.xml</DocumentationFile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-net40|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug-net40\</OutputPath>
     <DefineConstants>TRACE;DEBUG;WINDOWS;UNMANAGED;NET35;NET40;ENTITIES</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug4\Npgsql.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug-net40\Npgsql.xml</DocumentationFile>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-net40|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release-net40\</OutputPath>
+    <DefineConstants>TRACE;WINDOWS;UNMANAGED;NET35;NET40;ENTITIES</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release-net40\Npgsql.xml</DocumentationFile>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-net35|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug-net35\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;WINDOWS;UNMANAGED;NET35;ENTITIES</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug-net35\Npgsql.xml</DocumentationFile>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-net35|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release-Net20\</OutputPath>
+    <OutputPath>bin\Release-net35\</OutputPath>
+    <DefineConstants>TRACE;WINDOWS;UNMANAGED;NET35;ENTITIES</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release-net35\Npgsql.xml</DocumentationFile>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-net20|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug-net20\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;WINDOWS;UNMANAGED</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug-net20\Npgsql.xml</DocumentationFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <NoWarn>
+    </NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-net20|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release-net20\</OutputPath>
     <DefineConstants>TRACE;WINDOWS;UNMANAGED</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release-Net20\Npgsql.XML</DocumentationFile>
+    <DocumentationFile>bin\Release-net20\Npgsql.xml</DocumentationFile>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Mono.Security.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.Transactions" />
-    <Reference Include="System.XML" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Npgsql\Npgsql.snk" />
-    <EmbeddedResource Include="Npgsql\NpgsqlSchema.msl" />
-    <EmbeddedResource Include="Npgsql\NpgsqlSchema.ssdl" />
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug-net40' Or '$(Configuration)' == 'Release-net40' Or '$(Configuration)' == 'Debug-net45' Or '$(Configuration)' == 'Release-net45' ">
+    <Reference Include="Mono.Security">
+      <HintPath>..\lib\Mono.Security\4.0\Mono.Security.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug-net20' Or '$(Configuration)' == 'Release-net20' Or '$(Configuration)' == 'Debug-net35' Or '$(Configuration)' == 'Release-net35' ">
+    <Reference Include="Mono.Security">
+      <HintPath>..\lib\Mono.Security\2.0\Mono.Security.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NpgsqlTypes\ArrayHandling.cs" />
@@ -88,6 +153,14 @@
     <Compile Include="NpgsqlTypes\NpgsqlTypes.cs" />
     <Compile Include="NpgsqlTypes\NpgsqlTypesHelper.cs" />
     <Compile Include="Npgsql\AssemblyInfo.cs" />
+    <Compile Include="Npgsql\NpgsqlProviderManifest.cs" />
+    <Compile Include="Npgsql\NpgsqlServices.cs" />
+    <Compile Include="Npgsql\SqlGenerators\SqlBaseGenerator.cs" />
+    <Compile Include="Npgsql\SqlGenerators\SqlDeleteGenerator.cs" />
+    <Compile Include="Npgsql\SqlGenerators\SqlInsertGenerator.cs" />
+    <Compile Include="Npgsql\SqlGenerators\SqlSelectGenerator.cs" />
+    <Compile Include="Npgsql\SqlGenerators\SqlUpdateGenerator.cs" />
+    <Compile Include="Npgsql\SqlGenerators\VisitedExpression.cs" />
     <Compile Include="Npgsql\Cache.cs" />
     <Compile Include="Npgsql\HashAlgorithm.cs" />
     <Compile Include="Npgsql\MD5.cs" />
@@ -138,46 +211,22 @@
     <Compile Include="Npgsql\NpgsqlParse.cs" />
     <Compile Include="Npgsql\NpgsqlPasswordPacket.cs" />
     <Compile Include="Npgsql\NpgsqlPromotableSinglePhaseNotification.cs" />
-    <Compile Include="Npgsql\NpgsqlProviderManifest.cs" />
     <Compile Include="Npgsql\NpgsqlQuery.cs" />
     <Compile Include="Npgsql\NpgsqlReadyState.cs" />
     <Compile Include="Npgsql\NpgsqlResourceManager.cs" />
     <Compile Include="Npgsql\NpgsqlRow.cs" />
     <Compile Include="Npgsql\NpgsqlRowDescription.cs" />
     <Compile Include="Npgsql\NpgsqlSchema.cs" />
-    <Compile Include="Npgsql\NpgsqlServices.cs" />
     <Compile Include="Npgsql\NpgsqlStartupPacket.cs" />
     <Compile Include="Npgsql\NpgsqlStartupState.cs" />
     <Compile Include="Npgsql\NpgsqlState.cs" />
     <Compile Include="Npgsql\NpgsqlSync.cs" />
     <Compile Include="Npgsql\NpgsqlTransaction.cs" />
     <Compile Include="Npgsql\NpgsqlTransactionCallbacks.cs" />
     <Compile Include="Npgsql\PGUtil.cs" />
-    <Compile Include="Npgsql\SqlGenerators\SqlBaseGenerator.cs" />
-    <Compile Include="Npgsql\SqlGenerators\SqlDeleteGenerator.cs" />
-    <Compile Include="Npgsql\SqlGenerators\SqlInsertGenerator.cs" />
-    <Compile Include="Npgsql\SqlGenerators\SqlSelectGenerator.cs" />
-    <Compile Include="Npgsql\SqlGenerators\SqlUpdateGenerator.cs" />
-    <Compile Include="Npgsql\SqlGenerators\VisitedExpression.cs" />
     <Compile Include="Npgsql\SSPIHandler.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="NpgsqlTypes\NpgsqlTypesHelper.resx">
-      <DependentUpon>NpgsqlTypesHelper.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NpgsqlTypes\NpgsqlTypesHelper.de.resx">
-      <DependentUpon>NpgsqlTypesHelper.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NpgsqlTypes\NpgsqlTypesHelper.ja.resx">
-      <DependentUpon>NpgsqlTypesHelper.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NpgsqlTypes\NpgsqlTypesHelper.zh-CN.resx">
-      <DependentUpon>NpgsqlTypesHelper.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Npgsql\NpgsqlClosedState.resx">
       <DependentUpon>NpgsqlClosedState.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -497,7 +546,6 @@
       <DependentUpon>NpgsqlException.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql\NpgsqlProviderManifest.Manifest.xml" />
     <EmbeddedResource Include="Npgsql\NpgsqlReadyState.ja.resx">
       <DependentUpon>NpgsqlReadyState.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -523,9 +571,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
@@ -543,8 +588,17 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Npgsql\NpgsqlProviderManifest.Manifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Npgsql\Npgsql.snk" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>

diff --git a/src/Npgsql2012.sln b/src/Npgsql2012.sln
@@ -1,24 +1,54 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql2012", "Npgsql2012.csproj", "{9D13B739-62B1-4190-B386-7A9547304EB3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NpgsqlTests2012", "..\testsuite\noninteractive\NUnit20\NpgsqlTests2012.csproj", "{E9C258D7-0D8E-4E6A-9857-5C6438591755}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug-net20|AnyCPU = Debug-net20|AnyCPU
+		Debug-net35|AnyCPU = Debug-net35|AnyCPU
+		Debug-net40|AnyCPU = Debug-net40|AnyCPU
+		Debug-net45|AnyCPU = Debug-net45|AnyCPU
+		Release-net20|AnyCPU = Release-net20|AnyCPU
+		Release-net35|AnyCPU = Release-net35|AnyCPU
+		Release-net40|AnyCPU = Release-net40|AnyCPU
+		Release-net45|AnyCPU = Release-net45|AnyCPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug-net20|AnyCPU.ActiveCfg = Debug-net20|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug-net20|AnyCPU.Build.0 = Debug-net20|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug-net35|AnyCPU.ActiveCfg = Debug-net35|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug-net35|AnyCPU.Build.0 = Debug-net35|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug-net40|AnyCPU.ActiveCfg = Debug-net40|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug-net40|AnyCPU.Build.0 = Debug-net40|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug-net45|AnyCPU.ActiveCfg = Debug-net45|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug-net45|AnyCPU.Build.0 = Debug-net45|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release-net20|AnyCPU.ActiveCfg = Release-net20|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release-net20|AnyCPU.Build.0 = Release-net20|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release-net35|AnyCPU.ActiveCfg = Release-net35|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release-net35|AnyCPU.Build.0 = Release-net35|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release-net40|AnyCPU.ActiveCfg = Release-net40|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release-net40|AnyCPU.Build.0 = Release-net40|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release-net45|AnyCPU.ActiveCfg = Release-net45|Any CPU
+		{9D13B739-62B1-4190-B386-7A9547304EB3}.Release-net45|AnyCPU.Build.0 = Release-net45|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug-net20|AnyCPU.ActiveCfg = Debug|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug-net20|AnyCPU.Build.0 = Debug|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug-net35|AnyCPU.ActiveCfg = Debug|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug-net35|AnyCPU.Build.0 = Debug|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug-net40|AnyCPU.ActiveCfg = Debug|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug-net40|AnyCPU.Build.0 = Debug|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug-net45|AnyCPU.ActiveCfg = Debug|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug-net45|AnyCPU.Build.0 = Debug|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release-net20|AnyCPU.ActiveCfg = Release|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release-net20|AnyCPU.Build.0 = Release|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release-net35|AnyCPU.ActiveCfg = Release|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release-net35|AnyCPU.Build.0 = Release|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release-net40|AnyCPU.ActiveCfg = Release|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release-net40|AnyCPU.Build.0 = Release|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release-net45|AnyCPU.ActiveCfg = Release|Any CPU
+		{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release-net45|AnyCPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE