Merge bug26419

Author: Simon MacMullen

Local.props.example

@@ -13,7 +13,7 @@
     <PropLaunchExe Condition="'$(PropUsingMono)' == 'true'">mono --debug </PropLaunchExe>
 
     <!-- WCF component only for Windows, .NET 3.5 or higher -->
-    <PropBuildWcf Condition="'$(PropUsingMono)' != 'true' And ('$(PropTargetFramework)' == 'v3.5' Or '$(PropTargetFramework)' == 'v4.0' Or '$(PropTargetFramework)' == 'v4.5'))">true</PropBuildWcf>
+    <PropBuildWcf Condition="'$(PropUsingMono)' != 'true'">true</PropBuildWcf>
 
     <!-- Uncomment to run a single test case with /t:RunSingleUnitTest -->
     <!-- <PropTestToRun>RabbitMQ.Client.Unit.TestConnectionRecovery</PropTestToRun> -->

dist-msi.sh

@@ -60,6 +60,8 @@ NAME_VSN=$NAME-$RABBIT_VSN
 RELEASE_DIR=release
 
 function main {
+    ensure-tmp-unzip
+    get-binaries
     get-sources
     gen-license-rtf
 
@@ -98,16 +100,22 @@ function build-msm-msi {
     safe-rm-deep-dir tmp/wix
 }
 
-
-function get-sources {
+function ensure-tmp-unzip {
     safe-rm-deep-dir tmp/unzip
     mkdir -p tmp/unzip
-    unzip -q $RELEASE_DIR/$NAME_VSN-dotnet-2.0.zip -d tmp/unzip/$NAME_VSN-dotnet-2.0
+}
+
+function get-sources {
     unzip -q $RELEASE_DIR/$NAME_VSN-client-htmldoc.zip -d tmp/unzip/$NAME_VSN-client-htmldoc
     cp $RELEASE_DIR/$NAME_VSN-api-guide.pdf tmp/unzip/
     cp $RELEASE_DIR/$NAME_VSN-user-guide.pdf tmp/unzip/
 }
 
+function get-binaries {
+    unzip -q $RELEASE_DIR/$NAME_VSN.zip -d tmp/unzip/
+    mkdir -p tmp/unzip/bin
+    cp -r tmp/unzip/$NAME_VSN/projects/client/RabbitMQ.Client/build/bin tmp/unzip/$NAME_VSN/bin
+}
 
 function gen-wxs {
     set +x

dist.sh

@@ -104,12 +104,23 @@ function main {
 
 
 function dist-zips {
+    # clean & build
+    dist-target-framework dotnet-3.5
+
     ### Source dist
     src-dist
 
-    ### .NET 3.5 library (bin), examples (src and bin), WCF bindings library (bin)
-    ### and WCF examples (src) dist (WCF built only if MONO_DIST is undefined)
-    dist-target-framework dotnet-3.5
+    gendoc-dist \
+        build/bin/RabbitMQ.Client.xml \
+        $NAME_VSN-client-htmldoc.zip \
+        "/suppress:RabbitMQ.Client.Framing \
+         /suppress:RabbitMQ.Client.Framing.Impl \
+         /suppress:RabbitMQ.Client.Impl \
+         /suppress:RabbitMQ.Client.Apigen.Attributes" \
+        $NAME_VSN-tmp-xmldoc.zip \
+	projects/client/RabbitMQ.Client \
+        ../../..
+
     if [ -z "$MONO_DIST" ]; then
         ### HTML documentation for the WCF bindings library dist
         gendoc-dist \
@@ -160,7 +171,7 @@ function src-dist {
 function dist-target-framework {
     TARGET_FRAMEWORK="$1"
     BUILD_WCF=
-    test "$TARGET_FRAMEWORK" == "dotnet-3.0" && test -z "$MONO_DIST" && BUILD_WCF="true"
+    test -z "$MONO_DIST" && BUILD_WCF="true"
 
     ### Make sure we can use MSBuild.Community.Tasks.dll (it might be from a
     ### remote location)

docs/wikipages/data.BuildingTheClient.txt

@@ -23,17 +23,16 @@ The source tree is laid out as follows:
 To compile the RabbitMQ .NET client library, you will need
 
   - a .NET development environment:
-      - Microsoft .NET 2.0 (or later)
-      - Microsoft .NET 3.0 (or later) if you want to build the WCF binding too
-  - Microsoft Visual Studio 2005 or later (optional)
+      - Microsoft .NET 3.5 (or later) if you want to build the WCF binding too
+  - Microsoft Visual Studio 2008 or later (optional)
 
 To run the unit tests, you will need
 
  - NUnit 2.5 or later; included in the [code lib] directory
 
 ** Configuring Your Tree
 
-Copy [code Local.props.example] to [code Local.props], and edit it if necessary (the properties in this file have suggestive names). Set [code PropTargetFramework] to [code v1.1], [code v2.0], [code v3.0] or [code v3.5]. If you would like to build under Mono, only [code v1.1] and [code v2.0] are supported; also set [code PropUsingMono] to [code true] in this case.
+Copy [code Local.props.example] to [code Local.props], and edit it if necessary (the properties in this file have suggestive names). Set [code PropTargetFramework] to [code v3.5], [code v4.0] or [code v4.5]. If you would like to build under Mono, set [code PropUsingMono] to [code true] in this case.
 
 ** Building
 
@@ -51,7 +50,7 @@ Note: If you change a property in [code Local.props] while the solution is loade
 
 *** On Windows, without Visual Studio
 
-To build the client library without Visual Studio, first you need to make sure you have the .NET's framework directory in your [code PATH] environment variable. The .NET framework directory can usually be found at [code %WINDIR%\Microsoft.NET\Framework\v2.0.50727] for .NET 2.0 or [code %WINDIR%\Microsoft.NET\Framework\v3.0] for .NET 3.0.
+To build the client library without Visual Studio, first you need to make sure you have the .NET's framework directory in your [code PATH] environment variable. The .NET framework directory can usually be found at [code %WINDIR%\Microsoft.NET\Framework\v3.5] for .NET 3.5.
 
 Open the Command Prompt (Start -> Run -> cmd) or Cygwin (if you have it installed) and change to the client's directory. Now type [code msbuild.exe] and hit return to start building the solution.
 
@@ -63,7 +62,7 @@ For building under Mono, please refer to [link http://www.rabbitmq.com/build-dot
 
 ** Building the WCF binding
 
-Building the WCF binding is enabled by default in [code Local.props] if the target framework is [code v3.0] or later (only on Windows).
+Building the WCF binding is enabled by default in [code Local.props] on Windows.
 
 To disable building the WCF binding, set [code PropBuildWcf] to [code false].
 

projects/client/Apigen/RabbitMQ.Client.Apigen.csproj

@@ -66,16 +66,6 @@
     </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>

projects/client/RabbitMQ.Client/src/client/exceptions/OperationInterruptedException.cs

@@ -52,9 +52,7 @@ namespace RabbitMQ.Client.Exceptions
     /// </summary>
     [Serializable]
     public class OperationInterruptedException
-        // Eventually, as part of .NET 3.0, we get to inherit from ...
-        /* : OperationCanceledException */
-        // Until then, there's sadly nothing better to inherit from than ...
+        // TODO: inherit from OperationCanceledException
         : Exception
     {
         ///<summary>Possible explanation for the interruption. May be null.</summary>

wix/dotnet-client-merge-module.wxs.in

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
     <Module Id='DotNetClientModule' Guid='97DB49A3-B75E-4AE1-B01A-DFC8E335F866' Language='1033' Codepage='1252' Version='@VERSION@'>
-        <Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@' Manufacturer='GoPivotal, Inc.' InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
+        <Package Id='????????-????-????-????-????????????' Description='RabbitMQ .NET Client @VERSION@' Manufacturer='GoPivotal, Inc.'
+                 InstallerVersion='150' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
         <!-- VERSION is the RabbitMQ release version. This might differ
              from the RabbitMQ.Client.dll version (which always has 4
              components). -->
@@ -14,15 +15,19 @@
                  (i.e. will only have to be specified once, with Assembly='.net'
                  in order to be copied in both places). -->
             <Component Id='ClientLibraryAssembly' Guid='06543EE8-DED2-4C1C-826E-6AAE0B403AF3'>
-                <File Id='RabbitMQClientDllAssembly' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' Assembly='.net' KeyPath='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.dll' />
+                <File Id='RabbitMQClientDllAssembly' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' Assembly='.net' KeyPath='yes'
+                      Source='..\tmp\unzip\rabbitmq-dotnet-client-@VERSION@\bin\RabbitMQ.Client.dll' />
             </Component>
 
             <Directory Id='BinFolder' Name='bin'>
                 <Component Id='ClientLibraryBin' Guid='83A1DE00-CCB6-42C2-BD14-FBAEDDBC50E8'>
                     <CreateFolder />
-                    <File Id='RabbitMQClientDllBin' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' KeyPath='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.dll' />
-                    <File Id='RabbitMQClientDllXml' Name='RMQClnt.xml' LongName='RabbitMQ.Client.xml' Vital='yes' Source='..\tmp\unzip\rabbitmq-dotnet-client-@[email protected]\bin\RabbitMQ.Client.xml' />
-                    <Registry Id='RabbitMQAssemblyFolderReg' Action='createKeyAndRemoveKeyOnUninstall' Key='SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\RabbitMQ' Root='HKLM'>
+                    <File Id='RabbitMQClientDllBin' Name='RMQClnt.dll' LongName='RabbitMQ.Client.dll' Vital='yes' KeyPath='yes'
+                          Source='..\tmp\unzip\rabbitmq-dotnet-client-@VERSION@\bin\RabbitMQ.Client.dll' />
+                    <File Id='RabbitMQClientDllXml' Name='RMQClnt.xml' LongName='RabbitMQ.Client.xml' Vital='yes'
+                          Source='..\tmp\unzip\rabbitmq-dotnet-client-@VERSION@\bin\RabbitMQ.Client.xml' />
+                    <Registry Id='RabbitMQAssemblyFolderReg' Action='createKeyAndRemoveKeyOnUninstall'
+                              Key='SOFTWARE\Microsoft\.NETFramework\AssemblyFolders\RabbitMQ' Root='HKLM'>
                         <Registry Id='RabbitMQAssemblyFolderRegVal' Action='write' Type='string' Value='[BinFolder]' />
                     </Registry>
                 </Component>
@@ -31,13 +36,13 @@
             <Directory Id='ExamplesFolder' Name='examples'>
                 <Directory Id='BinExamplesFolder' Name='bin'>
                     <Component Id='ExampleBinaries' Guid='1C270D1C-CD79-49D8-9413-E6211F52B5A8'>
-@FILES ../tmp/unzip/rabbitmq-dotnet-client-@VERSION@-dotnet-2.0/bin -name *.exe
+@FILES ../tmp/unzip/rabbitmq-dotnet-client-@VERSION@/bin -name *.exe
                     </Component>
                 </Directory>
 
                 <Directory Id='SrcExamplesFolder' Name='src'>
                     <Component Id='ExampleSources' Guid='962896C3-D476-4C8E-B5F3-BE963D566A49'>
-@FILES ../tmp/unzip/rabbitmq-dotnet-client-@VERSION@-dotnet-2.0/projects/examples/client -name *.cs -not -name AssemblyInfo.cs
+@FILES ../tmp/unzip/rabbitmq-dotnet-client-@VERSION@/projects/examples/client -name *.cs -not -name AssemblyInfo.cs
                     </Component>
                 </Directory>