Delete appveyor.yml

* Build on Azure instead of Appveyor

* fixup! Update Nuget

* fixup! installer and tests

* fixup! automation tests mac/linux

* Fix .gitattributes

* Fix line endings

* Try to fix integration tests

* Install mediainfo

* Update sqlite3 binaries for windows and mac

* Update media info to 20.03 and fix test

* Fix HttpClientTests, Use Servarr HttpBin Mirror

* Update test script

* Add media info to tests

* Fix tests

* Ignore tests ignored on Aphrodite

* partial automation update

* Reveet mac mediaInfo upgrade

* fixup! automation tests

* Revert "Reveet mac mediaInfo upgrade"

This reverts commit b54a76446b.

* Don't run linux tests on mac

* Exclude test failing on mac

Co-authored-by: ta264 <ta264@users.noreply.github.com>

.circleci/Dockerfile

@@ -1,14 +0,0 @@
-FROM mono:5.18
-
-RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y git ssh tar gzip ca-certificates wget zip wine wine32 wine64 libwine libwine:i386
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -E -
-RUN apt-get install -y nodejs
-RUN wget https://mediaarea.net/repo/deb/repo-mediaarea_1.0-7_all.deb && dpkg -i repo-mediaarea_1.0-7_all.deb && apt-get update
-RUN apt-get install -y libmediainfo-dev libmediainfo0v5 mediainfo
-RUN npm i -g npm
-RUN apt-get install -y python3-pip && pip3 install gitchangelog pystache
-RUN curl -O https://dl.google.com/go/go1.10.2.linux-amd64.tar.gz && tar xvf go*.tar.gz && chown -R root:root ./go && mv go /usr/local
-ENV GOPATH=$HOME/work
-ENV PATH="${PATH}:/usr/local/go/bin:$GOPATH/bin"
-RUN go get github.com/aktau/github-release
-RUN npm install -g yarn

.circleci/config.yml

@@ -1,169 +0,0 @@
-version: 2
-
-defaults: &defaults
-  docker:
-    - image: gallileo/radarr-cci-primary:5.8.9
-  environment:
-      BUILD_VERSION: 0.2.0
-
-jobs:
-    build:
-        <<: *defaults
-        steps:
-            - restore_cache:
-                keys:
-                    - source-v1-{{ .Branch }}-{{ .Revision }}
-                    - source-v1-{{ .Branch }}-
-                    - source-v1-
-            - checkout
-            - run: git submodule update --init --recursive
-            - save_cache:
-                key: source-v1-{{ .Branch }}-{{ .Revision }}
-                paths:
-                    - ".git"
-            - run:
-                name: Patching Assembly Info
-                command: sed -i "s/AssemblyVersion(\".*\")/AssemblyVersion(\"$BUILD_VERSION.$CIRCLE_BUILD_NUM\")/gi" src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs && cat src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs
-            - run:
-                name: Clean Build
-                command: ./build.sh Clean
-            - run:
-                name: Restore Nuget
-                command: ./build.sh NugetMono
-            - run:
-                name: Build
-                command: ./build.sh Build
-            - restore_cache:
-                keys:
-                    - v1-npm-deps-{{ checksum "package.json" }}
-                    # Find the most recent cache used from any branch
-                    - v1-npm-deps-
-            - run:
-                name: Gulp
-                command: ./build.sh Gulp
-            - save_cache:
-                key: v1-npm-deps-{{ checksum "package.json" }}
-                paths:
-                    - "node_modules"
-            - run:
-                name: Package
-                command: ./build.sh Package
-            - run:
-                name: Preparing Tests
-                command: mkdir -p _tests/reports/junit && mkdir -p ../.config/Radarr && chmod -R 777 ../.config
-            - persist_to_workspace:
-                root: .
-                # Must be relative path from root
-                paths:
-                    - _output
-                    - _output_mono
-                    - _output_osx
-                    - _output_osx_app
-                    - _tests
-                    - setup
-                    - .circleci
-                    - deploy.sh
-    unit_tests:
-        <<: *defaults
-        steps:
-            - attach_workspace:
-                at: .
-            - run:
-                name: Preparing Tests
-                command: mkdir -p ../.config/Radarr && chmod -R 777 ../.config
-            - run:
-                name: Unit Tests
-                command: ./_tests/test.sh Linux Unit
-            - store_test_results:
-                path: _tests/reports/
-
-    integration_tests:
-        <<: *defaults
-        steps:
-            - attach_workspace:
-                at: .
-            - run:
-                name: Copy Binaries for Integration Tests
-                command: cp -R _output_mono/ _tests/bin
-            - run:
-                name: Preparing Tests
-                command: mkdir -p ../.config/Radarr && chmod -R 777 ../.config
-            - run:
-                name: Integration Tests
-                command: ./_tests/test.sh Linux Integration
-            - store_test_results:
-                path: _tests/reports/
-    publish_artifacts:
-        <<: *defaults
-        steps:
-            - attach_workspace:
-                at: .
-            - run:
-                name: "Creating packages"
-                command: |
-                    mkdir -p _packages/
-                    cp -r _output/ _packages/Radarr
-                    zip -r _packages/Radarr.${CIRCLE_BRANCH//\//-}.$BUILD_VERSION.$CIRCLE_BUILD_NUM.windows.zip _packages/Radarr
-                    rm -rf _packages/Radarr
-                    cp -r _output_mono/ _packages/Radarr
-                    tar -zcvf _packages/Radarr.${CIRCLE_BRANCH//\//-}.$BUILD_VERSION.$CIRCLE_BUILD_NUM.linux.tar.gz -C _packages Radarr
-                    rm -rf _packages/Radarr
-                    cp -r _output_osx/ _packages/Radarr
-                    tar -zcvf _packages/Radarr.${CIRCLE_BRANCH//\//-}.$BUILD_VERSION.$CIRCLE_BUILD_NUM.osx.tar.gz -C _packages Radarr
-                    rm -rf _packages/Radarr
-                    cd _output_osx_app/
-                    zip -r ../_packages/Radarr.${CIRCLE_BRANCH//\//-}.$BUILD_VERSION.$CIRCLE_BUILD_NUM.osx-app.zip *
-            - run:
-                name: "Creating Installer"
-                command: wine setup/inno/ISCC.exe setup/nzbdrone.iss && cp -r setup/Output/Radarr* _packages/
-            - store_artifacts:
-                path: _packages
-                destination: artifacts
-            #- run:
-            #    name: "Deploying"
-            #    command: chmod +x deploy.sh && ./deploy.sh
-            - persist_to_workspace:
-                root: .
-                # Must be relative path from root
-                paths:
-                    - _packages
-    deploy:
-        <<: *defaults
-        steps:
-            - attach_workspace:
-                at: .
-            - restore_cache:
-                keys:
-                    - source-v1-{{ .Branch }}-{{ .Revision }}
-                    - source-v1-{{ .Branch }}-
-                    - source-v1-
-            - checkout
-            - run:
-                name: Creating Release
-                command: export LC_ALL=C.UTF-8 && export changelog=$(GITCHANGELOG_CONFIG_FILENAME=.gitchangelog.rc.release gitchangelog) && echo "Deploying v$BUILD_VERSION.$CIRCLE_BUILD_NUM to Github, with changelog:\n\n$changelog" && github-release release -u Radarr -r Radarr -t "v$BUILD_VERSION" -p --draft -d "$changelog" -n "Pre-Release v$BUILD_VERSION"
-            - run:
-                name: Uploading Assets
-                command: cd _packages && ls Radarr.*.* | xargs -n1 -P0 -I{} -- github-release upload -u Radarr -r Radarr -t "v$BUILD_VERSION.$CIRCLE_BUILD_NUM" --name {} --file {}
-
-workflows:
-    version: 2
-
-    build_and_test:
-        jobs:
-            - build
-            - unit_tests:
-                requires:
-                    - build
-            #- integration_tests:
-            #    requires:
-            #        - build
-            - publish_artifacts:
-                requires:
-                    - build
-            #- request_deploy:
-            #    type: approval
-            #    requires:
-            #        - publish_artifacts
-            #- deploy:
-            #    requires:
-            #        - request_deploy

.circleci/nunit3-junit.xslt

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" indent="yes"/>
-
-  <xsl:template match="/test-run">
-    <testsuites tests="{@testcasecount}" failures="{@failed}" disabled="{@skipped}" time="{@duration}">
-      <xsl:apply-templates/>
-    </testsuites>
-  </xsl:template>
-
-  <xsl:template match="test-suite">
-    <xsl:if test="test-case">
-      <testsuite tests="{@testcasecount}" time="{@duration}" errors="{@testcasecount - @passed - @skipped - @failed}" failures="{@failed}" skipped="{@skipped}" timestamp="{@start-time}">
-        <xsl:attribute name="name">
-          <xsl:for-each select="ancestor-or-self::test-suite/@name">
-            <xsl:value-of select="concat(., '.')"/>
-          </xsl:for-each>
-        </xsl:attribute>
-        <xsl:apply-templates select="test-case"/>
-      </testsuite>
-      <xsl:apply-templates select="test-suite"/>
-    </xsl:if>
-    <xsl:if test="not(test-case)">
-      <xsl:apply-templates/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="test-case">
-    <testcase name="{@name}" assertions="{@asserts}" time="{@duration}" status="{@result}" classname="{@classname}">
-      <xsl:if test="@runstate = 'Skipped' or @runstate = 'Ignored'">
-        <skipped/>
-      </xsl:if>
-      
-      <xsl:apply-templates/>
-    </testcase>
-  </xsl:template>
-
-  <xsl:template match="command-line"/>
-  <xsl:template match="settings"/>
-
-  <xsl:template match="output">
-    <system-out>
-      <xsl:value-of select="."/>
-    </system-out>
-  </xsl:template>
-
-  <xsl:template match="stack-trace">
-  </xsl:template>
-
-  <xsl:template match="test-case/failure">
-    <failure message="{./message}">
-      <xsl:value-of select="./stack-trace"/>
-    </failure>
-  </xsl:template>
-
-  <xsl:template match="test-suite/failure"/>
-
-  <xsl:template match="test-case/reason">
-    <skipped message="{./message}"/>
-  </xsl:template>
-  
-  <xsl:template match="test-case/assertions">
-  </xsl:template>
-
-  <xsl:template match="test-suite/reason"/>
-
-  <xsl:template match="properties"/>
-</xsl:stylesheet>
-

.gitattributes

@@ -1,5 +1,9 @@
 # Auto detect text files and perform LF normalization
-*text eol=lf
+* text=auto
+
+# Explicitly set bash scripts to have unix endings
+*.sh text eol=lf
+macOS/Radarr text eol=lf
 
 # Custom for Visual Studio
 *.cs     diff=csharp

.gitchangelog.rc

@@ -1,305 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-##
-## Format
-##
-##   ACTION: [AUDIENCE:] COMMIT_MSG [!TAG ...]
-##
-## Description
-##
-##   ACTION is one of 'chg', 'fix', 'new'
-##
-##       Is WHAT the change is about.
-##
-##       'chg' is for refactor, small improvement, cosmetic changes...
-##       'fix' is for bug fixes
-##       'new' is for new features, big improvement
-##
-##   AUDIENCE is optional and one of 'dev', 'usr', 'pkg', 'test', 'doc'
-##
-##       Is WHO is concerned by the change.
-##
-##       'dev'  is for developpers (API changes, refactors...)
-##       'usr'  is for final users (UI changes)
-##       'pkg'  is for packagers   (packaging changes)
-##       'test' is for testers     (test only related changes)
-##       'doc'  is for doc guys    (doc only changes)
-##
-##   COMMIT_MSG is ... well ... the commit message itself.
-##
-##   TAGs are additionnal adjective as 'refactor' 'minor' 'cosmetic'
-##
-##       They are preceded with a '!' or a '@' (prefer the former, as the
-##       latter is wrongly interpreted in github.) Commonly used tags are:
-##
-##       'refactor' is obviously for refactoring code only
-##       'minor' is for a very meaningless change (a typo, adding a comment)
-##       'cosmetic' is for cosmetic driven change (re-indentation, 80-col...)
-##       'wip' is for partial functionality but complete subfunctionality.
-##
-## Example:
-##
-##   new: usr: support of bazaar implemented
-##   chg: re-indentend some lines !cosmetic
-##   new: dev: updated code to be compatible with last version of killer lib.
-##   fix: pkg: updated year of licence coverage.
-##   new: test: added a bunch of test around user usability of feature X.
-##   fix: typo in spelling my name in comment. !minor
-##
-##   Please note that multi-line commit message are supported, and only the
-##   first line will be considered as the "summary" of the commit message. So
-##   tags, and other rules only applies to the summary.  The body of the commit
-##   message will be displayed in the changelog without reformatting.
-
-
-##
-## ``ignore_regexps`` is a line of regexps
-##
-## Any commit having its full commit message matching any regexp listed here
-## will be ignored and won't be reported in the changelog.
-##
-ignore_regexps = [
-    r'@minor', r'!minor',
-    r'@cosmetic', r'!cosmetic',
-    r'@refactor', r'!refactor',
-    r'@wip', r'!wip',
-    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[p|P]kg:',
-    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[d|D]ev:',
-    r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
-    r'^$',  ## ignore commits with empty messages
-]
-
-
-## ``section_regexps`` is a list of 2-tuples associating a string label and a
-## list of regexp
-##
-## Commit messages will be classified in sections thanks to this. Section
-## titles are the label, and a commit is classified under this section if any
-## of the regexps associated is matching.
-##
-## Please note that ``section_regexps`` will only classify commits and won't
-## make any changes to the contents. So you'll probably want to go check
-## ``subject_process`` (or ``body_process``) to do some changes to the subject,
-## whenever you are tweaking this variable.
-##
-section_regexps = [
-    ('**New features**', [
-        r'^[aA]dded?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?(.*)$',
-        r'^[uU]pdated?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
-        r'^[cC]hanged?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
-        r'^[nN]ew?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
-     ]),
-    ('**Fixes**', [
-        r'^(?![mM]erge\s*)'
-    ]
-    ),
-
-]
-
-
-## ``body_process`` is a callable
-##
-## This callable will be given the original body and result will
-## be used in the changelog.
-##
-## Available constructs are:
-##
-##   - any python callable that take one txt argument and return txt argument.
-##
-##   - ReSub(pattern, replacement): will apply regexp substitution.
-##
-##   - Indent(chars="  "): will indent the text with the prefix
-##     Please remember that template engines gets also to modify the text and
-##     will usually indent themselves the text if needed.
-##
-##   - Wrap(regexp=r"\n\n"): re-wrap text in separate paragraph to fill 80-Columns
-##
-##   - noop: do nothing
-##
-##   - ucfirst: ensure the first letter is uppercase.
-##     (usually used in the ``subject_process`` pipeline)
-##
-##   - final_dot: ensure text finishes with a dot
-##     (usually used in the ``subject_process`` pipeline)
-##
-##   - strip: remove any spaces before or after the content of the string
-##
-##   - SetIfEmpty(msg="No commit message."): will set the text to
-##     whatever given ``msg`` if the current text is empty.
-##
-## Additionally, you can `pipe` the provided filters, for instance:
-#body_process = Wrap(regexp=r'\n(?=\w+\s*:)') | Indent(chars="  ")
-#body_process = Wrap(regexp=r'\n(?=\w+\s*:)')
-#body_process = noop
-body_process = ReSub(r'((^|\n)[A-Z]\w+(-\w+)*: .*(\n\s+.*)*)+$', r'') | strip
-
-
-## ``subject_process`` is a callable
-##
-## This callable will be given the original subject and result will
-## be used in the changelog.
-## subject_process = (strip |
-##    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'![New](https://img.shields.io/badge/-- -New-brightgreen.svg?style=flat-square) \4') |
-##    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'![Changed](https://img.shields.io/badge/-- -Changed-orange.svg?style=flat-square) \4') |
-##    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'![Fixed](https://img.shields.io/badge/-- -Fixed-red.svg?style=flat-square) \4') |
-##    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'![Updated](https://img.shields.io/badge/-- -Updated-blue.svg?style=flat-square) \4') |
-##    ReSub(r'#(\d{3,4})', r'[#\1](https://github.com/Radarr/Radarr/issues/\1)') |
-##    SetIfEmpty("No commit message.") | ucfirst | final_dot)
-
-## Available constructs are those listed in ``body_process`` doc.
-subject_process = (strip |
-    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'![New](https://img.shields.io/badge/--%20-New-brightgreen.svg?style=flat-square) \4') |
-    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'![Changed](https://img.shields.io/badge/--%20-Changed-orange.svg?style=flat-square) \4') |
-    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'![Fixed](https://img.shields.io/badge/--%20-Fixed-red.svg?style=flat-square) \4') |
-    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'![Updated](https://img.shields.io/badge/--%20-Updated-blue.svg?style=flat-square) \4') |
-    ReSub(r'#(\d{3,4})', r'[#\1](https://github.com/Radarr/Radarr/issues/\1)') |
-    SetIfEmpty("No commit message.") | ucfirst | final_dot)
-
-
-## ``tag_filter_regexp`` is a regexp
-##
-## Tags that will be used for the changelog must match this regexp.
-##
-tag_filter_regexp = r'^v[0]+\.[2-9]+\.[0-9]+\.[0-9]{3,4}$'
-
-
-## ``unreleased_version_label`` is a string or a callable that outputs a string
-##
-## This label will be used as the changelog Title of the last set of changes
-## between last valid tag and HEAD if any.
-unreleased_version_label = "(unreleased)"
-
-
-## ``output_engine`` is a callable
-##
-## This will change the output format of the generated changelog file
-##
-## Available choices are:
-##
-##   - rest_py
-##
-##        Legacy pure python engine, outputs ReSTructured text.
-##        This is the default.
-##
-##   - mustache(<template_name>)
-##
-##        Template name could be any of the available templates in
-##        ``templates/mustache/*.tpl``.
-##        Requires python package ``pystache``.
-##        Examples:
-##           - mustache("markdown")
-##           - mustache("restructuredtext")
-##
-##   - makotemplate(<template_name>)
-##
-##        Template name could be any of the available templates in
-##        ``templates/mako/*.tpl``.
-##        Requires python package ``mako``.
-##        Examples:
-##           - makotemplate("restructuredtext")
-##
-#output_engine = rest_py
-#output_engine = mustache("restructuredtext")
-output_engine = mustache("changelog.tpl")
-#output_engine = makotemplate("restructuredtext")
-
-
-## ``include_merge`` is a boolean
-##
-## This option tells git-log whether to include merge commits in the log.
-## The default is to include them.
-include_merge = False
-
-
-## ``log_encoding`` is a string identifier
-##
-## This option tells gitchangelog what encoding is outputed by ``git log``.
-## The default is to be clever about it: it checks ``git config`` for
-## ``i18n.logOutputEncoding``, and if not found will default to git's own
-## default: ``utf-8``.
-#log_encoding = 'utf-8'
-
-
-## ``publish`` is a callable
-##
-## Sets what ``gitchangelog`` should do with the output generated by
-## the output engine. ``publish`` is a callable taking one argument
-## that is an interator on lines from the output engine.
-##
-## Some helper callable are provided:
-##
-## Available choices are:
-##
-##   - stdout
-##
-##        Outputs directly to standard output
-##        (This is the default)
-##
-##   - FileInsertAtFirstRegexMatch(file, pattern, idx=lamda m: m.start())
-##
-##        Creates a callable that will parse given file for the given
-##        regex pattern and will insert the output in the file.
-##        ``idx`` is a callable that receive the matching object and
-##        must return a integer index point where to insert the
-##        the output in the file. Default is to return the position of
-##        the start of the matched string.
-##
-##   - FileRegexSubst(file, pattern, replace, flags)
-##
-##        Apply a replace inplace in the given file. Your regex pattern must
-##        take care of everything and might be more complex. Check the README
-##        for a complete copy-pastable example.
-##
-# publish = FileInsertIntoFirstRegexMatch(
-#     "CHANGELOG.rst",
-#     r'/(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n/',
-#     idx=lambda m: m.start(1)
-# )
-#publish = stdout
-
-def write_to_file(content):
-  with open("CHANGELOG.md", "w+") as f:
-    for chunk in content:
-      f.write(chunk)
-
-publish = write_to_file
-
-
-## ``revs`` is a list of callable or a list of string
-##
-## callable will be called to resolve as strings and allow dynamical
-## computation of these. The result will be used as revisions for
-## gitchangelog (as if directly stated on the command line). This allows
-## to filter exaclty which commits will be read by gitchangelog.
-##
-## To get a full documentation on the format of these strings, please
-## refer to the ``git rev-list`` arguments. There are many examples.
-##
-## Using callables is especially useful, for instance, if you
-## are using gitchangelog to generate incrementally your changelog.
-##
-## Some helpers are provided, you can use them::
-##
-##   - FileFirstRegexMatch(file, pattern): will return a callable that will
-##     return the first string match for the given pattern in the given file.
-##     If you use named sub-patterns in your regex pattern, it'll output only
-##     the string matching the regex pattern named "rev".
-##
-##   - Caret(rev): will return the rev prefixed by a "^", which is a
-##     way to remove the given revision and all its ancestor.
-##
-## Please note that if you provide a rev-list on the command line, it'll
-## replace this value (which will then be ignored).
-##
-## If empty, then ``gitchangelog`` will act as it had to generate a full
-## changelog.
-##
-## The default is to use all commits to make the changelog.
-#revs = ["^1.0.3", ]
-#revs = [
-#    Caret(
-#        FileFirstRegexMatch(
-#            "CHANGELOG.rst",
-#            r"(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n")),
-#    "HEAD"
-#]
-revs = ["v0.2.0.134..."]

.gitchangelog.rc.release

@@ -1,311 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-##
-## Format
-##
-##   ACTION: [AUDIENCE:] COMMIT_MSG [!TAG ...]
-##
-## Description
-##
-##   ACTION is one of 'chg', 'fix', 'new'
-##
-##       Is WHAT the change is about.
-##
-##       'chg' is for refactor, small improvement, cosmetic changes...
-##       'fix' is for bug fixes
-##       'new' is for new features, big improvement
-##
-##   AUDIENCE is optional and one of 'dev', 'usr', 'pkg', 'test', 'doc'
-##
-##       Is WHO is concerned by the change.
-##
-##       'dev'  is for developpers (API changes, refactors...)
-##       'usr'  is for final users (UI changes)
-##       'pkg'  is for packagers   (packaging changes)
-##       'test' is for testers     (test only related changes)
-##       'doc'  is for doc guys    (doc only changes)
-##
-##   COMMIT_MSG is ... well ... the commit message itself.
-##
-##   TAGs are additionnal adjective as 'refactor' 'minor' 'cosmetic'
-##
-##       They are preceded with a '!' or a '@' (prefer the former, as the
-##       latter is wrongly interpreted in github.) Commonly used tags are:
-##
-##       'refactor' is obviously for refactoring code only
-##       'minor' is for a very meaningless change (a typo, adding a comment)
-##       'cosmetic' is for cosmetic driven change (re-indentation, 80-col...)
-##       'wip' is for partial functionality but complete subfunctionality.
-##
-## Example:
-##
-##   new: usr: support of bazaar implemented
-##   chg: re-indentend some lines !cosmetic
-##   new: dev: updated code to be compatible with last version of killer lib.
-##   fix: pkg: updated year of licence coverage.
-##   new: test: added a bunch of test around user usability of feature X.
-##   fix: typo in spelling my name in comment. !minor
-##
-##   Please note that multi-line commit message are supported, and only the
-##   first line will be considered as the "summary" of the commit message. So
-##   tags, and other rules only applies to the summary.  The body of the commit
-##   message will be displayed in the changelog without reformatting.
-
-
-##
-## ``ignore_regexps`` is a line of regexps
-##
-## Any commit having its full commit message matching any regexp listed here
-## will be ignored and won't be reported in the changelog.
-##
-ignore_regexps = [
-    r'@minor', r'!minor',
-    r'@cosmetic', r'!cosmetic',
-    r'@refactor', r'!refactor',
-    r'@wip', r'!wip',
-    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[p|P]kg:',
-    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[d|D]ev:',
-    r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
-    r'^$',  ## ignore commits with empty messages
-]
-
-
-## ``section_regexps`` is a list of 2-tuples associating a string label and a
-## list of regexp
-##
-## Commit messages will be classified in sections thanks to this. Section
-## titles are the label, and a commit is classified under this section if any
-## of the regexps associated is matching.
-##
-## Please note that ``section_regexps`` will only classify commits and won't
-## make any changes to the contents. So you'll probably want to go check
-## ``subject_process`` (or ``body_process``) to do some changes to the subject,
-## whenever you are tweaking this variable.
-##
-section_regexps = [
-    ('**New features:**', [
-        r'^[aA]dded?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
-        r'^[uU]pdated?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
-        r'^[cC]hanged?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
-        r'^[nN]ew?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
-     ]),
-    ('**Fixes:**', [
-        r'^(?![mM]erge\s*)'
-    ]
-    ),
-
-]
-
-
-## ``body_process`` is a callable
-##
-## This callable will be given the original body and result will
-## be used in the changelog.
-##
-## Available constructs are:
-##
-##   - any python callable that take one txt argument and return txt argument.
-##
-##   - ReSub(pattern, replacement): will apply regexp substitution.
-##
-##   - Indent(chars="  "): will indent the text with the prefix
-##     Please remember that template engines gets also to modify the text and
-##     will usually indent themselves the text if needed.
-##
-##   - Wrap(regexp=r"\n\n"): re-wrap text in separate paragraph to fill 80-Columns
-##
-##   - noop: do nothing
-##
-##   - ucfirst: ensure the first letter is uppercase.
-##     (usually used in the ``subject_process`` pipeline)
-##
-##   - final_dot: ensure text finishes with a dot
-##     (usually used in the ``subject_process`` pipeline)
-##
-##   - strip: remove any spaces before or after the content of the string
-##
-##   - SetIfEmpty(msg="No commit message."): will set the text to
-##     whatever given ``msg`` if the current text is empty.
-##
-## Additionally, you can `pipe` the provided filters, for instance:
-#body_process = Wrap(regexp=r'\n(?=\w+\s*:)') | Indent(chars="  ")
-#body_process = Wrap(regexp=r'\n(?=\w+\s*:)')
-#body_process = noop
-body_process = ReSub(r'((^|\n)[A-Z]\w+(-\w+)*: .*(\n\s+.*)*)+$', r'') | strip
-
-
-## ``subject_process`` is a callable
-##
-## This callable will be given the original subject and result will
-## be used in the changelog.
-## subject_process = (strip |
-##    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'![New](https://img.shields.io/badge/-- -New-brightgreen.svg?style=flat-square) \4') |
-##    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'![Changed](https://img.shields.io/badge/-- -Changed-orange.svg?style=flat-square) \4') |
-##    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'![Fixed](https://img.shields.io/badge/-- -Fixed-red.svg?style=flat-square) \4') |
-##    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'![Updated](https://img.shields.io/badge/-- -Updated-blue.svg?style=flat-square) \4') |
-##    ReSub(r'#(\d{3,4})', r'[#\1](https://github.com/Radarr/Radarr/issues/\1)') |
-##    SetIfEmpty("No commit message.") | ucfirst | final_dot)
-
-## Available constructs are those listed in ``body_process`` doc.
-subject_process = (strip |
-    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'\4') |
-    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'\4') |
-    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'\4') |
-    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'\4') |
-    ReSub(r'#(\d{3,4})', r'Issue #\1') |
-    SetIfEmpty("No commit message.") | ucfirst | final_dot)
-
-
-## ``tag_filter_regexp`` is a regexp
-##
-## Tags that will be used for the changelog must match this regexp.
-##
-tag_filter_regexp = r'^v[0]+\.[2-9]+\.[0-9]+\.[0-9]+$'
-
-
-## ``unreleased_version_label`` is a string or a callable that outputs a string
-##
-## This label will be used as the changelog Title of the last set of changes
-## between last valid tag and HEAD if any.
-unreleased_version_label = "(unreleased)"
-
-
-## ``output_engine`` is a callable
-##
-## This will change the output format of the generated changelog file
-##
-## Available choices are:
-##
-##   - rest_py
-##
-##        Legacy pure python engine, outputs ReSTructured text.
-##        This is the default.
-##
-##   - mustache(<template_name>)
-##
-##        Template name could be any of the available templates in
-##        ``templates/mustache/*.tpl``.
-##        Requires python package ``pystache``.
-##        Examples:
-##           - mustache("markdown")
-##           - mustache("restructuredtext")
-##
-##   - makotemplate(<template_name>)
-##
-##        Template name could be any of the available templates in
-##        ``templates/mako/*.tpl``.
-##        Requires python package ``mako``.
-##        Examples:
-##           - makotemplate("restructuredtext")
-##
-#output_engine = rest_py
-#output_engine = mustache("restructuredtext")
-output_engine = mustache("changelog_release.tpl")
-#output_engine = makotemplate("restructuredtext")
-
-
-## ``include_merge`` is a boolean
-##
-## This option tells git-log whether to include merge commits in the log.
-## The default is to include them.
-include_merge = False
-
-
-## ``log_encoding`` is a string identifier
-##
-## This option tells gitchangelog what encoding is outputed by ``git log``.
-## The default is to be clever about it: it checks ``git config`` for
-## ``i18n.logOutputEncoding``, and if not found will default to git's own
-## default: ``utf-8``.
-#log_encoding = 'utf-8'
-
-
-## ``publish`` is a callable
-##
-## Sets what ``gitchangelog`` should do with the output generated by
-## the output engine. ``publish`` is a callable taking one argument
-## that is an interator on lines from the output engine.
-##
-## Some helper callable are provided:
-##
-## Available choices are:
-##
-##   - stdout
-##
-##        Outputs directly to standard output
-##        (This is the default)
-##
-##   - FileInsertAtFirstRegexMatch(file, pattern, idx=lamda m: m.start())
-##
-##        Creates a callable that will parse given file for the given
-##        regex pattern and will insert the output in the file.
-##        ``idx`` is a callable that receive the matching object and
-##        must return a integer index point where to insert the
-##        the output in the file. Default is to return the position of
-##        the start of the matched string.
-##
-##   - FileRegexSubst(file, pattern, replace, flags)
-##
-##        Apply a replace inplace in the given file. Your regex pattern must
-##        take care of everything and might be more complex. Check the README
-##        for a complete copy-pastable example.
-##
-# publish = FileInsertIntoFirstRegexMatch(
-#     "CHANGELOG.rst",
-#     r'/(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n/',
-#     idx=lambda m: m.start(1)
-# )
-publish = stdout
-
-#def write_to_file(content):
-#  with open("CHANGELOG.md", "w+") as f:
-#    for chunk in content:
-#      f.write(chunk)
-
-#publish = write_to_file
-
-
-## ``revs`` is a list of callable or a list of string
-##
-## callable will be called to resolve as strings and allow dynamical
-## computation of these. The result will be used as revisions for
-## gitchangelog (as if directly stated on the command line). This allows
-## to filter exaclty which commits will be read by gitchangelog.
-##
-## To get a full documentation on the format of these strings, please
-## refer to the ``git rev-list`` arguments. There are many examples.
-##
-## Using callables is especially useful, for instance, if you
-## are using gitchangelog to generate incrementally your changelog.
-##
-## Some helpers are provided, you can use them::
-##
-##   - FileFirstRegexMatch(file, pattern): will return a callable that will
-##     return the first string match for the given pattern in the given file.
-##     If you use named sub-patterns in your regex pattern, it'll output only
-##     the string matching the regex pattern named "rev".
-##
-##   - Caret(rev): will return the rev prefixed by a "^", which is a
-##     way to remove the given revision and all its ancestor.
-##
-## Please note that if you provide a rev-list on the command line, it'll
-## replace this value (which will then be ignored).
-##
-## If empty, then ``gitchangelog`` will act as it had to generate a full
-## changelog.
-##
-## The default is to use all commits to make the changelog.
-#revs = ["^1.0.3", ]
-#revs = [
-#    Caret(
-#        FileFirstRegexMatch(
-#            "CHANGELOG.rst",
-#            r"(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n")),
-#    "HEAD"
-#]
-# Gets the latest annoted tag and uses that as a base for new changes.
-
-import subprocess
-
-proc = subprocess.Popen(["git", "describe", "--abbrev=0", "--tags"], stdout=subprocess.PIPE)
-out = str(proc.communicate()[0].strip(), "utf-8")
-revs = [out+"..."]

.gitignore

@@ -11,6 +11,7 @@ src/**/[Oo]bj/
 *.user
 *.sln.docstates
 .vs/
+.vscode/
 
 # Build results
 *_i.c
@@ -45,6 +46,10 @@ _dotCover*
 # DevExpress CodeRush
 src/.cr/
 
+# Emacs
+*~
+\#*\#
+
 # NCrunch
 *.ncrunch*
 .*crunch*.local.xml
@@ -80,7 +85,6 @@ TestResults
 [Tt]est[Rr]esult*
 *.Cache
 ClientBin
-[Ss]tyle[Cc]op.*
 ~$*
 *.dbmdl
 Generated_Code #added for RIA/Silverlight projects
@@ -102,40 +106,44 @@ _NCrunch_*
 _TeamCity*
 
 # Radarr
-Backups/
-logs/
-#MediaCover/
-UpdateLogs/
-xdg/
 config.xml
-logs.db*
-nzbdrone.db*
-nzbdrone.pid
+nzbdrone.log*txt
+UpdateLogs/
 *workspace.xml
 *.test-cache
 *.userprefs
 */test-results/*
 src/UI/.idea/*
+*log.txt
 node_modules/
 _output*
+_artifacts
 _rawPackage/
 _dotTrace*
 _tests/
 *.Result.xml
+coverage*.xml
+coverage*.json
 setup/Output/
 *.~is
 
-UI.Phantom/
-
 # VS outout folders
 bin
 obj
 output/*
 
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
 # Packages
 Radarr_*/
 Radarr_*.zip
 Radarr_*.gz
+gecko.zip
+geckodriver.exe
 
 # macOS metadata files
 ._*
@@ -163,6 +171,8 @@ packages.config.md5sum
 **/.idea/**/tasks.xml
 **/.idea/shelf/*
 **/.idea/dictionaries
+**/.idea/.idea.Radarr.Posix
+**/.idea/.idea.Radarr.Windows
 
 # Sensitive or high-churn files
 **/.idea/**/dataSources/

.travis.yml

@@ -1,16 +0,0 @@
-language: csharp
-solution: src/NzbDrone.sln
-addons:
-  apt:
-    packages:
-      - nodejs
-#      - npm apparently not needed anymore.
-script:
-  - ./build.sh
-  - chmod +x test.sh
-#  - ./test.sh Linux Unit Takes far too long, maybe even crashes travis :/
-after_success:
-  - chmod +x package.sh
-  - ./package.sh
-notifications:
-  - webhooks: https://discordapp.com/api/webhooks/266910310219251712/V-QvCcnYkg3O8PMevcAJOJyCgrYkZQoF2pupLDGbaISNUECmYPd6LRwl3avKHsPyfgWP

appveyor.yml

@@ -1,59 +0,0 @@
-version: '0.2.0.{build}'
-
-image: Visual Studio 2017
-
-assembly_info:
-  patch: true
-  file: 'src\NzbDrone.Common\Properties\SharedAssemblyInfo.cs'
-  assembly_version: '{version}'
-  assembly_file_version: '{version}'
-  assembly_informational_version: '{version}-rc1'
-
-environment:
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-
-install:
-  - git submodule update --init --recursive
-  
-#init:
-#  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
-build_script:
-  - ps: ./build-appveyor.ps1
-
-test: off
-#test:
-#  assemblies:
-#    - '_tests\*Test.dll'
-#  categories:
-#    except:
-#      - IntegrationTest
-#      - AutomationTest
-
-artifacts:
-  - path: '_artifacts\*.zip'
-  - path: '_artifacts\*.exe'
-  - path: '_artifacts\*.tar.gz'
-
-cache:
-  - '%USERPROFILE%\.nuget\packages'
-  - node_modules -> package.json
-  
-pull_requests:
-  do_not_increment_build_number: true
-
-on_failure:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-  - ps: Get-ChildItem .\_artifacts\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-  - ps: Get-ChildItem .\_artifacts\*.exe | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-  - ps: Get-ChildItem .\_artifacts\*.tar.gz | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-
-only_commits:
-  files:
-    - src/
-    - osx/
-    - gulp/
-    - logo/
-    - setup/
-    - appveyor.yml
-    - build-appveyor.cake

azure-pipelines.yml

@@ -0,0 +1,431 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+variables:
+  outputFolder: './_output'
+  artifactsFolder: './_artifacts'
+  testsFolder: './_tests'
+  majorVersion: '0.2.0'
+  minorVersion: $[counter('minorVersionOld', 1510)]
+  radarrVersion: '$(majorVersion).$(minorVersion)'
+  buildName: '$(Build.SourceBranchName).$(radarrVersion)'
+  windowsInstaller: 'Radarr.$(buildName).windows-installer.exe'
+  windowsZip: 'Radarr.$(buildName).windows.zip'
+  macOsApp: 'Radarr.$(buildName).osx-app.zip'
+  macOsTar: 'Radarr.$(buildName).osx.tar.gz'
+  linuxTar: 'Radarr.$(buildName).linux.tar.gz'
+
+trigger:
+  branches:
+    include:
+    - develop
+    - aphrodite
+
+pr:
+- develop
+- aphrodite
+
+stages:
+  - stage: Build_Backend
+    displayName: Build Backend
+
+    jobs:
+    - job: Backend
+      strategy:
+        matrix:
+          Linux:
+            osName: 'Linux'
+            imageName: 'ubuntu-18.04'
+          Mac:
+            osName: 'Mac'
+            imageName: 'macos-10.14'
+          Windows:
+            osName: 'Windows'
+            imageName: 'windows-2019'
+
+      pool:
+        vmImage: $(imageName)
+      steps:
+      # Set the build name properly.  The 'name' property won't recursively expand so hack here:
+      - powershell: Write-Host "##vso[build.updatebuildnumber]$($env:RADARRVERSION)"
+        displayName: Set Build Name
+      - checkout: self
+        submodules: true
+        fetchDepth: 1
+      - task: Assembly-Info-NetFramework@2
+        displayName: Patch AssemblyInfo
+        inputs:
+          Path: '$(Build.SourcesDirectory)'
+          FileNames: 'src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs'
+          InsertAttributes: false
+          FileEncoding: 'auto'
+          WriteBOM: false
+          Configuration: 'debug'
+          VersionNumber: '$(radarrVersion)'
+          FileVersionNumber: '$(radarrVersion)'
+          InformationalVersion: '$(radarrVersion)-rc1'
+      - bash: ./build.sh --only-backend
+        displayName: Build Radarr Backend
+      - publish: $(outputFolder)
+        artifact: '$(osName)Backend'
+        displayName: Publish Backend
+        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+      - publish: $(testsFolder)
+        artifact: '$(osName)Tests'
+        displayName: Publish Test Package
+        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+
+  - stage: Build_Frontend
+    displayName: Build Frontend
+    dependsOn: []
+
+    jobs:
+    - job: Frontend
+      strategy:
+        matrix:
+          Linux:
+            osName: 'Linux'
+            imageName: 'ubuntu-18.04'
+          Mac:
+            osName: 'Mac'
+            imageName: 'macos-10.14'
+          Windows:
+            osName: 'Windows'
+            imageName: 'windows-2019'
+      pool:
+        vmImage: $(imageName)
+      steps:
+      - task: NodeTool@0
+        displayName: Set Node.js version
+        inputs:
+          versionSpec: '10.x'
+      - checkout: self
+        submodules: true
+        fetchDepth: 1
+      - bash: ./build.sh --only-frontend
+        displayName: Build Radarr Frontend
+        env:
+          FORCE_COLOR: 0
+      - publish: $(outputFolder)
+        artifact: '$(osName)Frontend'
+        displayName: Publish Frontend
+        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+
+  - stage: Package
+    dependsOn:
+    - Build_Backend
+    - Build_Frontend
+    jobs:
+    - job: Windows_Installer
+      displayName: Create Installer
+      pool:
+        vmImage: 'windows-2019'
+      steps:
+      - checkout: self
+        fetchDepth: 1
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          buildType: 'current'
+          artifactName: WindowsBackend
+          targetPath: _output
+        displayName: Fetch Backend
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          buildType: 'current'
+          artifactName: WindowsFrontend
+          targetPath: _output
+        displayName: Fetch Frontend
+      - bash: ./build.sh --only-packages
+        displayName: Create Packages
+      - bash: |
+          ./setup/inno/ISCC.exe "./setup/radarr.iss"
+          cp ./setup/output/Radarr.*windows.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/${WINDOWSINSTALLER}
+        displayName: Create Windows installer
+      - publish: $(Build.ArtifactStagingDirectory)
+        artifact: 'WindowsInstaller'
+        displayName: Publish Installer
+
+    - job: Other_Packages
+      displayName: Create Standard Packages
+      pool:
+        vmImage: 'ubuntu-18.04'
+      steps:
+      - checkout: self
+        fetchDepth: 1
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          buildType: 'current'
+          artifactName: WindowsBackend
+          targetPath: _output
+        displayName: Fetch Backend
+      - task: DownloadPipelineArtifact@2
+        inputs:
+          buildType: 'current'
+          artifactName: WindowsFrontend
+          targetPath: _output
+        displayName: Fetch Frontend
+      - bash: ./build.sh --only-packages
+        displayName: Create Packages
+      - bash: |
+          chmod a+x $(artifactsFolder)/macos/Radarr/Radarr
+          chmod a+x $(artifactsFolder)/macos-app/Radarr.app/Contents/MacOS/Radarr
+        displayName: Set Mac executable bits
+      - task: ArchiveFiles@2
+        displayName: Create Windows zip
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/$(windowsZip)'
+          archiveType: 'zip'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/windows
+      - task: ArchiveFiles@2
+        displayName: Create MacOS app
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/$(macOsApp)'
+          archiveType: 'zip'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/macos-app
+      - task: ArchiveFiles@2
+        displayName: Create MacOS tar
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/$(macOsTar)'
+          archiveType: 'tar'
+          tarCompression: 'gz'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/macos
+      - task: ArchiveFiles@2
+        displayName: Create Linux tar
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/$(linuxTar)'
+          archiveType: 'tar'
+          tarCompression: 'gz'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/linux
+      - publish: $(Build.ArtifactStagingDirectory)
+        artifact: 'Packages'
+        displayName: Publish Packages
+    
+  - stage: Unit_Test
+    displayName: Unit Tests
+    dependsOn: Build_Backend
+    condition: succeeded()
+    jobs:
+    - job: Unit
+      strategy:
+        matrix:
+          Linux:
+            osName: 'Linux'
+            imageName: 'ubuntu-18.04'
+          Mac:
+            osName: 'Mac'
+            imageName: 'macos-10.14'
+          Windows:
+            osName: 'Windows'
+            imageName: 'windows-2019'
+
+      pool:
+        vmImage: $(imageName)
+
+      steps:
+      - checkout: none
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Test Artifact
+        inputs:
+          buildType: 'current'
+          artifactName: WindowsTests
+          targetPath: $(testsFolder)
+      - bash: |
+          wget https://mediaarea.net/repo/deb/repo-mediaarea_1.0-11_all.deb
+          sudo dpkg -i repo-mediaarea_1.0-11_all.deb
+          sudo apt-get update
+          sudo apt-get install -y --allow-unauthenticated libmediainfo-dev libmediainfo0v5 mediainfo
+        displayName: Install mediainfo
+        condition: and(succeeded(), eq(variables['osName'], 'Linux'))
+      - powershell: Set-Service SCardSvr -StartupType Manual
+        displayName: Enable Windows Test Service
+        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+      - bash: |
+          chmod a+x ${TESTSFOLDER}/test.sh
+          ${TESTSFOLDER}/test.sh ${OSNAME} Unit Test
+        displayName: Run Unit Tests
+      - publish: TestResult.xml
+        artifact: 'TestResult'
+        displayName: Publish Test Result
+        condition: and(succeeded(), eq(variables['osName'], 'Windows'))
+      - task: PublishTestResults@2
+        displayName: Publish Test Results
+        inputs:
+          testResultsFormat: 'NUnit'
+          testResultsFiles: '**/TestResult.xml'
+          testRunTitle: '$(osName) Unit Tests'
+          failTaskOnFailedTests: true
+
+  - stage: Integration
+    displayName: Integration
+    dependsOn: Package
+
+    jobs:
+
+    - job: Integration
+      strategy:
+        matrix:
+          Linux:
+            osName: 'Linux'
+            imageName: 'ubuntu-18.04'
+            pattern: 'Radarr.**.linux.tar.gz'
+          Mac:
+            osName: 'Mac'
+            imageName: 'macos-10.14'
+            pattern: 'Radarr.**.osx.tar.gz'
+          Windows:
+            osName: 'Windows'
+            imageName: 'windows-2019'
+            pattern: 'Radarr.**.windows.zip'
+
+      pool:
+        vmImage: $(imageName)
+
+      steps:
+      - bash: |
+          SYMLINK=5_18_1
+          MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
+          echo "##vso[task.setvariable variable=MONOPREFIX;]$MONOPREFIX"
+          echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
+          echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
+        displayName: Set Mono Version
+        condition: and(succeeded(), eq(variables['osName'], 'Mac'))
+      - checkout: none
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Test Artifact
+        inputs:
+          buildType: 'current'
+          artifactName: WindowsTests
+          targetPath: $(testsFolder)
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Build Artifact
+        inputs:
+          buildType: 'current'
+          artifactName: Packages
+          itemPattern: '**/$(pattern)'
+          targetPath: $(Build.ArtifactStagingDirectory)
+      - task: ExtractFiles@1
+        inputs:
+          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
+          destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
+        displayName: Extract Package
+      - bash: |
+          mkdir -p ./bin/
+          cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Radarr/. ./bin/
+        displayName: Move Package Contents
+      - bash: |
+          ls -lR
+          chmod a+x ${TESTSFOLDER}/test.sh
+          ${TESTSFOLDER}/test.sh ${OSNAME} Integration Test
+        displayName: Run Integration Tests
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: 'NUnit'
+          testResultsFiles: '**/TestResult.xml'
+          testRunTitle: '$(osName) Integration Tests'
+          failTaskOnFailedTests: true
+        displayName: Publish Test Results
+
+  - stage: Automation
+    displayName: Automation
+    dependsOn: Package
+    
+    jobs:
+    - job: Automation
+      strategy:
+        matrix:
+          Linux:
+            osName: 'Linux'
+            imageName: 'ubuntu-18.04'
+            pattern: 'Radarr.**.linux.tar.gz'
+            failBuild: true
+          Mac:
+            osName: 'Mac'
+            imageName: 'macos-10.14' # Fails due to firefox not being installed on image
+            pattern: 'Radarr.**.osx.tar.gz'
+            failBuild: true
+          Windows:
+            osName: 'Windows'
+            imageName: 'windows-2019'
+            pattern: 'Radarr.**.windows.zip'
+            failBuild: true
+
+      pool:
+        vmImage: $(imageName)
+
+      steps:
+      - checkout: none
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Test Artifact
+        inputs:
+          buildType: 'current'
+          artifactName: WindowsTests
+          targetPath: $(testsFolder)
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Build Artifact
+        inputs:
+          buildType: 'current'
+          artifactName: Packages
+          itemPattern: '**/$(pattern)'
+          targetPath: $(Build.ArtifactStagingDirectory)
+      - task: ExtractFiles@1
+        inputs:
+          archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/**/$(pattern)' 
+          destinationFolder: '$(Build.ArtifactStagingDirectory)/bin'
+        displayName: Extract Package
+      - bash: |
+          mkdir -p ./bin/
+          cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Radarr/. ./bin/
+        displayName: Move Package Contents
+      - bash: |
+          if [[ $OSNAME == "Mac" ]]; then
+          url=https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-macos.tar.gz
+          elif [[ $OSNAME == "Linux" ]]; then
+          url=https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz
+          else
+          echo "Unhandled OS"
+          exit 1
+          fi
+          curl -s -L "$url" | tar -xz
+          chmod +x geckodriver
+          mv geckodriver _tests
+        displayName: Install Gecko Driver
+        condition: and(succeeded(), ne(variables['osName'], 'Windows'))
+      - bash: ls -lR
+      - bash: |
+          chmod a+x ${TESTSFOLDER}/test.sh
+          ${TESTSFOLDER}/test.sh ${OSNAME} Automation
+        displayName: Run Automation Tests
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: 'NUnit'
+          testResultsFiles: '**/TestResult.xml'
+          testRunTitle: '$(osName) Automation Tests'
+          failTaskOnFailedTests: $(failBuild)
+        displayName: Publish Test Results
+
+  - stage: Report_Out
+    dependsOn:
+    - Unit_Test
+    - Integration
+    - Automation
+    condition: eq(variables['system.pullrequest.isfork'], false)
+    displayName: Build Status Report
+    jobs:
+    - job:
+      displayName: Discord Notification
+      pool:
+        vmImage: 'ubuntu-18.04'
+      steps:
+        - checkout: none
+        - powershell: |
+            iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Servarr/AzureDiscordNotify/master/DiscordNotify.ps1'))
+          env:
+            SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+            DISCORDCHANNELID: $(discordChannelId)
+            DISCORDWEBHOOKKEY: $(discordWebhookKey)

build-appveyor.cake

@@ -1,323 +0,0 @@
-#addin nuget:?package=Cake.Npm
-#addin nuget:?package=SharpZipLib
-#addin nuget:?package=Cake.Compression
-#addin "Cake.FileHelpers"
-
-// Build variables
-var outputFolder = "./_output";
-var outputFolderMono = outputFolder + "_mono";
-var outputFolderOsx = outputFolder + "_osx";
-var outputFolderOsxApp = outputFolderOsx + "_app";
-var testPackageFolder = "./_tests";
-var testSearchPattern = "*.Test/bin/x86/Release";
-var sourceFolder = "./src";
-var solutionFile = sourceFolder + "/NzbDrone.sln";
-var updateFolder = outputFolder + "/NzbDrone.Update";
-var updateFolderMono = outputFolderMono + "/NzbDrone.Update";
-
-// Artifact variables
-var artifactsFolder = "./_artifacts";
-var artifactsFolderWindows = artifactsFolder + "/windows";
-var artifactsFolderLinux = artifactsFolder + "/linux";
-var artifactsFolderOsx = artifactsFolder + "/osx";
-var artifactsFolderOsxApp = artifactsFolder + "/osx-app";
-
-// Utility methods
-public void RemoveEmptyFolders(string startLocation) {
-    foreach (var directory in System.IO.Directory.GetDirectories(startLocation))
-    {
-        RemoveEmptyFolders(directory);
-
-        if (System.IO.Directory.GetFiles(directory).Length == 0 &&
-            System.IO.Directory.GetDirectories(directory).Length == 0)
-        {
-            DeleteDirectory(directory, false);
-        }
-    }
-}
-
-public void CleanFolder(string path, bool keepConfigFiles) {
-	DeleteFiles(path + "/**/*.transform");
-
-	if (!keepConfigFiles) {
-		DeleteFiles(path + "/**/*.dll.config");
-	}
-
-	DeleteFiles(path + "/**/FluentValidation.resources.dll");
-	DeleteFiles(path + "/**/App.config");
-
-	DeleteFiles(path + "/**/*.less");
-
-	DeleteFiles(path + "/**/*.vshost.exe");
-
-	DeleteFiles(path + "/**/*.dylib");
-
-	RemoveEmptyFolders(path);
-}
-
-public void CreateMdbs(string path) {
-	foreach (var file in System.IO.Directory.EnumerateFiles(path, "*.pdb", System.IO.SearchOption.AllDirectories)) {
-		var actualFile = file.Substring(0, file.Length - 4);
-
-		if (FileExists(actualFile + ".exe")) {
-			StartProcess("./tools/pdb2mdb/pdb2mdb.exe", new ProcessSettings()
-				.WithArguments(args => args.Append(actualFile + ".exe")));
-		}
-
-		if (FileExists(actualFile + ".dll")) {
-			StartProcess("./tools/pdb2mdb/pdb2mdb.exe", new ProcessSettings()
-				.WithArguments(args => args.Append(actualFile + ".dll")));
-		}
-	}
-}
-
-// Build Tasks
-Task("Compile").Does(() => {
-	// Build
-	if (DirectoryExists(outputFolder)) {
-		DeleteDirectory(outputFolder, true);
-	}
-
-	MSBuild(solutionFile, config =>
-		config.UseToolVersion(MSBuildToolVersion.VS2017)
-			.WithTarget("Clean")
-			.SetVerbosity(Verbosity.Minimal));
-
-	NuGetRestore(solutionFile);
-
-	MSBuild(solutionFile, config =>
-		config.UseToolVersion(MSBuildToolVersion.VS2017)
-			.SetPlatformTarget(PlatformTarget.x86)
-			.SetConfiguration("Release")
-			.WithProperty("AllowedReferenceRelatedFileExtensions", new string[] { ".pdb" })
-			.WithTarget("Build")
-			.SetVerbosity(Verbosity.Minimal));
-
-	CleanFolder(outputFolder, false);
-
-	// Add JsonNet
-	DeleteFiles(outputFolder + "/Newtonsoft.Json.*");
-	CopyFiles(sourceFolder + "/packages/Newtonsoft.Json.*/lib/net35/*.dll", outputFolder);
-	CopyFiles(sourceFolder + "/packages/Newtonsoft.Json.*/lib/net35/*.dll", updateFolder);
-
-	// Remove Mono stuff
-	DeleteFile(outputFolder + "/Mono.Posix.dll");
-});
-
-Task("Gulp").Does(() => {
-	NpmInstall(new NpmInstallSettings {
-		LogLevel = NpmLogLevel.Silent,
-		WorkingDirectory = "./",
-		Production = true
-	});
-
-	NpmRunScript("build");
-});
-
-Task("PackageMono").Does(() => {
-	// Start mono package
-	if (DirectoryExists(outputFolderMono)) {
-		DeleteDirectory(outputFolderMono, true);
-	}
-
-	CopyDirectory(outputFolder, outputFolderMono);
-
-	// Create MDBs
-	CreateMdbs(outputFolderMono);
-
-	// Remove PDBs
-	DeleteFiles(outputFolderMono + "/**/*.pdb");
-
-	// Remove service helpers
-	DeleteFiles(outputFolderMono + "/ServiceUninstall.*");
-	DeleteFiles(outputFolderMono + "/ServiceInstall.*");
-
-	// Remove native windows binaries
-	DeleteFiles(outputFolderMono + "/sqlite3.*");
-	DeleteFiles(outputFolderMono + "/MediaInfo.*");
-
-	// Adding NzbDrone.Core.dll.config (for dllmap)
-	CopyFile(sourceFolder + "/NzbDrone.Core/NzbDrone.Core.dll.config", outputFolderMono + "/NzbDrone.Core.dll.config");
-
-	// Adding CurlSharp.dll.config (for dllmap)
-	CopyFile(sourceFolder + "/NzbDrone.Common/CurlSharp.dll.config", outputFolderMono + "/CurlSharp.dll.config");
-
-	// Renaming Radarr.Console.exe to Radarr.exe
-	DeleteFiles(outputFolderMono + "/Radarr.exe*");
-	MoveFile(outputFolderMono + "/Radarr.Console.exe", outputFolderMono + "/Radarr.exe");
-	MoveFile(outputFolderMono + "/Radarr.Console.exe.config", outputFolderMono + "/Radarr.exe.config");
-	MoveFile(outputFolderMono + "/Radarr.Console.exe.mdb", outputFolderMono + "/Radarr.exe.mdb");
-
-	// Remove NzbDrone.Windows.*
-	DeleteFiles(outputFolderMono + "/NzbDrone.Windows.*");
-
-	// Adding NzbDrone.Mono to updatePackage
-	CopyFiles(outputFolderMono + "/NzbDrone.Mono.*", updateFolderMono);
-});
-
-Task("PackageOsx").Does(() => {
-	// Start osx package
-	if (DirectoryExists(outputFolderOsx)) {
-		DeleteDirectory(outputFolderOsx, true);
-	}
-
-	CopyDirectory(outputFolderMono, outputFolderOsx);
-
-	// Adding sqlite dylibs
-	CopyFiles(sourceFolder + "/Libraries/Sqlite/*.dylib", outputFolderOsx);
-
-	// Adding MediaInfo dylib
-	CopyFiles(sourceFolder + "/Libraries/MediaInfo/*.dylib", outputFolderOsx);
-
-	// Chmod as executable
-	StartProcess(@"C:\cygwin64\bin\chmod.exe", new ProcessSettings()
-		.WithArguments(args => args
-			.Append("+x")
-			.Append(outputFolderOsx + "/Radarr")));
-
-	// Adding Startup script
-	CopyFile("./osx/Radarr", outputFolderOsx + "/Radarr");
-});
-
-Task("PackageOsxApp").Does((ctx) => {
-	// Start osx app package
-	if (DirectoryExists(outputFolderOsxApp)) {
-		DeleteDirectory(outputFolderOsxApp, true);
-	}
-
-	CreateDirectory(outputFolderOsxApp);
-
-	// Copy osx package files
-	CopyDirectory("./osx/Radarr.app", outputFolderOsxApp + "/Radarr.app");
-	CopyDirectory(outputFolderOsx, outputFolderOsxApp + "/Radarr.app/Contents/MacOS");
-
-    // Edit version of osx app
-    ctx.ReplaceTextInFiles(outputFolderOsxApp + "/Radarr.app/Contents/Info.plist", "2.0", ctx.EnvironmentVariable("APPVEYOR_BUILD_VERSION") ?? "unknown");
-});
-
-Task("PackageTests").Does(() => {
-	// Start tests package
-	if (DirectoryExists(testPackageFolder)) {
-		DeleteDirectory(testPackageFolder, true);
-	}
-
-	CreateDirectory(testPackageFolder);
-
-	// Copy tests
-	CopyFiles(sourceFolder + "/" + testSearchPattern + "/*", testPackageFolder);
-	foreach (var directory in System.IO.Directory.GetDirectories(sourceFolder, "*.Test")) {
-		var releaseDirectory = directory + "/bin/x86/Release";
-		if (DirectoryExists(releaseDirectory)) {
-			foreach (var releaseSubDirectory in System.IO.Directory.GetDirectories(releaseDirectory)) {
-				Information(System.IO.Path.GetDirectoryName(releaseSubDirectory));
-				CopyDirectory(releaseSubDirectory, testPackageFolder + "/" + System.IO.Path.GetFileName(releaseSubDirectory));
-			}
-		}
-	}
-
-	// Install NUnit.ConsoleRunner
-	NuGetInstall("NUnit.ConsoleRunner", new NuGetInstallSettings {
-		Version = "3.2.0",
-		OutputDirectory = testPackageFolder
-	});
-
-	// Copy dlls
-	CopyFiles(outputFolder + "/*.dll", testPackageFolder);
-
-	// Copy scripts
-	CopyFiles("./*.sh", testPackageFolder);
-
-	// Create MDBs for tests
-	CreateMdbs(testPackageFolder);
-
-	// Remove config
-	DeleteFiles(testPackageFolder + "/*.log.config");
-
-	// Clean
-	CleanFolder(testPackageFolder, true);
-
-	// Adding NzbDrone.Core.dll.config (for dllmap)
-	CopyFile(sourceFolder + "/NzbDrone.Core/NzbDrone.Core.dll.config", testPackageFolder + "/NzbDrone.Core.dll.config");
-
-	// Adding CurlSharp.dll.config (for dllmap)
-	CopyFile(sourceFolder + "/NzbDrone.Common/CurlSharp.dll.config", testPackageFolder + "/CurlSharp.dll.config");
-
-	// Adding CurlSharp libraries
-	CopyFiles(sourceFolder + "/ExternalModules/CurlSharp/libs/i386/*", testPackageFolder);
-});
-
-Task("CleanupWindowsPackage").Does(() => {
-	// Remove mono
-	DeleteFiles(outputFolder + "/NzbDrone.Mono.*");
-
-	// Adding NzbDrone.Windows to updatePackage
-	CopyFiles(outputFolder + "/NzbDrone.Windows.*", updateFolder);
-});
-
-Task("Build")
-	.IsDependentOn("Compile")
-	.IsDependentOn("Gulp")
-	.IsDependentOn("PackageMono")
-	.IsDependentOn("PackageOsx")
-	.IsDependentOn("PackageOsxApp")
-	.IsDependentOn("PackageTests")
-	.IsDependentOn("CleanupWindowsPackage");
-
-// Build Artifacts
-Task("CleanArtifacts").Does(() => {
-	if (DirectoryExists(artifactsFolder)) {
-		DeleteDirectory(artifactsFolder, true);
-	}
-
-	CreateDirectory(artifactsFolder);
-});
-
-Task("ArtifactsWindows").Does(() => {
-	CopyDirectory(outputFolder, artifactsFolderWindows + "/Radarr");
-});
-
-Task("ArtifactsWindowsInstaller").Does(() => {
-	InnoSetup("./setup/nzbdrone.iss", new InnoSetupSettings {
-		OutputDirectory = artifactsFolder,
-		ToolPath = "./setup/inno/ISCC.exe"
-    });
-});
-
-Task("ArtifactsLinux").Does(() => {
-	CopyDirectory(outputFolderMono, artifactsFolderLinux + "/Radarr");
-});
-
-Task("ArtifactsOsx").Does(() => {
-	CopyDirectory(outputFolderOsx, artifactsFolderOsx + "/Radarr");
-});
-
-Task("ArtifactsOsxApp").Does(() => {
-	CopyDirectory(outputFolderOsxApp, artifactsFolderOsxApp);
-});
-
-Task("CompressArtifacts").Does(() => {
-	var prefix = "";
-
-	if (AppVeyor.IsRunningOnAppVeyor) {
-		prefix += AppVeyor.Environment.Repository.Branch.Replace("/", "-") + ".";
-		prefix += AppVeyor.Environment.Build.Version + ".";
-	}
-
-	Zip(artifactsFolderWindows, artifactsFolder + "/Radarr." + prefix + "windows.zip");
-	GZipCompress(artifactsFolderLinux, artifactsFolder + "/Radarr." + prefix + "linux.tar.gz");
-	GZipCompress(artifactsFolderOsx, artifactsFolder + "/Radarr." + prefix + "osx.tar.gz");
-	Zip(artifactsFolderOsxApp, artifactsFolder + "/Radarr." + prefix + "osx-app.zip");
-});
-
-Task("Artifacts")
-	.IsDependentOn("CleanArtifacts")
-	.IsDependentOn("ArtifactsWindows")
-	.IsDependentOn("ArtifactsWindowsInstaller")
-	.IsDependentOn("ArtifactsLinux")
-	.IsDependentOn("ArtifactsOsx")
-	.IsDependentOn("ArtifactsOsxApp")
-	.IsDependentOn("CompressArtifacts");
-
-// Run
-RunTarget("Build");
-RunTarget("Artifacts");

build-appveyor.ps1

@@ -1,189 +0,0 @@
-##########################################################################
-# This is the Cake bootstrapper script for PowerShell.
-# This file was downloaded from https://github.com/cake-build/resources
-# Feel free to change this file to fit your needs.
-##########################################################################
-
-<#
-.SYNOPSIS
-This is a Powershell script to bootstrap a Cake build.
-.DESCRIPTION
-This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
-and execute your Cake build script with the parameters you provide.
-.PARAMETER Script
-The build script to execute.
-.PARAMETER Target
-The build script target to run.
-.PARAMETER Configuration
-The build configuration to use.
-.PARAMETER Verbosity
-Specifies the amount of information to be displayed.
-.PARAMETER Experimental
-Tells Cake to use the latest Roslyn release.
-.PARAMETER WhatIf
-Performs a dry run of the build script.
-No tasks will be executed.
-.PARAMETER Mono
-Tells Cake to use the Mono scripting engine.
-.PARAMETER SkipToolPackageRestore
-Skips restoring of packages.
-.PARAMETER ScriptArgs
-Remaining arguments are added here.
-.LINK
-http://cakebuild.net
-#>
-
-[CmdletBinding()]
-Param(
-    [string]$Script = "build-appveyor.cake",
-    [string]$Target = "Default",
-    [ValidateSet("Release", "Debug")]
-    [string]$Configuration = "Release",
-    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
-    [string]$Verbosity = "Verbose",
-    [switch]$Experimental,
-    [Alias("DryRun","Noop")]
-    [switch]$WhatIf,
-    [switch]$Mono,
-    [switch]$SkipToolPackageRestore,
-    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
-    [string[]]$ScriptArgs
-)
-
-[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
-function MD5HashFile([string] $filePath)
-{
-    if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
-    {
-        return $null
-    }
-
-    [System.IO.Stream] $file = $null;
-    [System.Security.Cryptography.MD5] $md5 = $null;
-    try
-    {
-        $md5 = [System.Security.Cryptography.MD5]::Create()
-        $file = [System.IO.File]::OpenRead($filePath)
-        return [System.BitConverter]::ToString($md5.ComputeHash($file))
-    }
-    finally
-    {
-        if ($file -ne $null)
-        {
-            $file.Dispose()
-        }
-    }
-}
-
-Write-Host "Preparing to run build script..."
-
-if(!$PSScriptRoot){
-    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-}
-
-$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
-$NUGET_EXE = Join-Path $TOOLS_DIR "nuget/nuget.exe"
-$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
-$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
-$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
-
-# Should we use mono?
-$UseMono = "";
-if($Mono.IsPresent) {
-    Write-Verbose -Message "Using the Mono based scripting engine."
-    $UseMono = "-mono"
-}
-
-# Should we use the new Roslyn?
-$UseExperimental = "";
-if($Experimental.IsPresent -and !($Mono.IsPresent)) {
-    Write-Verbose -Message "Using experimental version of Roslyn."
-    $UseExperimental = "-experimental"
-}
-
-# Is this a dry run?
-$UseDryRun = "";
-if($WhatIf.IsPresent) {
-    $UseDryRun = "-dryrun"
-}
-
-# Make sure tools folder exists
-if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
-    Write-Verbose -Message "Creating tools directory..."
-    New-Item -Path $TOOLS_DIR -Type directory | out-null
-}
-
-# Make sure that packages.config exist.
-if (!(Test-Path $PACKAGES_CONFIG)) {
-    Write-Verbose -Message "Downloading packages.config..."
-    try { (New-Object System.Net.WebClient).DownloadFile("http://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
-        Throw "Could not download packages.config."
-    }
-}
-
-# Try find NuGet.exe in path if not exists
-if (!(Test-Path $NUGET_EXE)) {
-    Write-Verbose -Message "Trying to find nuget.exe in PATH..."
-    $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_) }
-    $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
-    if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
-        Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
-        $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
-    }
-}
-
-# Try download NuGet.exe if not exists
-if (!(Test-Path $NUGET_EXE)) {
-    Write-Verbose -Message "Downloading NuGet.exe..."
-    try {
-        (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE)
-    } catch {
-        Throw "Could not download NuGet.exe."
-    }
-}
-
-# Save nuget.exe path to environment to be available to child processed
-$ENV:NUGET_EXE = $NUGET_EXE
-
-# Restore tools from NuGet?
-if(-Not $SkipToolPackageRestore.IsPresent) {
-    Push-Location
-    Set-Location $TOOLS_DIR
-
-    # Check for changes in packages.config and remove installed tools if true.
-    [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
-    if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
-      ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
-        Write-Verbose -Message "Missing or changed package.config hash..."
-        Get-ChildItem -Path $TOOLS_DIR -Recurse -Exclude packages.config |
-        Select -ExpandProperty FullName |
-        Where {$_ -notlike (Join-Path $TOOLS_DIR "pdb2mdb*")} |
-        Where {$_ -notlike (Join-Path $TOOLS_DIR "nuget*")} |
-        sort length -Descending |
-        Remove-Item -Recurse 
-    }
-
-    Write-Verbose -Message "Restoring tools from NuGet..."
-    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
-
-    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occured while restoring NuGet tools."
-    }
-    else
-    {
-        $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
-    }
-    Write-Verbose -Message ($NuGetOutput | out-string)
-    Pop-Location
-}
-
-# Make sure that Cake has been installed.
-if (!(Test-Path $CAKE_EXE)) {
-    Throw "Could not find Cake.exe at $CAKE_EXE"
-}
-
-# Start Cake
-Write-Host "Running build script..."
-Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
-exit $LASTEXITCODE

build.ps1

@@ -1 +0,0 @@
-Write-Warning "DEPRECATED -- Please use build.sh instead."

build.sh

@@ -1,17 +1,25 @@
-#! /bin/bash
-msBuild='/MSBuild/15.0/Bin'
+msBuildVersion='15.0'
 outputFolder='./_output'
-outputFolderMono='./_output_mono'
-outputFolderOsx='./_output_osx'
-outputFolderOsxApp='./_output_osx_app'
+outputFolderLinux='./_output_linux'
+outputFolderMacOS='./_output_macos'
+outputFolderMacOSApp='./_output_macos_app'
 testPackageFolder='./_tests/'
-testSearchPattern='*.Test/bin/x86/Release'
+testSearchPattern='*.Test/bin/x86/Release/*'
 sourceFolder='./src'
 slnFile=$sourceFolder/NzbDrone.sln
 updateFolder=$outputFolder/NzbDrone.Update
-updateFolderMono=$outputFolderMono/NzbDrone.Update
+updateFolderMono=$outputFolderLinux/NzbDrone.Update
+
+#Artifact variables
+artifactsFolder="./_artifacts";
+artifactsFolderWindows=$artifactsFolder/windows
+artifactsFolderLinux=$artifactsFolder/linux
+artifactsFolderMacOS=$artifactsFolder/macos
+artifactsFolderMacOSApp=$artifactsFolder/macos-app
 
 nuget='tools/nuget/nuget.exe';
+vswhere='tools/vswhere/vswhere.exe';
+
 CheckExitCode()
 {
     "$@"
@@ -23,12 +31,21 @@ CheckExitCode()
     return $status
 }
 
+ProgressStart()
+{
+    echo "Start '$1'"
+}
+
+ProgressEnd()
+{
+    echo "Finish '$1'"
+}
+
 CleanFolder()
 {
     local path=$1
     local keepConfigFiles=$2
 
-
     find $path -name "*.transform" -exec rm "{}" \;
 
     if [ $keepConfigFiles != true ] ; then
@@ -39,9 +56,6 @@ CleanFolder()
     find $path -name "FluentValidation.resources.dll" -exec rm "{}" \;
     find $path -name "App.config" -exec rm "{}" \;
 
-    echo "Removing .less files"
-    find $path -name "*.less" -exec rm "{}" \;
-
     echo "Removing vshost files"
     find $path -name "*.vshost.exe" -exec rm "{}" \;
 
@@ -52,209 +66,218 @@ CleanFolder()
     find $path -depth -empty -type d -exec rm -r "{}" \;
 }
 
-
-
-AddJsonNet()
-{
-    rm $outputFolder/Newtonsoft.Json.*
-    cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $outputFolder
-    cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $outputFolder/NzbDrone.Update
-}
-
 BuildWithMSBuild()
 {
-    export PATH=$msBuild:$PATH
-	echo $PATH
-    CheckExitCode MSBuild.exe $slnFile //t:Clean //m
+    msBuildPath=`$vswhere -latest -products \* -requires Microsoft.Component.MSBuild -find MSBuild\\\\\*\*\\\\Bin\\\\MSBuild.exe`
+    msBuildPath=${msBuildPath/C:\\/\/c\/}
+    msBuildPath=${msBuildPath//\\/\/}
+    msBuildDir=$(dirname "$msBuildPath")
+    echo $msBuildPath
+
+    export PATH=$msBuildDir:$PATH
+    CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Clean //m
     $nuget restore $slnFile
     CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb
 }
 
-RestoreNuget()
-{
-    export MONO_IOMAP=case
-    mono $nuget restore $slnFile
-}
-
-CleanWithXbuild()
-{
-    export MONO_IOMAP=case
-    CheckExitCode msbuild /t:Clean $slnFile
-}
-
 BuildWithXbuild()
 {
     export MONO_IOMAP=case
-    CheckExitCode msbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb /maxcpucount:3 $slnFile
+    CheckExitCode msbuild /p:Configuration=Debug /t:Clean $slnFile
+    CheckExitCode msbuild /p:Configuration=Release /t:Clean $slnFile
+    mono $nuget locals all -clear
+    mono $nuget restore $slnFile
+    CheckExitCode msbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile
 }
 
 Build()
 {
-    echo "##teamcity[progressStart 'Build']"
+    ProgressStart 'Build'
 
     rm -rf $outputFolder
+    rm -rf $testPackageFolder
 
     if [ $runtime = "dotnet" ] ; then
         BuildWithMSBuild
     else
-        CleanWithXbuild
-        RestoreNuget
         BuildWithXbuild
     fi
 
     CleanFolder $outputFolder false
 
-    AddJsonNet
-
     echo "Removing Mono.Posix.dll"
     rm $outputFolder/Mono.Posix.dll
 
-    echo "##teamcity[progressFinish 'Build']"
+    echo "Adding LICENSE.md"
+    cp LICENSE.md $outputFolder
+
+    ProgressEnd 'Build'
 }
 
 RunGulp()
 {
-    echo "##teamcity[progressStart 'npm install']"
+    ProgressStart 'npm install'
     npm-cache install npm || CheckExitCode npm install
-    echo "##teamcity[progressFinish 'npm install']"
+    ProgressEnd 'npm install'
 
-    echo "##teamcity[progressStart 'Running gulp']"
+    ProgressStart 'Running gulp'
     CheckExitCode npm run build
-    echo "##teamcity[progressFinish 'Running gulp']"
-}
-
-CreateMdbs()
-{
-    local path=$1
-    if [ $runtime = "dotnet" ] ; then
-        local pdbFiles=( $(find $path -name "*.pdb") )
-        for filename in "${pdbFiles[@]}"
-        do
-          if [ -e ${filename%.pdb}.dll ]  ; then
-            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.dll
-          fi
-          if [ -e ${filename%.pdb}.exe ]  ; then
-            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.exe
-          fi
-        done
-    fi
+    ProgressEnd 'Running gulp'
 }
 
 PackageMono()
 {
-    echo "##teamcity[progressStart 'Creating Mono Package']"
-    rm -rf $outputFolderMono
-    cp -r $outputFolder $outputFolderMono
+    ProgressStart 'Creating Mono Package'
 
-    echo "Creating MDBs"
-    CreateMdbs $outputFolderMono
+    rm -rf $outputFolderLinux
 
-    echo "Removing PDBs"
-    find $outputFolderMono -name "*.pdb" -exec rm "{}" \;
+    echo "Copying Binaries"
+    cp -r $outputFolder $outputFolderLinux
 
     echo "Removing Service helpers"
-    rm -f $outputFolderMono/ServiceUninstall.*
-    rm -f $outputFolderMono/ServiceInstall.*
+    rm -f $outputFolderLinux/ServiceUninstall.*
+    rm -f $outputFolderLinux/ServiceInstall.*
 
     echo "Removing native windows binaries Sqlite, MediaInfo"
-    rm -f $outputFolderMono/sqlite3.*
-    rm -f $outputFolderMono/MediaInfo.*
+    rm -f $outputFolderLinux/sqlite3.*
+    rm -f $outputFolderLinux/MediaInfo.*
 
     echo "Adding NzbDrone.Core.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Core/NzbDrone.Core.dll.config $outputFolderMono
+    cp $sourceFolder/NzbDrone.Core/NzbDrone.Core.dll.config $outputFolderLinux
 
-    echo "Adding CurlSharp.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $outputFolderMono
 
-    echo "Renaming NzbDrone.Console.exe to NzbDrone.exe"
-    rm $outputFolderMono/Radarr.exe*
-    for file in $outputFolderMono/Radarr.Console.exe*; do
+    echo "Renaming Radarr.Console.exe to Radarr.exe"
+    rm $outputFolderLinux/Radarr.exe*
+    for file in $outputFolderLinux/Radarr.Console.exe*; do
         mv "$file" "${file//.Console/}"
     done
 
     echo "Removing NzbDrone.Windows"
-    rm $outputFolderMono/NzbDrone.Windows.*
+    rm $outputFolderLinux/NzbDrone.Windows.*
 
     echo "Adding NzbDrone.Mono to UpdatePackage"
-    cp $outputFolderMono/NzbDrone.Mono.* $updateFolderMono
+    cp $outputFolderLinux/NzbDrone.Mono.* $updateFolderMono
 
-    echo "##teamcity[progressFinish 'Creating Mono Package']"
+    ProgressEnd 'Creating Mono Package'
 }
 
-PackageOsx()
+PackageMacOS()
 {
-    echo "##teamcity[progressStart 'Creating OS X Package']"
-    rm -rf $outputFolderOsx
-    cp -r $outputFolderMono $outputFolderOsx
+    ProgressStart 'Creating MacOS Package'
 
-    echo "Adding sqlite dylibs"
-    cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderOsx
-
-    echo "Adding MediaInfo dylib"
-    cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderOsx
+    rm -rf $outputFolderMacOS
+    mkdir $outputFolderMacOS
 
     echo "Adding Startup script"
-    cp  ./osx/Radarr $outputFolderOsx
+    cp ./macOS/Radarr $outputFolderMacOS
 
-    echo "##teamcity[progressFinish 'Creating OS X Package']"
+    echo "Copying Binaries"
+    cp -r $outputFolderLinux/* $outputFolderMacOS
+
+    echo "Adding sqlite dylibs"
+    cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOS
+
+    echo "Adding MediaInfo dylib"
+    cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderMacOS
+
+    ProgressEnd 'Creating MacOS Package'
 }
 
-PackageOsxApp()
+PackageMacOSApp()
 {
-    echo "##teamcity[progressStart 'Creating OS X App Package']"
-    rm -rf $outputFolderOsxApp
-    mkdir $outputFolderOsxApp
+    ProgressStart 'Creating macOS App Package'
 
-    cp -r ./osx/Radarr.app $outputFolderOsxApp
-    cp -r $outputFolderOsx $outputFolderOsxApp/Radarr.app/Contents/MacOS
+    rm -rf $outputFolderMacOSApp
+    mkdir $outputFolderMacOSApp
+    cp -r ./macOS/Radarr.app $outputFolderMacOSApp
+    mkdir -p $outputFolderMacOSApp/Radarr.app/Contents/MacOS
 
-    echo "##teamcity[progressFinish 'Creating OS X App Package']"
+    echo "Adding Startup script"
+    cp ./macOS/Radarr $outputFolderMacOSApp/Radarr.app/Contents/MacOS
+
+    echo "Copying Binaries"
+    cp -r $outputFolderLinux/* $outputFolderMacOSApp/Radarr.app/Contents/MacOS
+
+    echo "Adding sqlite dylibs"
+    cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOSApp/Radarr.app/Contents/MacOS
+
+    echo "Adding MediaInfo dylib"
+    cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderMacOSApp/Radarr.app/Contents/MacOS
+
+    echo "Removing Update Folder"
+    rm -r $outputFolderMacOSApp/Radarr.app/Contents/MacOS/NzbDrone.Update
+
+    ProgressEnd 'Creating macOS App Package'
 }
 
 PackageTests()
 {
-    echo "Packaging Tests"
-    echo "##teamcity[progressStart 'Creating Test Package']"
+    ProgressStart 'Creating Test Package'
+
     rm -rf $testPackageFolder
     mkdir $testPackageFolder
 
-    find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;
+    find . -maxdepth 6 -path $testSearchPattern -exec cp -r "{}" $testPackageFolder \;
 
     if [ $runtime = "dotnet" ] ; then
-        $nuget install NUnit.Runners -Version 3.9.0 -Output $testPackageFolder
+        $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder
     else
-        mono $nuget install NUnit.Runners -Version 3.9.0 -Output $testPackageFolder
+        mono $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder
     fi
 
     cp $outputFolder/*.dll $testPackageFolder
-    cp ./*.sh $testPackageFolder
-
-    echo "Creating MDBs for tests"
-    CreateMdbs $testPackageFolder
+    cp $outputFolder/*.exe $testPackageFolder
+    cp ./test.sh $testPackageFolder
 
     rm -f $testPackageFolder/*.log.config
 
     CleanFolder $testPackageFolder true
 
-    echo "Adding NzbDrone.Core.dll.config (for dllmap)"
-    cp $sourceFolder/NzbDrone.Core/NzbDrone.Core.dll.config $testPackageFolder
-
     echo "Adding CurlSharp.dll.config (for dllmap)"
     cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $testPackageFolder
 
     echo "Copying CurlSharp libraries"
     cp $sourceFolder/ExternalModules/CurlSharp/libs/i386/* $testPackageFolder
 
-    echo "##teamcity[progressFinish 'Creating Test Package']"
+    echo "Adding sqlite and mediainfo dylibs"
+    cp $sourceFolder/Libraries/MediaInfo/*.dylib $testPackageFolder
+    cp $sourceFolder/Libraries/Sqlite/*.dylib $testPackageFolder
+
+    ProgressEnd 'Creating Test Package'
 }
 
 CleanupWindowsPackage()
 {
+    ProgressStart 'Cleaning Windows Package'
+
     echo "Removing NzbDrone.Mono"
     rm -f $outputFolder/NzbDrone.Mono.*
 
     echo "Adding NzbDrone.Windows to UpdatePackage"
     cp $outputFolder/NzbDrone.Windows.* $updateFolder
+
+    ProgressEnd 'Cleaning Windows Package'
+}
+
+PackageArtifacts()
+{
+    echo "Creating Artifact Directories"
+    
+    rm -rf $artifactsFolder
+    mkdir $artifactsFolder
+    
+    mkdir $artifactsFolderWindows
+    mkdir $artifactsFolderMacOS
+    mkdir $artifactsFolderLinux
+    mkdir $artifactsFolderWindows/Radarr
+    mkdir $artifactsFolderMacOS/Radarr
+    mkdir $artifactsFolderLinux/Radarr
+    mkdir $artifactsFolderMacOSApp
+    
+    cp -r $outputFolder/* $artifactsFolderWindows/Radarr
+    cp -r $outputFolderMacOSApp/* $artifactsFolderMacOSApp
+    cp -r $outputFolderMacOS/* $artifactsFolderMacOS/Radarr
+    cp -r $outputFolderLinux/* $artifactsFolderLinux/Radarr
 }
 
 # Use mono or .net depending on OS
@@ -262,9 +285,6 @@ case "$(uname -s)" in
     CYGWIN*|MINGW32*|MINGW64*|MSYS*)
         # on windows, use dotnet
         runtime="dotnet"
-		vsLoc=$(./vswhere.exe -property installationPath)
-		vsLoc=$(echo "/$vsLoc" | sed -e 's/\\/\//g' -e 's/://')
-		msBuild="$vsLoc$msBuild"
         ;;
     *)
         # otherwise use mono
@@ -272,42 +292,51 @@ case "$(uname -s)" in
         ;;
 esac
 
-if [ $# -eq 0 ]
-  then
+POSITIONAL=()
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    --only-backend)
+        ONLY_BACKEND=YES
+        shift # past argument
+        ;;
+    --only-frontend)
+        ONLY_FRONTEND=YES
+        shift # past argument
+        ;;
+    --only-packages)
+        ONLY_PACKAGES=YES
+        shift # past argument
+        ;;
+    *)    # unknown option
+        POSITIONAL+=("$1") # save it in an array for later
+        shift # past argument
+        ;;
+esac
+done
+set -- "${POSITIONAL[@]}" # restore positional parameters
+
+# Only build backend if we haven't set only-frontend or only-packages
+if [ -z "$ONLY_FRONTEND" ] && [ -z "$ONLY_PACKAGES" ];
+then
     Build
-    RunGulp
-    PackageMono
-    PackageOsx
-    PackageOsxApp
     PackageTests
+fi
+
+# Only build frontend if we haven't set only-backend or only-packages
+if [ -z "$ONLY_BACKEND" ] && [ -z "$ONLY_PACKAGES" ];
+then
+   RunGulp
+fi
+
+# Only package if we haven't set only-backend or only-frontend
+if [ -z "$ONLY_BACKEND" ] && [ -z "$ONLY_FRONTEND" ];
+then
+    PackageMono
+    PackageMacOS
+    PackageMacOSApp
     CleanupWindowsPackage
-fi
-
-if [ "$1" = "CleanXbuild" ]
-then rm -rf $outputFolder
-    CleanWithXbuild
-fi
-
-if [ "$1" = "NugetMono" ]
-then rm -rf $outputFolder
-    RestoreNuget
-fi
-
-if [ "$1" = "Build" ]
-then BuildWithXbuild
-  CleanFolder $outputFolder false
-  AddJsonNet
-  rm $outputFolder/Mono.Posix.dll
-fi
-
-if [ "$1" = "Gulp" ]
-then RunGulp
-fi
-
-if [ "$1" = "Package" ]
-then PackageMono
-  PackageOsx
-  PackageOsxApp
-  PackageTests
-  CleanupWindowsPackage
+    PackageArtifacts
 fi

changelog.tpl

@@ -1,14 +0,0 @@
-# Changelog
-
-{{#versions}}
-## {{{label}}}
-
-{{#sections}}
-### {{{label}}}
-{{#commits}}
-- {{{subject}}} [<a href="https://github.com/{{{author}}}">{{{author}}}</a>]
-{{/commits}}
-
-{{/sections}}
-
-{{/versions}}

changelog_release.tpl

@@ -1,15 +0,0 @@
-**To receive further Pre-Release updates, please change the branch to develop. (Settings -> General (Show Advanced Settings) -> Updates -> Branch)**
-
-{{#versions}}
-
-{{#sections}}
-{{{label}}}
-{{#commits}}
-- {{{subject}}} [{{{author}}}]
-{{/commits}}
-
-{{/sections}}
-
-{{/versions}}
-
-**Note**: The OSX version does not automatically launch the browser. You have to go to http://localhost:7878 by yourself in a browser of your choice.

create_test_cases.py

@@ -1,44 +0,0 @@
-input1 = """Prometheus.Special.Edition.Fan Edit.2012..BRRip.x264.AAC-m2g
-Star Wars Episode IV - A New Hope (Despecialized) 1999.mkv
-Prometheus.(Special.Edition.Remastered).2012.[Bluray-1080p].mkv
-Prometheus Extended 2012
-Prometheus Extended Directors Cut Fan Edit 2012
-Prometheus Director's Cut 2012
-Prometheus Directors Cut 2012
-Prometheus.(Extended.Theatrical.Version.IMAX).BluRay.1080p.2012.asdf
-2001 A Space Odyssey Director's Cut (1968).mkv
-2001: A Space Odyssey (Extended Directors Cut FanEdit) Bluray 1080p 1968
-A Fake Movie 2035 Directors 2012.mkv
-Blade Runner Director's Cut 2049.mkv
-Prometheus 50th Anniversary Edition 2012.mkv
-Movie 2in1 2012.mkv
-Movie IMAX 2012.mkv"""
-
-output1 = """Special.Edition.Fan Edit     BRRip.x264.AAC-m2g
-Despecialized     mkv
-Special.Edition.Remastered     Bluray-1080p].mkv
-Extended     mkv
-Extended Directors Cut Fan Edit     mkv
-Director's Cut     mkv
-Directors Cut     mkv
-Extended.Theatrical.Version.IMAX     asdf
-Director's Cut     mkv
-Extended Directors Cut FanEdit     mkv
-Directors     mkv
-Director's Cut     mkv
-50th Anniversary Edition     mkv
-2in1     mkv
-IMAX     mkv"""
-
-inputs = input1.split("\n")
-outputs = output1.split("\n")
-real_o = []
-for output in outputs:
-    real_o.append(output.split("   ")[0].replace(".", " ").strip())
-
-count = 0
-
-for inp in inputs:
-    o = real_o[count]
-    print "[TestCase(\"{0}\", \"{1}\")]".format(inp, o)
-    count += 1

debian/copyright

@@ -1,24 +1,24 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: nzbdrone
-Source: https://github.com/Sonarr/Sonarr
-
-Files: *
-Copyright: 2010-2016 Sonarr <hello@sonarr.tv>
-
-License: GPL-3.0+
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nzbdrone
+Source: https://github.com/Sonarr/Sonarr
+
+Files: *
+Copyright: 2010-2016 Sonarr <hello@sonarr.tv>
+
+License: GPL-3.0+
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

debian/install

@@ -1 +1 @@
-nzbdrone_bin/* opt/NzbDrone
+nzbdrone_bin/* opt/NzbDrone

deploy.sh

@@ -1,7 +0,0 @@
-if [ -z "$CIRCLE_PULL_REQUEST" ]; then
-    echo "We are building a normal branch, deploying as such..."
-    curl "http://pr.radarr.video:4466/deploy?url=https%3A%2F%2F${CIRCLE_BUILD_NUM}-77323220-gh.circle-artifacts.com%2F0%2Fartifacts%2FRadarr.${CIRCLE_BRANCH//\//-}.$BUILD_VERSION.$CIRCLE_BUILD_NUM.linux.tar.gz&b=branch&name=${CIRCLE_BRANCH}"
-else
-    echo "We are building a pr, deploying as such..."
-    curl "http://pr.radarr.video:4466/deploy?url=https%3A%2F%2F${CIRCLE_BUILD_NUM}-77323220-gh.circle-artifacts.com%2F0%2Fartifacts%2FRadarr.${CIRCLE_BRANCH//\//-}.$BUILD_VERSION.$CIRCLE_BUILD_NUM.linux.tar.gz&b=pr&name=${CIRCLE_PR_NUMBER}"
-fi

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "Radarr",
-  "version": "2.0.0",
+  "name": "radarr",
+  "version": "1.0.0",
   "description": "Radarr",
   "main": "main.js",
   "scripts": {

package.sh

@@ -1,77 +0,0 @@
-if [ $# -eq 0 ]; then
-  if [ "$TRAVIS_PULL_REQUEST" != false ]; then
-    echo "Need to supply version argument" && exit;
-  fi
-fi
-
-# Use mono or .net depending on OS
-case "$(uname -s)" in
-    CYGWIN*|MINGW32*|MINGW64*|MSYS*)
-        # on windows, use dotnet
-        runtime="dotnet"
-        ;;
-    *)
-        # otherwise use mono
-        runtime="mono"
-        ;;
-esac
-
-if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-  VERSION="$(date +%H:%M:%S)"
-  YEAR="$(date +%Y)"
-  MONTH="$(date +%m)"
-  DAY="$(date +%d)"
-else
-  VERSION=$1
-  BRANCH=$2
-  BRANCH=${BRANCH#refs\/heads\/}
-  BRANCH=${BRANCH//\//-}
-fi
-outputFolder='./_output'
-outputFolderMono='./_output_mono'
-outputFolderOsx='./_output_osx'
-outputFolderOsxApp='./_output_osx_app'
-
-tr -d "\r" < $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr > $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr2
-rm $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr
-chmod +x $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr2
-mv $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr2 $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr >& error.log
-
-if [ $runtime = "dotnet" ] ; then
-  ./7za.exe a Radarr_Windows_$VERSION.zip ./Radarr_Windows_$VERSION/*
-  ./7za.exe a -ttar -so Radarr_Mono_$VERSION.tar ./Radarr_Mono_$VERSION/* | ./7za.exe a -si Radarr_Mono_$VERSION.tar.gz
-  ./7za.exe a -ttar -so Radarr_OSX_$VERSION.tar ./_output_osx/* | ./7za.exe a -si Radarr_OSX_$VERSION.tar.gz
-  ./7za.exe a -ttar -so Radarr_OSX_App_$VERSION.tar ./_output_osx_app/* | ./7za.exe a -si Radarr_OSX_App_$VERSION.tar.gz
-else
-  cp -r $outputFolder/ Radarr
-  zip -r Radarr.$BRANCH.$VERSION.windows.zip Radarr
-  rm -rf Radarr
-  cp -r $outputFolderMono/ Radarr
-  tar -zcvf Radarr.$BRANCH.$VERSION.linux.tar.gz Radarr
-  rm -rf Radarr
-  cp -r $outputFolderOsx/ Radarr
-  tar -zcvf Radarr.$BRANCH.$VERSION.osx.tar.gz Radarr
-  rm -rf Radarr
-  #TODO update for tar.gz
-
-  cd _output_osx_app/
-  zip -r ../Radarr.$BRANCH.$VERSION.osx-app.zip *
-fi
-# ftp -n ftp.leonardogalli.ch << END_SCRIPT
-# passive
-# quote USER $FTP_USER
-# quote PASS $FTP_PASS
-# mkdir builds
-# cd builds
-# mkdir $YEAR
-# cd $YEAR
-# mkdir $MONTH
-# cd $MONTH
-# mkdir $DAY
-# cd $DAY
-# binary
-# put Radarr_Windows_$VERSION.zip
-# put Radarr_Mono_$VERSION.zip
-# put Radarr_OSX_$VERSION.zip
-# quit
-# END_SCRIPT

setup/nzbdrone.iss

@@ -1,67 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define AppName "Radarr"
-#define AppPublisher "Team Radarr"
-#define AppURL "https://radarr.video/"
-#define ForumsURL "https://github.com/Radarr/Radarr/issues"
-#define AppExeName "Radarr.exe"
-#define BuildNumber "2.0"
-#define BuildVersion GetEnv('APPVEYOR_BUILD_VERSION')
-#define BranchName StringChange(GetEnv('APPVEYOR_REPO_BRANCH'), "/", "-")
-
-#if BuildVersion == ""
-
-#define BuildVersion GetEnv('BUILD_VERSION') + GetEnv('$CIRCLE_BUILD_NUM')
-#define BranchName StringChange(GetEnv('CIRCLE_BRANCH'), "/", "-")
-
-#endif
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{56C1065D-3523-4025-B76D-6F73F67F7F82}
-AppName={#AppName}
-AppVersion=0.2
-AppPublisher={#AppPublisher}
-AppPublisherURL={#AppURL}
-AppSupportURL={#ForumsURL}
-AppUpdatesURL={#AppURL}
-DefaultDirName={commonappdata}\Radarr\bin
-DisableDirPage=yes
-DefaultGroupName={#AppName}
-DisableProgramGroupPage=yes
-OutputBaseFilename=Radarr.{#BranchName}.{#BuildVersion}.installer
-SolidCompression=yes
-AppCopyright=Creative Commons 3.0 License
-AllowUNCPath=False
-UninstallDisplayIcon={app}\Radarr.exe
-DisableReadyPage=True
-CompressionThreads=2
-Compression=lzma2/normal
-AppContact={#ForumsURL}
-VersionInfoVersion={#BuildNumber}
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-[Tasks]
-;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "windowsService"; Description: "Install as a Windows Service"
-
-[Files]
-Source: "..\_output\Radarr.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
-Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
-
-[Run]
-Filename: "{app}\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated;
-Filename: "{app}\radarr.console.exe"; Parameters: "/i"; Flags: waituntilterminated; Tasks: windowsService
-
-[UninstallRun]
-Filename: "{app}\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist

setup/radarr.iss

@@ -0,0 +1,75 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define AppName "Radarr"
+#define AppPublisher "Team Radarr"
+#define AppURL "https://radarr.video/"
+#define ForumsURL "https://forums.radarr.video/"
+#define AppExeName "Radarr.exe"
+#define BaseVersion "0.2.0"
+#define BuildNumber GetEnv('MINORVERSION')
+#define BuildVersion GetEnv('RADARRVERSION')
+#define BranchName GetEnv('BUILD_SOURCEBRANCHNAME')
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{56C1065D-3523-4025-B76D-6F73F67F7F82}
+AppName={#AppName}
+AppVersion={#BaseVersion}
+AppPublisher={#AppPublisher}
+AppPublisherURL={#AppURL}
+AppSupportURL={#ForumsURL}
+AppUpdatesURL={#AppURL}
+DefaultDirName={commonappdata}\Radarr\bin
+DisableDirPage=yes
+DefaultGroupName={#AppName}
+DisableProgramGroupPage=yes
+OutputBaseFilename=Radarr.{#BranchName}.{#BuildVersion}.windows
+SolidCompression=yes
+AppCopyright=Creative Commons 3.0 License
+AllowUNCPath=False
+UninstallDisplayIcon={app}\Radarr.exe
+DisableReadyPage=True
+CompressionThreads=2
+Compression=lzma2/normal
+AppContact={#ForumsURL}
+VersionInfoVersion={#BaseVersion}.{#BuildNumber}
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"
+Name: "windowsService"; Description: "Install Windows Service (Starts when the computer starts)"; GroupDescription: "Start automatically"; Flags: exclusive
+Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts when you log into Windows)"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
+Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
+
+[Files]
+Source: "..\_output\Radarr.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
+Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
+Name: "{userstartup}\{#AppName}"; Filename: "{app}\Radarr.exe"; WorkingDir: "{app}"; Tasks: startupShortcut
+
+[Run]
+Filename: "{app}\Radarr.Console.exe"; StatusMsg: "Removing previous Windows Service"; Parameters: "/u"; Flags: runhidden waituntilterminated;
+Filename: "{app}\Radarr.Console.exe"; Description: "Enable Access from Other Devices"; StatusMsg: "Enabling Remote access"; Parameters: "/registerurl"; Flags: postinstall runascurrentuser runhidden waituntilterminated; Tasks: startupShortcut none;
+Filename: "{app}\Radarr.Console.exe"; StatusMsg: "Installing Windows Service"; Parameters: "/i"; Flags: runhidden waituntilterminated; Tasks: windowsService
+Filename: "{app}\Radarr.exe"; Description: "Open Radarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
+Filename: "{app}\Radarr.exe"; Description: "Start Radarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
+
+[UninstallRun]
+Filename: "{app}\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
+
+[Code]
+function PrepareToInstall(var NeedsRestart: Boolean): String;
+var
+  ResultCode: Integer;
+begin
+  Exec(ExpandConstant('{commonappdata}\Radarr\bin\Radarr.Console.exe'), '/u', '', 0, ewWaitUntilTerminated, ResultCode)
+end;

src/LogentriesCore/AsyncLogger.cs

@@ -1,648 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Configuration;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Security;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-
-namespace LogentriesCore
-{
-    public class AsyncLogger
-    {
-        #region Constants
-
-        // Current version number.
-        protected const String Version = "2.6.0";
-
-        // Size of the internal event queue. 
-        protected const int QueueSize = 32768;
-
-        // Minimal delay between attempts to reconnect in milliseconds. 
-        protected const int MinDelay = 100;
-
-        // Maximal delay between attempts to reconnect in milliseconds. 
-        protected const int MaxDelay = 10000;
-
-        // Appender signature - used for debugging messages. 
-        protected const String LeSignature = "LE: ";
-
-        // Legacy Logentries configuration names. 
-        protected const String LegacyConfigTokenName = "LOGENTRIES_TOKEN";
-        protected const String LegacyConfigAccountKeyName = "LOGENTRIES_ACCOUNT_KEY";
-        protected const String LegacyConfigLocationName = "LOGENTRIES_LOCATION";
-
-        // New Logentries configuration names.
-        protected const String ConfigTokenName = "Logentries.Token";
-        protected const String ConfigAccountKeyName = "Logentries.AccountKey";
-        protected const String ConfigLocationName = "Logentries.Location";
-
-        // Error message displayed when invalid token is detected. 
-        protected const String InvalidTokenMessage = "\n\nIt appears your LOGENTRIES_TOKEN value is invalid or missing.\n\n";
-
-        // Error message displayed when invalid account_key or location parameters are detected. 
-        protected const String InvalidHttpPutCredentialsMessage = "\n\nIt appears your LOGENTRIES_ACCOUNT_KEY or LOGENTRIES_LOCATION values are invalid or missing.\n\n";
-
-        // Error message deisplayed when queue overflow occurs. 
-        protected const String QueueOverflowMessage = "\n\nLogentries buffer queue overflow. Message dropped.\n\n";
-
-        // Newline char to trim from message for formatting. 
-        protected static char[] TrimChars = { '\r', '\n' };
-
-        /** Non-Unix and Unix Newline */
-        protected static string[] posix_newline = { "\r\n", "\n" };
-
-        /** Unicode line separator character */
-        protected static string line_separator = "\u2028";
-
-        // Restricted symbols that should not appear in host name.
-        // See http://support.microsoft.com/kb/228275/en-us for details.
-        private static Regex ForbiddenHostNameChars = new Regex(@"[/\\\[\]\""\:\;\|\<\>\+\=\,\?\* _]{1,}", RegexOptions.Compiled);
-
-        /** Regex used to validate GUID in .NET3.5 */
-        private static Regex isGuid = new Regex(@"^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$", RegexOptions.Compiled);
-
-        #endregion
-
-        #region Singletons
-
-        // UTF-8 output character set. 
-        protected static readonly UTF8Encoding UTF8 = new UTF8Encoding();
-
-        // ASCII character set used by HTTP. 
-        protected static readonly ASCIIEncoding ASCII = new ASCIIEncoding();
-
-        //static list of all the queues the le appender might be managing.
-        private static ConcurrentBag<BlockingCollection<string>> _allQueues = new ConcurrentBag<BlockingCollection<string>>();
-
-        /// <summary>
-        /// Determines if the queue is empty after waiting the specified waitTime.
-        /// Returns true or false if the underlying queues are empty.
-        /// </summary>
-        /// <param name="waitTime">The length of time the method should block before giving up waiting for it to empty.</param>
-        /// <returns>True if the queue is empty, false if there are still items waiting to be written.</returns>
-        public static bool AreAllQueuesEmpty(TimeSpan waitTime)
-        {
-            var start = DateTime.UtcNow;
-            var then = DateTime.UtcNow;
-
-            while (start.Add(waitTime) > then)
-            {
-                if (_allQueues.All(x => x.Count == 0))
-                    return true;
-
-                Thread.Sleep(100);
-                then = DateTime.UtcNow;
-            }
-
-            return _allQueues.All(x => x.Count == 0);
-        }
-        #endregion
-
-        public AsyncLogger()
-        {
-            Queue = new BlockingCollection<string>(QueueSize);
-            _allQueues.Add(Queue);
-
-            WorkerThread = new Thread(Run);
-            WorkerThread.Name = "Logentries Log4net Appender";
-            WorkerThread.IsBackground = true;
-        }
-
-        #region Configuration properties
-
-        private String m_Token = "";
-        private String m_AccountKey = "";
-        private String m_Location = "";
-        private bool m_ImmediateFlush = false;
-        private bool m_Debug = false;
-        private bool m_UseHttpPut = false;
-        private bool m_UseSsl = false;
-
-        // Properties for defining location of DataHub instance if one is used.
-        private bool m_UseDataHub = false; // By default Logentries service is used instead of DataHub instance.
-        private String m_DataHubAddr = "";
-        private int m_DataHubPort = 0;
-
-        // Properties to define host name of user's machine and define user-specified log ID.
-        private bool m_UseHostName = false; // Defines whether to prefix log message with HostName or not.
-        private String m_HostName = ""; // User-defined or auto-defined host name (if not set in config. file)
-        private String m_LogID = ""; // User-defined log ID to be prefixed to the log message.
-
-        // Sets DataHub usage flag.
-        public void setIsUsingDataHub(bool useDataHub)
-        {
-            m_UseDataHub = useDataHub;
-        }
-
-        public bool getIsUsingDataHab()
-        {
-            return m_UseDataHub;
-        }
-
-        // Sets DataHub instance address.
-        public void setDataHubAddr(String dataHubAddr)
-        {
-            m_DataHubAddr = dataHubAddr;
-        }
-
-        public String getDataHubAddr()
-        {
-            return m_DataHubAddr;
-        }
-
-        // Sets the port on which DataHub instance is waiting for log messages.
-        public void setDataHubPort(int port)
-        {
-            m_DataHubPort = port;
-        }
-
-        public int getDataHubPort()
-        {
-            return m_DataHubPort;
-        }
-
-        public void setToken(String token)
-        {
-            m_Token = token;
-        }
-
-        public String getToken()
-        {
-            return m_Token;
-        }
-
-        public void setAccountKey(String accountKey)
-        {
-            m_AccountKey = accountKey;
-        }
-
-        public string getAccountKey()
-        {
-            return m_AccountKey;
-        }
-
-        public void setLocation(String location)
-        {
-            m_Location = location;
-        }
-
-        public String getLocation()
-        {
-            return m_Location;
-        }
-
-        public void setImmediateFlush(bool immediateFlush)
-        {
-            m_ImmediateFlush = immediateFlush;
-        }
-
-        public bool getImmediateFlush()
-        {
-            return m_ImmediateFlush;
-        }
-
-        public void setDebug(bool debug)
-        {
-            m_Debug = debug;
-        }
-
-        public bool getDebug()
-        {
-            return m_Debug;
-        }
-
-        public void setUseHttpPut(bool useHttpPut)
-        {
-            m_UseHttpPut = useHttpPut;
-        }
-
-        public bool getUseHttpPut()
-        {
-            return m_UseHttpPut;
-        }
-
-        public void setUseSsl(bool useSsl)
-        {
-            m_UseSsl = useSsl;
-        }
-
-        public bool getUseSsl()
-        {
-            return m_UseSsl;
-        }
-
-        public void setUseHostName(bool useHostName)
-        {
-            m_UseHostName = useHostName;
-        }
-
-        public bool getUseHostName()
-        {
-            return m_UseHostName;
-        }
-
-        public void setHostName(String hostName)
-        {
-            m_HostName = hostName;
-        }
-
-        public String getHostName()
-        {
-            return m_HostName;
-        }
-
-        public void setLogID(String logID)
-        {
-            m_LogID = logID;
-        }
-
-        public String getLogID()
-        {
-            return m_LogID;
-        }
-
-        #endregion
-
-        protected readonly BlockingCollection<string> Queue;
-        protected readonly Thread WorkerThread;
-        protected readonly Random Random = new Random();
-
-        private LeClient LeClient = null;
-        protected bool IsRunning = false;
-
-        #region Protected methods
-
-        protected virtual void Run()
-        {
-            try
-            {
-                // Open connection.
-                ReopenConnection();
-
-                string logMessagePrefix = String.Empty;
-
-                if (m_UseHostName)
-                {
-                    // If LogHostName is set to "true", but HostName is not defined -
-                    // try to get host name from Environment.
-                    if (m_HostName == String.Empty)
-                    {
-                        try
-                        {
-                            WriteDebugMessages("HostName parameter is not defined - trying to get it from System.Environment.MachineName");
-                            m_HostName = "HostName=" + System.Environment.MachineName + " ";
-                        }
-                        catch (InvalidOperationException)
-                        {
-                            // Cannot get host name automatically, so assume that HostName is not used
-                            // and log message is sent without it.
-                            m_UseHostName = false;
-                            WriteDebugMessages("Failed to get HostName parameter using System.Environment.MachineName. Log messages will not be prefixed by HostName");
-                        }
-                    }
-                    else
-                    {
-                        if (!CheckIfHostNameValid(m_HostName))
-                        {
-                            // If user-defined host name is incorrect - we cannot use it
-                            // and log message is sent without it.
-                            m_UseHostName = false;
-                            WriteDebugMessages("HostName parameter contains prohibited characters. Log messages will not be prefixed by HostName");
-                        }
-                        else
-                        {
-                            m_HostName = "HostName=" + m_HostName + " ";
-                        }
-                    }
-                }
-                            
-                if (m_LogID != String.Empty)
-                {
-                    logMessagePrefix = m_LogID + " ";
-                }
-
-                if (m_UseHostName)
-                {
-                    logMessagePrefix += m_HostName;
-                }
-
-                // Flag that is set if logMessagePrefix is empty.
-                bool isPrefixEmpty = (logMessagePrefix == String.Empty);
-
-                // Send data in queue.
-                while (true)
-                {
-                    // Take data from queue.
-                    var line = Queue.Take();
-
-                    // Replace newline chars with line separator to format multi-line events nicely.
-                    foreach (String newline in posix_newline)
-                    {
-                        line = line.Replace(newline, line_separator);
-                    }
-
-                    // If m_UseDataHub == true (logs are sent to DataHub instance) then m_Token is not
-                    // appended to the message.
-                    string finalLine = ((!m_UseHttpPut && !m_UseDataHub) ? this.m_Token + line : line) + '\n';
-                    
-                    // Add prefixes: LogID and HostName if they are defined.
-                    if (!isPrefixEmpty)
-                    {
-                        finalLine = logMessagePrefix + finalLine;
-                    }
-
-                    byte[] data = UTF8.GetBytes(finalLine);
-
-                    // Send data, reconnect if needed.
-                    while (true)
-                    {
-                        try
-                        {
-                            this.LeClient.Write(data, 0, data.Length);
-
-                            if (m_ImmediateFlush)
-                                this.LeClient.Flush();
-                        }
-                        catch (IOException)
-                        {
-                            // Reopen the lost connection.
-                            ReopenConnection();
-                            continue;
-                        }
-
-                        break;
-                    }
-                }
-            }
-            catch (ThreadInterruptedException ex)
-            {
-                WriteDebugMessages("Logentries asynchronous socket client was interrupted.", ex);
-            }
-        }
-
-        protected virtual void OpenConnection()
-        {
-            try
-            {
-                if (LeClient == null)
-                {
-                    // Create LeClient instance providing all needed parameters. If DataHub-related properties
-                    // have not been overridden by log4net or NLog configurators, then DataHub is not used, 
-                    // because m_UseDataHub == false by default.
-                    LeClient = new LeClient(m_UseHttpPut, m_UseSsl, m_UseDataHub, m_DataHubAddr, m_DataHubPort);
-                }                    
-
-                LeClient.Connect();
-
-                if (m_UseHttpPut)
-                {
-                    var header = String.Format("PUT /{0}/hosts/{1}/?realtime=1 HTTP/1.1\r\n\r\n", m_AccountKey, m_Location);
-                    LeClient.Write(ASCII.GetBytes(header), 0, header.Length);
-                }
-            }
-            catch (Exception ex)
-            {
-                throw new IOException("An error occurred while opening the connection.", ex);
-            }
-        }
-
-        protected virtual void ReopenConnection()
-        {
-            CloseConnection();
-
-            var rootDelay = MinDelay;
-            while (true)
-            {
-                try
-                {
-                    OpenConnection();
-
-                    return;
-                }
-                catch (Exception ex)
-                {
-                    if (m_Debug)
-                    {
-                        WriteDebugMessages("Unable to connect to Logentries API.", ex);
-                    }
-                }
-
-                rootDelay *= 2;
-                if (rootDelay > MaxDelay)
-                    rootDelay = MaxDelay;
-
-                var waitFor = rootDelay + Random.Next(rootDelay);
-
-                try
-                {
-                    Thread.Sleep(waitFor);
-                }
-                catch
-                {
-                    throw new ThreadInterruptedException();
-                }
-            }
-        }
-
-        protected virtual void CloseConnection()
-        {
-            if (LeClient != null)
-                LeClient.Close();
-        }
-
-        public static bool IsNullOrWhiteSpace(String value)
-        {
-            if (value == null) return true;
-
-            for (int i = 0; i < value.Length; i++)
-            {
-                if (!Char.IsWhiteSpace(value[i])) return false;
-            }
-
-            return true;
-        }
-
-        private string retrieveSetting(String name)
-        {
-            string value;
-
-
-            value = ConfigurationManager.AppSettings[name];
-
-            if (IsNullOrWhiteSpace(value))
-            {
-                try
-                {
-                    value = Environment.GetEnvironmentVariable(name);
-                }
-                catch (SecurityException)
-                {
-                }
-            }
-
-            return value;
-        }
-
-        /*
-         * Use CloudConfigurationManager with .NET4.0 and fallback to System.Configuration for previous frameworks.
-         * 
-         * NOTE: This is not entirely clear with regards to the above comment, but this block of code uses a compiler directive NET4_0
-         *       which is not set by default anywhere, so most uses of this code will default back to the "pre-.Net4.0" code branch, even
-         *       if you are using .Net4.0 or .Net4.5.
-         *       
-         *       The second issue is that there are two appsetting keys for each setting - the "legacy" key, such as "LOGENTRIES_TOKEN"
-         *       and the "non-legacy" key, such as "Logentries.Token".  Again, I'm not sure of the reasons behind this, so the code below checks
-         *       both the legacy and non-legacy keys, defaulting to the legacy keys if they are found.
-         *       
-         *       It probably should be investigated whether the fallback to ConfigurationManager is needed at all, as CloudConfigurationManager 
-         *       will retrieve settings from appSettings in a non-Azure environment.
-         */
-        protected virtual bool LoadCredentials()
-        {
-            if (!m_UseHttpPut)
-            {
-                if (GetIsValidGuid(m_Token))
-                    return true;
-
-                var configToken = retrieveSetting(LegacyConfigTokenName) ?? retrieveSetting(ConfigTokenName);
-
-                if (!String.IsNullOrEmpty(configToken) && GetIsValidGuid(configToken))
-                {
-                    m_Token = configToken;
-                    return true;
-                }
-
-                WriteDebugMessages(InvalidTokenMessage);
-                return false;
-            }
-
-            if (m_AccountKey != "" && GetIsValidGuid(m_AccountKey) && m_Location != "")
-                return true;
-
-            var configAccountKey = ConfigurationManager.AppSettings[LegacyConfigAccountKeyName] ?? ConfigurationManager.AppSettings[ConfigAccountKeyName];
-            if (!String.IsNullOrEmpty(configAccountKey) && GetIsValidGuid(configAccountKey))
-            {
-                m_AccountKey = configAccountKey;
-
-                var configLocation = ConfigurationManager.AppSettings[LegacyConfigLocationName] ?? ConfigurationManager.AppSettings[ConfigLocationName];
-                if (!String.IsNullOrEmpty(configLocation))
-                {
-                    m_Location = configLocation;
-                    return true;
-                }
-            }
-
-            WriteDebugMessages(InvalidHttpPutCredentialsMessage);
-            return false;
-        }
-
-        private bool CheckIfHostNameValid(String hostName)
-        {
-            return !ForbiddenHostNameChars.IsMatch(hostName); // Returns false if reg.ex. matches any of forbidden chars.
-        }
-
-        static bool IsGuid(string candidate, out Guid output)
-        {
-            bool isValid = false;
-            output = Guid.Empty;
-
-            if (isGuid.IsMatch(candidate))
-            {
-                output = new Guid(candidate);
-                isValid = true;
-            }
-            return isValid;
-        }
-
-        protected virtual bool GetIsValidGuid(string guidString)
-        {
-            if (String.IsNullOrEmpty(guidString))
-                return false;
-
-            System.Guid newGuid = System.Guid.NewGuid();
-            return IsGuid(guidString, out newGuid);
-        }
-
-        protected virtual void WriteDebugMessages(string message, Exception ex)
-        {
-            if (!m_Debug)
-                return;
-
-            message = LeSignature + message;
-            string[] messages = { message, ex.ToString() };
-            foreach (var msg in messages)
-            {
-                // Use below line instead when compiling with log4net1.2.10.
-                //LogLog.Debug(msg);
-
-                //LogLog.Debug(typeof(LogentriesAppender), msg);
-
-                Debug.WriteLine(message);
-            }
-        }
-
-        protected virtual void WriteDebugMessages(string message)
-        {
-            if (!m_Debug)
-                return;
-
-            message = LeSignature + message;
-
-            // Use below line instead when compiling with log4net1.2.10.
-            //LogLog.Debug(message);
-
-            //LogLog.Debug(typeof(LogentriesAppender), message);
-            Debug.WriteLine(message);
-        }
-
-        #endregion
-
-        #region publicMethods
-
-        public virtual void AddLine(string line)
-        {
-            if (!IsRunning)
-            {
-                // We need to load user credentials only
-                // if the configuration does not state that DataHub is used;
-                // credentials needed only if logs are sent to LE service directly.
-                bool credentialsLoaded = false;
-                if(!m_UseDataHub)
-                {
-                    credentialsLoaded = LoadCredentials();
-                }
-
-                // If in DataHub mode credentials are ignored.
-                if (credentialsLoaded || m_UseDataHub)
-                {
-                    WriteDebugMessages("Starting Logentries asynchronous socket client.");
-                    WorkerThread.Start();
-                    IsRunning = true;
-                }
-            }
-
-            WriteDebugMessages("Queueing: " + line);
-
-            String trimmedEvent = line.TrimEnd(TrimChars);
-
-            // Try to append data to queue.
-            if (!Queue.TryAdd(trimmedEvent))
-            {
-                Queue.Take();
-                if (!Queue.TryAdd(trimmedEvent))
-                    WriteDebugMessages(QueueOverflowMessage);
-            }
-        }
-
-        public void interruptWorker()
-        {
-            WorkerThread.Interrupt();
-        }
-
-        #endregion
-    }
-}

src/LogentriesCore/LeClient.cs

@@ -1,103 +0,0 @@
-using System;
-using System.IO;
-using System.Net.Security;
-using System.Net.Sockets;
-
-namespace LogentriesCore
-{
-    class LeClient
-    {
-        // Logentries API server address. 
-        protected const String LeApiUrl = "api.logentries.com";
-
-        // Port number for token logging on Logentries API server. 
-        protected const int LeApiTokenPort = 10000;
-
-        // Port number for TLS encrypted token logging on Logentries API server 
-        protected const int LeApiTokenTlsPort = 20000;
-
-        // Port number for HTTP PUT logging on Logentries API server. 
-        protected const int LeApiHttpPort = 80;
-
-        // Port number for SSL HTTP PUT logging on Logentries API server. 
-        protected const int LeApiHttpsPort = 443;
-
-        // Creates LeClient instance. If do not define useServerUrl and/or useOverrideProt during call
-        // LeClient will be configured to work with api.logentries.com server; otherwise - with
-        // defined server on defined port.
-        public LeClient(bool useHttpPut, bool useSsl, bool useDataHub, String serverAddr, int port)
-        {
-            
-            // Override port number and server address to send logs to DataHub instance.
-            if (useDataHub)
-            {
-                m_UseSsl = false; // DataHub does not support receiving log messages over SSL for now.
-                m_TcpPort = port;
-                m_ServerAddr = serverAddr;
-            }
-            else
-            {
-                m_UseSsl = useSsl;
-
-                if (!m_UseSsl)
-                    m_TcpPort = useHttpPut ? LeApiHttpPort : LeApiTokenPort;
-                else
-                    m_TcpPort = useHttpPut ? LeApiHttpsPort : LeApiTokenTlsPort;
-            }            
-        }
-
-        private bool m_UseSsl = false;
-        private int m_TcpPort;
-        private TcpClient m_Client = null;
-        private Stream m_Stream = null;
-        private SslStream m_SslStream = null;
-        private String m_ServerAddr = LeApiUrl; // By default m_ServerAddr points to api.logentries.com if useDataHub is not set to true.
-
-        private Stream ActiveStream
-        {
-            get
-            {
-                return m_UseSsl ? m_SslStream : m_Stream;
-            }
-        }
-
-        public void Connect()
-        {
-            m_Client = new TcpClient(m_ServerAddr, m_TcpPort);
-            m_Client.NoDelay = true;
-
-            m_Stream = m_Client.GetStream();
-
-            if (m_UseSsl)
-            {
-                m_SslStream = new SslStream(m_Stream);
-                m_SslStream.AuthenticateAsClient(m_ServerAddr);
-
-            }
-        }
-
-        public void Write(byte[] buffer, int offset, int count)
-        {
-            ActiveStream.Write(buffer, offset, count);
-        }
-
-        public void Flush()
-        {
-            ActiveStream.Flush();
-        }
-
-        public void Close()
-        {
-            if (m_Client != null)
-            {
-                try
-                {
-                    m_Client.Close();
-                }
-                catch
-                {
-                }
-            }
-        }
-    }
-}

src/LogentriesCore/LogentriesCore.csproj

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{90D6E9FC-7B88-4E1B-B018-8FA742274558}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>LogentriesCore</RootNamespace>
-    <AssemblyName>LogentriesCore</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AsyncLogger.cs" />
-    <Compile Include="LeClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

src/LogentriesCore/Properties/AssemblyInfo.cs

@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("LogentriesCore")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("LogentriesCore")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("14055980-6937-4745-9449-dabf47c1d892")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.0.0")]
-[assembly: AssemblyFileVersion("2.6.0.0")]

src/LogentriesCore/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.1.0" targetFramework="net40" />
-</packages>

src/LogentriesNLog/LogentriesNLog.csproj

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>LogentriesNLog</RootNamespace>
-    <AssemblyName>LogentriesNLog</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="fastJSON\Getters.cs" />
-    <Compile Include="fastJSON\JSON.cs" />
-    <Compile Include="fastJSON\JsonParser.cs" />
-    <Compile Include="fastJSON\JsonSerializer.cs" />
-    <Compile Include="fastJSON\SafeDictionary.cs" />
-    <Compile Include="LogentriesTarget.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\LogentriesCore\LogentriesCore.csproj">
-      <Project>{90D6E9FC-7B88-4E1B-B018-8FA742274558}</Project>
-      <Name>LogentriesCore</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="fastJSON\license.txt" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

src/LogentriesNLog/LogentriesTarget.cs

@@ -1,150 +0,0 @@
-using System;
-using LogentriesCore;
-using LogentriesNLog.fastJSON;
-using NLog;
-using NLog.Targets;
-
-namespace LogentriesNLog
-{
-    [Target("Logentries")]
-    public sealed class LogentriesTarget : TargetWithLayout
-    {
-        private AsyncLogger logentriesAsync;
-
-        public LogentriesTarget()
-        {
-            logentriesAsync = new AsyncLogger();
-            logentriesAsync.setImmediateFlush(true);
-        }
-
-
-        /** Debug flag. */
-        public bool Debug
-        {
-            get { return logentriesAsync.getDebug(); }
-            set { logentriesAsync.setDebug(value); }
-        }
-
-        /** Is using DataHub parameter flag. - ste to true if it is needed to send messages to DataHub instance. */
-        public bool IsUsingDataHub
-        {
-            get { return logentriesAsync.getIsUsingDataHab(); }
-            set { logentriesAsync.setIsUsingDataHub(value); }
-        }
-
-        /** DataHub server address */
-        public String DataHubAddr
-        {
-            get { return logentriesAsync.getDataHubAddr(); }
-            set { logentriesAsync.setDataHubAddr(value); }
-        }
-
-        /** DataHub server port */
-        public int DataHubPort
-        {
-            get { return logentriesAsync.getDataHubPort(); }
-            set { logentriesAsync.setDataHubPort(value); }
-        }
-
-        /** Option to set Token programmatically or in Appender Definition */
-        public string Token
-        {
-            get { return logentriesAsync.getToken(); }
-            set { logentriesAsync.setToken(value); }
-        }
-
-        /** HTTP PUT Flag */
-        public bool HttpPut
-        {
-            get { return logentriesAsync.getUseHttpPut(); }
-            set { logentriesAsync.setUseHttpPut(value); }
-        }
-
-        /** SSL/TLS parameter flag */
-        public bool Ssl
-        {
-            get { return logentriesAsync.getUseSsl(); }
-            set { logentriesAsync.setUseSsl(value); }
-        }
-
-        /** ACCOUNT_KEY parameter for HTTP PUT logging */
-        public String Key
-        {
-            get { return logentriesAsync.getAccountKey(); }
-            set { logentriesAsync.setAccountKey(value); }
-        }
-
-        /** LOCATION parameter for HTTP PUT logging */
-        public String Location
-        {
-            get { return logentriesAsync.getLocation(); }
-            set { logentriesAsync.setLocation(value); }
-        }
-
-        /* LogHostname - switch that defines whether add host name to the log message */
-        public bool LogHostname
-        {
-            get { return logentriesAsync.getUseHostName(); }
-            set { logentriesAsync.setUseHostName(value); }
-        }
-
-        /* HostName - user-defined host name. If empty the library will try to obtain it automatically */
-        public String HostName
-        {
-            get { return logentriesAsync.getHostName(); }
-            set { logentriesAsync.setHostName(value); }
-        }
-
-        /* User-defined log message ID */
-        public String LogID
-        {
-            get { return logentriesAsync.getLogID(); }
-            set { logentriesAsync.setLogID(value); }
-        }
-
-        public bool KeepConnection { get; set; }
-
-        protected override void Write(LogEventInfo logEvent)
-        {
-            //Render message content
-            var log = new Log
-            {
-                Level = logEvent.Level.ToString(),
-                Logger = logEvent.LoggerName,
-                Message = logEvent.FormattedMessage,
-                Time = logEvent.TimeStamp,
-            };
-
-            //NLog can pass null references of Exception
-            if (logEvent.Exception != null)
-            {
-                log.Exception = logEvent.Exception.ToString();
-                log.ExceptionType = logEvent.Exception.GetType().ToString();
-            }
-
-            logentriesAsync.AddLine(JSON.Instance.ToJSON(log));
-        }
-
-        protected override void CloseTarget()
-        {
-            base.CloseTarget();
-
-            logentriesAsync.interruptWorker();
-        }
-    }
-
-    public class Log
-    {
-        public string Message { get; set; }
-
-        public DateTime Time { get; set; }
-
-        public string Logger { get; set; }
-
-        public string Exception { get; set; }
-
-        public string ExceptionType { get; set; }
-
-        public String Level { get; set; }
-    }
-}

src/LogentriesNLog/Properties/AssemblyInfo.cs

@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("LogentriesNLog")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("LogentriesNLog")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7e04ff2d-ea59-4b62-969d-72bd3e37c684")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]

src/LogentriesNLog/fastJSON/Getters.cs

@@ -1,21 +0,0 @@
-//http://fastjson.codeplex.com/
-//http://fastjson.codeplex.com/license
-
-using System;
-using System.Collections.Generic;
-
-namespace LogentriesNLog.fastJSON
-{
-    internal class Getters
-    {
-        public string Name;
-        public JSON.GenericGetter Getter;
-        public Type propertyType;
-    }
-
-    internal class DatasetSchema
-    {
-        public List<string> Info { get; set; }
-        public string Name { get; set; }
-    }
-}

src/LogentriesNLog/fastJSON/JSON.cs

@@ -1,821 +0,0 @@
-//http://fastjson.codeplex.com/
-//http://fastjson.codeplex.com/license
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using System.IO;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Xml.Serialization;
-
-namespace LogentriesNLog.fastJSON
-{
-
-    internal class JSON
-    {
-        public readonly static JSON Instance = new JSON();
-
-        private JSON()
-        {
-            UseSerializerExtension = false;
-            SerializeNullValues = false;
-            UseOptimizedDatasetSchema = false;
-            UsingGlobalTypes = false;
-            UseUTCDateTime = true;
-        }
-        public bool UseOptimizedDatasetSchema = true;
-        public bool UseFastGuid = true;
-        public bool UseSerializerExtension = true;
-        public bool IndentOutput = false;
-        public bool SerializeNullValues = true;
-        public bool UseUTCDateTime = false;
-        public bool ShowReadOnlyProperties = false;
-        public bool UsingGlobalTypes = true;
-
-        public string ToJSON(object obj)
-        {
-            return ToJSON(obj, UseSerializerExtension, UseFastGuid, UseOptimizedDatasetSchema, SerializeNullValues);
-        }
-
-
-        public string ToJSON(object obj,
-                             bool enableSerializerExtensions,
-                             bool enableFastGuid,
-                             bool enableOptimizedDatasetSchema,
-                             bool serializeNullValues)
-        {
-            return new JSONSerializer(enableOptimizedDatasetSchema, enableFastGuid, enableSerializerExtensions, serializeNullValues, IndentOutput).ConvertToJSON(obj);
-        }
-
-
-        public T ToObject<T>(string json)
-        {
-            return (T)ToObject(json, typeof(T));
-        }
-
-
-        public object ToObject(string json, Type type)
-        {
-            var ht = new JsonParser(json).Decode() as Dictionary<string, object>;
-            if (ht == null) return null;
-            return ParseDictionary(ht, null, type);
-        }
-
-#if CUSTOMTYPE
-        internal SafeDictionary<Type, Serialize> _customSerializer = new SafeDictionary<Type, Serialize>();
-        internal SafeDictionary<Type, Deserialize> _customDeserializer = new SafeDictionary<Type, Deserialize>();
-
-        public void RegisterCustomType(Type type, Serialize serializer, Deserialize deserializer)
-        {
-            if (type != null && serializer != null && deserializer != null)
-            {
-                _customSerializer.Add(type, serializer);
-                _customDeserializer.Add(type, deserializer);
-                // reset property cache
-                _propertycache = new SafeDictionary<string, SafeDictionary<string, myPropInfo>>();
-            }
-        }
-
-        internal bool IsTypeRegistered(Type t)
-        {
-            Serialize s;
-            return _customSerializer.TryGetValue(t, out s);
-        }
-#endif
-
-        #region [   PROPERTY GET SET CACHE   ]
-
-        readonly SafeDictionary<Type, string> _tyname = new SafeDictionary<Type, string>();
-        internal string GetTypeAssemblyName(Type t)
-        {
-            string val = "";
-            if (_tyname.TryGetValue(t, out val))
-                return val;
-            string s = t.AssemblyQualifiedName;
-            _tyname.Add(t, s);
-            return s;
-        }
-
-        readonly SafeDictionary<string, Type> _typecache = new SafeDictionary<string, Type>();
-        private Type GetTypeFromCache(string typename)
-        {
-            Type val = null;
-            if (_typecache.TryGetValue(typename, out val))
-                return val;
-            Type t = Type.GetType(typename);
-            _typecache.Add(typename, t);
-            return t;
-        }
-
-        readonly SafeDictionary<Type, CreateObject> _constrcache = new SafeDictionary<Type, CreateObject>();
-        private delegate object CreateObject();
-        private object FastCreateInstance(Type objtype)
-        {
-            try
-            {
-                CreateObject c = null;
-                if (_constrcache.TryGetValue(objtype, out c))
-                {
-                    return c();
-                }
-                DynamicMethod dynMethod = new DynamicMethod("_", objtype, null, true);
-                ILGenerator ilGen = dynMethod.GetILGenerator();
-
-                ilGen.Emit(OpCodes.Newobj, objtype.GetConstructor(Type.EmptyTypes));
-                ilGen.Emit(OpCodes.Ret);
-                c = (CreateObject)dynMethod.CreateDelegate(typeof(CreateObject));
-                _constrcache.Add(objtype, c);
-                return c();
-            }
-            catch (Exception exc)
-            {
-                throw new Exception(string.Format("Failed to fast create instance for type '{0}' from assemebly '{1}'",
-                    objtype.FullName, objtype.AssemblyQualifiedName), exc);
-            }
-        }
-
-        private struct myPropInfo
-        {
-            public bool filled;
-            public Type pt;
-            public Type bt;
-            public Type changeType;
-            public bool isDictionary;
-            public bool isValueType;
-            public bool isGenericType;
-            public bool isArray;
-            public bool isByteArray;
-            public bool isGuid;
-#if !SILVERLIGHT
-            public bool isDataSet;
-            public bool isDataTable;
-            public bool isHashtable;
-#endif
-            public GenericSetter setter;
-            public bool isEnum;
-            public bool isDateTime;
-            public Type[] GenericTypes;
-            public bool isInt;
-            public bool isLong;
-            public bool isString;
-            public bool isBool;
-            public bool isClass;
-            public GenericGetter getter;
-            public bool isStringDictionary;
-            public string Name;
-#if CUSTOMTYPE
-            public bool isCustomType;
-#endif
-            public bool CanWrite;
-        }
-
-        readonly SafeDictionary<string, SafeDictionary<string, myPropInfo>> _propertycache = new SafeDictionary<string, SafeDictionary<string, myPropInfo>>();
-        private SafeDictionary<string, myPropInfo> Getproperties(Type type, string typename)
-        {
-            SafeDictionary<string, myPropInfo> sd = null;
-            if (_propertycache.TryGetValue(typename, out sd))
-            {
-                return sd;
-            }
-            sd = new SafeDictionary<string, myPropInfo>();
-            var pr = type.GetProperties(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
-            foreach (var p in pr)
-            {
-                myPropInfo d = CreateMyProp(p.PropertyType, p.Name);
-                d.CanWrite = p.CanWrite;
-                d.setter = CreateSetMethod(p);
-                d.getter = CreateGetMethod(p);
-                sd.Add(p.Name, d);
-            }
-
-            _propertycache.Add(typename, sd);
-            return sd;
-        }
-
-        private myPropInfo CreateMyProp(Type t, string name)
-        {
-            myPropInfo d = new myPropInfo();
-            d.filled = true;
-            d.CanWrite = true;
-            d.pt = t;
-            d.Name = name;
-            d.isDictionary = t.Name.Contains("Dictionary");
-            if (d.isDictionary)
-                d.GenericTypes = t.GetGenericArguments();
-            d.isValueType = t.IsValueType;
-            d.isGenericType = t.IsGenericType;
-            d.isArray = t.IsArray;
-            if (d.isArray)
-                d.bt = t.GetElementType();
-            if (d.isGenericType)
-                d.bt = t.GetGenericArguments()[0];
-            d.isByteArray = t == typeof(byte[]);
-            d.isGuid = (t == typeof(Guid) || t == typeof(Guid?));
-#if !SILVERLIGHT
-            d.isHashtable = t == typeof(Hashtable);
-            d.isDataSet = t == typeof(DataSet);
-            d.isDataTable = t == typeof(DataTable);
-#endif
-
-            d.changeType = GetChangeType(t);
-            d.isEnum = t.IsEnum;
-            d.isDateTime = t == typeof(DateTime) || t == typeof(DateTime?);
-            d.isInt = t == typeof(int) || t == typeof(int?);
-            d.isLong = t == typeof(long) || t == typeof(long?);
-            d.isString = t == typeof(string);
-            d.isBool = t == typeof(bool) || t == typeof(bool?);
-            d.isClass = t.IsClass;
-
-            if (d.isDictionary && d.GenericTypes.Length > 0 && d.GenericTypes[0] == typeof(string))
-                d.isStringDictionary = true;
-
-#if CUSTOMTYPE
-            if (IsTypeRegistered(t))
-                d.isCustomType = true;
-#endif
-            return d;
-        }
-
-        private delegate void GenericSetter(object target, object value);
-
-        private static GenericSetter CreateSetMethod(PropertyInfo propertyInfo)
-        {
-            MethodInfo setMethod = propertyInfo.GetSetMethod(nonPublic: true);
-            if (setMethod == null)
-                return null;
-
-            var arguments = new Type[2];
-            arguments[0] = arguments[1] = typeof(object);
-
-            DynamicMethod setter = new DynamicMethod("_", typeof(void), arguments, true);
-            ILGenerator il = setter.GetILGenerator();
-            il.Emit(OpCodes.Ldarg_0);
-            il.Emit(OpCodes.Castclass, propertyInfo.DeclaringType);
-            il.Emit(OpCodes.Ldarg_1);
-
-            if (propertyInfo.PropertyType.IsClass)
-                il.Emit(OpCodes.Castclass, propertyInfo.PropertyType);
-            else
-                il.Emit(OpCodes.Unbox_Any, propertyInfo.PropertyType);
-
-            il.EmitCall(OpCodes.Callvirt, setMethod, null);
-            il.Emit(OpCodes.Ret);
-
-            return (GenericSetter)setter.CreateDelegate(typeof(GenericSetter));
-        }
-
-        internal delegate object GenericGetter(object obj);
-
-
-        private GenericGetter CreateGetMethod(PropertyInfo propertyInfo)
-        {
-            MethodInfo getMethod = propertyInfo.GetGetMethod();
-            if (getMethod == null)
-                return null;
-
-            var arguments = new Type[1];
-            arguments[0] = typeof(object);
-
-            DynamicMethod getter = new DynamicMethod("_", typeof(object), arguments, true);
-            ILGenerator il = getter.GetILGenerator();
-            il.Emit(OpCodes.Ldarg_0);
-            il.Emit(OpCodes.Castclass, propertyInfo.DeclaringType);
-            il.EmitCall(OpCodes.Callvirt, getMethod, null);
-
-            if (!propertyInfo.PropertyType.IsClass)
-                il.Emit(OpCodes.Box, propertyInfo.PropertyType);
-
-            il.Emit(OpCodes.Ret);
-
-            return (GenericGetter)getter.CreateDelegate(typeof(GenericGetter));
-        }
-
-        readonly SafeDictionary<Type, List<Getters>> _getterscache = new SafeDictionary<Type, List<Getters>>();
-        internal List<Getters> GetGetters(Type type)
-        {
-            List<Getters> val = null;
-            if (_getterscache.TryGetValue(type, out val))
-                return val;
-
-            var props = type.GetProperties(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
-            var getters = new List<Getters>();
-            foreach (var p in props)
-            {
-                if (!p.CanWrite && ShowReadOnlyProperties == false) continue;
-
-                var att = p.GetCustomAttributes(typeof(XmlIgnoreAttribute), false);
-                if (att != null && att.Length > 0)
-                    continue;
-
-                GenericGetter g = CreateGetMethod(p);
-                if (g != null)
-                {
-                    Getters gg = new Getters();
-                    gg.Name = p.Name;
-                    gg.Getter = g;
-                    gg.propertyType = p.PropertyType;
-                    getters.Add(gg);
-                }
-            }
-
-
-            _getterscache.Add(type, getters);
-            return getters;
-        }
-
-        private object ChangeType(object value, Type conversionType)
-        {
-            if (conversionType == typeof(int))
-                return (int)CreateLong((string)value);
-
-            if (conversionType == typeof(long))
-                return CreateLong((string)value);
-
-            if (conversionType == typeof(string))
-                return value;
-
-            if (conversionType == typeof(Guid))
-                return CreateGuid((string)value);
-
-            if (conversionType.IsEnum)
-                return CreateEnum(conversionType, (string)value);
-
-            return Convert.ChangeType(value, conversionType, CultureInfo.InvariantCulture);
-        }
-        #endregion
-
-
-        private object ParseDictionary(Dictionary<string, object> d, Dictionary<string, object> globaltypes, Type type)
-        {
-            object tn = "";
-            if (d.TryGetValue("$types", out tn))
-            {
-                UsingGlobalTypes = true;
-                globaltypes = new Dictionary<string, object>();
-                foreach (var kv in (Dictionary<string, object>)tn)
-                {
-                    globaltypes.Add((string)kv.Value, kv.Key);
-                }
-            }
-
-            bool found = d.TryGetValue("$type", out tn);
-#if !SILVERLIGHT
-            if (found == false && type == typeof(Object))
-            {
-                return CreateDataset(d, globaltypes);
-            }
-#endif
-            if (found)
-            {
-                if (UsingGlobalTypes)
-                {
-                    object tname = "";
-                    if (globaltypes.TryGetValue((string)tn, out tname))
-                        tn = tname;
-                }
-                type = GetTypeFromCache((string)tn);
-            }
-
-            if (type == null)
-                throw new Exception("Cannot determine type");
-
-            string typename = type.FullName;
-            object o = FastCreateInstance(type);
-            var props = Getproperties(type, typename);
-            foreach (var name in d.Keys)
-            {
-                if (name == "$map")
-                {
-                    ProcessMap(o, props, (Dictionary<string, object>)d[name]);
-                    continue;
-                }
-                myPropInfo pi;
-                if (props.TryGetValue(name, out pi) == false)
-                    continue;
-                if (pi.filled)
-                {
-                    object v = d[name];
-
-                    if (v != null)
-                    {
-                        object oset = null;
-
-                        if (pi.isInt)
-                            oset = (int)CreateLong((string)v);
-#if CUSTOMTYPE
-                        else if (pi.isCustomType)
-                            oset = CreateCustom((string)v, pi.pt);
-#endif
-                        else if (pi.isLong)
-                            oset = CreateLong((string)v);
-
-                        else if (pi.isString)
-                            oset = v;
-
-                        else if (pi.isBool)
-                            oset = (bool)v;
-
-                        else if (pi.isGenericType && pi.isValueType == false && pi.isDictionary == false)
-#if SILVERLIGHT
-                            oset = CreateGenericList((List<object>)v, pi.pt, pi.bt, globaltypes);
-#else
-                            oset = CreateGenericList((ArrayList)v, pi.pt, pi.bt, globaltypes);
-#endif
-                        else if (pi.isByteArray)
-                            oset = Convert.FromBase64String((string)v);
-
-                        else if (pi.isArray && pi.isValueType == false)
-#if SILVERLIGHT
-                            oset = CreateArray((List<object>)v, pi.pt, pi.bt, globaltypes);
-#else
-                            oset = CreateArray((ArrayList)v, pi.pt, pi.bt, globaltypes);
-#endif
-                        else if (pi.isGuid)
-                            oset = CreateGuid((string)v);
-#if !SILVERLIGHT
-                        else if (pi.isDataSet)
-                            oset = CreateDataset((Dictionary<string, object>)v, globaltypes);
-
-                        else if (pi.isDataTable)
-                            oset = CreateDataTable((Dictionary<string, object>)v, globaltypes);
-#endif
-
-                        else if (pi.isStringDictionary)
-                            oset = CreateStringKeyDictionary((Dictionary<string, object>)v, pi.pt, pi.GenericTypes, globaltypes);
-
-#if !SILVERLIGHT
-                        else if (pi.isDictionary || pi.isHashtable)
-                            oset = CreateDictionary((ArrayList)v, pi.pt, pi.GenericTypes, globaltypes);
-#else
-                        else if (pi.isDictionary)
-                            oset = CreateDictionary((List<object>)v, pi.pt, pi.GenericTypes, globaltypes);
-#endif
-
-                        else if (pi.isEnum)
-                            oset = CreateEnum(pi.pt, (string)v);
-
-                        else if (pi.isDateTime)
-                            oset = CreateDateTime((string)v);
-
-                        else if (pi.isClass && v is Dictionary<string, object>)
-                            oset = ParseDictionary((Dictionary<string, object>)v, globaltypes, pi.pt);
-
-                        else if (pi.isValueType)
-                            oset = ChangeType(v, pi.changeType);
-
-#if SILVERLIGHT
-                        else if (v is List<object>)
-                            oset = CreateArray((List<object>)v, pi.pt, typeof(object), globaltypes);
-#else
-                        else if (v is ArrayList)
-                            oset = CreateArray((ArrayList)v, pi.pt, typeof(object), globaltypes);
-#endif
-                        else
-                            oset = v;
-
-                        if (pi.CanWrite)
-                            pi.setter(o, oset);
-                    }
-                }
-            }
-            return o;
-        }
-
-#if CUSTOMTYPE
-        private object CreateCustom(string v, Type type)
-        {
-            Deserialize d;
-            _customDeserializer.TryGetValue(type, out d);
-            return d(v);
-        }
-#endif
-
-        private void ProcessMap(object obj, SafeDictionary<string, myPropInfo> props, Dictionary<string, object> dic)
-        {
-            foreach (var kv in dic)
-            {
-                myPropInfo p = props[kv.Key];
-                object o = p.getter(obj);
-                Type t = Type.GetType((string)kv.Value);
-                if (t == typeof(Guid))
-                    p.setter(obj, CreateGuid((string)o));
-            }
-        }
-
-        private long CreateLong(string s)
-        {
-            long num = 0;
-            bool neg = false;
-            foreach (var cc in s)
-            {
-                if (cc == '-')
-                    neg = true;
-                else if (cc == '+')
-                    neg = false;
-                else
-                {
-                    num *= 10;
-                    num += (cc - '0');
-                }
-            }
-
-            return neg ? -num : num;
-        }
-
-        private object CreateEnum(Type pt, string v)
-        {
-            // TODO : optimize create enum
-#if !SILVERLIGHT
-            return Enum.Parse(pt, v);
-#else
-            return Enum.Parse(pt, v, true);
-#endif
-        }
-
-        private Guid CreateGuid(string s)
-        {
-            if (s.Length > 30)
-                return new Guid(s);
-            return new Guid(Convert.FromBase64String(s));
-        }
-
-        private DateTime CreateDateTime(string value)
-        {
-            bool utc = false;
-            //                   0123456789012345678
-            // datetime format = yyyy-MM-dd HH:mm:ss
-            int year = (int)CreateLong(value.Substring(0, 4));
-            int month = (int)CreateLong(value.Substring(5, 2));
-            int day = (int)CreateLong(value.Substring(8, 2));
-            int hour = (int)CreateLong(value.Substring(11, 2));
-            int min = (int)CreateLong(value.Substring(14, 2));
-            int sec = (int)CreateLong(value.Substring(17, 2));
-
-            if (value.EndsWith("Z"))
-                utc = true;
-
-            if (UseUTCDateTime == false && utc == false)
-                return new DateTime(year, month, day, hour, min, sec);
-            return new DateTime(year, month, day, hour, min, sec, DateTimeKind.Utc).ToLocalTime();
-        }
-
-#if SILVERLIGHT
-        private object CreateArray(List<object> data, Type pt, Type bt, Dictionary<string, object> globalTypes)
-        {
-            Array col = Array.CreateInstance(bt, data.Count);
-            // create an array of objects
-            for (int i = 0; i < data.Count; i++)// each (object ob in data)
-            {
-                object ob = data[i];
-                if (ob is IDictionary)
-                    col.SetValue(ParseDictionary((Dictionary<string, object>)ob, globalTypes, bt), i);
-                else
-                    col.SetValue(ChangeType(ob, bt), i);
-            }
-
-            return col;
-        }
-#else
-        private object CreateArray(ArrayList data, Type pt, Type bt, Dictionary<string, object> globalTypes)
-        {
-            ArrayList col = new ArrayList();
-            // create an array of objects
-            foreach (var ob in data)
-            {
-                if (ob is IDictionary)
-                    col.Add(ParseDictionary((Dictionary<string, object>)ob, globalTypes, bt));
-                else
-                    col.Add(ChangeType(ob, bt));
-            }
-            return col.ToArray(bt);
-        }
-#endif
-
-
-#if SILVERLIGHT
-        private object CreateGenericList(List<object> data, Type pt, Type bt, Dictionary<string, object> globalTypes)
-#else
-        private object CreateGenericList(ArrayList data, Type pt, Type bt, Dictionary<string, object> globalTypes)
-#endif
-        {
-            IList col = (IList)FastCreateInstance(pt);
-            // create an array of objects
-            foreach (var ob in data)
-            {
-                if (ob is IDictionary)
-                    col.Add(ParseDictionary((Dictionary<string, object>)ob, globalTypes, bt));
-#if SILVERLIGHT
-                else if (ob is List<object>)
-                    col.Add(((List<object>)ob).ToArray());
-#else
-                else if (ob is ArrayList)
-                    col.Add(((ArrayList)ob).ToArray());
-#endif
-                else
-                    col.Add(ChangeType(ob, bt));
-            }
-            return col;
-        }
-
-        private object CreateStringKeyDictionary(Dictionary<string, object> reader, Type pt, Type[] types, Dictionary<string, object> globalTypes)
-        {
-            var col = (IDictionary)FastCreateInstance(pt);
-            Type t1 = null;
-            Type t2 = null;
-            if (types != null)
-            {
-                t1 = types[0];
-                t2 = types[1];
-            }
-
-            foreach (var values in reader)
-            {
-                var key = values.Key;//ChangeType(values.Key, t1);
-                object val = null;
-                if (values.Value is Dictionary<string, object>)
-                    val = ParseDictionary((Dictionary<string, object>)values.Value, globalTypes, t2);
-                else
-                    val = ChangeType(values.Value, t2);
-                col.Add(key, val);
-            }
-
-            return col;
-        }
-
-#if SILVERLIGHT
-        private object CreateDictionary(List<object> reader, Type pt, Type[] types, Dictionary<string, object> globalTypes)
-#else
-        private object CreateDictionary(ArrayList reader, Type pt, Type[] types, Dictionary<string, object> globalTypes)
-#endif
-        {
-            IDictionary col = (IDictionary)FastCreateInstance(pt);
-            Type t1 = null;
-            Type t2 = null;
-            if (types != null)
-            {
-                t1 = types[0];
-                t2 = types[1];
-            }
-
-            foreach (Dictionary<string, object> values in reader)
-            {
-                object key = values["k"];
-                object val = values["v"];
-
-                if (key is Dictionary<string, object>)
-                    key = ParseDictionary((Dictionary<string, object>)key, globalTypes, t1);
-                else
-                    key = ChangeType(key, t1);
-
-                if (val is Dictionary<string, object>)
-                    val = ParseDictionary((Dictionary<string, object>)val, globalTypes, t2);
-                else
-                    val = ChangeType(val, t2);
-
-                col.Add(key, val);
-            }
-
-            return col;
-        }
-
-        private Type GetChangeType(Type conversionType)
-        {
-            if (conversionType.IsGenericType && conversionType.GetGenericTypeDefinition().Equals(typeof(Nullable<>)))
-                return conversionType.GetGenericArguments()[0];
-
-            return conversionType;
-        }
-#if !SILVERLIGHT
-        private DataSet CreateDataset(Dictionary<string, object> reader, Dictionary<string, object> globalTypes)
-        {
-            DataSet ds = new DataSet();
-            ds.EnforceConstraints = false;
-            ds.BeginInit();
-
-            // read dataset schema here
-            ReadSchema(reader, ds, globalTypes);
-
-            foreach (var pair in reader)
-            {
-                if (pair.Key == "$type" || pair.Key == "$schema") continue;
-
-                ArrayList rows = (ArrayList)pair.Value;
-                if (rows == null) continue;
-
-                DataTable dt = ds.Tables[pair.Key];
-                ReadDataTable(rows, dt);
-            }
-
-            ds.EndInit();
-
-            return ds;
-        }
-
-        private void ReadSchema(Dictionary<string, object> reader, DataSet ds, Dictionary<string, object> globalTypes)
-        {
-            var schema = reader["$schema"];
-
-            if (schema is string)
-            {
-                TextReader tr = new StringReader((string)schema);
-                ds.ReadXmlSchema(tr);
-            }
-            else
-            {
-                DatasetSchema ms = (DatasetSchema)ParseDictionary((Dictionary<string, object>)schema, globalTypes, typeof(DatasetSchema));
-                ds.DataSetName = ms.Name;
-                for (int i = 0; i < ms.Info.Count; i += 3)
-                {
-                    if (ds.Tables.Contains(ms.Info[i]) == false)
-                        ds.Tables.Add(ms.Info[i]);
-                    ds.Tables[ms.Info[i]].Columns.Add(ms.Info[i + 1], Type.GetType(ms.Info[i + 2]));
-                }
-            }
-        }
-
-        private void ReadDataTable(ArrayList rows, DataTable dt)
-        {
-            dt.BeginInit();
-            dt.BeginLoadData();
-            var guidcols = new List<int>();
-            var datecol = new List<int>();
-
-            foreach (DataColumn c in dt.Columns)
-            {
-                if (c.DataType == typeof(Guid) || c.DataType == typeof(Guid?))
-                    guidcols.Add(c.Ordinal);
-                if (UseUTCDateTime && (c.DataType == typeof(DateTime) || c.DataType == typeof(DateTime?)))
-                    datecol.Add(c.Ordinal);
-            }
-
-            foreach (ArrayList row in rows)
-            {
-                var v = new object[row.Count];
-                row.CopyTo(v, 0);
-                foreach (var i in guidcols)
-                {
-                    string s = (string)v[i];
-                    if (s != null && s.Length < 36)
-                        v[i] = new Guid(Convert.FromBase64String(s));
-                }
-                if (UseUTCDateTime)
-                {
-                    foreach (var i in datecol)
-                    {
-                        string s = (string)v[i];
-                        if (s != null)
-                            v[i] = CreateDateTime(s);
-                    }
-                }
-                dt.Rows.Add(v);
-            }
-
-            dt.EndLoadData();
-            dt.EndInit();
-        }
-
-        DataTable CreateDataTable(Dictionary<string, object> reader, Dictionary<string, object> globalTypes)
-        {
-            var dt = new DataTable();
-
-            // read dataset schema here
-            var schema = reader["$schema"];
-
-            if (schema is string)
-            {
-                TextReader tr = new StringReader((string)schema);
-                dt.ReadXmlSchema(tr);
-            }
-            else
-            {
-                var ms = (DatasetSchema)ParseDictionary((Dictionary<string, object>)schema, globalTypes, typeof(DatasetSchema));
-                dt.TableName = ms.Info[0];
-                for (int i = 0; i < ms.Info.Count; i += 3)
-                {
-                    dt.Columns.Add(ms.Info[i + 1], Type.GetType(ms.Info[i + 2]));
-                }
-            }
-
-            foreach (var pair in reader)
-            {
-                if (pair.Key == "$type" || pair.Key == "$schema")
-                    continue;
-
-                var rows = (ArrayList)pair.Value;
-                if (rows == null)
-                    continue;
-
-                if (!dt.TableName.Equals(pair.Key, StringComparison.InvariantCultureIgnoreCase))
-                    continue;
-
-                ReadDataTable(rows, dt);
-            }
-
-            return dt;
-        }
-#endif
-    }
-}

src/LogentriesNLog/fastJSON/JsonParser.cs

@@ -1,409 +0,0 @@
-//http://fastjson.codeplex.com/
-//http://fastjson.codeplex.com/license
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-
-namespace LogentriesNLog.fastJSON
-{
-    /// <summary>
-    /// This class encodes and decodes JSON strings.
-    /// Spec. details, see http://www.json.org/
-    /// 
-    /// JSON uses Arrays and Objects. These correspond here to the datatypes ArrayList and Hashtable.
-    /// All numbers are parsed to doubles.
-    /// </summary>
-    internal class JsonParser
-    {
-        enum Token
-        {
-            None = -1,           // Used to denote no Lookahead available
-            Curly_Open,
-            Curly_Close,
-            Squared_Open,
-            Squared_Close,
-            Colon,
-            Comma,
-            String,
-            Number,
-            True,
-            False,
-            Null
-        }
-
-        readonly char[] json;
-        readonly StringBuilder s = new StringBuilder();
-        Token lookAheadToken = Token.None;
-        int index;
-
-        internal JsonParser(string json)
-        {
-            this.json = json.ToCharArray();
-        }
-
-        public object Decode()
-        {
-            return ParseValue();
-        }
-
-        private Dictionary<string, object> ParseObject()
-        {
-            var table = new Dictionary<string, object>();
-
-            ConsumeToken(); // {
-
-            while (true)
-            {
-                switch (LookAhead())
-                {
-
-                    case Token.Comma:
-                        ConsumeToken();
-                        break;
-
-                    case Token.Curly_Close:
-                        ConsumeToken();
-                        return table;
-
-                    default:
-                        {
-
-                            // name
-                            string name = ParseString();
-
-                            // :
-                            if (NextToken() != Token.Colon)
-                            {
-                                throw new Exception("Expected colon at index " + index);
-                            }
-
-                            // value
-                            object value = ParseValue();
-
-                            table[name] = value;
-                        }
-                        break;
-                }
-            }
-        }
-
-#if SILVERLIGHT
-        private List<object> ParseArray()
-        {
-            List<object> array = new List<object>();
-#else
-        private ArrayList ParseArray()
-        {
-            ArrayList array = new ArrayList();
-#endif
-            ConsumeToken(); // [
-
-            while (true)
-            {
-                switch (LookAhead())
-                {
-
-                    case Token.Comma:
-                        ConsumeToken();
-                        break;
-
-                    case Token.Squared_Close:
-                        ConsumeToken();
-                        return array;
-
-                    default:
-                        {
-                            array.Add(ParseValue());
-                        }
-                        break;
-                }
-            }
-        }
-
-        private object ParseValue()
-        {
-            switch (LookAhead())
-            {
-                case Token.Number:
-                    return ParseNumber();
-
-                case Token.String:
-                    return ParseString();
-
-                case Token.Curly_Open:
-                    return ParseObject();
-
-                case Token.Squared_Open:
-                    return ParseArray();
-
-                case Token.True:
-                    ConsumeToken();
-                    return true;
-
-                case Token.False:
-                    ConsumeToken();
-                    return false;
-
-                case Token.Null:
-                    ConsumeToken();
-                    return null;
-            }
-
-            throw new Exception("Unrecognized token at index" + index);
-        }
-
-        private string ParseString()
-        {
-            ConsumeToken(); // "
-
-            s.Length = 0;
-
-            int runIndex = -1;
-
-            while (index < json.Length)
-            {
-                var c = json[index++];
-
-                if (c == '"')
-                {
-                    if (runIndex != -1)
-                    {
-                        if (s.Length == 0)
-                            return new string(json, runIndex, index - runIndex - 1);
-
-                        s.Append(json, runIndex, index - runIndex - 1);
-                    }
-                    return s.ToString();
-                }
-
-                if (c != '\\')
-                {
-                    if (runIndex == -1)
-                        runIndex = index - 1;
-
-                    continue;
-                }
-
-                if (index == json.Length) break;
-
-                if (runIndex != -1)
-                {
-                    s.Append(json, runIndex, index - runIndex - 1);
-                    runIndex = -1;
-                }
-
-                switch (json[index++])
-                {
-                    case '"':
-                        s.Append('"');
-                        break;
-
-                    case '\\':
-                        s.Append('\\');
-                        break;
-
-                    case '/':
-                        s.Append('/');
-                        break;
-
-                    case 'b':
-                        s.Append('\b');
-                        break;
-
-                    case 'f':
-                        s.Append('\f');
-                        break;
-
-                    case 'n':
-                        s.Append('\n');
-                        break;
-
-                    case 'r':
-                        s.Append('\r');
-                        break;
-
-                    case 't':
-                        s.Append('\t');
-                        break;
-
-                    case 'u':
-                        {
-                            int remainingLength = json.Length - index;
-                            if (remainingLength < 4) break;
-
-                            // parse the 32 bit hex into an integer codepoint
-                            uint codePoint = ParseUnicode(json[index], json[index + 1], json[index + 2], json[index + 3]);
-                            s.Append((char)codePoint);
-
-                            // skip 4 chars
-                            index += 4;
-                        }
-                        break;
-                }
-            }
-
-            throw new Exception("Unexpectedly reached end of string");
-        }
-
-        private uint ParseSingleChar(char c1, uint multipliyer)
-        {
-            uint p1 = 0;
-            if (c1 >= '0' && c1 <= '9')
-                p1 = (uint)(c1 - '0') * multipliyer;
-            else if (c1 >= 'A' && c1 <= 'F')
-                p1 = (uint)((c1 - 'A') + 10) * multipliyer;
-            else if (c1 >= 'a' && c1 <= 'f')
-                p1 = (uint)((c1 - 'a') + 10) * multipliyer;
-            return p1;
-        }
-
-        private uint ParseUnicode(char c1, char c2, char c3, char c4)
-        {
-            uint p1 = ParseSingleChar(c1, 0x1000);
-            uint p2 = ParseSingleChar(c2, 0x100);
-            uint p3 = ParseSingleChar(c3, 0x10);
-            uint p4 = ParseSingleChar(c4, 1);
-
-            return p1 + p2 + p3 + p4;
-        }
-
-        private string ParseNumber()
-        {
-            ConsumeToken();
-
-            // Need to start back one place because the first digit is also a token and would have been consumed
-            var startIndex = index - 1;
-
-            do
-            {
-                var c = json[index];
-
-                if ((c >= '0' && c <= '9') || c == '.' || c == '-' || c == '+' || c == 'e' || c == 'E')
-                {
-                    if (++index == json.Length) throw new Exception("Unexpected end of string whilst parsing number");
-                    continue;
-                }
-
-                break;
-            } while (true);
-
-            return new string(json, startIndex, index - startIndex);
-        }
-
-        private Token LookAhead()
-        {
-            if (lookAheadToken != Token.None) return lookAheadToken;
-
-            return lookAheadToken = NextTokenCore();
-        }
-
-        private void ConsumeToken()
-        {
-            lookAheadToken = Token.None;
-        }
-
-        private Token NextToken()
-        {
-            var result = lookAheadToken != Token.None ? lookAheadToken : NextTokenCore();
-
-            lookAheadToken = Token.None;
-
-            return result;
-        }
-
-        private Token NextTokenCore()
-        {
-            char c;
-
-            // Skip past whitespace
-            do
-            {
-                c = json[index];
-
-                if (c > ' ') break;
-                if (c != ' ' && c != '\t' && c != '\n' && c != '\r') break;
-
-            } while (++index < json.Length);
-
-            if (index == json.Length)
-            {
-                throw new Exception("Reached end of string unexpectedly");
-            }
-
-            c = json[index];
-
-            index++;
-
-            //if (c >= '0' && c <= '9')
-            //    return Token.Number;
-
-            switch (c)
-            {
-                case '{':
-                    return Token.Curly_Open;
-
-                case '}':
-                    return Token.Curly_Close;
-
-                case '[':
-                    return Token.Squared_Open;
-
-                case ']':
-                    return Token.Squared_Close;
-
-                case ',':
-                    return Token.Comma;
-
-                case '"':
-                    return Token.String;
-
-				case '0': case '1': case '2': case '3': case '4':
-				case '5': case '6': case '7': case '8': case '9':
-                case '-': case '+': case '.':
-                    return Token.Number;
-
-                case ':':
-                    return Token.Colon;
-
-                case 'f':
-                    if (json.Length - index >= 4 &&
-                        json[index + 0] == 'a' &&
-                        json[index + 1] == 'l' &&
-                        json[index + 2] == 's' &&
-                        json[index + 3] == 'e')
-                    {
-                        index += 4;
-                        return Token.False;
-                    }
-                    break;
-
-                case 't':
-                    if (json.Length - index >= 3 &&
-                        json[index + 0] == 'r' &&
-                        json[index + 1] == 'u' &&
-                        json[index + 2] == 'e')
-                    {
-                        index += 3;
-                        return Token.True;
-                    }
-                    break;
-
-                case 'n':
-                    if (json.Length - index >= 3 &&
-                        json[index + 0] == 'u' &&
-                        json[index + 1] == 'l' &&
-                        json[index + 2] == 'l')
-                    {
-                        index += 3;
-                        return Token.Null;
-                    }
-                    break;
-
-            }
-
-            throw new Exception("Could not find token at index " + --index);
-        }
-    }
-}

src/LogentriesNLog/fastJSON/JsonSerializer.cs

@@ -1,521 +0,0 @@
-//http://fastjson.codeplex.com/
-//http://fastjson.codeplex.com/license
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using System.IO;
-using System.Text;
-
-namespace LogentriesNLog.fastJSON
-{
-    internal class JSONSerializer
-    {
-        private readonly StringBuilder _output = new StringBuilder();
-        readonly bool useMinimalDataSetSchema;
-        readonly bool fastguid = true;
-        readonly bool useExtension = true;
-        readonly bool serializeNulls = true;
-        readonly int _MAX_DEPTH = 10;
-        readonly bool _Indent;
-        readonly bool _useGlobalTypes = true;
-        int _current_depth;
-        private readonly Dictionary<string, int> _globalTypes = new Dictionary<string, int>();
-
-        internal JSONSerializer(bool UseMinimalDataSetSchema, bool UseFastGuid, bool UseExtensions, bool SerializeNulls, bool IndentOutput)
-        {
-            useMinimalDataSetSchema = UseMinimalDataSetSchema;
-            fastguid = UseFastGuid;
-            useExtension = UseExtensions;
-            _Indent = IndentOutput;
-            serializeNulls = SerializeNulls;
-            if (useExtension == false)
-                _useGlobalTypes = false;
-        }
-
-        internal string ConvertToJSON(object obj)
-        {
-            WriteValue(obj);
-
-            string str = "";
-            if (_useGlobalTypes)
-            {
-                StringBuilder sb = new StringBuilder();
-                sb.Append("{\"$types\":{");
-                bool pendingSeparator = false;
-                foreach (var kv in _globalTypes)
-                {
-                    if (pendingSeparator) sb.Append(',');
-                    pendingSeparator = true;
-                    sb.Append("\"");
-                    sb.Append(kv.Key);
-                    sb.Append("\":\"");
-                    sb.Append(kv.Value);
-                    sb.Append("\"");
-                }
-                sb.Append("},");
-                str = sb + _output.ToString();
-            }
-            else
-                str = _output.ToString();
-
-            return str;
-        }
-
-        private void WriteValue(object obj)
-        {
-            if (obj == null || obj is DBNull)
-                _output.Append("null");
-
-            else if (obj is string || obj is char)
-                WriteString((string)obj);
-
-            else if (obj is Guid)
-                WriteGuid((Guid)obj);
-
-            else if (obj is bool)
-                _output.Append(((bool)obj) ? "true" : "false"); // conform to standard
-
-            else if (
-                obj is int || obj is long || obj is double ||
-                obj is decimal || obj is float ||
-                obj is byte || obj is short ||
-                obj is sbyte || obj is ushort ||
-                obj is uint || obj is ulong
-            )
-                _output.Append(((IConvertible)obj).ToString(NumberFormatInfo.InvariantInfo));
-
-            else if (obj is DateTime)
-                WriteDateTime((DateTime)obj);
-
-            else if (obj is IDictionary && obj.GetType().IsGenericType && obj.GetType().GetGenericArguments()[0] == typeof(string))
-                WriteStringDictionary((IDictionary)obj);
-
-            else if (obj is IDictionary)
-                WriteDictionary((IDictionary)obj);
-#if !SILVERLIGHT
-            else if (obj is DataSet)
-                WriteDataset((DataSet)obj);
-
-            else if (obj is DataTable)
-                WriteDataTable((DataTable)obj);
-#endif
-            else if (obj is byte[])
-                WriteBytes((byte[])obj);
-
-            else if (obj is Array || obj is IList || obj is ICollection)
-                WriteArray((IEnumerable)obj);
-
-            else if (obj is Enum)
-                WriteEnum((Enum)obj);
-
-#if CUSTOMTYPE
-            else if (JSON.Instance.IsTypeRegistered(obj.GetType()))
-                WriteCustom(obj);
-#endif
-            else
-                WriteObject(obj);
-        }
-
-#if CUSTOMTYPE
-        private void WriteCustom(object obj)
-        {
-            Serialize s;
-            JSON.Instance._customSerializer.TryGetValue(obj.GetType(), out s);
-            WriteStringFast(s(obj));
-        }
-#endif
-
-        private void WriteEnum(Enum e)
-        {
-            // TODO : optimize enum write
-            WriteStringFast(e.ToString());
-        }
-
-        private void WriteGuid(Guid g)
-        {
-            if (fastguid == false)
-                WriteStringFast(g.ToString());
-            else
-                WriteBytes(g.ToByteArray());
-        }
-
-        private void WriteBytes(byte[] bytes)
-        {
-#if !SILVERLIGHT
-            WriteStringFast(Convert.ToBase64String(bytes, 0, bytes.Length, Base64FormattingOptions.None));
-#else
-            WriteStringFast(Convert.ToBase64String(bytes, 0, bytes.Length));
-#endif
-        }
-
-        private void WriteDateTime(DateTime dateTime)
-        {
-            // datetime format standard : yyyy-MM-dd HH:mm:ss
-            DateTime dt = dateTime;
-            if (JSON.Instance.UseUTCDateTime)
-                dt = dateTime.ToUniversalTime();
-
-            _output.Append("\"");
-            _output.Append(dt.Year.ToString("0000", NumberFormatInfo.InvariantInfo));
-            _output.Append("-");
-            _output.Append(dt.Month.ToString("00", NumberFormatInfo.InvariantInfo));
-            _output.Append("-");
-            _output.Append(dt.Day.ToString("00", NumberFormatInfo.InvariantInfo));
-            _output.Append(" ");
-            _output.Append(dt.Hour.ToString("00", NumberFormatInfo.InvariantInfo));
-            _output.Append(":");
-            _output.Append(dt.Minute.ToString("00", NumberFormatInfo.InvariantInfo));
-            _output.Append(":");
-            _output.Append(dt.Second.ToString("00", NumberFormatInfo.InvariantInfo));
-            _output.Append(".");
-            _output.Append(dt.Millisecond.ToString("000", NumberFormatInfo.InvariantInfo));
-
-            if (JSON.Instance.UseUTCDateTime)
-                _output.Append("Z");
-
-            _output.Append("\"");
-        }
-#if !SILVERLIGHT
-        private DatasetSchema GetSchema(DataTable ds)
-        {
-            if (ds == null) return null;
-
-            DatasetSchema m = new DatasetSchema();
-            m.Info = new List<string>();
-            m.Name = ds.TableName;
-
-            foreach (DataColumn c in ds.Columns)
-            {
-                m.Info.Add(ds.TableName);
-                m.Info.Add(c.ColumnName);
-                m.Info.Add(c.DataType.ToString());
-            }
-            // TODO : serialize relations and constraints here
-
-            return m;
-        }
-
-        private DatasetSchema GetSchema(DataSet ds)
-        {
-            if (ds == null) return null;
-
-            DatasetSchema m = new DatasetSchema();
-            m.Info = new List<string>();
-            m.Name = ds.DataSetName;
-
-            foreach (DataTable t in ds.Tables)
-            {
-                foreach (DataColumn c in t.Columns)
-                {
-                    m.Info.Add(t.TableName);
-                    m.Info.Add(c.ColumnName);
-                    m.Info.Add(c.DataType.ToString());
-                }
-            }
-            // TODO : serialize relations and constraints here
-
-            return m;
-        }
-
-        private string GetXmlSchema(DataTable dt)
-        {
-            using (var writer = new StringWriter())
-            {
-                dt.WriteXmlSchema(writer);
-                return dt.ToString();
-            }
-        }
-
-        private void WriteDataset(DataSet ds)
-        {
-            _output.Append('{');
-            if (useExtension)
-            {
-                WritePair("$schema", useMinimalDataSetSchema ? (object)GetSchema(ds) : ds.GetXmlSchema());
-                _output.Append(',');
-            }
-            bool tablesep = false;
-            foreach (DataTable table in ds.Tables)
-            {
-                if (tablesep) _output.Append(",");
-                tablesep = true;
-                WriteDataTableData(table);
-            }
-            // end dataset
-            _output.Append('}');
-        }
-
-        private void WriteDataTableData(DataTable table)
-        {
-            _output.Append('\"');
-            _output.Append(table.TableName);
-            _output.Append("\":[");
-            DataColumnCollection cols = table.Columns;
-            bool rowseparator = false;
-            foreach (DataRow row in table.Rows)
-            {
-                if (rowseparator) _output.Append(",");
-                rowseparator = true;
-                _output.Append('[');
-
-                bool pendingSeperator = false;
-                foreach (DataColumn column in cols)
-                {
-                    if (pendingSeperator) _output.Append(',');
-                    WriteValue(row[column]);
-                    pendingSeperator = true;
-                }
-                _output.Append(']');
-            }
-
-            _output.Append(']');
-        }
-
-        void WriteDataTable(DataTable dt)
-        {
-            _output.Append('{');
-            if (useExtension)
-            {
-                WritePair("$schema", useMinimalDataSetSchema ? (object)GetSchema(dt) : GetXmlSchema(dt));
-                _output.Append(',');
-            }
-
-            WriteDataTableData(dt);
-
-            // end datatable
-            _output.Append('}');
-        }
-#endif
-        bool _firstWritten;
-        private void WriteObject(object obj)
-        {
-            Indent();
-            if (_useGlobalTypes == false)
-                _output.Append('{');
-            else
-            {
-                if (_firstWritten)
-                    _output.Append("{");
-            }
-            _firstWritten = true;
-            _current_depth++;
-            if (_current_depth > _MAX_DEPTH)
-                throw new Exception("Serializer encountered maximum depth of " + _MAX_DEPTH);
-
-
-            var map = new Dictionary<string, string>();
-            Type t = obj.GetType();
-            bool append = false;
-            if (useExtension)
-            {
-                if (_useGlobalTypes == false)
-                    WritePairFast("$type", JSON.Instance.GetTypeAssemblyName(t));
-                else
-                {
-                    int dt = 0;
-                    string ct = JSON.Instance.GetTypeAssemblyName(t);
-                    if (_globalTypes.TryGetValue(ct, out dt) == false)
-                    {
-                        dt = _globalTypes.Count + 1;
-                        _globalTypes.Add(ct, dt);
-                    }
-                    WritePairFast("$type", dt.ToString());
-                }
-                append = true;
-            }
-
-            var g = JSON.Instance.GetGetters(t);
-            foreach (var p in g)
-            {
-                if (append)
-                    _output.Append(',');
-                object o = p.Getter(obj);
-                if ((o == null || o is DBNull) && serializeNulls == false)
-                    append = false;
-                else
-                {
-                    WritePair(p.Name, o);
-                    if (o != null && useExtension)
-                    {
-                        Type tt = o.GetType();
-                        if (tt == typeof(Object))
-                            map.Add(p.Name, tt.ToString());
-                    }
-                    append = true;
-                }
-            }
-            if (map.Count > 0 && useExtension)
-            {
-                _output.Append(",\"$map\":");
-                WriteStringDictionary(map);
-            }
-            _current_depth--;
-            Indent();
-            _output.Append('}');
-            _current_depth--;
-
-        }
-
-        private void Indent()
-        {
-            Indent(false);
-        }
-
-        private void Indent(bool dec)
-        {
-            if (_Indent)
-            {
-                _output.Append("\r\n");
-                for (int i = 0; i < _current_depth - (dec ? 1 : 0); i++)
-                    _output.Append("\t");
-            }
-        }
-
-        private void WritePairFast(string name, string value)
-        {
-            if ((value == null) && serializeNulls == false)
-                return;
-            Indent();
-            WriteStringFast(name);
-
-            _output.Append(':');
-
-            WriteStringFast(value);
-        }
-
-        private void WritePair(string name, object value)
-        {
-            if ((value == null || value is DBNull) && serializeNulls == false)
-                return;
-            Indent();
-            WriteStringFast(name);
-
-            _output.Append(':');
-
-            WriteValue(value);
-        }
-
-        private void WriteArray(IEnumerable array)
-        {
-            Indent();
-            _output.Append('[');
-
-            bool pendingSeperator = false;
-
-            foreach (var obj in array)
-            {
-                Indent();
-                if (pendingSeperator) _output.Append(',');
-
-                WriteValue(obj);
-
-                pendingSeperator = true;
-            }
-            Indent();
-            _output.Append(']');
-        }
-
-        private void WriteStringDictionary(IDictionary dic)
-        {
-            Indent();
-            _output.Append('{');
-
-            bool pendingSeparator = false;
-
-            foreach (DictionaryEntry entry in dic)
-            {
-                if (pendingSeparator) _output.Append(',');
-
-                WritePair((string)entry.Key, entry.Value);
-
-                pendingSeparator = true;
-            }
-            Indent();
-            _output.Append('}');
-        }
-
-        private void WriteDictionary(IDictionary dic)
-        {
-            Indent();
-            _output.Append('[');
-
-            bool pendingSeparator = false;
-
-            foreach (DictionaryEntry entry in dic)
-            {
-                if (pendingSeparator) _output.Append(',');
-                Indent();
-                _output.Append('{');
-                WritePair("k", entry.Key);
-                _output.Append(",");
-                WritePair("v", entry.Value);
-                Indent();
-                _output.Append('}');
-
-                pendingSeparator = true;
-            }
-            Indent();
-            _output.Append(']');
-        }
-
-        private void WriteStringFast(string s)
-        {
-            //Indent();
-            _output.Append('\"');
-            _output.Append(s);
-            _output.Append('\"');
-        }
-
-        private void WriteString(string s)
-        {
-            //Indent();
-            _output.Append('\"');
-
-            int runIndex = -1;
-
-            for (var index = 0; index < s.Length; ++index)
-            {
-                var c = s[index];
-
-                if (c >= ' ' && c < 128 && c != '\"' && c != '\\')
-                {
-                    if (runIndex == -1)
-                    {
-                        runIndex = index;
-                    }
-
-                    continue;
-                }
-
-                if (runIndex != -1)
-                {
-                    _output.Append(s, runIndex, index - runIndex);
-                    runIndex = -1;
-                }
-
-                switch (c)
-                {
-                    case '\t': _output.Append("\\t"); break;
-                    case '\r': _output.Append("\\r"); break;
-                    case '\n': _output.Append("\\n"); break;
-                    case '"':
-                    case '\\': _output.Append('\\'); _output.Append(c); break;
-                    default:
-                        _output.Append("\\u");
-                        _output.Append(((int)c).ToString("X4", NumberFormatInfo.InvariantInfo));
-                        break;
-                }
-            }
-
-            if (runIndex != -1)
-            {
-                _output.Append(s, runIndex, s.Length - runIndex);
-            }
-
-            _output.Append('\"');
-        }
-    }
-}

src/LogentriesNLog/fastJSON/SafeDictionary.cs

@@ -1,36 +0,0 @@
-//http://fastjson.codeplex.com/
-//http://fastjson.codeplex.com/license
-
-using System.Collections.Generic;
-
-namespace LogentriesNLog.fastJSON
-{
-    internal class SafeDictionary<TKey, TValue>
-    {
-        private readonly object _Padlock = new object();
-        private readonly Dictionary<TKey, TValue> _Dictionary = new Dictionary<TKey, TValue>();
-
-
-        internal bool TryGetValue(TKey key, out TValue value)
-        {
-            return _Dictionary.TryGetValue(key, out value);
-        }
-
-        internal TValue this[TKey key]
-        {
-            get
-            {
-                return _Dictionary[key];
-            }
-        }
-
-        internal void Add(TKey key, TValue value)
-        {
-            lock (_Padlock)
-            {
-                if (_Dictionary.ContainsKey(key) == false)
-                    _Dictionary.Add(key, value);
-            }
-        }
-    }
-}

src/LogentriesNLog/fastJSON/license.txt

@@ -1,87 +0,0 @@
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-
-c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

src/LogentriesNLog/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
-</packages>

src/NzbDrone.Api/Extensions/Pipelines/GZipPipeline.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -23,7 +23,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
             _logger = logger;
 
             // On Mono GZipStream/DeflateStream leaks memory if an exception is thrown, use an intermediate buffer in that case.
-            _writeGZipStream = OsInfo.IsMonoRuntime ? WriteGZipStreamMono : (Action<Action<Stream>, Stream>)WriteGZipStream;
+            _writeGZipStream = PlatformInfo.IsMono ? WriteGZipStreamMono : (Action<Action<Stream>, Stream>)WriteGZipStream;
         }
 
         public void Register(IPipelines pipelines)

src/NzbDrone.Api/Extensions/Pipelines/RequestLoggingPipeline.cs

@@ -1,84 +1,84 @@
-using System;
-using System.Threading;
-using Nancy;
-using Nancy.Bootstrapper;
-using NLog;
-using NzbDrone.Api.ErrorManagement;
-using NzbDrone.Common.Extensions;
-
-namespace NzbDrone.Api.Extensions.Pipelines
-{
-    public class RequestLoggingPipeline : IRegisterNancyPipeline
-    {
-        private static readonly Logger _loggerHttp = LogManager.GetLogger("Http");
-        private static readonly Logger _loggerApi = LogManager.GetLogger("Api");
-
-        private static int _requestSequenceID;
-
-        private readonly NzbDroneErrorPipeline _errorPipeline;
-
-        public RequestLoggingPipeline(NzbDroneErrorPipeline errorPipeline)
-        {
-            _errorPipeline = errorPipeline;
-        }
-
-        public int Order => 100;
-
-        public void Register(IPipelines pipelines)
-        {
-            pipelines.BeforeRequest.AddItemToStartOfPipeline(LogStart);
-            pipelines.AfterRequest.AddItemToEndOfPipeline(LogEnd);
-            pipelines.OnError.AddItemToEndOfPipeline(LogError);
-        }
-
-        private Response LogStart(NancyContext context)
-        {
-            var id = Interlocked.Increment(ref _requestSequenceID);
-
-            context.Items["ApiRequestSequenceID"] = id;
-            context.Items["ApiRequestStartTime"] = DateTime.UtcNow;
-
-            var reqPath = GetRequestPathAndQuery(context.Request);
-            
-            _loggerHttp.Trace("Req: {0} [{1}] {2}", id, context.Request.Method, reqPath);
-
-            return null;
-        }
-
-        private void LogEnd(NancyContext context)
-        {
-            var id = (int)context.Items["ApiRequestSequenceID"];
-            var startTime = (DateTime)context.Items["ApiRequestStartTime"];
-
-            var endTime = DateTime.UtcNow;
-            var duration = endTime - startTime;
-
-            var reqPath = GetRequestPathAndQuery(context.Request);
-
-            _loggerHttp.Trace("Res: {0} [{1}] {2}: {3}.{4} ({5} ms)", id, context.Request.Method, reqPath, (int)context.Response.StatusCode, context.Response.StatusCode, (int)duration.TotalMilliseconds);
-
-            if (context.Request.IsApiRequest())
-            {
-                _loggerApi.Debug("[{0}] {1}: {2}.{3} ({4} ms)", context.Request.Method, reqPath, (int)context.Response.StatusCode, context.Response.StatusCode, (int)duration.TotalMilliseconds);
-            }
-        }
-
-        private Response LogError(NancyContext context, Exception exception)
-        {
-            var response = _errorPipeline.HandleException(context, exception);
-            context.Response = response;
-            LogEnd(context);
-            context.Response = null;
-            return response;
-        }
-
-        private static string GetRequestPathAndQuery(Request request)
-        {
-            if (request.Url.Query.IsNotNullOrWhiteSpace())
-            {
-                return string.Concat(request.Url.Path, request.Url.Query);
-            }
-            return request.Url.Path;
-        }
-    }
+using System;
+using System.Threading;
+using Nancy;
+using Nancy.Bootstrapper;
+using NLog;
+using NzbDrone.Api.ErrorManagement;
+using NzbDrone.Common.Extensions;
+
+namespace NzbDrone.Api.Extensions.Pipelines
+{
+    public class RequestLoggingPipeline : IRegisterNancyPipeline
+    {
+        private static readonly Logger _loggerHttp = LogManager.GetLogger("Http");
+        private static readonly Logger _loggerApi = LogManager.GetLogger("Api");
+
+        private static int _requestSequenceID;
+
+        private readonly NzbDroneErrorPipeline _errorPipeline;
+
+        public RequestLoggingPipeline(NzbDroneErrorPipeline errorPipeline)
+        {
+            _errorPipeline = errorPipeline;
+        }
+
+        public int Order => 100;
+
+        public void Register(IPipelines pipelines)
+        {
+            pipelines.BeforeRequest.AddItemToStartOfPipeline(LogStart);
+            pipelines.AfterRequest.AddItemToEndOfPipeline(LogEnd);
+            pipelines.OnError.AddItemToEndOfPipeline(LogError);
+        }
+
+        private Response LogStart(NancyContext context)
+        {
+            var id = Interlocked.Increment(ref _requestSequenceID);
+
+            context.Items["ApiRequestSequenceID"] = id;
+            context.Items["ApiRequestStartTime"] = DateTime.UtcNow;
+
+            var reqPath = GetRequestPathAndQuery(context.Request);
+            
+            _loggerHttp.Trace("Req: {0} [{1}] {2}", id, context.Request.Method, reqPath);
+
+            return null;
+        }
+
+        private void LogEnd(NancyContext context)
+        {
+            var id = (int)context.Items["ApiRequestSequenceID"];
+            var startTime = (DateTime)context.Items["ApiRequestStartTime"];
+
+            var endTime = DateTime.UtcNow;
+            var duration = endTime - startTime;
+
+            var reqPath = GetRequestPathAndQuery(context.Request);
+
+            _loggerHttp.Trace("Res: {0} [{1}] {2}: {3}.{4} ({5} ms)", id, context.Request.Method, reqPath, (int)context.Response.StatusCode, context.Response.StatusCode, (int)duration.TotalMilliseconds);
+
+            if (context.Request.IsApiRequest())
+            {
+                _loggerApi.Debug("[{0}] {1}: {2}.{3} ({4} ms)", context.Request.Method, reqPath, (int)context.Response.StatusCode, context.Response.StatusCode, (int)duration.TotalMilliseconds);
+            }
+        }
+
+        private Response LogError(NancyContext context, Exception exception)
+        {
+            var response = _errorPipeline.HandleException(context, exception);
+            context.Response = response;
+            LogEnd(context);
+            context.Response = null;
+            return response;
+        }
+
+        private static string GetRequestPathAndQuery(Request request)
+        {
+            if (request.Url.Query.IsNotNullOrWhiteSpace())
+            {
+                return string.Concat(request.Url.Path, request.Url.Query);
+            }
+            return request.Url.Path;
+        }
+    }
 }

src/NzbDrone.Api/Frontend/CacheableSpecification.cs

@@ -14,7 +14,7 @@ namespace NzbDrone.Api.Frontend
     {
         public bool IsCacheable(NancyContext context)
         {
-            if (!RuntimeInfoBase.IsProduction)
+            if (!RuntimeInfo.IsProduction)
             {
                 return false;
             }
@@ -46,4 +46,4 @@ namespace NzbDrone.Api.Frontend
             return true;
         }
     }
-}
+}

src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs

@@ -79,7 +79,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         private string GetIndexText()
         {
-            if (RuntimeInfoBase.IsProduction && _generatedContent != null)
+            if (RuntimeInfo.IsProduction && _generatedContent != null)
             {
                 return _generatedContent;
             }
@@ -111,7 +111,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             text = text.Replace("APP_BRANCH", _configFileProvider.Branch.ToLower());
             text = text.Replace("APP_ANALYTICS", _analyticsService.IsEnabled.ToString().ToLowerInvariant());
             text = text.Replace("URL_BASE", URL_BASE);
-            text = text.Replace("PRODUCTION", RuntimeInfoBase.IsProduction.ToString().ToLowerInvariant());
+            text = text.Replace("PRODUCTION", RuntimeInfo.IsProduction.ToString().ToLowerInvariant());
 
             _generatedContent = text;
 

src/NzbDrone.Api/Frontend/Mappers/LoginHtmlMapper.cs

@@ -67,7 +67,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         private string GetLoginText()
         {
-            if (RuntimeInfoBase.IsProduction && _generatedContent != null)
+            if (RuntimeInfo.IsProduction && _generatedContent != null)
             {
                 return _generatedContent;
             }

src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapperBase.cs

@@ -21,10 +21,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             _diskProvider = diskProvider;
             _logger = logger;
 
-            if (!RuntimeInfoBase.IsProduction)
-            {
-                _caseSensitive = StringComparison.OrdinalIgnoreCase;
-            }
+            _caseSensitive = RuntimeInfo.IsProduction ? DiskProviderBase.PathStringComparison : StringComparison.OrdinalIgnoreCase;
         }
 
         public abstract string Map(string resourceUrl);
@@ -38,7 +35,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             if (_diskProvider.FileExists(filePath, _caseSensitive))
             {
                 var response = new StreamResponse(() => GetContentStream(filePath), MimeTypes.GetMimeType(filePath));
-                return response;
+                return new MaterialisingResponse(response);
             }
 
             _logger.Warn("File {0} not found", filePath);

src/NzbDrone.Api/Indexers/ReleaseModule.cs

@@ -95,11 +95,11 @@ namespace NzbDrone.Api.Indexers
             }
             catch (NotImplementedException ex)
             {
-                _logger.Error(ex, "One or more indexer you selected does not support movie search yet: " + ex.Message);
+                _logger.Error(ex, "One or more indexer you selected does not support movie search yet: {0}", ex.Message);
             }
             catch (Exception ex)
             {
-                _logger.Error(ex, "Movie search failed: " + ex.Message);
+                _logger.Error(ex, "Movie search failed: {0}", ex.Message);
             }
 
             return new List<ReleaseResource>();

src/NzbDrone.Api/NancyBootstrapper.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Nancy.Bootstrapper;
 using Nancy.Diagnostics;
 using NLog;
@@ -24,9 +24,9 @@ namespace NzbDrone.Api
 
         protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
         {
-            Logger.Info("Starting NzbDrone API");
+            Logger.Info("Starting Web Server");
 
-            if (RuntimeInfoBase.IsProduction)
+            if (RuntimeInfo.IsProduction)
             {
                 DiagnosticsHook.Disable(pipelines);
             }

src/NzbDrone.Api/NetImport/ImportExclusionsModule.cs

@@ -1,45 +1,45 @@
-using System.Collections.Generic;
-using FluentValidation;
-using NzbDrone.Api.ClientSchema;
-using NzbDrone.Core.NetImport;
-using NzbDrone.Core.NetImport.ImportExclusions;
-using NzbDrone.Core.Validation.Paths;
-
-namespace NzbDrone.Api.NetImport
-{
-    public class ImportExclusionsModule : NzbDroneRestModule<ImportExclusionsResource>
-    {
-        private readonly IImportExclusionsService _exclusionService;
-
-        public ImportExclusionsModule(NetImportFactory netImportFactory, IImportExclusionsService exclusionService) : base("exclusions")
-        {
-            _exclusionService = exclusionService;
-            GetResourceAll = GetAll;
-            CreateResource = AddExclusion;
-            DeleteResource = RemoveExclusion;
-            GetResourceById = GetById;
-        }
-
-        public List<ImportExclusionsResource> GetAll()
-        {
-            return _exclusionService.GetAllExclusions().ToResource();
-        }
-
-        public ImportExclusionsResource GetById(int id)
-        {
-            return _exclusionService.GetById(id).ToResource();
-        }
-       
-        public int AddExclusion(ImportExclusionsResource exclusionResource)
-        {
-            var model = exclusionResource.ToModel();
-
-            return _exclusionService.AddExclusion(model).Id;
-        }
-
-        public void RemoveExclusion (int id)
-        {
-            _exclusionService.RemoveExclusion(new ImportExclusion { Id = id });
-        }
-    }
-}
+using System.Collections.Generic;
+using FluentValidation;
+using NzbDrone.Api.ClientSchema;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.NetImport.ImportExclusions;
+using NzbDrone.Core.Validation.Paths;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class ImportExclusionsModule : NzbDroneRestModule<ImportExclusionsResource>
+    {
+        private readonly IImportExclusionsService _exclusionService;
+
+        public ImportExclusionsModule(NetImportFactory netImportFactory, IImportExclusionsService exclusionService) : base("exclusions")
+        {
+            _exclusionService = exclusionService;
+            GetResourceAll = GetAll;
+            CreateResource = AddExclusion;
+            DeleteResource = RemoveExclusion;
+            GetResourceById = GetById;
+        }
+
+        public List<ImportExclusionsResource> GetAll()
+        {
+            return _exclusionService.GetAllExclusions().ToResource();
+        }
+
+        public ImportExclusionsResource GetById(int id)
+        {
+            return _exclusionService.GetById(id).ToResource();
+        }
+       
+        public int AddExclusion(ImportExclusionsResource exclusionResource)
+        {
+            var model = exclusionResource.ToModel();
+
+            return _exclusionService.AddExclusion(model).Id;
+        }
+
+        public void RemoveExclusion (int id)
+        {
+            _exclusionService.RemoveExclusion(new ImportExclusion { Id = id });
+        }
+    }
+}

src/NzbDrone.Api/NetImport/ImportExclusionsResource.cs

@@ -1,46 +1,46 @@
-using System.Collections.Generic;
-using System.Linq;
-using NzbDrone.Core.NetImport;
-using NzbDrone.Core.Movies;
-
-namespace NzbDrone.Api.NetImport
-{
-    public class ImportExclusionsResource : ProviderResource
-    {
-        //public int Id { get; set; }
-        public int TmdbId { get; set; }
-        public string MovieTitle { get; set; }
-        public int MovieYear { get; set; }
-    }
-
-    public static class ImportExclusionsResourceMapper
-    {
-        public static ImportExclusionsResource ToResource(this Core.NetImport.ImportExclusions.ImportExclusion model)
-        {
-            if (model == null) return null;
-
-            return new ImportExclusionsResource
-            {
-                Id = model.Id,
-                TmdbId = model.TmdbId,
-                MovieTitle = model.MovieTitle,
-                MovieYear = model.MovieYear
-            };
-        }
-
-        public static List<ImportExclusionsResource> ToResource(this IEnumerable<Core.NetImport.ImportExclusions.ImportExclusion> exclusions)
-        {
-            return exclusions.Select(ToResource).ToList();
-        }
-
-        public static Core.NetImport.ImportExclusions.ImportExclusion ToModel(this ImportExclusionsResource resource)
-        {
-            return new Core.NetImport.ImportExclusions.ImportExclusion
-            {
-                TmdbId = resource.TmdbId,
-                MovieTitle = resource.MovieTitle,
-                MovieYear = resource.MovieYear
-            };
-        }
-    }
-}
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.Movies;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class ImportExclusionsResource : ProviderResource
+    {
+        //public int Id { get; set; }
+        public int TmdbId { get; set; }
+        public string MovieTitle { get; set; }
+        public int MovieYear { get; set; }
+    }
+
+    public static class ImportExclusionsResourceMapper
+    {
+        public static ImportExclusionsResource ToResource(this Core.NetImport.ImportExclusions.ImportExclusion model)
+        {
+            if (model == null) return null;
+
+            return new ImportExclusionsResource
+            {
+                Id = model.Id,
+                TmdbId = model.TmdbId,
+                MovieTitle = model.MovieTitle,
+                MovieYear = model.MovieYear
+            };
+        }
+
+        public static List<ImportExclusionsResource> ToResource(this IEnumerable<Core.NetImport.ImportExclusions.ImportExclusion> exclusions)
+        {
+            return exclusions.Select(ToResource).ToList();
+        }
+
+        public static Core.NetImport.ImportExclusions.ImportExclusion ToModel(this ImportExclusionsResource resource)
+        {
+            return new Core.NetImport.ImportExclusions.ImportExclusion
+            {
+                TmdbId = resource.TmdbId,
+                MovieTitle = resource.MovieTitle,
+                MovieYear = resource.MovieYear
+            };
+        }
+    }
+}

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -68,9 +68,8 @@
       <HintPath>..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>

src/NzbDrone.Api/System/SystemModule.cs

@@ -1,4 +1,4 @@
-using Nancy;
+using Nancy;
 using Nancy.Routing;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Common.EnvironmentInfo;
@@ -13,6 +13,8 @@ namespace NzbDrone.Api.System
     {
         private readonly IAppFolderInfo _appFolderInfo;
         private readonly IRuntimeInfo _runtimeInfo;
+        private readonly IPlatformInfo _platformInfo;
+        private readonly IOsInfo _osInfo;
         private readonly IRouteCacheProvider _routeCacheProvider;
         private readonly IConfigFileProvider _configFileProvider;
         private readonly IMainDatabase _database;
@@ -20,14 +22,17 @@ namespace NzbDrone.Api.System
 
         public SystemModule(IAppFolderInfo appFolderInfo,
                             IRuntimeInfo runtimeInfo,
+                            IPlatformInfo platformInfo,
+                            IOsInfo osInfo,
                             IRouteCacheProvider routeCacheProvider,
                             IConfigFileProvider configFileProvider,
                             IMainDatabase database,
-                            ILifecycleService lifecycleService)
-            : base("system")
+                            ILifecycleService lifecycleService) : base("system")
         {
             _appFolderInfo = appFolderInfo;
             _runtimeInfo = runtimeInfo;
+            _platformInfo = platformInfo;
+            _osInfo = osInfo;
             _routeCacheProvider = routeCacheProvider;
             _configFileProvider = configFileProvider;
             _database = database;
@@ -41,27 +46,29 @@ namespace NzbDrone.Api.System
         private Response GetStatus()
         {
             return new
-                {
-                    Version = BuildInfo.Version.ToString(),
-                    BuildTime = BuildInfo.BuildDateTime,
-                    IsDebug = BuildInfo.IsDebug,
-                    IsProduction = RuntimeInfoBase.IsProduction,
-                    IsAdmin = _runtimeInfo.IsAdmin,
-                    IsUserInteractive = RuntimeInfoBase.IsUserInteractive,
-                    StartupPath = _appFolderInfo.StartUpFolder,
-                    AppData = _appFolderInfo.GetAppDataPath(),
-                    OsVersion = OsInfo.Version.ToString(),
-                    IsMonoRuntime = OsInfo.IsMonoRuntime,
-                    IsMono = OsInfo.IsNotWindows,
-                    IsLinux = OsInfo.IsLinux,
-                    IsOsx = OsInfo.IsOsx,
-                    IsWindows = OsInfo.IsWindows,
-                    Branch = _configFileProvider.Branch,
-                    Authentication = _configFileProvider.AuthenticationMethod,
-                    SqliteVersion = _database.Version,
-                    UrlBase = _configFileProvider.UrlBase,
-                    RuntimeVersion = _runtimeInfo.RuntimeVersion
-                }.AsResponse();
+            {
+                Version = BuildInfo.Version.ToString(),
+                BuildTime = BuildInfo.BuildDateTime,
+                IsDebug = BuildInfo.IsDebug,
+                IsProduction = RuntimeInfo.IsProduction,
+                IsAdmin = _runtimeInfo.IsAdmin,
+                IsUserInteractive = RuntimeInfo.IsUserInteractive,
+                StartupPath = _appFolderInfo.StartUpFolder,
+                AppData = _appFolderInfo.GetAppDataPath(),
+                OsName = _osInfo.Name,
+                OsVersion = _osInfo.Version,
+                IsMonoRuntime = PlatformInfo.IsMono,
+                IsMono = PlatformInfo.IsMono,
+                IsLinux = OsInfo.IsLinux,
+                IsOsx = OsInfo.IsOsx,
+                IsWindows = OsInfo.IsWindows,
+                Branch = _configFileProvider.Branch,
+                Authentication = _configFileProvider.AuthenticationMethod,
+                SqliteVersion = _database.Version,
+                UrlBase = _configFileProvider.UrlBase,
+                RuntimeVersion = _platformInfo.Version,
+                RuntimeName = PlatformInfo.Platform
+            }.AsResponse();
         }
 
         private Response GetRoutes()

src/NzbDrone.Api/Wanted/MovieMissingModule.cs

@@ -15,9 +15,9 @@ namespace NzbDrone.Api.Wanted
     {
         protected readonly IMovieService _movieService;
 
-        public MovieMissingModule(IMovieService movieService, 
-                                  IQualityUpgradableSpecification qualityUpgradableSpecification, 
-                                  IBroadcastSignalRMessage signalRBroadcaster) 
+        public MovieMissingModule(IMovieService movieService,
+                                  IQualityUpgradableSpecification qualityUpgradableSpecification,
+                                  IBroadcastSignalRMessage signalRBroadcaster)
             : base(movieService, qualityUpgradableSpecification, signalRBroadcaster, "wanted/missing")
         {
 

src/NzbDrone.Api/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="FluentMigrator" publicKeyToken="aacfc7de5acabf05" culture="neutral" />

src/NzbDrone.Api/packages.config

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentValidation" version="6.2.1.0" targetFramework="net40" />
-  <package id="Ical.Net" version="2.2.25" targetFramework="net40" />
-  <package id="Nancy" version="1.4.3" targetFramework="net40" />
-  <package id="Nancy.Authentication.Basic" version="1.4.1" targetFramework="net40" />
-  <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FluentValidation" version="6.2.1.0" targetFramework="net40" />
+  <package id="Ical.Net" version="2.2.25" targetFramework="net40" />
+  <package id="Nancy" version="1.4.3" targetFramework="net40" />
+  <package id="Nancy.Authentication.Basic" version="1.4.1" targetFramework="net40" />
+  <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
 </packages>

src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj

@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NzbDrone.App.Test</RootNamespace>
-    <AssemblyName>NzbDrone.App.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FizzWare.NBuilder, Version=4.0.0.115, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
-      <HintPath>..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ContainerFixture.cs" />
-    <Compile Include="NzbDroneProcessServiceFixture.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RouterTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\NzbDrone.Test.Common\App.config">
-      <Link>App.config</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
-      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
-      <Name>NzbDrone.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
-      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
-      <Name>NzbDrone.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
-      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
-      <Name>NzbDrone.Host</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
-      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
-      <Name>NzbDrone.Test.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\Libraries\Sqlite\sqlite3.dll">
-      <Link>sqlite3.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="Build">
-    <MSBuild Projects="@(ProjectReference)" Targets="Build" />
-  </Target>
-  <PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.App.Test</RootNamespace>
+    <AssemblyName>NzbDrone.App.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FizzWare.NBuilder, Version=4.0.0.115, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
+      <HintPath>..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ContainerFixture.cs" />
+    <Compile Include="NzbDroneProcessServiceFixture.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RouterTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\NzbDrone.Test.Common\App.config">
+      <Link>App.config</Link>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
+      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
+      <Name>NzbDrone.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
+      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
+      <Name>NzbDrone.Host</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
+      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
+      <Name>NzbDrone.Test.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\Libraries\Sqlite\sqlite3.dll">
+      <Link>sqlite3.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="Build">
+    <MSBuild Projects="@(ProjectReference)" Targets="Build" />
+  </Target>
+  <PropertyGroup>
     <PostBuildEvent Condition="('$(OS)' == 'Windows_NT')">
       xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Mono.*"   "$(TargetDir)"
       xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Windows.*"   "$(TargetDir)"
-    </PostBuildEvent>
+    </PostBuildEvent>
     <PostBuildEvent Condition="('$(OS)' != 'Windows_NT')">
       cp -rv $(SolutionDir)\..\_output\NzbDrone.Mono.* $(TargetDir)
       cp -rv $(SolutionDir)\..\_output\NzbDrone.Windows.* $(TargetDir)
-    </PostBuildEvent>
-  </PropertyGroup>
+    </PostBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-</Project>
+  -->
+</Project>

src/NzbDrone.App.Test/packages.config

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
-  <package id="Moq" version="4.0.10827" />
-  <package id="NBuilder" version="4.0.0" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
-  <package id="NUnit" version="3.5.0" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
+  <package id="Moq" version="4.0.10827" />
+  <package id="NBuilder" version="4.0.0" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NUnit" version="3.5.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Automation.Test/AutomationTest.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
 using NLog;
@@ -31,10 +31,15 @@ namespace NzbDrone.Automation.Test
             LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Trace, consoleTarget));
         }
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SmokeTestSetup()
         {
-            driver = new FirefoxDriver();
+            var options = new FirefoxOptions();
+            options.AddArguments("--headless");
+            FirefoxDriverService service = FirefoxDriverService.CreateDefaultService();
+
+            // service.Host = "::1"; // Workaround netcore/selenium bug https://github.com/SeleniumHQ/selenium/issues/7840
+            driver = new FirefoxDriver(service, options, new System.TimeSpan(0, 3, 0));
 
             _runner = new NzbDroneRunner(LogManager.GetCurrentClassLogger());
             _runner.KillAll();
@@ -56,7 +61,7 @@ namespace NzbDrone.Automation.Test
                 .Select(e => e.Text);
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void SmokeTestTearDown()
         {
             _runner.KillAll();

src/NzbDrone.Automation.Test/MainPagesTest.cs

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Automation.Test.PageModel;
 using OpenQA.Selenium;
@@ -17,11 +17,11 @@ namespace NzbDrone.Automation.Test
         }
 
         [Test]
-        public void series_page()
+        public void movies_page()
         {
-            page.SeriesNavIcon.Click();
+            page.MoviesNavIcon.Click();
             page.WaitForNoSpinner();
-            page.FindByClass("iv-series-index-seriesindexlayout").Should().NotBeNull();
+            page.FindByClass("iv-movies-index-moviesindexlayout").Should().NotBeNull();
         }
 
         [Test]
@@ -61,16 +61,16 @@ namespace NzbDrone.Automation.Test
         }
 
         [Test]
-        public void add_series_page()
+        public void add_movies_page()
         {
-            page.SeriesNavIcon.Click();
+            page.MoviesNavIcon.Click();
             page.WaitForNoSpinner();
 
-            page.Find(By.LinkText("Add Series")).Click();
+            page.Find(By.LinkText("Add Movies")).Click();
 
             page.WaitForNoSpinner();
 
-            page.FindByClass("iv-addseries-addserieslayout").Should().NotBeNull();
+            page.FindByClass("iv-addmovies-addmovieslayout").Should().NotBeNull();
         }
     }
-}
+}

src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj

@@ -1,109 +1,102 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{CC26800D-F67E-464B-88DE-8EB1A0C227A3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NzbDrone.Automation.Test</RootNamespace>
-    <AssemblyName>NzbDrone.Automation.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <ProductVersion>12.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="WebDriver, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.3.0.1\lib\net40\WebDriver.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="WebDriver.Support, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.Support.3.0.1\lib\net40\WebDriver.Support.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AutomationTest.cs" />
-    <Compile Include="AutomationTestAttribute.cs" />
-    <Compile Include="MainPagesTest.cs" />
-    <Compile Include="PageModel\PageBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
-      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
-      <Name>NzbDrone.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
-      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
-      <Name>NzbDrone.Test.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{CC26800D-F67E-464B-88DE-8EB1A0C227A3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.Automation.Test</RootNamespace>
+    <AssemblyName>NzbDrone.Automation.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <ProductVersion>12.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AutomationTest.cs" />
+    <Compile Include="AutomationTestAttribute.cs" />
+    <Compile Include="MainPagesTest.cs" />
+    <Compile Include="PageModel\PageBase.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
+      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
+      <Name>NzbDrone.Test.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions">
+      <Version>4.18.0</Version>
+    </PackageReference>
+    <PackageReference Include="NLog">
+      <Version>4.5.0-rc06</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.5.0</Version>
+    </PackageReference>
+    <PackageReference Include="Selenium.Firefox.WebDriver">
+      <Version>0.26.0</Version>
+    </PackageReference>
+    <PackageReference Include="Selenium.Support">
+      <Version>3.141.0</Version>
+    </PackageReference>
+  </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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

src/NzbDrone.Automation.Test/PageModel/PageBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Remote;
@@ -47,7 +47,7 @@ namespace NzbDrone.Automation.Test.PageModel
             });
         }
 
-        public IWebElement SeriesNavIcon => FindByClass("x-series-nav");
+        public IWebElement MoviesNavIcon => FindByClass("x-movies-nav");
 
         public IWebElement CalendarNavIcon => FindByClass("x-calendar-nav");
 
@@ -59,4 +59,4 @@ namespace NzbDrone.Automation.Test.PageModel
 
         public IWebElement SystemNavIcon => FindByClass("x-system-nav");
     }
-}
+}

src/NzbDrone.Automation.Test/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="FluentMigrator" publicKeyToken="aacfc7de5acabf05" culture="neutral" />

src/NzbDrone.Automation.Test/packages.config

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
-  <package id="NUnit" version="3.5.0" targetFramework="net40" />
-  <package id="Selenium.Support" version="3.0.1" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="3.0.1" targetFramework="net40" />
-</packages>

src/NzbDrone.Common.Test/DiskTests/DiskProviderFixtureBase.cs

@@ -244,12 +244,14 @@ namespace NzbDrone.Common.Test.DiskTests
         }
 
         [Test]
+        [Ignore("No longer behaving this way in a Windows 10 Feature Update")]
         public void should_not_be_able_to_rename_open_hardlinks_with_fileshare_none()
         {
             Assert.Throws<IOException>(() => DoHardLinkRename(FileShare.None));
         }
 
         [Test]
+        [Ignore("No longer behaving this way in a Windows 10 Feature Update")]
         public void should_not_be_able_to_rename_open_hardlinks_with_fileshare_write()
         {
             Assert.Throws<IOException>(() => DoHardLinkRename(FileShare.Read));

src/NzbDrone.Common.Test/EnvironmentProviderTest.cs

@@ -27,9 +27,10 @@ namespace NzbDrone.Common.Test
         }
 
         [Test]
+        [Platform(Exclude="MacOsX")]
         public void IsProduction_should_return_false_when_run_within_nunit()
         {
-            RuntimeInfoBase.IsProduction.Should().BeFalse("Process name is " + Process.GetCurrentProcess().ProcessName + " Folder is " + Directory.GetCurrentDirectory());
+            RuntimeInfo.IsProduction.Should().BeFalse("Process name is " + Process.GetCurrentProcess().ProcessName + " Folder is " + Directory.GetCurrentDirectory());
         }
 
         [Test]

src/NzbDrone.Common.Test/Http/HttpClientFixture.cs

@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Threading;
 using FluentAssertions;
@@ -9,6 +10,7 @@ using Moq;
 using NLog;
 using NUnit.Framework;
 using NzbDrone.Common.Cache;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Http.Dispatchers;
 using NzbDrone.Common.Http.Proxy;
@@ -23,13 +25,78 @@ namespace NzbDrone.Common.Test.Http
     [TestFixture(typeof(CurlHttpDispatcher))]
     public class HttpClientFixture<TDispatcher> : TestBase<HttpClient> where TDispatcher : IHttpDispatcher
     {
-        private static string[] _httpBinHosts = new[] { "eu.httpbin.org", "httpbin.org" };
-        private static int _httpBinRandom;
+        private string[] _httpBinHosts;
+        private int _httpBinSleep;
+        private int _httpBinRandom;
         private string _httpBinHost;
+        private string _httpBinHost2;
+
+        [OneTimeSetUp]
+        public void FixtureSetUp()
+        {
+            // Always use our server for main tests
+            var mainHost = "httpbin.servarr.com";
+
+            // Use mirrors for tests that use two hosts
+            var candidates = new[] { "eu.httpbin.org", /* "httpbin.org", */ "www.httpbin.org" };
+
+            // httpbin.org is broken right now, occassionally redirecting to https if it's unavailable.
+            _httpBinHost = mainHost;
+            _httpBinHosts = candidates.Where(IsTestSiteAvailable).ToArray();
+
+            TestLogger.Info($"{candidates.Length} TestSites available.");
+
+            _httpBinSleep = _httpBinHosts.Count() < 2 ? 100 : 10;
+        }
+
+        private bool IsTestSiteAvailable(string site)
+        {
+            try
+            {
+                var req = WebRequest.Create($"https://{site}/get") as HttpWebRequest;
+                var res = req.GetResponse() as HttpWebResponse;
+                if (res.StatusCode != HttpStatusCode.OK)
+                {
+                    return false;
+                }
+
+                try
+                {
+                    req = WebRequest.Create($"https://{site}/status/429") as HttpWebRequest;
+                    res = req.GetResponse() as HttpWebResponse;
+                }
+                catch (WebException ex)
+                {
+                    res = ex.Response as HttpWebResponse;
+                }
+
+                if (res == null || res.StatusCode != (HttpStatusCode)429)
+                {
+                    return false;
+                }
+
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
 
         [SetUp]
         public void SetUp()
         {
+            if (!_httpBinHosts.Any())
+            {
+                Assert.Inconclusive("No TestSites available");
+            }
+
+            Mocker.GetMock<IPlatformInfo>().Setup(c => c.Version).Returns(new Version("1.0.0"));
+            Mocker.GetMock<IOsInfo>().Setup(c => c.Name).Returns("TestOS");
+            Mocker.GetMock<IOsInfo>().Setup(c => c.Version).Returns("9.0.0");
+            
+            Mocker.SetConstant<IUserAgentBuilder>(Mocker.Resolve<UserAgentBuilder>());
+
             Mocker.SetConstant<ICacheManager>(Mocker.Resolve<CacheManager>());
             Mocker.SetConstant<ICreateManagedWebProxy>(Mocker.Resolve<ManagedWebProxyFactory>());
             Mocker.SetConstant<IRateLimitService>(Mocker.Resolve<RateLimitService>());
@@ -42,13 +109,19 @@ namespace NzbDrone.Common.Test.Http
             //      .Returns(new HttpProxySettings(ProxyType.Socks5, "127.0.0.1", 5476, "", false));
 
             // Roundrobin over the two servers, to reduce the chance of hitting the ratelimiter.
-            _httpBinHost = _httpBinHosts[_httpBinRandom++ % _httpBinHosts.Length];
+            _httpBinHost2 = _httpBinHosts[_httpBinRandom++ % _httpBinHosts.Length];
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Thread.Sleep(_httpBinSleep);
         }
 
         [Test]
         public void should_execute_simple_get()
         {
-            var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/get");
 
             var response = Subject.Execute(request);
 
@@ -58,7 +131,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_execute_https_get()
         {
-            var request = new HttpRequest(string.Format("https://{0}/get", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/get");
 
             var response = Subject.Execute(request);
 
@@ -68,11 +141,12 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_execute_typed_get()
         {
-            var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/get?test=1");
 
             var response = Subject.Get<HttpBinResource>(request);
 
-            response.Resource.Url.Should().Be(request.Url.FullUri);
+            response.Resource.Url.EndsWith("/get?test=1");
+            response.Resource.Args.Should().Contain("test", "1");
         }
 
         [Test]
@@ -80,7 +154,7 @@ namespace NzbDrone.Common.Test.Http
         {
             var message = "{ my: 1 }";
 
-            var request = new HttpRequest(string.Format("http://{0}/post", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/post");
             request.SetContent(message);
 
             var response = Subject.Post<HttpBinResource>(request);
@@ -91,7 +165,7 @@ namespace NzbDrone.Common.Test.Http
         [TestCase("gzip")]
         public void should_execute_get_using_gzip(string compression)
         {
-            var request = new HttpRequest(string.Format("http://{0}/{1}", _httpBinHost, compression));
+            var request = new HttpRequest($"https://{_httpBinHost}/{compression}");
 
             var response = Subject.Get<HttpBinResource>(request);
 
@@ -107,7 +181,7 @@ namespace NzbDrone.Common.Test.Http
         [TestCase(HttpStatusCode.BadGateway)]
         public void should_throw_on_unsuccessful_status_codes(int statusCode)
         {
-            var request = new HttpRequest(string.Format("http://{0}/status/{1}", _httpBinHost, statusCode));
+            var request = new HttpRequest($"https://{_httpBinHost}/status/{statusCode}");
 
             var exception = Assert.Throws<HttpException>(() => Subject.Get<HttpBinResource>(request));
 
@@ -117,9 +191,10 @@ namespace NzbDrone.Common.Test.Http
         }
 
         [Test]
+        [Platform(Exclude="MacOsX")]
         public void should_not_follow_redirects_when_not_in_production()
         {
-            var request = new HttpRequest(string.Format("http://{0}/redirect/1", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/redirect/1");
 
             Subject.Get(request);
 
@@ -129,7 +204,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_follow_redirects()
         {
-            var request = new HttpRequest(string.Format("http://{0}/redirect/1", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/redirect/1");
             request.AllowAutoRedirect = true;
 
             var response = Subject.Get(request);
@@ -140,9 +215,10 @@ namespace NzbDrone.Common.Test.Http
         }
 
         [Test]
+        [Platform(Exclude="MacOsX")]
         public void should_not_follow_redirects()
         {
-            var request = new HttpRequest($"http://{_httpBinHost}/redirect/1");
+            var request = new HttpRequest($"https://{_httpBinHost}/redirect/1");
             request.AllowAutoRedirect = false;
 
             var response = Subject.Get(request);
@@ -155,7 +231,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_follow_redirects_to_https()
         {
-            var request = new HttpRequestBuilder($"http://{_httpBinHost}/redirect-to")
+            var request = new HttpRequestBuilder($"https://{_httpBinHost}/redirect-to")
                 .AddQueryParam("url", $"https://sonarr.tv/")
                 .Build();
             request.AllowAutoRedirect = true;
@@ -171,7 +247,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_throw_on_too_many_redirects()
         {
-            var request = new HttpRequest($"http://{_httpBinHost}/redirect/4");
+            var request = new HttpRequest($"https://{_httpBinHost}/redirect/6");
             request.AllowAutoRedirect = true;
 
             Assert.Throws<WebException>(() => Subject.Get(request));
@@ -182,7 +258,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_send_user_agent()
         {
-            var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/get");
 
             var response = Subject.Get<HttpBinResource>(request);
 
@@ -196,7 +272,7 @@ namespace NzbDrone.Common.Test.Http
         [TestCase("Accept", "text/xml, text/rss+xml, application/rss+xml")]
         public void should_send_headers(string header, string value)
         {
-            var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/get");
             request.Headers.Add(header, value);
 
             var response = Subject.Get<HttpBinResource>(request);
@@ -209,7 +285,7 @@ namespace NzbDrone.Common.Test.Http
         {
             var file = GetTempFilePath();
 
-            Assert.Throws<WebException>(() => Subject.DownloadFile("http://download.sonarr.tv/wrongpath", file));
+            Assert.Throws<WebException>(() => Subject.DownloadFile("https://download.sonarr.tv/wrongpath", file));
 
             File.Exists(file).Should().BeFalse();
 
@@ -219,7 +295,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_send_cookie()
         {
-            var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/get");
             request.Cookies["my"] = "cookie";
 
             var response = Subject.Get<HttpBinResource>(request);
@@ -233,10 +309,15 @@ namespace NzbDrone.Common.Test.Http
 
         public void GivenOldCookie()
         {
-            var oldRequest = new HttpRequest("http://eu.httpbin.org/get");
+            if (_httpBinHost == _httpBinHost2)
+            {
+                Assert.Inconclusive("Need both httpbin.org and eu.httpbin.org to run this test.");
+            }
+
+            var oldRequest = new HttpRequest($"https://{_httpBinHost2}/get");
             oldRequest.Cookies["my"] = "cookie";
 
-            var oldClient = new HttpClient(new IHttpRequestInterceptor[0], Mocker.Resolve<ICacheManager>(), Mocker.Resolve<IRateLimitService>(), Mocker.Resolve<IHttpDispatcher>(), Mocker.Resolve<Logger>());
+            var oldClient = new HttpClient(new IHttpRequestInterceptor[0], Mocker.Resolve<ICacheManager>(), Mocker.Resolve<IRateLimitService>(), Mocker.Resolve<IHttpDispatcher>(), Mocker.GetMock<IUserAgentBuilder>().Object, Mocker.Resolve<Logger>());
 
             oldClient.Should().NotBeSameAs(Subject);
 
@@ -250,7 +331,7 @@ namespace NzbDrone.Common.Test.Http
         {
             GivenOldCookie();
 
-            var request = new HttpRequest("http://eu.httpbin.org/get");
+            var request = new HttpRequest($"https://{_httpBinHost2}/get");
 
             var response = Subject.Get<HttpBinResource>(request);
 
@@ -266,7 +347,7 @@ namespace NzbDrone.Common.Test.Http
         {
             GivenOldCookie();
 
-            var request = new HttpRequest("http://httpbin.org/get");
+            var request = new HttpRequest($"https://{_httpBinHost}/get");
 
             var response = Subject.Get<HttpBinResource>(request);
 
@@ -276,14 +357,14 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_not_store_request_cookie()
         {
-            var requestGet = new HttpRequest($"http://{_httpBinHost}/get");
+            var requestGet = new HttpRequest($"https://{_httpBinHost}/get");
             requestGet.Cookies.Add("my", "cookie");
             requestGet.AllowAutoRedirect = false;
             requestGet.StoreRequestCookie = false;
             requestGet.StoreResponseCookie = false;
             var responseGet = Subject.Get<HttpBinResource>(requestGet);
 
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
             requestCookies.AllowAutoRedirect = false;
             var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
@@ -295,14 +376,14 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_store_request_cookie()
         {
-            var requestGet = new HttpRequest($"http://{_httpBinHost}/get");
+            var requestGet = new HttpRequest($"https://{_httpBinHost}/get");
             requestGet.Cookies.Add("my", "cookie");
             requestGet.AllowAutoRedirect = false;
             requestGet.StoreRequestCookie.Should().BeTrue();
             requestGet.StoreResponseCookie = false;
             var responseGet = Subject.Get<HttpBinResource>(requestGet);
 
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
             requestCookies.AllowAutoRedirect = false;
             var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
@@ -314,7 +395,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_delete_request_cookie()
         {
-            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            var requestDelete = new HttpRequest($"https://{_httpBinHost}/cookies/delete?my");
             requestDelete.Cookies.Add("my", "cookie");
             requestDelete.AllowAutoRedirect = true;
             requestDelete.StoreRequestCookie = false;
@@ -329,14 +410,14 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_not_store_response_cookie()
         {
-            var requestSet = new HttpRequest(string.Format("http://{0}/cookies/set?my=cookie", _httpBinHost));
+            var requestSet = new HttpRequest($"https://{_httpBinHost}/cookies/set?my=cookie");
             requestSet.AllowAutoRedirect = false;
             requestSet.StoreRequestCookie = false;
             requestSet.StoreResponseCookie.Should().BeFalse();
 
             var responseSet = Subject.Get(requestSet);
 
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
 
             var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
@@ -348,14 +429,14 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_store_response_cookie()
         {
-            var requestSet = new HttpRequest(string.Format("http://{0}/cookies/set?my=cookie", _httpBinHost));
+            var requestSet = new HttpRequest($"https://{_httpBinHost}/cookies/set?my=cookie");
             requestSet.AllowAutoRedirect = false;
             requestSet.StoreRequestCookie = false;
             requestSet.StoreResponseCookie = true;
 
             var responseSet = Subject.Get(requestSet);
 
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
 
             var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
@@ -367,7 +448,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_temp_store_response_cookie()
         {
-            var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
+            var requestSet = new HttpRequest($"https://{_httpBinHost}/cookies/set?my=cookie");
             requestSet.AllowAutoRedirect = true;
             requestSet.StoreRequestCookie = false;
             requestSet.StoreResponseCookie.Should().BeFalse();
@@ -382,7 +463,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_overwrite_response_cookie()
         {
-            var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
+            var requestSet = new HttpRequest($"https://{_httpBinHost}/cookies/set?my=cookie");
             requestSet.Cookies.Add("my", "oldcookie");
             requestSet.AllowAutoRedirect = false;
             requestSet.StoreRequestCookie = false;
@@ -390,7 +471,7 @@ namespace NzbDrone.Common.Test.Http
 
             var responseSet = Subject.Get(requestSet);
 
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
 
             var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
@@ -402,7 +483,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_overwrite_temp_response_cookie()
         {
-            var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
+            var requestSet = new HttpRequest($"https://{_httpBinHost}/cookies/set?my=cookie");
             requestSet.Cookies.Add("my", "oldcookie");
             requestSet.AllowAutoRedirect = true;
             requestSet.StoreRequestCookie = true;
@@ -412,7 +493,7 @@ namespace NzbDrone.Common.Test.Http
 
             responseSet.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
 
             var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
@@ -424,7 +505,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_not_delete_response_cookie()
         {
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
             requestCookies.Cookies.Add("my", "cookie");
             requestCookies.AllowAutoRedirect = false;
             requestCookies.StoreRequestCookie = true;
@@ -433,14 +514,14 @@ namespace NzbDrone.Common.Test.Http
 
             responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
-            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            var requestDelete = new HttpRequest($"https://{_httpBinHost}/cookies/delete?my");
             requestDelete.AllowAutoRedirect = false;
             requestDelete.StoreRequestCookie = false;
             requestDelete.StoreResponseCookie = false;
 
             var responseDelete = Subject.Get(requestDelete);
 
-            requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
             requestCookies.StoreRequestCookie = false;
             requestCookies.StoreResponseCookie = false;
 
@@ -454,7 +535,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_delete_response_cookie()
         {
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
             requestCookies.Cookies.Add("my", "cookie");
             requestCookies.AllowAutoRedirect = false;
             requestCookies.StoreRequestCookie = true;
@@ -463,14 +544,14 @@ namespace NzbDrone.Common.Test.Http
 
             responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
-            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            var requestDelete = new HttpRequest($"https://{_httpBinHost}/cookies/delete?my");
             requestDelete.AllowAutoRedirect = false;
             requestDelete.StoreRequestCookie = false;
             requestDelete.StoreResponseCookie = true;
 
             var responseDelete = Subject.Get(requestDelete);
 
-            requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
             requestCookies.StoreRequestCookie = false;
             requestCookies.StoreResponseCookie = false;
 
@@ -484,7 +565,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_delete_temp_response_cookie()
         {
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
             requestCookies.Cookies.Add("my", "cookie");
             requestCookies.AllowAutoRedirect = false;
             requestCookies.StoreRequestCookie = true;
@@ -493,7 +574,7 @@ namespace NzbDrone.Common.Test.Http
 
             responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
-            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            var requestDelete = new HttpRequest($"https://{_httpBinHost}/cookies/delete?my");
             requestDelete.AllowAutoRedirect = true;
             requestDelete.StoreRequestCookie = false;
             requestDelete.StoreResponseCookie = false;
@@ -501,7 +582,7 @@ namespace NzbDrone.Common.Test.Http
 
             responseDelete.Resource.Cookies.Should().BeEmpty();
 
-            requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
             requestCookies.StoreRequestCookie = false;
             requestCookies.StoreResponseCookie = false;
 
@@ -514,8 +595,8 @@ namespace NzbDrone.Common.Test.Http
         public void should_not_send_old_cookie()
         {
             GivenOldCookie();
-            
-            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+
+            var requestCookies = new HttpRequest($"https://{_httpBinHost}/cookies");
             requestCookies.IgnorePersistentCookies = true;
             requestCookies.StoreRequestCookie = false;
             requestCookies.StoreResponseCookie = false;
@@ -527,7 +608,7 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_throw_on_http429_too_many_requests()
         {
-            var request = new HttpRequest(string.Format("http://{0}/status/429", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/status/429");
 
             Assert.Throws<TooManyRequestsException>(() => Subject.Get(request));
 
@@ -547,7 +628,7 @@ namespace NzbDrone.Common.Test.Http
                 .Setup(v => v.PostResponse(It.IsAny<HttpResponse>()))
                 .Returns<HttpResponse>(r => r);
 
-            var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+            var request = new HttpRequest($"https://{_httpBinHost}/get");
 
             Subject.Get(request);
 
@@ -569,7 +650,7 @@ namespace NzbDrone.Common.Test.Http
             {
                 // the date is bad in the below - should be 13-Jul-2026
                 string malformedCookie = @"__cfduid=d29e686a9d65800021c66faca0a29b4261436890790; expires=Mon, 13-Jul-26 16:19:50 GMT; path=/; HttpOnly";
-                var requestSet = new HttpRequestBuilder(string.Format("http://{0}/response-headers", _httpBinHost))
+                var requestSet = new HttpRequestBuilder($"https://{_httpBinHost}/response-headers")
                     .AddQueryParam("Set-Cookie", malformedCookie)
                     .Build();
 
@@ -578,7 +659,7 @@ namespace NzbDrone.Common.Test.Http
 
                 var responseSet = Subject.Get(requestSet);
 
-                var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+                var request = new HttpRequest($"https://{_httpBinHost}/get");
 
                 var response = Subject.Get<HttpBinResource>(request);
 
@@ -602,7 +683,8 @@ namespace NzbDrone.Common.Test.Http
         {
             try
             {
-                string url = string.Format("http://{0}/response-headers?Set-Cookie={1}", _httpBinHost, Uri.EscapeUriString(malformedCookie));
+                string url =
+                    $"https://{_httpBinHost}/response-headers?Set-Cookie={Uri.EscapeUriString(malformedCookie)}";
 
                 var requestSet = new HttpRequest(url);
                 requestSet.AllowAutoRedirect = false;
@@ -610,7 +692,7 @@ namespace NzbDrone.Common.Test.Http
 
                 var responseSet = Subject.Get(requestSet);
 
-                var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+                var request = new HttpRequest($"https://{_httpBinHost}/get");
 
                 var response = Subject.Get<HttpBinResource>(request);
 
@@ -626,6 +708,7 @@ namespace NzbDrone.Common.Test.Http
 
     public class HttpBinResource
     {
+        public Dictionary<string, object> Args { get; set; }
         public Dictionary<string, object> Headers { get; set; }
         public string Origin { get; set; }
         public string Url { get; set; }

src/NzbDrone.Common.Test/Http/UserAgentBuilderFixture.cs

@@ -0,0 +1,30 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Http;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Common.Test.Http
+{
+    [TestFixture]
+    public class UserAgentBuilderFixture : TestBase<UserAgentBuilder>
+    {
+        [Test]
+        public void should_get_user_agent_if_os_version_is_null()
+        {
+            Mocker.GetMock<IOsInfo>().SetupGet(c => c.Version).Returns((string)null);
+            Mocker.GetMock<IOsInfo>().SetupGet(c => c.Name).Returns("TestOS");
+
+            Subject.GetUserAgent(false).Should().NotBeNullOrWhiteSpace();
+        }
+
+        [Test]
+        public void should_get_use_os_family_if_name_is_null()
+        {
+            Mocker.GetMock<IOsInfo>().SetupGet(c => c.Version).Returns((string)null);
+            Mocker.GetMock<IOsInfo>().SetupGet(c => c.Name).Returns((string)null);
+
+            Subject.GetUserAgent(false).Should().NotBeNullOrWhiteSpace();
+        }
+    }
+}

src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj

@@ -1,164 +1,165 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BEC74619-DDBB-4FBA-B517-D3E20AFC9997}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NzbDrone.Common.Test</RootNamespace>
-    <AssemblyName>NzbDrone.Common.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CacheTests\CachedDictionaryFixture.cs" />
-    <Compile Include="CacheTests\CachedFixture.cs" />
-    <Compile Include="CacheTests\CachedManagerFixture.cs" />
-    <Compile Include="ConfigFileProviderTest.cs" />
-    <Compile Include="DiskTests\DirectoryLookupServiceFixture.cs" />
-    <Compile Include="DiskTests\DiskProviderFixtureBase.cs" />
-    <Compile Include="DiskTests\FreeSpaceFixtureBase.cs" />
-    <Compile Include="DiskTests\IsParentFixtureBase.cs" />
-    <Compile Include="DiskTests\DiskTransferServiceFixture.cs" />
-    <Compile Include="EnsureTest\PathExtensionFixture.cs" />
-    <Compile Include="EnvironmentProviderTest.cs" />
-    <Compile Include="EnvironmentTests\EnvironmentProviderTest.cs" />
-    <Compile Include="EnvironmentTests\StartupArgumentsFixture.cs" />
-    <Compile Include="ExtensionTests\FromOctalStringFixture.cs" />
-    <Compile Include="ExtensionTests\IEnumerableExtensionTests\ExceptByFixture.cs" />
-    <Compile Include="ExtensionTests\IEnumerableExtensionTests\IntersectByFixture.cs" />
-    <Compile Include="ExtensionTests\Int64ExtensionFixture.cs" />
-    <Compile Include="Http\HttpClientFixture.cs" />
-    <Compile Include="Http\HttpHeaderFixture.cs" />
-    <Compile Include="Http\HttpRequestBuilderFixture.cs" />
-    <Compile Include="Http\HttpRequestFixture.cs" />
-    <Compile Include="Http\HttpUriFixture.cs" />
-    <Compile Include="InstrumentationTests\CleanseLogMessageFixture.cs" />
-    <Compile Include="LevenshteinDistanceFixture.cs" />
-    <Compile Include="OsPathFixture.cs" />
-    <Compile Include="PathExtensionFixture.cs" />
-    <Compile Include="ProcessProviderTests.cs" />
-    <Compile Include="ReflectionExtensions.cs" />
-    <Compile Include="ReflectionTests\ReflectionExtensionFixture.cs" />
-    <Compile Include="ServiceFactoryFixture.cs" />
-    <Compile Include="ServiceProviderTests.cs" />
-    <Compile Include="TPLTests\DebouncerFixture.cs" />
-    <Compile Include="TPLTests\RateLimitServiceFixture.cs" />
-    <Compile Include="WebClientTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\NzbDrone.Test.Common\App.config">
-      <Link>App.config</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
-      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
-      <Name>NzbDrone.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
-      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
-      <Name>NzbDrone.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
-      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
-      <Name>NzbDrone.Host</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Mono\NzbDrone.Mono.csproj">
-      <Project>{15ad7579-a314-4626-b556-663f51d97cd1}</Project>
-      <Name>NzbDrone.Mono</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Windows\NzbDrone.Windows.csproj">
-      <Project>{911284d3-f130-459e-836c-2430b6fbf21d}</Project>
-      <Name>NzbDrone.Windows</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone\NzbDrone.csproj">
-      <Project>{D12F7F2F-8A3C-415F-88FA-6DD061A84869}</Project>
-      <Name>NzbDrone</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
-      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
-      <Name>NzbDrone.Test.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Test.Dummy\NzbDrone.Test.Dummy.csproj">
-      <Project>{FAFB5948-A222-4CF6-AD14-026BE7564802}</Project>
-      <Name>NzbDrone.Test.Dummy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent Condition="'$(Configuration)|$(OS)' == 'Debug|Windows_NT'">xcopy /s /y "$(SolutionDir)\ExternalModules\CurlSharp\libs\i386\*" "$(TargetDir)"</PostBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BEC74619-DDBB-4FBA-B517-D3E20AFC9997}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.Common.Test</RootNamespace>
+    <AssemblyName>NzbDrone.Common.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CacheTests\CachedDictionaryFixture.cs" />
+    <Compile Include="CacheTests\CachedFixture.cs" />
+    <Compile Include="CacheTests\CachedManagerFixture.cs" />
+    <Compile Include="ConfigFileProviderTest.cs" />
+    <Compile Include="DiskTests\DirectoryLookupServiceFixture.cs" />
+    <Compile Include="DiskTests\DiskProviderFixtureBase.cs" />
+    <Compile Include="DiskTests\FreeSpaceFixtureBase.cs" />
+    <Compile Include="DiskTests\IsParentFixtureBase.cs" />
+    <Compile Include="DiskTests\DiskTransferServiceFixture.cs" />
+    <Compile Include="EnsureTest\PathExtensionFixture.cs" />
+    <Compile Include="EnvironmentProviderTest.cs" />
+    <Compile Include="EnvironmentTests\EnvironmentProviderTest.cs" />
+    <Compile Include="EnvironmentTests\StartupArgumentsFixture.cs" />
+    <Compile Include="ExtensionTests\FromOctalStringFixture.cs" />
+    <Compile Include="ExtensionTests\IEnumerableExtensionTests\ExceptByFixture.cs" />
+    <Compile Include="ExtensionTests\IEnumerableExtensionTests\IntersectByFixture.cs" />
+    <Compile Include="ExtensionTests\Int64ExtensionFixture.cs" />
+    <Compile Include="Http\HttpClientFixture.cs" />
+    <Compile Include="Http\HttpHeaderFixture.cs" />
+    <Compile Include="Http\HttpRequestBuilderFixture.cs" />
+    <Compile Include="Http\HttpRequestFixture.cs" />
+    <Compile Include="Http\HttpUriFixture.cs" />
+    <Compile Include="Http\UserAgentBuilderFixture.cs" />
+    <Compile Include="InstrumentationTests\CleanseLogMessageFixture.cs" />
+    <Compile Include="LevenshteinDistanceFixture.cs" />
+    <Compile Include="OsPathFixture.cs" />
+    <Compile Include="PathExtensionFixture.cs" />
+    <Compile Include="ProcessProviderTests.cs" />
+    <Compile Include="ReflectionExtensions.cs" />
+    <Compile Include="ReflectionTests\ReflectionExtensionFixture.cs" />
+    <Compile Include="ServiceFactoryFixture.cs" />
+    <Compile Include="ServiceProviderTests.cs" />
+    <Compile Include="TPLTests\DebouncerFixture.cs" />
+    <Compile Include="TPLTests\RateLimitServiceFixture.cs" />
+    <Compile Include="WebClientTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\NzbDrone.Test.Common\App.config">
+      <Link>App.config</Link>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
+      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
+      <Name>NzbDrone.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
+      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
+      <Name>NzbDrone.Host</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Mono\NzbDrone.Mono.csproj">
+      <Project>{15ad7579-a314-4626-b556-663f51d97cd1}</Project>
+      <Name>NzbDrone.Mono</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Windows\NzbDrone.Windows.csproj">
+      <Project>{911284d3-f130-459e-836c-2430b6fbf21d}</Project>
+      <Name>NzbDrone.Windows</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone\NzbDrone.csproj">
+      <Project>{D12F7F2F-8A3C-415F-88FA-6DD061A84869}</Project>
+      <Name>NzbDrone</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
+      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
+      <Name>NzbDrone.Test.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Test.Dummy\NzbDrone.Test.Dummy.csproj">
+      <Project>{FAFB5948-A222-4CF6-AD14-026BE7564802}</Project>
+      <Name>NzbDrone.Test.Dummy</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent Condition="'$(Configuration)|$(OS)' == 'Debug|Windows_NT'">xcopy /s /y "$(SolutionDir)\ExternalModules\CurlSharp\libs\i386\*" "$(TargetDir)"</PostBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

src/NzbDrone.Common.Test/PathExtensionFixture.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using FluentAssertions;
 using Moq;
@@ -206,7 +206,7 @@ namespace NzbDrone.Common.Test
         public void get_actual_casing_should_return_actual_casing_for_local_dir_in_windows()
         {
             WindowsOnly();
-            var path = Directory.GetCurrentDirectory().Replace("c:\\","C:\\").Replace("system32", "System32");
+            var path = Directory.GetCurrentDirectory().Replace("c:\\","C:\\").Replace("d:\\", "D:\\").Replace("system32", "System32");
 
             path.ToUpper().GetActualCasing().Should().Be(path);
             path.ToLower().GetActualCasing().Should().Be(path);
@@ -257,13 +257,13 @@ namespace NzbDrone.Common.Test
         [Test]
         public void GetUpdateClientFolder()
         {
-            GetIAppDirectoryInfo().GetUpdateClientFolder().Should().BeEquivalentTo(@"C:\Temp\radarr_update\Radarr\NzbDrone.Update\".AsOsAgnostic());
+            GetIAppDirectoryInfo().GetUpdateClientFolder(new Version("0.2.0.1480")).Should().BeEquivalentTo(@"C:\Temp\radarr_update\Radarr\NzbDrone.Update\".AsOsAgnostic());
         }
 
         [Test]
         public void GetUpdateClientExePath()
         {
-            GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\radarr_update\Radarr.Update.exe".AsOsAgnostic());
+            GetIAppDirectoryInfo().GetUpdateClientExePath(new Version("0.2.0.1480")).Should().BeEquivalentTo(@"C:\Temp\radarr_update\Radarr.Update.exe".AsOsAgnostic());
         }
 
         [Test]

src/NzbDrone.Common.Test/packages.config

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
-  <package id="Moq" version="4.0.10827" />
-  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
-  <package id="NUnit" version="3.5.0" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
+  <package id="Moq" version="4.0.10827" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NUnit" version="3.5.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Common/Cloud/RadarrCloudRequestBuilder.cs

@@ -13,7 +13,7 @@ namespace NzbDrone.Common.Cloud
     {
         public RadarrCloudRequestBuilder()
         {
-            Services = new HttpRequestBuilder("https://radarr.aeonlucid.com/v1/")
+            Services = new HttpRequestBuilder("https://radarr.lidarr.audio/v1/")
                 .CreateFactory();
 
             TMDB = new HttpRequestBuilder("https://api.themoviedb.org/3/{route}/{id}{secondaryRoute}")

src/NzbDrone.Common/Composition/ContainerBuilderBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -13,12 +13,15 @@ namespace NzbDrone.Common.Composition
     {
         private readonly List<Type> _loadedTypes;
 
-        public IContainer Container { get; private set; }
+        protected IContainer Container { get; }
 
-        protected ContainerBuilderBase(IStartupContext args, params string[] assemblies)
+        protected ContainerBuilderBase(IStartupContext args, List<string> assemblies)
         {
             _loadedTypes = new List<Type>();
 
+            assemblies.Add(OsInfo.IsWindows ? "NzbDrone.Windows" : "NzbDrone.Mono");
+            assemblies.Add("NzbDrone.Common");
+
             foreach (var assembly in assemblies)
             {
                 _loadedTypes.AddRange(Assembly.Load(assembly).GetTypes());

src/NzbDrone.Common/Disk/DiskProviderBase.cs

@@ -17,6 +17,19 @@ namespace NzbDrone.Common.Disk
     {
         private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(DiskProviderBase));
 
+        public static StringComparison PathStringComparison
+        {
+            get
+            {
+                if (OsInfo.IsWindows)
+                {
+                    return StringComparison.OrdinalIgnoreCase;
+                }
+
+                return StringComparison.Ordinal;
+            }
+        }
+
         public abstract long? GetAvailableSpace(string path);
         public abstract void InheritFolderPermissions(string filename);
         public abstract void SetPermissions(string path, string mask, string user, string group);
@@ -87,7 +100,7 @@ namespace NzbDrone.Common.Disk
         public bool FileExists(string path)
         {
             Ensure.That(path, () => path).IsValidPath();
-            return FileExists(path, OsInfo.PathStringComparison);
+            return FileExists(path, PathStringComparison);
         }
 
         public bool FileExists(string path, StringComparison stringComparison)

src/NzbDrone.Common/Disk/FileSystemLookupService.cs

@@ -45,7 +45,8 @@ namespace NzbDrone.Common.Disk
                                                             ".@__thumb",
 
                                                             // Synology
-                                                            "@eadir"
+                                                            "@eadir",
+                                                            "#recycle"
                                                         };
 
         public FileSystemLookupService(IDiskProvider diskProvider, Logger logger)

src/NzbDrone.Common/EnsureThat/EnsureStringExtensions.cs

@@ -101,12 +101,12 @@ namespace NzbDrone.Common.EnsureThat
 
             if (param.Value.IsPathValid()) return param;
 
-            if (OsInfo.IsNotWindows)
+            if (OsInfo.IsWindows)
             {
-                throw ExceptionFactory.CreateForParamValidation(param.Name, string.Format("value [{0}]  is not a valid *nix path. paths must start with /", param.Value));
+                throw ExceptionFactory.CreateForParamValidation(param.Name, string.Format("value [{0}]  is not a valid Windows path. paths must be a full path eg. C:\\Windows", param.Value));
             }
          
-            throw ExceptionFactory.CreateForParamValidation(param.Name, string.Format("value [{0}]  is not a valid Windows path. paths must be a full path eg. C:\\Windows", param.Value));
+            throw ExceptionFactory.CreateForParamValidation(param.Name, string.Format("value [{0}]  is not a valid *nix path. paths must start with /", param.Value));
         }
     }
 }

src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Security.AccessControl;
 using System.Security.Principal;
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Instrumentation;
 
 namespace NzbDrone.Common.EnvironmentInfo
@@ -27,12 +28,24 @@ namespace NzbDrone.Common.EnvironmentInfo
 
         public void Register()
         {
-            _diskProvider.EnsureFolder(_appFolderInfo.AppDataFolder);
+            try
+            {
+                _diskProvider.EnsureFolder(_appFolderInfo.AppDataFolder);
+            }
+            catch (UnauthorizedAccessException)
+            {
+                throw new RadarrStartupException("Cannot create AppFolder, Access to the path {0} is denied", _appFolderInfo.AppDataFolder);
+            }
 
             if (OsInfo.IsWindows)
             {
                 SetPermissions();
             }
+
+            if (!_diskProvider.FolderWritable(_appFolderInfo.AppDataFolder))
+            {
+                throw new RadarrStartupException("AppFolder {0} is not writable", _appFolderInfo.AppDataFolder);
+            }
         }
 
         private void SetPermissions()

src/NzbDrone.Common/EnvironmentInfo/BuildInfo.cs

@@ -1,12 +1,34 @@
-using System;
+using System;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 
 namespace NzbDrone.Common.EnvironmentInfo
 {
     public static class BuildInfo
     {
-        public static Version Version => Assembly.GetExecutingAssembly().GetName().Version;
+        static BuildInfo()
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+
+            Version = assembly.GetName().Version;
+
+            var attributes = assembly.GetCustomAttributes(true);
+
+            Branch = "unknow";
+
+            var config = attributes.OfType<AssemblyConfigurationAttribute>().FirstOrDefault();
+            if (config != null)
+            {
+                Branch = config.Configuration;
+            }
+
+            Release = $"{Version}-{Branch}";
+        }
+
+        public static Version Version { get; }
+        public static String Branch { get; }
+        public static string Release { get; }
 
         public static DateTime BuildDateTime
         {
@@ -29,4 +51,4 @@ namespace NzbDrone.Common.EnvironmentInfo
             }
         }
     }
-}
+}

src/NzbDrone.Common/EnvironmentInfo/IOperatingSystemVersionInfo.cs

@@ -0,0 +1,9 @@
+namespace NzbDrone.Common.EnvironmentInfo
+{
+    public interface IOperatingSystemVersionInfo
+    {
+        string Version { get; }
+        string Name { get; }
+        string FullName { get; }
+    }
+}

src/NzbDrone.Common/EnvironmentInfo/IOsVersionAdapter.cs

@@ -0,0 +1,9 @@
+namespace NzbDrone.Common.EnvironmentInfo
+{
+
+    public interface IOsVersionAdapter
+    {
+        bool Enabled { get; }
+        OsVersionModel Read();
+    }
+}

src/NzbDrone.Common/EnvironmentInfo/IPlatformInfo.cs

@@ -0,0 +1,50 @@
+using System;
+
+namespace NzbDrone.Common.EnvironmentInfo
+{
+
+    public enum PlatformType
+    {
+        DotNet = 0,
+        Mono = 1
+    }
+
+    public interface IPlatformInfo
+    {
+        Version Version { get; }
+    }
+
+    public abstract class PlatformInfo : IPlatformInfo
+    {
+        static PlatformInfo()
+        {
+            if (Type.GetType("Mono.Runtime") != null)
+            {
+                Platform = PlatformType.Mono;
+            }
+            else
+            {
+                Platform = PlatformType.DotNet;
+            }
+        }
+
+        public static PlatformType Platform { get; }
+        public static bool IsMono => Platform == PlatformType.Mono;
+        public static bool IsDotNet => Platform == PlatformType.DotNet;
+
+        public static string PlatformName
+        {
+            get
+            {
+                if (IsDotNet)
+                {
+                    return ".NET";
+                }
+
+                return "Mono";
+            }
+        }
+
+        public abstract Version Version { get; }
+    }
+}

src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs

@@ -1,14 +1,13 @@
-namespace NzbDrone.Common.EnvironmentInfo
+namespace NzbDrone.Common.EnvironmentInfo
 {
     public interface IRuntimeInfo
     {
         bool IsUserInteractive { get; }
         bool IsAdmin { get; }
         bool IsWindowsService { get; }
-        bool IsConsole { get; }
-        bool IsRunning { get; set; }
+        bool IsWindowsTray { get; }
+        bool IsExiting { get; set; }
         bool RestartPending { get; set; }
         string ExecutingApplication { get; }
-        string RuntimeVersion { get; }
     }
-}
+}

src/NzbDrone.Common/EnvironmentInfo/OsInfo.cs

@@ -1,87 +1,95 @@
-using System;
-using System.Diagnostics;
-using System.Globalization;
-using System.Runtime.InteropServices;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using NLog;
 
 namespace NzbDrone.Common.EnvironmentInfo
 {
-    public static class OsInfo
+    public class OsInfo : IOsInfo
     {
+        public static Os Os { get; }
+
+        public static bool IsNotWindows => !IsWindows;
+        public static bool IsLinux => Os == Os.Linux;
+        public static bool IsOsx => Os == Os.Osx;
+        public static bool IsWindows => Os == Os.Windows;
+
+        public string Version { get; }
+        public string Name { get; }
+        public string FullName { get; }
 
         static OsInfo()
         {
-            var platform = (int)Environment.OSVersion.Platform;
+            var platform = Environment.OSVersion.Platform;
 
-            Version = Environment.OSVersion.Version;
-
-            IsMonoRuntime = Type.GetType("Mono.Runtime") != null;           
-            IsNotWindows = (platform == 4) || (platform == 6) || (platform == 128);
-            IsOsx = IsRunningOnMac();
-            IsLinux = IsNotWindows && !IsOsx;
-            IsWindows = !IsNotWindows;
-
-            FirstDayOfWeek = CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek;
-
-            if (IsWindows)
+            switch (platform)
             {
-                Os = Os.Windows;
-                PathStringComparison = StringComparison.OrdinalIgnoreCase;
+                case PlatformID.Win32NT:
+                    {
+                        Os = Os.Windows;
+                        break;
+                    }
+                case PlatformID.MacOSX:
+                case PlatformID.Unix:
+                    {
+                        // Sometimes Mac OS reports itself as Unix
+                        if (Directory.Exists("/System/Library/CoreServices/") &&
+                            (File.Exists("/System/Library/CoreServices/SystemVersion.plist") ||
+                            File.Exists("/System/Library/CoreServices/ServerVersion.plist"))
+                            )
+                        {
+                            Os = Os.Osx;
+                        }
+                        else
+                        {
+                            Os = Os.Linux;
+                        }
+                        break;
+                    }
+            }
+        }
+
+        public OsInfo(IEnumerable<IOsVersionAdapter> versionAdapters, Logger logger)
+        {
+            OsVersionModel osInfo = null;
+
+            foreach (var osVersionAdapter in versionAdapters.Where(c => c.Enabled))
+            {
+                try
+                {
+                    osInfo = osVersionAdapter.Read();
+                }
+                catch (Exception e)
+                {
+                    logger.Error(e, "Couldn't get OS Version info");
+                }
+
+                if (osInfo != null)
+                {
+                    break;
+                }
+            }
+
+            if (osInfo != null)
+            {
+                Name = osInfo.Name;
+                Version = osInfo.Version;
+                FullName = osInfo.FullName;
             }
             else
             {
-                Os = IsOsx ? Os.Osx : Os.Linux;
-
-                PathStringComparison = StringComparison.Ordinal;
+                Name = Os.ToString();
+                FullName = Name;
             }
         }
+    }
 
-        public static Version Version { get; private set; }
-        public static bool IsMonoRuntime { get; private set; }
-        public static bool IsNotWindows { get; private set; }
-        public static bool IsLinux { get; private set; }
-        public static bool IsOsx { get; private set; }
-        public static bool IsWindows { get; private set; }
-        public static Os Os { get; private set; }
-        public static DayOfWeek FirstDayOfWeek { get; private set; }
-        public static StringComparison PathStringComparison { get; private set; }
-
-        //Borrowed from: https://github.com/jpobst/Pinta/blob/master/Pinta.Core/Managers/SystemManager.cs
-        //From Managed.Windows.Forms/XplatUI
-        [DllImport("libc")]
-        static extern int uname(IntPtr buf);
-
-        [DebuggerStepThrough]
-        static bool IsRunningOnMac()
-        {
-            var buf = IntPtr.Zero;
-
-            try
-            {
-                buf = Marshal.AllocHGlobal(8192);
-                // This is a hacktastic way of getting sysname from uname ()
-                if (uname(buf) == 0)
-                {
-                    var os = Marshal.PtrToStringAnsi(buf);
-
-                    if (os == "Darwin")
-                    {
-                        return true;
-                    }
-                }
-            }
-            catch
-            {
-            }
-            finally
-            {
-                if (buf != IntPtr.Zero)
-                {
-                    Marshal.FreeHGlobal(buf);
-                }
-            }
-
-            return false;
-        }
+    public interface IOsInfo
+    {
+        string Version { get; }
+        string Name { get; }
+        string FullName { get; }
     }
 
     public enum Os
@@ -90,4 +98,4 @@ namespace NzbDrone.Common.EnvironmentInfo
         Linux,
         Osx
     }
-}
+}

src/NzbDrone.Common/EnvironmentInfo/OsVersionModel.cs

@@ -0,0 +1,29 @@
+namespace NzbDrone.Common.EnvironmentInfo
+{
+    public class OsVersionModel
+    {
+
+
+        public OsVersionModel(string name, string version, string fullName = null)
+        {
+            Name = Trim(name);
+            Version = Trim(version);
+
+            if (string.IsNullOrWhiteSpace(fullName))
+            {
+                fullName = $"{Name} {Version}";
+            }
+
+            FullName = Trim(fullName);
+        }
+
+        private static string Trim(string source)
+        {
+            return source.Trim().Trim('"', '\'');
+        }
+
+        public string Name { get; }
+        public string FullName { get; }
+        public string Version { get; }
+    }
+}

src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
@@ -9,11 +9,11 @@ using NzbDrone.Common.Processes;
 
 namespace NzbDrone.Common.EnvironmentInfo
 {
-    public abstract class RuntimeInfoBase : IRuntimeInfo
+    public class RuntimeInfo : IRuntimeInfo
     {
         private readonly Logger _logger;
 
-        public RuntimeInfoBase(IServiceProvider serviceProvider, Logger logger)
+        public RuntimeInfo(IServiceProvider serviceProvider, Logger logger)
         {
             _logger = logger;
 
@@ -28,10 +28,11 @@ namespace NzbDrone.Common.EnvironmentInfo
             if (entry != null)
             {
                 ExecutingApplication = entry.Location;
+                IsWindowsTray = entry.ManifestModule.Name == $"{ProcessProvider.NZB_DRONE_PROCESS_NAME}.exe";
             }
         }
 
-        static RuntimeInfoBase()
+        static RuntimeInfo()
         {
             IsProduction = InternalIsProduction();
         }
@@ -59,31 +60,18 @@ namespace NzbDrone.Common.EnvironmentInfo
 
         public bool IsWindowsService { get; private set; }
 
-        public bool IsConsole
-        {
-            get
-            {
-                if (OsInfo.IsWindows)
-                {
-                    return IsUserInteractive && Process.GetCurrentProcess().ProcessName.Equals(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME, StringComparison.InvariantCultureIgnoreCase);
-                }
-
-                return true;
-            }
-        }
-
-        public bool IsRunning { get; set; }
+        public bool IsExiting { get; set; }
         public bool RestartPending { get; set; }
-        public string ExecutingApplication { get; private set; }
+        public string ExecutingApplication { get; }
 
-        public abstract string RuntimeVersion { get; }
-
-        public static bool IsProduction { get; private set; }
+        public static bool IsProduction { get; }
 
         private static bool InternalIsProduction()
         {
             if (BuildInfo.IsDebug || Debugger.IsAttached) return false;
-            if (BuildInfo.Version.Revision > 10000) return false; //Official builds will never have such a high revision
+
+            //Official builds will never have such a high revision
+            if (BuildInfo.Version.Revision > 10000) return false;
 
             try
             {
@@ -99,21 +87,23 @@ namespace NzbDrone.Common.EnvironmentInfo
 
             }
 
-			try
-			{
-				var currentAssmeblyLocation = typeof(RuntimeInfoBase).Assembly.Location;
-				if(currentAssmeblyLocation.ToLower().Contains("_output"))return false;
-			}
-			catch
-			{
+            try
+            {
+                var currentAssmeblyLocation = typeof(RuntimeInfo).Assembly.Location;
+                if (currentAssmeblyLocation.ToLower().Contains("_output")) return false;
+            }
+            catch
+            {
 
-			}
+            }
 
-            string lowerCurrentDir = Directory.GetCurrentDirectory().ToLower();
+            var lowerCurrentDir = Directory.GetCurrentDirectory().ToLower();
             if (lowerCurrentDir.Contains("teamcity")) return false;
             if (lowerCurrentDir.Contains("_output")) return false;
 
             return true;
         }
+
+        public bool IsWindowsTray { get; private set; }
     }
 }

src/NzbDrone.Common/Exceptions/RadarrStartupException.cs

@@ -0,0 +1,37 @@
+using System;
+
+namespace NzbDrone.Common.Exceptions
+{
+    public class RadarrStartupException : NzbDroneException
+    {
+        public RadarrStartupException(string message, params object[] args)
+            : base("Radarr failed to start: " + string.Format(message, args))
+        {
+        }
+
+        public RadarrStartupException(string message)
+            : base("Radarr failed to start: " + message)
+        {
+        }
+
+        public RadarrStartupException()
+            : base("Radarr failed to start")
+        {
+        }
+
+        public RadarrStartupException(Exception innerException, string message, params object[] args)
+            : base("Radarr failed to start: " + string.Format(message, args), innerException)
+        {
+        }
+
+        public RadarrStartupException(Exception innerException, string message)
+            : base("Radarr failed to start: " + message, innerException)
+        {
+        }
+
+        public RadarrStartupException(Exception innerException)
+            : base("Radarr failed to start: " + innerException.Message)
+        {
+        }
+    }
+}

src/NzbDrone.Common/Exceptron/ExceptionExtentions.cs

@@ -1,31 +0,0 @@
-using System;
-using NzbDrone.Common.EnvironmentInfo;
-
-namespace NzbDrone.Common.Exceptron
-{
-    public static class ExceptionExtentions
-    {
-        private const string IGNORE_FLAG = "exceptron_ignore";
-
-        public static Exception ExceptronIgnoreOnMono(this Exception exception)
-        {
-            if (OsInfo.IsNotWindows)
-            {
-                exception.ExceptronIgnore();
-            }
-
-            return exception;
-        }
-
-        public static Exception ExceptronIgnore(this Exception exception)
-        {
-            exception.Data.Add(IGNORE_FLAG, true);
-            return exception;
-        }
-
-        public static bool ExceptronShouldIgnore(this Exception exception)
-        {
-            return exception.Data.Contains(IGNORE_FLAG);
-        }
-    }
-}

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
+using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.EnvironmentInfo;
 
@@ -13,7 +14,7 @@ namespace NzbDrone.Common.Extensions
         private const string NZBDRONE_DB = "nzbdrone.db";
         private const string NZBDRONE_LOG_DB = "logs.db";
         private const string NLOG_CONFIG_FILE = "nlog.config";
-        private const string UPDATE_CLIENT_EXE = "Radarr.Update.exe";
+        private const string UPDATE_CLIENT_EXE_NAME = "Radarr.Update";
         private const string BACKUP_FOLDER = "Backups";
 
         private static readonly string UPDATE_SANDBOX_FOLDER_NAME = "radarr_update" + Path.DirectorySeparatorChar;
@@ -21,6 +22,7 @@ namespace NzbDrone.Common.Extensions
         private static readonly string UPDATE_BACKUP_FOLDER_NAME = "radarr_backup" + Path.DirectorySeparatorChar;
         private static readonly string UPDATE_BACKUP_APPDATA_FOLDER_NAME = "radarr_appdata_backup" + Path.DirectorySeparatorChar;
         private static readonly string UPDATE_CLIENT_FOLDER_NAME = "NzbDrone.Update" + Path.DirectorySeparatorChar;
+        private static readonly string UPDATE_V3_CLIENT_FOLDER_NAME = "Radarr.Update" + Path.DirectorySeparatorChar;
         private static readonly string UPDATE_LOG_FOLDER_NAME = "UpdateLogs" + Path.DirectorySeparatorChar;
 
         public static string CleanFilePath(this string path)
@@ -47,7 +49,7 @@ namespace NzbDrone.Common.Extensions
         {
             if (!comparison.HasValue)
             {
-                comparison = OsInfo.PathStringComparison;
+                comparison = DiskProviderBase.PathStringComparison;
             }
 
             if (firstPath.Equals(secondPath, comparison.Value)) return true;
@@ -93,7 +95,7 @@ namespace NzbDrone.Common.Extensions
 
             while (child.Parent != null)
             {
-                if (child.Parent.FullName.Equals(parent.FullName, OsInfo.PathStringComparison))
+                if (child.Parent.FullName.Equals(parent.FullName, DiskProviderBase.PathStringComparison))
                 {
                     return true;
                 }
@@ -190,6 +192,19 @@ namespace NzbDrone.Common.Extensions
             return directories;
         }
 
+        private static string ProcessNameToExe(this string processName, Version version)
+        {
+            // Windows always has exe (but is shunted to net core)
+            // Linux is kept on mono pending manual upgrade to net core so has .exe
+            // macOS is shunted to net core and does not have .exe
+            if (OsInfo.IsWindows || OsInfo.IsLinux || version.Major == 0)
+            {
+                processName += ".exe";
+            }
+
+            return processName;
+        }
+
         public static string GetAppDataPath(this IAppFolderInfo appFolderInfo)
         {
             return appFolderInfo.AppDataFolder;
@@ -245,14 +260,21 @@ namespace NzbDrone.Common.Extensions
             return Path.Combine(GetUpdateSandboxFolder(appFolderInfo), UPDATE_PACKAGE_FOLDER_NAME);
         }
 
-        public static string GetUpdateClientFolder(this IAppFolderInfo appFolderInfo)
+        public static string GetUpdateClientFolder(this IAppFolderInfo appFolderInfo, Version version)
         {
-            return Path.Combine(GetUpdatePackageFolder(appFolderInfo), UPDATE_CLIENT_FOLDER_NAME);
+            if (version.Major >= 3)
+            {
+                return Path.Combine(GetUpdatePackageFolder(appFolderInfo), UPDATE_V3_CLIENT_FOLDER_NAME);
+            }
+            else
+            {
+                return Path.Combine(GetUpdatePackageFolder(appFolderInfo), UPDATE_CLIENT_FOLDER_NAME);
+            }
         }
 
-        public static string GetUpdateClientExePath(this IAppFolderInfo appFolderInfo)
+        public static string GetUpdateClientExePath(this IAppFolderInfo appFolderInfo, Version version)
         {
-            return Path.Combine(GetUpdateSandboxFolder(appFolderInfo), UPDATE_CLIENT_EXE);
+            return Path.Combine(GetUpdateSandboxFolder(appFolderInfo), UPDATE_CLIENT_EXE_NAME).ProcessNameToExe(version);
         }
 
         public static string GetBackupFolder(this IAppFolderInfo appFolderInfo)
@@ -275,4 +297,4 @@ namespace NzbDrone.Common.Extensions
             return Path.Combine(appFolderInfo.StartUpFolder, NLOG_CONFIG_FILE);
         }
     }
-}
+}