Fix #18

Update to build and publish on git.
rnwood · Nov 29, 2017 · a005974 · a005974
1 parent d26a2c4
commit a005974
Show file tree

Hide file tree

Showing 62 changed files with 116 additions and 186 deletions.
diff --git a/..svnbridge/.svnbridge b/..svnbridge/.svnbridge
diff --git a/Installer/..svnbridge/.svnbridge b/Installer/..svnbridge/.svnbridge
diff --git a/Installer/Bitmaps/..svnbridge/bannrbmp.bmp b/Installer/Bitmaps/..svnbridge/bannrbmp.bmp
diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>setup</OutputName>
     <OutputType>Package</OutputType>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.5\Wix.targets</WixTargetsPath>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>

diff --git a/Installer/Product.wxs b/Installer/Product.wxs
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="smtp4dev 2.0.8" Language="1033" Version="2.0.9" Manufacturer="Robert Wood" UpgradeCode="542EEA02-7932-465A-B51C-79B20B6E26AF">
+  <Product Id="*" Name="smtp4dev 2.0.10" Language="1033" Version="2.0.10" Manufacturer="Robert Wood" UpgradeCode="542EEA02-7932-465A-B51C-79B20B6E26AF">
 
     <Package InstallerVersion="200" Compressed="yes" />
 
     <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
 
     <Upgrade Id="542EEA02-7932-465A-B51C-79B20B6E26AF">
-      <UpgradeVersion Minimum="1.0.0" Maximum="2.0.8" IncludeMaximum="yes" Property="THEUPGRADEVERSION"/>
+      <UpgradeVersion Minimum="1.0.0" Maximum="2.0.9" IncludeMaximum="yes" Property="THEUPGRADEVERSION"/>
     </Upgrade>
 
     <WixVariable Id="WixUILicenseRtf" Value="$(var.SolutionDir)license.rtf" />

diff --git a/Rnwood.AutoUpdate/..svnbridge/.svnbridge b/Rnwood.AutoUpdate/..svnbridge/.svnbridge
diff --git a/Rnwood.AutoUpdate/Properties/Resources.Designer.cs b/Rnwood.AutoUpdate/Properties/Resources.Designer.cs
diff --git a/Rnwood.AutoUpdate/Rnwood.AutoUpdate.csproj b/Rnwood.AutoUpdate/Rnwood.AutoUpdate.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,11 @@
     <AssemblyName>Rnwood.AutoUpdate</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Rnwood.Smtp4dev/..svnbridge/.svnbridge b/Rnwood.Smtp4dev/..svnbridge/.svnbridge
diff --git a/Rnwood.Smtp4dev/Properties/Resources.Designer.cs b/Rnwood.Smtp4dev/Properties/Resources.Designer.cs
diff --git a/Rnwood.Smtp4dev/Properties/Settings.Designer.cs b/Rnwood.Smtp4dev/Properties/Settings.Designer.cs
diff --git a/Rnwood.Smtp4dev/Properties/Settings.settings b/Rnwood.Smtp4dev/Properties/Settings.settings
@@ -81,7 +81,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="UpdateURL" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">https://smtp4dev.svn.codeplex.com/svn/trunk/releases.xml</Value>
+      <Value Profile="(Default)">https://www.rnwood.co.uk/smtp4dev-releases.xml</Value>
     </Setting>
     <Setting Name="EnableUpdateCheck" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>

diff --git a/Rnwood.Smtp4dev/Resources/..svnbridge/Icon1.ico b/Rnwood.Smtp4dev/Resources/..svnbridge/Icon1.ico
diff --git a/Rnwood.Smtp4dev/Resources/..svnbridge/Icon2.ico b/Rnwood.Smtp4dev/Resources/..svnbridge/Icon2.ico
diff --git a/Rnwood.Smtp4dev/Resources/..svnbridge/localhost.cer b/Rnwood.Smtp4dev/Resources/..svnbridge/localhost.cer
diff --git a/Rnwood.Smtp4dev/Resources/..svnbridge/root.cer b/Rnwood.Smtp4dev/Resources/..svnbridge/root.cer
diff --git a/Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj b/Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,6 +13,11 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>Resources\Icon1.ico</ApplicationIcon>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj.user b/Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj.user
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <StartArguments>
     </StartArguments>

diff --git a/Rnwood.Smtp4dev/app.config b/Rnwood.Smtp4dev/app.config
@@ -159,7 +159,7 @@
     <applicationSettings>
         <Rnwood.Smtp4dev.Properties.Settings>
             <setting name="UpdateURL" serializeAs="String">
-                <value>https://smtp4dev.svn.codeplex.com/svn/trunk/releases.xml</value>
+                <value>https://www.rnwood.co.uk/smtp4dev-releases.xml</value>
             </setting>
             <setting name="UpdateCheckIncludePrerelease" serializeAs="String">
                 <value>True</value>

diff --git a/Rnwood.SmtpServer.Tests/..svnbridge/.svnbridge b/Rnwood.SmtpServer.Tests/..svnbridge/.svnbridge
diff --git a/Rnwood.SmtpServer.Tests/Rnwood.SmtpServer.Tests.csproj b/Rnwood.SmtpServer.Tests/Rnwood.SmtpServer.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,8 +11,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Rnwood.SmtpServer.Tests</RootNamespace>
     <AssemblyName>Rnwood.SmtpServer.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,8 +37,18 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Gallio, Version=3.1.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL" />
-    <Reference Include="MbUnit, Version=3.1.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL" />
+    <Reference Include="Gallio, Version=3.4.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL">
+      <HintPath>..\packages\mbunit.3.4.14.0\lib\net40\Gallio.dll</HintPath>
+    </Reference>
+    <Reference Include="Gallio40, Version=3.4.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL">
+      <HintPath>..\packages\mbunit.3.4.14.0\lib\net40\Gallio40.dll</HintPath>
+    </Reference>
+    <Reference Include="MbUnit, Version=3.4.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL">
+      <HintPath>..\packages\mbunit.3.4.14.0\lib\net40\MbUnit.dll</HintPath>
+    </Reference>
+    <Reference Include="MbUnit40, Version=3.4.0.0, Culture=neutral, PublicKeyToken=eb9cfa67ee6ab36e, processorArchitecture=MSIL">
+      <HintPath>..\packages\mbunit.3.4.14.0\lib\net40\MbUnit40.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=3.1.416.3, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\Moq\Moq.dll</HintPath>
@@ -72,6 +87,9 @@
       <Name>Rnwood.SmtpServer</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\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.

diff --git a/Rnwood.SmtpServer.Tests/Verbs/HeloVerbTests.cs b/Rnwood.SmtpServer.Tests/Verbs/HeloVerbTests.cs
@@ -22,6 +22,18 @@ public void SayHelo()
             mocks.Session.VerifySet(s => s.ClientName, "foo.bar");
         }
 
+        [Test]
+        public void SayHelo_NoClientName()
+        {
+            Mocks mocks = new Mocks();
+
+            HeloVerb verb = new HeloVerb();
+            verb.Process(mocks.Connection.Object, new SmtpCommand("HELO"));
+
+            mocks.VerifyWriteResponse(StandardSmtpResponseCode.OK);
+            mocks.Session.VerifySet(s => s.ClientName, (string) null);
+        }
+
         [Test]
         public void SayHeloTwice_ReturnsError()
         {

diff --git a/Rnwood.SmtpServer/..svnbridge/.svnbridge b/Rnwood.SmtpServer/..svnbridge/.svnbridge
diff --git a/Rnwood.SmtpServer/Connection.cs b/Rnwood.SmtpServer/Connection.cs
@@ -211,7 +211,7 @@ public void Start()
                     }
                 }
             }
-            catch (IOException ioException)
+            catch (Exception ioException)
             {
                 Session.SessionError = ioException.Message;
             }

diff --git a/Rnwood.SmtpServer/Examples/..svnbridge/.svnbridge b/Rnwood.SmtpServer/Examples/..svnbridge/.svnbridge
diff --git a/Rnwood.SmtpServer/Examples/SimpleServer/..svnbridge/.svnbridge b/Rnwood.SmtpServer/Examples/SimpleServer/..svnbridge/.svnbridge