This is an automated email from the ASF dual-hosted git repository. dfoulks pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-nms-ems.git
commit 568c71e7482f6a04351ff17c91703eef7ba8e2a3 Author: Jim Gomes <[email protected]> AuthorDate: Wed Oct 7 22:52:39 2015 +0000 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) --- nant.build | 4 +- package.ps1 | 18 ++---- vs2008-ems-test.csproj => vs2013-ems-test.csproj | 70 +++++++++++++++--------- vs2008-ems.csproj => vs2013-ems.csproj | 51 ++++++++++------- vs2008-ems.sln => vs2013-ems.sln | 10 ++-- 5 files changed, 90 insertions(+), 63 deletions(-) diff --git a/nant.build b/nant.build index 42d2ed3..40bfe93 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> diff --git a/package.ps1 b/package.ps1 index d054d0a..96b503d 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.8-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." diff --git a/vs2008-ems-test.csproj b/vs2013-ems-test.csproj similarity index 69% rename from vs2008-ems-test.csproj rename to vs2013-ems-test.csproj index 1ddf024..05b37d7 100644 --- a/vs2008-ems-test.csproj +++ b/vs2013-ems-test.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?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> @@ -13,9 +14,18 @@ </StartupObject> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <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> @@ -28,47 +38,40 @@ <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> + <TargetFrameworkProfile /> </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> + <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-2.0\release\</OutputPath> - <DefineConstants>TRACE;NET,NET_2_0</DefineConstants> + <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, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL"> + <Reference Include="Apache.NMS"> <SpecificVersion>False</SpecificVersion> - <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath> + <HintPath>lib\Apache.NMS\net-4.0\Apache.NMS.dll</HintPath> </Reference> - <Reference Include="Apache.NMS.Test, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL"> + <Reference Include="Apache.NMS.Test"> <SpecificVersion>False</SpecificVersion> - <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.Test.dll</HintPath> + <HintPath>lib\Apache.NMS\net-4.0\Apache.NMS.Test.dll</HintPath> </Reference> - <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"> + <Reference Include="nunit.framework"> <SpecificVersion>False</SpecificVersion> - <HintPath>lib\NUnit\net-2.0\nunit.framework.dll</HintPath> + <HintPath>lib\NUnit\net-4.0\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Xml" /> @@ -78,12 +81,11 @@ <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.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> @@ -99,16 +101,32 @@ <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) diff --git a/vs2008-ems.csproj b/vs2013-ems.csproj similarity index 79% rename from vs2008-ems.csproj rename to vs2013-ems.csproj index baebf54..d11732c 100644 --- a/vs2008-ems.csproj +++ b/vs2013-ems.csproj @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5"> +<?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> @@ -10,9 +11,18 @@ <AssemblyName>Apache.NMS.EMS</AssemblyName> <FileUpgradeFlags> </FileUpgradeFlags> - <OldToolsVersion>2.0</OldToolsVersion> + <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> @@ -25,46 +35,39 @@ <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> + <TargetFrameworkProfile /> </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> + <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-2.0\release\</OutputPath> - <DefineConstants>TRACE;NET,NET_2_0</DefineConstants> + <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, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL"> + <Reference Include="Apache.NMS"> <SpecificVersion>False</SpecificVersion> - <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath> + <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, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5b83db8ff05c64ba"> + <Reference Include="TIBCO.EMS"> <SpecificVersion>False</SpecificVersion> - <HintPath>lib\TIBCO.EMS\net-2.0\TIBCO.EMS.dll</HintPath> + <HintPath>lib\TIBCO.EMS\net-4.0\TIBCO.EMS.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -99,6 +102,11 @@ <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> @@ -114,6 +122,11 @@ <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. @@ -125,7 +138,7 @@ --> <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: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> diff --git a/vs2008-ems.sln b/vs2013-ems.sln similarity index 72% rename from vs2008-ems.sln rename to vs2013-ems.sln index 3e7fe5b..600d735 100644 --- a/vs2008-ems.sln +++ b/vs2013-ems.sln @@ -1,9 +1,11 @@ -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}" +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}") = "vs2008-ems-test", "vs2008-ems-test.csproj", "{EB943C69-2C9B-45E7-B95B-FB916E7057ED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2013-ems-test", "vs2013-ems-test.csproj", "{EB943C69-2C9B-45E7-B95B-FB916E7057ED}" EndProject Global GlobalSection(SubversionScc) = preSolution
