Apply patch #30 to lock x86 only configurations and match the changes to vendor dependency to only use release build DLLs.
Contributed by Chuck Rolke. Thanks!
Fixes [AMQNET-454]. (See https://issues.apache.org/jira/browse/AMQNET-454)
diff --git a/nant.build b/nant.build
index a391c8f..6f68909 100644
--- a/nant.build
+++ b/nant.build
@@ -28,16 +28,16 @@
<property name="project.description" value="Apache NMS for AMQP Class Library (.Net Messaging Library Implementation): An implementation of the NMS API for AMQP using Apache QPID and Proton" />
<!-- Native Qpid DLLs -->
- <property name="boost_chrono" value="boost_chrono-${vcver}-mt${boostdebug}-1_47.dll" dynamic="true" />
- <property name="boost_date_time" value="boost_date_time-${vcver}-mt${boostdebug}-1_47.dll" dynamic="true" />
- <property name="boost_program_options" value="boost_program_options-${vcver}-mt${boostdebug}-1_47.dll" dynamic="true" />
- <property name="boost_system" value="boost_system-${vcver}-mt${boostdebug}-1_47.dll" dynamic="true" />
- <property name="boost_thread" value="boost_thread-${vcver}-mt${boostdebug}-1_47.dll" dynamic="true" />
- <property name="qpidclient" value="qpidclient${debugsuffix}.dll" dynamic="true" />
- <property name="qpidcommon" value="qpidcommon${debugsuffix}.dll" dynamic="true" />
- <property name="qpidmessaging" value="qpidmessaging${debugsuffix}.dll" dynamic="true" />
- <property name="qpid-proton" value="qpid-proton${debugsuffix}.dll" dynamic="true" />
- <property name="qpidtypes" value="qpidtypes${debugsuffix}.dll" dynamic="true" />
+ <property name="boost_chrono" value="boost_chrono-${vcver}-mt-1_47.dll" dynamic="true" />
+ <property name="boost_date_time" value="boost_date_time-${vcver}-mt-1_47.dll" dynamic="true" />
+ <property name="boost_program_options" value="boost_program_options-${vcver}-mt-1_47.dll" dynamic="true" />
+ <property name="boost_system" value="boost_system-${vcver}-mt-1_47.dll" dynamic="true" />
+ <property name="boost_thread" value="boost_thread-${vcver}-mt-1_47.dll" dynamic="true" />
+ <property name="qpidclient" value="qpidclient.dll" dynamic="true" />
+ <property name="qpidcommon" value="qpidcommon.dll" dynamic="true" />
+ <property name="qpidmessaging" value="qpidmessaging.dll" dynamic="true" />
+ <property name="qpid-proton" value="qpid-proton.dll" dynamic="true" />
+ <property name="qpidtypes" value="qpidtypes.dll" dynamic="true" />
<!-- Repository organized as: organization/module/version/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
<property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
@@ -53,9 +53,6 @@
to align .NET build with underlying unmanaged C runtime. -->
<property name="build.framework.strings" value="net-2.0,net-4.0"/>
- <!-- Limit to debug until lib\Apache.Qpid\net-X.0 gets debug/release subdirectories -->
- <property name="build.config.strings" value="debug" />
-
<target name="vendor-init" description="Initializes Vendor library from local repository.">
<!--
Vendor specific info. The prefix of 'vendor.apache.org' is taken from the property
@@ -82,10 +79,7 @@
<property name="vendor.qpid.apache.org.version" value="0.28.0.16239" />
<!-- net-4.0 built with VS2010 (vc100), net-2.0 built with VS2008 (vc90) -->
<property name="vcver" value="${if(current.build.framework == 'net-4.0', 'vc100', 'vc90')}" />
- <property name="debugsuffix" value="${if(current.build.config == 'release', '', 'd')}" />
- <property name="boostdebug" value="${if(current.build.config == 'release', '', '-gd')}" />
- <echo message="Vendor-init current.build.framework = ${current.build.framework}, current.build.config = ${current.build.config}" />
- <echo message="vcver = ${vcver}, debugsuffix = ${debugsuffix}, boostdebug = ${boostdebug}" />
+ <echo message="Vendor-init current.build.framework = ${current.build.framework}, current.build.config = ${current.build.config}, vcver = ${vcver}" />
<property name="vendor.qpid.apache.org.filenames" value="org.apache.qpid.messaging.dll,${boost_chrono},${boost_date_time},${boost_program_options},${boost_system},${boost_thread},${qpidclient},${qpidcommon},${qpidmessaging},${qpid-proton},${qpidtypes}" dynamic="true"/>
</target>
@@ -118,29 +112,27 @@
<include name="${Apache.NMS.pdb}" />
<include name="${Apache.NMS.Test.dll}" />
<include name="${Apache.NMS.Test.pdb}" />
- <include name="${Apache.Qpid.dll}" />
+ <include name="${Apache.Qpid.dll}" />
<include name="${nunit.dll}" />
<include name="${NUnit.Projectfile}" />
+ <!-- boost unmanaged: net-2.0 -->
+ <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_chrono-vc90-mt-1_47.dll" />
+ <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_date_time-vc90-mt-1_47.dll" />
+ <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_program_options-vc90-mt-1_47.dll" />
+ <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_system-vc90-mt-1_47.dll" />
+ <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_thread-vc90-mt-1_47.dll" />
+ <!-- boost unmanaged net-4.0 -->
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_chrono-vc100-mt-1_47.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_chrono-vc100-mt-gd-1_47.dll" />
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_date_time-vc100-mt-1_47.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_date_time-vc100-mt-gd-1_47.dll" />
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_program_options-vc100-mt-1_47.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_program_options-vc100-mt-gd-1_47.dll" />
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_system-vc100-mt-1_47.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_system-vc100-mt-gd-1_47.dll" />
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_thread-vc100-mt-1_47.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_thread-vc100-mt-gd-1_47.dll" />
+ <!-- qpid native: identical names regardless of framework -->
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpid-proton.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpid-protond.dll" />
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidclient.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidclientd.dll" />
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidcommon.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidcommond.dll" />
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidmessaging.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidmessagingd.dll" />
<include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidtypes.dll" />
- <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidtypesd.dll" />
</fileset>
<fileset id="install.filenames">
@@ -159,11 +151,11 @@
<include name="NOTICE.txt" />
<include name="nant-common.xml" />
<include name="nant.build" />
- <include name="nant.build" />
<include name="nmsprovider*.config" />
<include name="vs2008-*.csproj" />
- <include name="vs2008-*.csproj" />
+ <include name="vs2010-*.csproj" />
<include name="vs2008-*.sln" />
+ <include name="vs2010-*.sln" />
<include name="keyfile/*" />
<include name="src/**/*.cs" />
<exclude name="src/sandbox/**" />
diff --git a/src/test/csharp/HelloWorld/HelloWorld.cs b/src/test/csharp/HelloWorld/HelloWorld.cs
index 2899f39..120ec49 100644
--- a/src/test/csharp/HelloWorld/HelloWorld.cs
+++ b/src/test/csharp/HelloWorld/HelloWorld.cs
@@ -69,7 +69,7 @@
connection.Start();
// Create a text message
- ITextMessage request = session.CreateTextMessage("Hello World!");
+ ITextMessage request = session.CreateTextMessage("Hello World! " + DateTime.Now.ToString("HH:mm:ss tt"));
request.Properties["NMSXGroupID"] = "cheese";
request.Properties["myHeader"] = "Cheddar";
@@ -90,6 +90,9 @@
Console.WriteLine("Received message text: " + message.Text);
Console.WriteLine("Received message properties: " + message.Properties.ToString());
}
+ producer.Close();
+ consumer.Close();
+ session.Close();
connection.Stop();
}
}
diff --git a/vs2008-HelloWorld.csproj b/vs2008-HelloWorld.csproj
index 26bd5bf..bcdcb7c 100644
--- a/vs2008-HelloWorld.csproj
+++ b/vs2008-HelloWorld.csproj
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{DC7079D8-D4A1-41FB-9997-78914CFAACB0}</ProjectGuid>
@@ -16,6 +16,18 @@
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
+ <SccProjectName>
+ </SccProjectName>
+ <SccLocalPath>
+ </SccLocalPath>
+ <SccAuxPath>
+ </SccAuxPath>
+ <SccProvider>
+ </SccProvider>
+ <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -28,22 +40,10 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <SignAssembly>true</SignAssembly>
- <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile>
- <SccProjectName>
- </SccProjectName>
- <SccLocalPath>
- </SccLocalPath>
- <SccAuxPath>
- </SccAuxPath>
- <SccProvider>
- </SccProvider>
- <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
@@ -51,8 +51,9 @@
<DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<NoWarn>3016</NoWarn>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<OutputPath>build\net-2.0\release\</OutputPath>
@@ -60,22 +61,6 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<DebugType>full</DebugType>
<NoWarn>3016</NoWarn>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>build\net-2.0\debug\</OutputPath>
- <DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants>
- <NoWarn>3016</NoWarn>
- <DebugType>full</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x86\Release\</OutputPath>
- <DefineConstants>TRACE;NET,NET_2_0</DefineConstants>
- <Optimize>true</Optimize>
- <NoWarn>3016</NoWarn>
- <DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
diff --git a/vs2008-amqp-test.csproj b/vs2008-amqp-test.csproj
index 5bf8dd7..11f123e 100644
--- a/vs2008-amqp-test.csproj
+++ b/vs2008-amqp-test.csproj
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2F31ED5C-44A2-464A-BD55-2B5B010654E8}</ProjectGuid>
@@ -43,7 +43,7 @@
</SccProvider>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
@@ -51,8 +51,9 @@
<DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<NoWarn>3016</NoWarn>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<OutputPath>build\net-2.0\release\</OutputPath>
@@ -60,6 +61,7 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<DebugType>full</DebugType>
<NoWarn>3016</NoWarn>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/vs2008-amqp.csproj b/vs2008-amqp.csproj
index 53cd911..91a7265 100644
--- a/vs2008-amqp.csproj
+++ b/vs2008-amqp.csproj
@@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}</ProjectGuid>
@@ -43,28 +43,33 @@
</SccProvider>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\net-2.0\debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<OutputPath>build\net-2.0\release\</OutputPath>
<DefineConstants>TRACE;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
</Reference>
- <Reference Include="org.apache.qpid.messaging, Version=0.28.0.16239, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=x86" />
+ <Reference Include="org.apache.qpid.messaging, Version=0.28.0.16239, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>lib\Apache.Qpid\net-2.0\org.apache.qpid.messaging.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
@@ -114,7 +119,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>
<PreBuildEvent>cd $(ProjectDir)
-nant -nologo download-vendor -D:vendor.build.config=$(ConfigurationName) -D:vendor.build.framework=net-2.0</PreBuildEvent>
+nant -nologo download-vendor -D:current.build.config=$(ConfigurationName) -D:current.build.framework=net-2.0</PreBuildEvent>
<PostBuildEvent>cd $(ProjectDir)
nant -nologo -q install-all -D:compile.skip=true</PostBuildEvent>
</PropertyGroup>
diff --git a/vs2008-amqp.sln b/vs2008-amqp.sln
index b18af6c..bd94b8d 100644
--- a/vs2008-amqp.sln
+++ b/vs2008-amqp.sln
@@ -9,30 +9,20 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Debug|x86.ActiveCfg = Debug|Any CPU
- {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Release|Any CPU.Build.0 = Release|Any CPU
- {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Release|x86.ActiveCfg = Release|Any CPU
- {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Debug|x86.ActiveCfg = Debug|Any CPU
- {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Release|Any CPU.Build.0 = Release|Any CPU
- {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Release|x86.ActiveCfg = Release|Any CPU
- {DC7079D8-D4A1-41FB-9997-78914CFAACB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DC7079D8-D4A1-41FB-9997-78914CFAACB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Debug|x86.ActiveCfg = Debug|x86
+ {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Debug|x86.Build.0 = Debug|x86
+ {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Release|x86.ActiveCfg = Release|x86
+ {5CDFDA77-CFC2-4A6E-B731-6C06B59BFFE3}.Release|x86.Build.0 = Release|x86
+ {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Debug|x86.ActiveCfg = Debug|x86
+ {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Debug|x86.Build.0 = Debug|x86
+ {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Release|x86.ActiveCfg = Release|x86
+ {2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Release|x86.Build.0 = Release|x86
{DC7079D8-D4A1-41FB-9997-78914CFAACB0}.Debug|x86.ActiveCfg = Debug|x86
{DC7079D8-D4A1-41FB-9997-78914CFAACB0}.Debug|x86.Build.0 = Debug|x86
- {DC7079D8-D4A1-41FB-9997-78914CFAACB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DC7079D8-D4A1-41FB-9997-78914CFAACB0}.Release|Any CPU.Build.0 = Release|Any CPU
{DC7079D8-D4A1-41FB-9997-78914CFAACB0}.Release|x86.ActiveCfg = Release|x86
{DC7079D8-D4A1-41FB-9997-78914CFAACB0}.Release|x86.Build.0 = Release|x86
EndGlobalSection
diff --git a/vs2010-amqp-test.csproj b/vs2010-amqp-test.csproj
index 270dd2d..7b6d55c 100644
--- a/vs2010-amqp-test.csproj
+++ b/vs2010-amqp-test.csproj
@@ -20,7 +20,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{E7A4FA3E-6106-470C-99A6-B59C8340F7DB}</ProjectGuid>
@@ -64,7 +64,7 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
@@ -72,8 +72,9 @@
<DefineConstants>TRACE;DEBUG;NET,NET_4_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<NoWarn>3016</NoWarn>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<OutputPath>build\net-2.0\release\</OutputPath>
@@ -81,6 +82,7 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<DebugType>full</DebugType>
<NoWarn>3016</NoWarn>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/vs2010-amqp.csproj b/vs2010-amqp.csproj
index a7e52ca..de54f90 100644
--- a/vs2010-amqp.csproj
+++ b/vs2010-amqp.csproj
@@ -20,7 +20,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5E1E5956-2AC0-4134-BA91-CE3A13268432}</ProjectGuid>
@@ -64,7 +64,7 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
@@ -73,7 +73,7 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugSymbols>true</DebugSymbols>
<Optimize>true</Optimize>
<OutputPath>build\net-4.0\release\</OutputPath>
@@ -86,7 +86,8 @@
<Reference Include="Apache.NMS">
<HintPath>lib\Apache.NMS\net-4.0\Apache.NMS.dll</HintPath>
</Reference>
- <Reference Include="org.apache.qpid.messaging">
+ <Reference Include="org.apache.qpid.messaging, Version=0.28.0.16239, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
<HintPath>lib\Apache.Qpid\net-4.0\org.apache.qpid.messaging.dll</HintPath>
</Reference>
<Reference Include="System" />
@@ -127,7 +128,7 @@
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
- <Install>true</Install>
+ <Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
<Visible>False</Visible>
@@ -148,7 +149,7 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>
<PreBuildEvent>cd $(ProjectDir)
-nant -nologo download-vendor -D:vendor.build.config=$(ConfigurationName) -D:vendor.build.framework=net-4.0</PreBuildEvent>
+nant -nologo download-vendor -D:current.build.config=$(ConfigurationName) -D:current.build.framework=net-4.0</PreBuildEvent>
<PostBuildEvent>cd $(ProjectDir)
nant -nologo -q install-all -D:compile.skip=true</PostBuildEvent>
</PropertyGroup>
diff --git a/vs2010-amqp.sln b/vs2010-amqp.sln
index fba3b07..f29c5d9 100644
--- a/vs2010-amqp.sln
+++ b/vs2010-amqp.sln
@@ -9,42 +9,20 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Debug|x86.ActiveCfg = Debug|Any CPU
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Release|Any CPU.Build.0 = Release|Any CPU
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Release|x86.ActiveCfg = Release|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Release|Any CPU.Build.0 = Release|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Release|x86.ActiveCfg = Release|Any CPU
- {AC7C231F-0539-4612-A521-27CD9E00352B}.Debug|Any CPU.ActiveCfg = Debug|x86
- {AC7C231F-0539-4612-A521-27CD9E00352B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
- {AC7C231F-0539-4612-A521-27CD9E00352B}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Debug|x86.ActiveCfg = Debug|x86
+ {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Debug|x86.Build.0 = Debug|x86
+ {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Release|x86.ActiveCfg = Release|x86
+ {5E1E5956-2AC0-4134-BA91-CE3A13268432}.Release|x86.Build.0 = Release|x86
+ {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Debug|x86.ActiveCfg = Debug|x86
+ {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Debug|x86.Build.0 = Debug|x86
+ {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Release|x86.ActiveCfg = Release|x86
+ {E7A4FA3E-6106-470C-99A6-B59C8340F7DB}.Release|x86.Build.0 = Release|x86
{AC7C231F-0539-4612-A521-27CD9E00352B}.Debug|x86.ActiveCfg = Debug|x86
{AC7C231F-0539-4612-A521-27CD9E00352B}.Debug|x86.Build.0 = Debug|x86
- {AC7C231F-0539-4612-A521-27CD9E00352B}.Release|Any CPU.ActiveCfg = Release|x86
- {AC7C231F-0539-4612-A521-27CD9E00352B}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {AC7C231F-0539-4612-A521-27CD9E00352B}.Release|Mixed Platforms.Build.0 = Release|x86
{AC7C231F-0539-4612-A521-27CD9E00352B}.Release|x86.ActiveCfg = Release|x86
{AC7C231F-0539-4612-A521-27CD9E00352B}.Release|x86.Build.0 = Release|x86
EndGlobalSection
