Merged revision(s) 1707414 from activemq/activemq-dotnet/Apache.NMS.EMS/trunk: Update to .NET 4.0. Update to TIBCO EMS 8.2.0 client assembly reference. Fixes [AMQNET-512]. (See https://issues.apache.org/jira/browse/AMQNET-512)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/commit/f4dbe8ed Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/tree/f4dbe8ed Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/diff/f4dbe8ed Branch: refs/heads/1.7.x Commit: f4dbe8ed1406578eb79cd81618f6cba47a55007e Parents: 029b230 Author: Jim Gomes <[email protected]> Authored: Wed Oct 7 23:04:08 2015 +0000 Committer: Jim Gomes <[email protected]> Committed: Wed Oct 7 23:04:08 2015 +0000 ---------------------------------------------------------------------- nant.build | 4 +- package.ps1 | 18 ++---- vs2008-ems-test.csproj | 117 ----------------------------------- vs2008-ems.csproj | 132 ---------------------------------------- vs2008-ems.sln | 30 --------- vs2013-ems-test.csproj | 135 +++++++++++++++++++++++++++++++++++++++++ vs2013-ems.csproj | 145 ++++++++++++++++++++++++++++++++++++++++++++ vs2013-ems.sln | 32 ++++++++++ 8 files changed, 320 insertions(+), 293 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/blob/f4dbe8ed/nant.build ---------------------------------------------------------------------- diff --git a/nant.build b/nant.build index d9843ce..225b42d 100644 --- a/nant.build +++ b/nant.build @@ -44,6 +44,8 @@ <property name="build.netcf-3.5.skip" value="true" /> <property name="build.mono-2.0.skip" value="true" /> <property name="build.mono-4.0.skip" value="true" /> + <property name="build.net-2.0.skip" value="true" /> + <property name="build.net-3.5.skip" value="true" /> <target name="vendor-init" description="Initializes Vendor library from local repository."> <!-- @@ -68,7 +70,7 @@ <!-- Property grouping for 'vendor.tibco.org' --> <property name="vendor.tibco.org.name" value="TIBCO.EMS" /> <property name="vendor.tibco.org.group" value="org.tibco.ems" /> - <property name="vendor.tibco.org.version" value="6.0.1" /> + <property name="vendor.tibco.org.version" value="8.2.0" /> <property name="vendor.tibco.org.filenames" value="TIBCO.EMS.dll" /> </target> http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/blob/f4dbe8ed/package.ps1 ---------------------------------------------------------------------- diff --git a/package.ps1 b/package.ps1 index d054d0a..d9b9f74 100644 --- a/package.ps1 +++ b/package.ps1 @@ -14,9 +14,9 @@ # limitations under the License. $pkgname = "Apache.NMS.EMS" -$pkgver = "1.6-SNAPSHOT" +$pkgver = "1.7-SNAPSHOT" $configurations = "release", "debug" -$frameworks = "net-2.0", "net-3.5", "net-4.0" +$frameworks = "net-4.0" write-progress "Creating package directory." "Initializing..." if(!(test-path package)) @@ -43,16 +43,8 @@ if(test-path build) zip -9 -u "$zipfile" "$framework\$configuration\nmsprovider*.config" zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll" zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml" - if($framework -ieq "mono-2.0") - { - zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb" - zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb" - } - else - { - zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb" - zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb" - } + zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb" + zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb" } } @@ -63,7 +55,7 @@ write-progress "Packaging Source code files." "Scanning..." $pkgdir = "package" $zipfile = "$pkgdir\$pkgname-$pkgver-src.zip" -zip -9 -u "$zipfile" LICENSE.txt NOTICE.txt nant-common.xml nant.build package.ps1 vs2008-ems-test.csproj vs2008-ems.csproj vs2008-ems.sln +zip -9 -u "$zipfile" LICENSE.txt NOTICE.txt nant-common.xml nant.build package.ps1 vs2013-ems-test.csproj vs2013-ems.csproj vs2013-ems.sln zip -9 -u -r "$zipfile" keyfile src write-progress -Completed "Packaging" "Complete." http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/blob/f4dbe8ed/vs2008-ems-test.csproj ---------------------------------------------------------------------- diff --git a/vs2008-ems-test.csproj b/vs2008-ems-test.csproj deleted file mode 100644 index 1ddf024..0000000 --- a/vs2008-ems-test.csproj +++ /dev/null @@ -1,117 +0,0 @@ -<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> - <ProductVersion>9.0.30729</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{EB943C69-2C9B-45E7-B95B-FB916E7057ED}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>Apache.NMS.EMS.Test</RootNamespace> - <AssemblyName>Apache.NMS.EMS.Test</AssemblyName> - <WarningLevel>4</WarningLevel> - <StartupObject> - </StartupObject> - <FileUpgradeFlags> - </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> - <UpgradeBackupLocation> - </UpgradeBackupLocation> - <PublishUrl>publish\</PublishUrl> - <Install>true</Install> - <InstallFrom>Disk</InstallFrom> - <UpdateEnabled>false</UpdateEnabled> - <UpdateMode>Foreground</UpdateMode> - <UpdateInterval>7</UpdateInterval> - <UpdateIntervalUnits>Days</UpdateIntervalUnits> - <UpdatePeriodically>false</UpdatePeriodically> - <UpdateRequired>false</UpdateRequired> - <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>Svn</SccProjectName> - <SccLocalPath>Svn</SccLocalPath> - <SccAuxPath>Svn</SccAuxPath> - <SccProvider>SubversionScc</SccProvider> - <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <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> - <NoWarn>3016</NoWarn> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <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> - <NoWarn>3016</NoWarn> - </PropertyGroup> - <ItemGroup> - <Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath> - </Reference> - <Reference Include="Apache.NMS.Test, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.Test.dll</HintPath> - </Reference> - <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>lib\NUnit\net-2.0\nunit.framework.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Xml" /> - </ItemGroup> - <ItemGroup> - <Compile Include="src\test\csharp\CommonAssemblyInfo.cs" /> - <Compile Include="src\test\csharp\ReqResponseTempQueue.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="vs2008-ems.csproj"> - <Project>{2AF5EBB5-9873-4B35-A8FC-8B6E74242767}</Project> - <Name>vs2008-ems</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> - <Visible>False</Visible> - <ProductName>.NET Framework 2.0 %28x86%29</ProductName> - <Install>true</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.3.0"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.0 %28x86%29</ProductName> - <Install>false</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.3.5"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.5</ProductName> - <Install>false</Install> - </BootstrapperPackage> - </ItemGroup> - <ItemGroup> - <None Include="Apache.NMS.EMS.Test.nunit"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="keyfile\NMSKey.snk" /> - <Content Include="nmsprovider-test.config"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - </ItemGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> - <PropertyGroup> - <PostBuildEvent>cd $(ProjectDir) -nant -nologo -q install-all -D:compile.skip=true</PostBuildEvent> - </PropertyGroup> -</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/blob/f4dbe8ed/vs2008-ems.csproj ---------------------------------------------------------------------- diff --git a/vs2008-ems.csproj b/vs2008-ems.csproj deleted file mode 100644 index baebf54..0000000 --- a/vs2008-ems.csproj +++ /dev/null @@ -1,132 +0,0 @@ -<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> - <ProductVersion>9.0.30729</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{2AF5EBB5-9873-4B35-A8FC-8B6E74242767}</ProjectGuid> - <OutputType>Library</OutputType> - <RootNamespace>Apache.NMS.EMS</RootNamespace> - <AssemblyName>Apache.NMS.EMS</AssemblyName> - <FileUpgradeFlags> - </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> - <UpgradeBackupLocation> - </UpgradeBackupLocation> - <PublishUrl>publish\</PublishUrl> - <Install>true</Install> - <InstallFrom>Disk</InstallFrom> - <UpdateEnabled>false</UpdateEnabled> - <UpdateMode>Foreground</UpdateMode> - <UpdateInterval>7</UpdateInterval> - <UpdateIntervalUnits>Days</UpdateIntervalUnits> - <UpdatePeriodically>false</UpdatePeriodically> - <UpdateRequired>false</UpdateRequired> - <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>Svn</SccProjectName> - <SccLocalPath>Svn</SccLocalPath> - <SccAuxPath>Svn</SccAuxPath> - <SccProvider>SubversionScc</SccProvider> - <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>build\net-2.0\debug\</OutputPath> - <DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>full</DebugType> - <Optimize>true</Optimize> - <OutputPath>build\net-2.0\release\</OutputPath> - <DefineConstants>TRACE;NET,NET_2_0</DefineConstants> - <ErrorReport>none</ErrorReport> - <WarningLevel>4</WarningLevel> - <DebugSymbols>true</DebugSymbols> - </PropertyGroup> - <ItemGroup> - <Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> - <Reference Include="TIBCO.EMS, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba"> - <SpecificVersion>False</SpecificVersion> - <HintPath>lib\TIBCO.EMS\net-2.0\TIBCO.EMS.dll</HintPath> - </Reference> - </ItemGroup> - <ItemGroup> - <Compile Include="src\main\csharp\BytesMessage.cs" /> - <Compile Include="src\main\csharp\CommonAssemblyInfo.cs" /> - <Compile Include="src\main\csharp\Connection.cs" /> - <Compile Include="src\main\csharp\ConnectionFactory.cs" /> - <Compile Include="src\main\csharp\ConnectionMetaData.cs" /> - <Compile Include="src\main\csharp\ExceptionUtil.cs" /> - <Compile Include="src\main\csharp\IntrospectionSupport.cs" /> - <Compile Include="src\main\csharp\StreamMessage.cs" /> - <Compile Include="src\main\csharp\QueueBrowser.cs" /> - <Compile Include="src\main\csharp\Destination.cs" /> - <Compile Include="src\main\csharp\Dispatcher.cs" /> - <Compile Include="src\main\csharp\EMSConvert.cs" /> - <Compile Include="src\main\csharp\MapMessage.cs" /> - <Compile Include="src\main\csharp\Message.cs" /> - <Compile Include="src\main\csharp\MessageConsumer.cs" /> - <Compile Include="src\main\csharp\MessageProducer.cs" /> - <Compile Include="src\main\csharp\MessageProperties.cs" /> - <Compile Include="src\main\csharp\ObjectMessage.cs" /> - <Compile Include="src\main\csharp\Queue.cs" /> - <Compile Include="src\main\csharp\Session.cs" /> - <Compile Include="src\main\csharp\TemporaryQueue.cs"> - <SubType>Code</SubType> - </Compile> - <Compile Include="src\main\csharp\TemporaryTopic.cs" /> - <Compile Include="src\main\csharp\TextMessage.cs" /> - <Compile Include="src\main\csharp\Topic.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="keyfile\NMSKey.snk" /> - </ItemGroup> - <ItemGroup> - <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> - <Visible>False</Visible> - <ProductName>.NET Framework 2.0 %28x86%29</ProductName> - <Install>true</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.3.0"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.0 %28x86%29</ProductName> - <Install>false</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.3.5"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.5</ProductName> - <Install>false</Install> - </BootstrapperPackage> - </ItemGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <!-- 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> - <Target Name="AfterBuild"> - </Target> - --> - <PropertyGroup> - <PreBuildEvent>cd $(ProjectDir) -nant -nologo download-vendor -D:vendor.build.config=$(ConfigurationName) -D:vendor.build.framework=net-2.0</PreBuildEvent> - <PostBuildEvent>cd $(ProjectDir) -nant -nologo -q install-all -D:compile.skip=true</PostBuildEvent> - </PropertyGroup> -</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/blob/f4dbe8ed/vs2008-ems.sln ---------------------------------------------------------------------- diff --git a/vs2008-ems.sln b/vs2008-ems.sln deleted file mode 100644 index 3e7fe5b..0000000 --- a/vs2008-ems.sln +++ /dev/null @@ -1,30 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-ems", "vs2008-ems.csproj", "{2AF5EBB5-9873-4B35-A8FC-8B6E74242767}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-ems-test", "vs2008-ems-test.csproj", "{EB943C69-2C9B-45E7-B95B-FB916E7057ED}" -EndProject -Global - GlobalSection(SubversionScc) = preSolution - Svn-Managed = True - Manager = AnkhSVN - Subversion Support for Visual Studio - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2AF5EBB5-9873-4B35-A8FC-8B6E74242767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AF5EBB5-9873-4B35-A8FC-8B6E74242767}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AF5EBB5-9873-4B35-A8FC-8B6E74242767}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AF5EBB5-9873-4B35-A8FC-8B6E74242767}.Release|Any CPU.Build.0 = Release|Any CPU - {EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/blob/f4dbe8ed/vs2013-ems-test.csproj ---------------------------------------------------------------------- diff --git a/vs2013-ems-test.csproj b/vs2013-ems-test.csproj new file mode 100644 index 0000000..05b37d7 --- /dev/null +++ b/vs2013-ems-test.csproj @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="12.0"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{EB943C69-2C9B-45E7-B95B-FB916E7057ED}</ProjectGuid> + <OutputType>Library</OutputType> + <RootNamespace>Apache.NMS.EMS.Test</RootNamespace> + <AssemblyName>Apache.NMS.EMS.Test</AssemblyName> + <WarningLevel>4</WarningLevel> + <StartupObject> + </StartupObject> + <FileUpgradeFlags> + </FileUpgradeFlags> + <OldToolsVersion>3.5</OldToolsVersion> + <UpgradeBackupLocation> + </UpgradeBackupLocation> + <IsWebBootstrapper>false</IsWebBootstrapper> + <SignAssembly>true</SignAssembly> + <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile> + <SccProjectName>Svn</SccProjectName> + <SccLocalPath>Svn</SccLocalPath> + <SccAuxPath>Svn</SccAuxPath> + <SccProvider>SubversionScc</SccProvider> + <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> + <InstallFrom>Disk</InstallFrom> + <UpdateEnabled>false</UpdateEnabled> + <UpdateMode>Foreground</UpdateMode> + <UpdateInterval>7</UpdateInterval> + <UpdateIntervalUnits>Days</UpdateIntervalUnits> + <UpdatePeriodically>false</UpdatePeriodically> + <UpdateRequired>false</UpdateRequired> + <MapFileExtensions>true</MapFileExtensions> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> + <TargetFrameworkProfile /> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>build\net-4.0\debug\</OutputPath> + <DefineConstants>TRACE;DEBUG;NET,NET_4_0</DefineConstants> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> + <NoWarn>3016</NoWarn> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <Optimize>true</Optimize> + <OutputPath>build\net-4.0\release\</OutputPath> + <DefineConstants>TRACE;NET,NET_4_0</DefineConstants> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> + <DebugType>full</DebugType> + <NoWarn>3016</NoWarn> + </PropertyGroup> + <ItemGroup> + <Reference Include="Apache.NMS"> + <SpecificVersion>False</SpecificVersion> + <HintPath>lib\Apache.NMS\net-4.0\Apache.NMS.dll</HintPath> + </Reference> + <Reference Include="Apache.NMS.Test"> + <SpecificVersion>False</SpecificVersion> + <HintPath>lib\Apache.NMS\net-4.0\Apache.NMS.Test.dll</HintPath> + </Reference> + <Reference Include="nunit.framework"> + <SpecificVersion>False</SpecificVersion> + <HintPath>lib\NUnit\net-4.0\nunit.framework.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="src\test\csharp\CommonAssemblyInfo.cs" /> + <Compile Include="src\test\csharp\ReqResponseTempQueue.cs" /> + </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> + <Visible>False</Visible> + <ProductName>.NET Framework 2.0 %28x86%29</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.0"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.0 %28x86%29</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>false</Install> + </BootstrapperPackage> + </ItemGroup> + <ItemGroup> + <None Include="Apache.NMS.EMS.Test.nunit"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <SubType>Designer</SubType> + </None> + <None Include="keyfile\NMSKey.snk" /> + <Content Include="nmsprovider-test.config"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <SubType>Designer</SubType> + </Content> + </ItemGroup> + <ItemGroup> + <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="vs2013-ems.csproj"> + <Project>{2af5ebb5-9873-4b35-a8fc-8b6e74242767}</Project> + <Name>vs2013-ems</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> + <PropertyGroup> + <PostBuildEvent>cd $(ProjectDir) +nant -nologo -q install-all -D:compile.skip=true</PostBuildEvent> + </PropertyGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/blob/f4dbe8ed/vs2013-ems.csproj ---------------------------------------------------------------------- diff --git a/vs2013-ems.csproj b/vs2013-ems.csproj new file mode 100644 index 0000000..d11732c --- /dev/null +++ b/vs2013-ems.csproj @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="12.0"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{2AF5EBB5-9873-4B35-A8FC-8B6E74242767}</ProjectGuid> + <OutputType>Library</OutputType> + <RootNamespace>Apache.NMS.EMS</RootNamespace> + <AssemblyName>Apache.NMS.EMS</AssemblyName> + <FileUpgradeFlags> + </FileUpgradeFlags> + <OldToolsVersion>3.5</OldToolsVersion> + <UpgradeBackupLocation> + </UpgradeBackupLocation> + <IsWebBootstrapper>false</IsWebBootstrapper> + <SignAssembly>true</SignAssembly> + <AssemblyOriginatorKeyFile>keyfile\NMSKey.snk</AssemblyOriginatorKeyFile> + <SccProjectName>Svn</SccProjectName> + <SccLocalPath>Svn</SccLocalPath> + <SccAuxPath>Svn</SccAuxPath> + <SccProvider>SubversionScc</SccProvider> + <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> + <InstallFrom>Disk</InstallFrom> + <UpdateEnabled>false</UpdateEnabled> + <UpdateMode>Foreground</UpdateMode> + <UpdateInterval>7</UpdateInterval> + <UpdateIntervalUnits>Days</UpdateIntervalUnits> + <UpdatePeriodically>false</UpdatePeriodically> + <UpdateRequired>false</UpdateRequired> + <MapFileExtensions>true</MapFileExtensions> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> + <TargetFrameworkProfile /> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>build\net-4.0\debug\</OutputPath> + <DefineConstants>TRACE;DEBUG;NET,NET_4_0</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>full</DebugType> + <Optimize>true</Optimize> + <OutputPath>build\net-4.0\release\</OutputPath> + <DefineConstants>TRACE;NET,NET_4_0</DefineConstants> + <ErrorReport>none</ErrorReport> + <WarningLevel>4</WarningLevel> + <DebugSymbols>true</DebugSymbols> + </PropertyGroup> + <ItemGroup> + <Reference Include="Apache.NMS"> + <SpecificVersion>False</SpecificVersion> + <HintPath>lib\Apache.NMS\net-4.0\Apache.NMS.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + <Reference Include="TIBCO.EMS"> + <SpecificVersion>False</SpecificVersion> + <HintPath>lib\TIBCO.EMS\net-4.0\TIBCO.EMS.dll</HintPath> + </Reference> + </ItemGroup> + <ItemGroup> + <Compile Include="src\main\csharp\BytesMessage.cs" /> + <Compile Include="src\main\csharp\CommonAssemblyInfo.cs" /> + <Compile Include="src\main\csharp\Connection.cs" /> + <Compile Include="src\main\csharp\ConnectionFactory.cs" /> + <Compile Include="src\main\csharp\ConnectionMetaData.cs" /> + <Compile Include="src\main\csharp\ExceptionUtil.cs" /> + <Compile Include="src\main\csharp\IntrospectionSupport.cs" /> + <Compile Include="src\main\csharp\StreamMessage.cs" /> + <Compile Include="src\main\csharp\QueueBrowser.cs" /> + <Compile Include="src\main\csharp\Destination.cs" /> + <Compile Include="src\main\csharp\Dispatcher.cs" /> + <Compile Include="src\main\csharp\EMSConvert.cs" /> + <Compile Include="src\main\csharp\MapMessage.cs" /> + <Compile Include="src\main\csharp\Message.cs" /> + <Compile Include="src\main\csharp\MessageConsumer.cs" /> + <Compile Include="src\main\csharp\MessageProducer.cs" /> + <Compile Include="src\main\csharp\MessageProperties.cs" /> + <Compile Include="src\main\csharp\ObjectMessage.cs" /> + <Compile Include="src\main\csharp\Queue.cs" /> + <Compile Include="src\main\csharp\Session.cs" /> + <Compile Include="src\main\csharp\TemporaryQueue.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="src\main\csharp\TemporaryTopic.cs" /> + <Compile Include="src\main\csharp\TextMessage.cs" /> + <Compile Include="src\main\csharp\Topic.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="keyfile\NMSKey.snk" /> + </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> + <Visible>False</Visible> + <ProductName>.NET Framework 2.0 %28x86%29</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.0"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.0 %28x86%29</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>false</Install> + </BootstrapperPackage> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> + <!-- 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> + <Target Name="AfterBuild"> + </Target> + --> + <PropertyGroup> + <PreBuildEvent>cd $(ProjectDir) +nant -nologo download-vendor -D:vendor.build.config=$(ConfigurationName) -D:vendor.build.framework=net-4.0</PreBuildEvent> + <PostBuildEvent>cd $(ProjectDir) +nant -nologo -q install-all -D:compile.skip=true</PostBuildEvent> + </PropertyGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-nms-ems/blob/f4dbe8ed/vs2013-ems.sln ---------------------------------------------------------------------- diff --git a/vs2013-ems.sln b/vs2013-ems.sln new file mode 100644 index 0000000..600d735 --- /dev/null +++ b/vs2013-ems.sln @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2013-ems", "vs2013-ems.csproj", "{2AF5EBB5-9873-4B35-A8FC-8B6E74242767}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2013-ems-test", "vs2013-ems-test.csproj", "{EB943C69-2C9B-45E7-B95B-FB916E7057ED}" +EndProject +Global + GlobalSection(SubversionScc) = preSolution + Svn-Managed = True + Manager = AnkhSVN - Subversion Support for Visual Studio + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2AF5EBB5-9873-4B35-A8FC-8B6E74242767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2AF5EBB5-9873-4B35-A8FC-8B6E74242767}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2AF5EBB5-9873-4B35-A8FC-8B6E74242767}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2AF5EBB5-9873-4B35-A8FC-8B6E74242767}.Release|Any CPU.Build.0 = Release|Any CPU + {EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal
