You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2015/10/08 01:04:08 UTC
svn commit: r1707416 - in
/activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x: ./ nant.build
package.ps1 vs2008-ems-test.csproj vs2008-ems.csproj vs2008-ems.sln
vs2013-ems-test.csproj vs2013-ems.csproj vs2013-ems.sln
Author: jgomes
Date: Wed Oct 7 23:04:08 2015
New Revision: 1707416
URL: http://svn.apache.org/viewvc?rev=1707416&view=rev
Log:
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)
Added:
activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/vs2013-ems-test.csproj
- copied unchanged from r1707414, activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2013-ems-test.csproj
activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/vs2013-ems.csproj (props changed)
- copied unchanged from r1707414, activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2013-ems.csproj
activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/vs2013-ems.sln (props changed)
- copied unchanged from r1707414, activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2013-ems.sln
Removed:
activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/vs2008-ems-test.csproj
activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/vs2008-ems.csproj
activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/vs2008-ems.sln
Modified:
activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/ (props changed)
activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/nant.build
activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/package.ps1
Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 7 23:04:08 2015
@@ -1,2 +1,2 @@
/activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.5.x:1172914
-/activemq/activemq-dotnet/Apache.NMS.EMS/trunk:1705382
+/activemq/activemq-dotnet/Apache.NMS.EMS/trunk:1705382,1707414
Modified: activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/nant.build?rev=1707416&r1=1707415&r2=1707416&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/nant.build Wed Oct 7 23:04:08 2015
@@ -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>
Modified: activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/package.ps1
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/package.ps1?rev=1707416&r1=1707415&r2=1707416&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/package.ps1 (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/branches/1.7.x/package.ps1 Wed Oct 7 23:04:08 2015
@@ -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 fi
$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."