Merge branch 'rel-1.3.27.0' of https://github.com/Cimpress-MCP/TimberWinR into rel-2.0.0

TimberWinR/TimberWinR.csproj

@@ -96,7 +96,6 @@
     <Compile Include="Configuration.cs" />
     <Compile Include="ConfigurationErrors.cs" />
     <Compile Include="Diagnostics\Diagnostics.cs" />
-    <Compile Include="Diagnostics\IDiagnosable.cs" />
     <Compile Include="Filters\DateFilter.cs" />
     <Compile Include="Filters\FilterBase.cs" />
     <Compile Include="Filters\GrokFilter.cs" />

appveyor.yml

@@ -1,38 +1,14 @@
-version: build_number_{build}
-configuration: Release
-skip_tags: true
-init:
-- ps: "$v = [regex]::match($env:APPVEYOR_REPO_BRANCH,'release/(.*)').Groups[1].Value\nWrite-Host \"On branch $($env:APPVEYOR_REPO_BRANCH)\"\nIF($v) { \n   $env:VERSION_FROM_BRANCH = \"$($v).$($env:APPVEYOR_BUILD_NUMBER)\"\n} else {\n   $env:VERSION_FROM_BRANCH = \"0.0.0.$($env:APPVEYOR_BUILD_NUMBER)\"\n}\nWrite-Host \"Set version to $($env:VERSION_FROM_BRANCH)\""
+version: 1.2.{build}
+
+build:
+  verbosity: minimal
+
 assembly_info:
   patch: true
-  file: '**\AssemblyInfo.*'
-  assembly_version: $(VERSION_FROM_BRANCH)
-  assembly_file_version: $(VERSION_FROM_BRANCH)
-  assembly_informational_version: $(VERSION_FROM_BRANCH)
-before_build:
-- ps: >-
-    mkdir tools
+  file: AssemblyInfo.*
+  assembly_version: "1.2.{build}"
+  assembly_file_version: "{version}"
+  assembly_informational_version: "{version}"
 
-    NuGet.exe restore TimberWinR.sln
-build:
-  verbosity: normal
-after_build:
-- ps: >-
-    cat chocolateyInstall.ps1.template|%{$_-replace "\$\{version\}",$env:VERSION_FROM_BRANCH} > tools\chocolateyInstall.ps1
-
-    cat chocolateyUninstall.ps1.template|%{$_-replace "\$\{version\}",$env:VERSION_FROM_BRANCH} > tools\chocolateyUninstall.ps1
-
-    cat tools\chocolateyUninstall.ps1
-
-    cat timberwinr.nuspec.template|%{$_-replace "\$\{version\}",$env:VERSION_FROM_BRANCH} > timberwinr.nuspec
-
-    choco pack timberwinr.nuspec
 artifacts:
-- path: .\*.nupkg
-  name: NuGet
-- path: TimberWinR.ServiceHost\bin\*\*.dll
-  name: Dlls
-- path: TimberWinR.ServiceHost\bin\*\*.exe
-  name: Exes
-- path: TimberWix\bin\*\*.msi
-  name: MSI
+  - path: '**\*.msi'