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>

.gitattributes

@@ -1,13 +1,17 @@
 # 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
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
+#*.sln    merge=union
+#*.csproj merge=union
+#*.vbproj merge=union
+#*.fsproj merge=union
+#*.dbproj merge=union
 
 # Standard to msysgit
 *.doc   diff=astextplain

.github/FUNDING.yml

@@ -0,0 +1,8 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: radarr
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+custom: # Replace with a single custom sponsorship URL

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,22 @@
+**Description:**
 
+<!-- Check first that your problem is not listed in our wiki section:
+* https://github.com/Radarr/Radarr/wiki/Common-Problems
+* https://github.com/Radarr/Radarr/wiki/FAQ
 
+**Just because you receive an exception in your logs, doesn't mean it's a bug and should be reported here. Often it's something else, such as a permission error. If you are unsure ask on the Discord or Subreddit first.**
 
-Provide a description of the feature request or bug, the more details the better.
-Please use https://forums.sonarr.tv/ for support or other questions. (When in doubt, use the forums)
+Visit our [Discord server](https://discord.gg/NWYch8M) or [Subreddit](https://reddit.com/r/radarr) for support or longer discussions. Support questions posed on here will be closed immediately.
+
+Provide a description of the feature request or bug here, the more details the better. 
+Please also include the following if you are reporting a bug. If you do not include it, the issue will probably be closed as we cannot help you. -->
+
+**Radarr Version:**
+
+**Mono Version:**
+
+**Debug Logs:**
+
+# Do not remove anything from your logs and post the full logs! If not everything fits in here use a service like https://pastebin.com to upload them.
+
+<!-- Please use the search bar (make sure to include closed issues as well) and make sure you are not submitting an already submitted issue. -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Support requests will be closed immediately, if you are unsure go to our Discord
+  or Subreddit first. Exceptions do not mean you found a bug!
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows]
+ - Mono Version: [e.g. Mono 5.8] (Only needed under Linux and Mac, found under System -> Status)
+ - Browser and Version [e.g. chrome, safari] (Only needed for UI issues)
+ - Version [e.g. 22]
+
+**Debug Logs**
+Turn on debug logs under Settings -> General and wait for the bug to occur again. **Upload the full log file here (or another site and link it). Issues will be closed, if they do not include this!**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,13 +2,11 @@
 YES | NO
 
 #### Description
-A few sentences describing the overall goals of the pull request's commits.
+
 
 #### Todos
 - [ ] Tests
-- [ ] Documentation
-
 
 #### Issues Fixed or Closed by this PR
 
-* 
+* #

.github/config.yml

@@ -0,0 +1,2 @@
+todo:
+  keyword: "TODO"

.github/reaction.yml

@@ -0,0 +1 @@
+

.github/stale.yml

@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - feature request
+  - parser
+  - confirmed
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had recent activity. Please verify that this is still an issue with the latest version of Radarr and report back. Otherwise this issue will be closed.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/support.yml

@@ -0,0 +1,13 @@
+# Configuration for support-requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: support
+# Comment to post on issues marked as support requests. Add a link
+# to a support page, or set to `false` to disable
+supportComment: >
+  We use the issue tracker exclusively for bug reports and feature requests.
+  However, this issue appears to be a support request. Please hop over onto our [Discord](https://discord.gg/ZDmT7qb) or [Subreddit](https://reddit.com/r/radarr)
+# Whether to close issues marked as support requests
+close: true
+# Whether to lock issues marked as support requests
+lock: false

.gitignore

@@ -10,6 +10,8 @@ src/**/[Oo]bj/
 *.suo
 *.user
 *.sln.docstates
+.vs/
+.vscode/
 
 # Build results
 *_i.c
@@ -41,6 +43,13 @@ src/**/[Oo]bj/
 _ReSharper*
 _dotCover*
 
+# DevExpress CodeRush
+src/.cr/
+
+# Emacs
+*~
+\#*\#
+
 # NCrunch
 *.ncrunch*
 .*crunch*.local.xml
@@ -76,7 +85,6 @@ TestResults
 [Tt]est[Rr]esult*
 *.Cache
 ClientBin
-[Ss]tyle[Cc]op.*
 ~$*
 *.dbmdl
 Generated_Code #added for RIA/Silverlight projects
@@ -97,7 +105,7 @@ App_Data/*.ldf
 _NCrunch_*
 _TeamCity*
 
-# Sonarr
+# Radarr
 config.xml
 nzbdrone.log*txt
 UpdateLogs/
@@ -109,23 +117,76 @@ 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
+# VS outout folders
 bin
 obj
 output/*
 
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
 
-#OS X metadata files
+# Packages
+Radarr_*/
+Radarr_*.zip
+Radarr_*.gz
+gecko.zip
+geckodriver.exe
+
+# macOS metadata files
 ._*
+.DS_Store
 
 _start
 _temp_*/**/*
+
+# Windows thumbnail cache files
+Thumbs.db
+
+# AppVeyor
+/tools/cake/
+/_artifacts/
+
+# Cake
+/tools/Addins/*
+packages.config.md5sum
+
+
+# Common IntelliJ Platform excludes
+
+# User specific
+**/.idea/**/workspace.xml
+**/.idea/**/tasks.xml
+**/.idea/shelf/*
+**/.idea/dictionaries
+**/.idea/.idea.Radarr.Posix
+**/.idea/.idea.Radarr.Windows
+
+# Sensitive or high-churn files
+**/.idea/**/dataSources/
+**/.idea/**/dataSources.ids
+**/.idea/**/dataSources.xml
+**/.idea/**/dataSources.local.xml
+**/.idea/**/sqlDataSources.xml
+**/.idea/**/dynamic.xml
+
+# Rider
+# Rider auto-generates .iml files, and contentModel.xml
+**/.idea/**/*.iml
+**/.idea/**/contentModel.xml
+**/.idea/**/modules.xml
+# ignore node_modules symlink
+node_modules
+node_modules.nosync

.idea/.name

@@ -1 +0,0 @@
-Sonarr

.idea/Sonarr.iml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/Logo" />
-      <excludeFolder url="file://$MODULE_DIR$/_output" />
-      <excludeFolder url="file://$MODULE_DIR$/_output_mono" />
-      <excludeFolder url="file://$MODULE_DIR$/_output_osx" />
-      <excludeFolder url="file://$MODULE_DIR$/_output_osx_app" />
-      <excludeFolder url="file://$MODULE_DIR$/_start" />
-      <excludeFolder url="file://$MODULE_DIR$/_tests" />
-      <excludeFolder url="file://$MODULE_DIR$/debian" />
-      <excludeFolder url="file://$MODULE_DIR$/node_modules" />
-      <excludeFolder url="file://$MODULE_DIR$/osx" />
-      <excludeFolder url="file://$MODULE_DIR$/schemas" />
-      <excludeFolder url="file://$MODULE_DIR$/setup" />
-      <excludeFolder url="file://$MODULE_DIR$/src" />
-      <excludeFolder url="file://$MODULE_DIR$/tools" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Sonarr node_modules" level="project" />
-  </component>
-</module>

.idea/codeStyleSettings.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="LINE_SEPARATOR" value="&#13;&#10;" />
-        <option name="RIGHT_MARGIN" value="190" />
-        <option name="HTML_ATTRIBUTE_WRAP" value="0" />
-        <option name="HTML_KEEP_LINE_BREAKS" value="false" />
-        <option name="HTML_KEEP_BLANK_LINES" value="1" />
-        <option name="HTML_ALIGN_ATTRIBUTES" value="false" />
-        <option name="HTML_INLINE_ELEMENTS" value="" />
-        <option name="HTML_DONT_ADD_BREAKS_IF_INLINE_CONTENT" value="" />
-        <CssCodeStyleSettings>
-          <option name="HEX_COLOR_LOWER_CASE" value="true" />
-          <option name="HEX_COLOR_LONG_FORMAT" value="true" />
-          <option name="VALUE_ALIGNMENT" value="1" />
-        </CssCodeStyleSettings>
-        <JSCodeStyleSettings>
-          <option name="SPACE_BEFORE_PROPERTY_COLON" value="true" />
-          <option name="ALIGN_OBJECT_PROPERTIES" value="2" />
-          <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-          <option name="OBJECT_LITERAL_WRAP" value="2" />
-          <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-        </JSCodeStyleSettings>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <codeStyleSettings language="CSS">
-          <indentOptions>
-            <option name="SMART_TABS" value="true" />
-          </indentOptions>
-        </codeStyleSettings>
-        <codeStyleSettings language="JavaScript">
-          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="true" />
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
-          <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-          <option name="CATCH_ON_NEW_LINE" value="true" />
-          <option name="FINALLY_ON_NEW_LINE" value="true" />
-          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="BINARY_OPERATION_WRAP" value="1" />
-          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="2" />
-          <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
-          <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
-          <option name="IF_BRACE_FORCE" value="3" />
-          <option name="DOWHILE_BRACE_FORCE" value="3" />
-          <option name="WHILE_BRACE_FORCE" value="3" />
-          <option name="FOR_BRACE_FORCE" value="3" />
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </component>
-</project>

.idea/jsLibraryMappings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{Sonarr node_modules}" />
-    <includedPredefinedLibrary name="ECMAScript 6" />
-  </component>
-</project>

.idea/libraries/Sonarr_node_modules.xml

@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="Sonarr node_modules" type="javaScript">
-    <properties>
-      <option name="frameworkName" value="node_modules" />
-      <sourceFilesUrls>
-        <item url="file://$PROJECT_DIR$/node_modules" />
-      </sourceFilesUrls>
-    </properties>
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/node_modules" />
-    </CLASSES>
-    <SOURCES />
-  </library>
-</component>

.idea/misc.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" />
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Sonarr.iml" filepath="$PROJECT_DIR$/.idea/Sonarr.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

CLA.md

@@ -1,6 +1,6 @@
-# Sonarr Individual Contributor License Agreement #
+# Radarr Individual Contributor License Agreement #
 
-Thank you for your interest in contributing to Sonarr ("We" or "Us").
+Thank you for your interest in contributing to Radarr ("We" or "Us").
 This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please complete the form below. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.
 
 ## 1. Definitions ##

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # How to Contribute #
 
-We're always looking for people to help make Sonarr even better, there are a number of ways to contribute.
+We're always looking for people to help make Radarr even better, there are a number of ways to contribute.
 
 ## Documentation ##
 Setup guides, FAQ, the more information we have on the wiki the better.
@@ -8,14 +8,14 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 ## Development ##
 
 ### Tools required ###
-- Visual Studio 2013
-- HTML/Javascript editor of choice (Sublime Text/Webstorm/etc)
+- Visual Studio 2015
+- HTML/Javascript editor of choice (Sublime Text/Webstorm/Atom/etc)
 - npm (node package manager)
 - git
 
 ### Getting started ###
 
-1.  Fork Sonarr
+1.  Fork Radarr
 2.  Clone (develop branch) *you may need pull in submodules separately if you client doesn't clone them automatically (CurlSharp)*
 3.  Run `npm install`
 4.  Run `npm start` - Used to compile the UI components and copy them.
@@ -24,8 +24,8 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 5.  Compile in Visual Studio
 
 ### Contributing Code ###
-- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Sonarr/Sonarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
-- Rebase from Sonarr's develop branch, don't merge
+- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Radarr/Radarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
+- Rebase from Radarr's develop branch, don't merge
 - Make meaningful commits, or squash them
 - Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
 - Reach out to us on the forums or on IRC if you have any questions

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  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.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    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 program 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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Logo/Sonarr.svg

@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="218px"
-	 height="218px" viewBox="0 0 218 218" enable-background="new 0 0 218 218" xml:space="preserve">
-<symbol  id="hex_grid" viewBox="-114.25 -98.617 228.55 197.233">
-	
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#989898" stroke-width="0.5" stroke-linecap="square" stroke-miterlimit="1" d="
-		M72.15,90.3l4.7-2.7l4.65,2.7v5.4l-4.65,2.7l-4.7-2.7V90.3z M62.85,95.7l-4.65,2.7l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7V95.7l4.65,2.7
-		l4.65-2.7 M62.85,90.3l4.65-2.7l4.65,2.7 M62.85,79.55v-5.4l4.65-2.7l4.65,2.7v5.4L67.5,82.2L62.85,79.55L58.2,82.2l-4.65-2.65
-		 M72.15,74.15l4.7-2.7l4.65,2.7v5.4l-4.65,2.65l-4.7-2.65 M76.85,87.6v-5.4 M67.5,87.6v-5.4 M81.5,95.7l4.65,2.7l4.65-2.7l4.65,2.7
-		l4.65-2.7l4.65,2.7l4.65-2.7v-5.4l4.65-2.7v-5.4l-4.65-2.65v-5.4l4.65-2.7v-5.4l-4.65-2.7v-5.4l4.65-2.7v-5.4l-4.65-2.65v-5.4
-		l4.65-2.7v-5.4L109.4,31v-5.4l4.65-2.7v-5.4l-4.65-2.65v-5.4l4.65-2.7v-5.4l-4.65-2.7v-5.4l4.65-2.7v-5.4l-4.65-2.65v-5.4l4.65-2.7
-		V-31l-4.65-2.7v-5.4l4.65-2.7v-5.4l-4.65-2.65v-5.4l4.65-2.7v-5.4l-4.65-2.7v-5.4l4.65-2.7v-5.4l-4.65-2.65v-5.4l4.65-2.7v-5.4
-		l-4.65-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.7-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7
-		l-4.65-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.7-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7L7-98.4l-4.65,2.7l-4.65-2.7
-		l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.7-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.65-2.7
-		l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.7-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7l-4.65-2.7l-4.65,2.7v5.4l-4.65,2.7
-		v5.4l4.65,2.65v5.4l-4.65,2.7v5.4l4.65,2.7v5.4l-4.65,2.7v5.4l4.65,2.65v5.4l-4.65,2.7v5.4l4.65,2.7v5.4l-4.65,2.7v5.4l4.65,2.65
-		v5.4l-4.65,2.7v5.4l4.65,2.7v5.4l-4.65,2.7v5.4l4.65,2.65v5.4l-4.65,2.7V31l4.65,2.7v5.4l-4.65,2.7v5.4l4.65,2.65v5.4l-4.65,2.7
-		v5.4l4.65,2.7v5.4l-4.65,2.7v5.4l4.65,2.65v5.4l-4.65,2.7v5.4l4.65,2.7l4.65-2.7l4.65,2.7l4.65-2.7l4.65,2.7l4.65-2.7l4.7,2.7
-		l4.65-2.7l4.65,2.7l4.65-2.7l4.65,2.7l4.65-2.7l4.65,2.7l4.65-2.7l4.65,2.7l4.65-2.7l4.7,2.7l4.65-2.7l4.65,2.7l4.65-2.7l4.65,2.7
-		l4.65-2.7l4.65,2.7l4.65-2.7l4.65,2.7L7,95.7l4.65,2.7l4.65-2.7l4.65,2.7l4.65-2.7l4.7,2.7l4.65-2.7l4.65,2.7l4.65-2.7l4.65,2.7
-		l4.65-2.7 M44.25,95.7v-5.4l4.65-2.7l4.65,2.7 M44.25,79.55v-5.4l4.65-2.7l4.65,2.7v5.4L48.9,82.2L44.25,79.55L39.6,82.2
-		l-4.65-2.65 M58.2,87.6v-5.4 M48.9,87.6v-5.4 M53.55,63.35v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.7L53.55,63.35l-4.65,2.7l-4.65-2.7
-		v-5.4l4.65-2.7l4.65,2.7 M62.85,74.15l-4.65-2.7v-5.4 M53.55,74.15l4.65-2.7 M48.9,71.45v-5.4 M48.9,55.25v-5.4l4.65-2.65
-		l4.65,2.65v5.4 M67.5,71.45v-5.4l4.65-2.7l4.7,2.7v5.4 M67.5,66.05l-4.65-2.7 M58.2,49.85l4.65-2.65l4.65,2.65v5.4l-4.65,2.7
-		 M72.15,63.35v-5.4l4.7-2.7l4.65,2.7v5.4l-4.65,2.7 M76.85,55.25v-5.4l4.65-2.65l4.65,2.65v5.4l-4.65,2.7 M67.5,55.25l4.65,2.7
-		 M34.95,95.7v-5.4l4.65-2.7l4.65,2.7 M16.3,95.7v-5.4l4.65-2.7l4.65,2.7v5.4 M25.6,90.3l4.7-2.7l4.65,2.7 M25.6,79.55v-5.4l4.7-2.7
-		l4.65,2.7v5.4L30.3,82.2L25.6,79.55l-4.65,2.65l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7 M20.95,87.6v-5.4 M39.6,87.6v-5.4 M30.3,87.6
-		v-5.4 M7,95.7v-5.4l4.65-2.7l4.65,2.7 M-2.3,95.7v-5.4l4.65-2.7L7,90.3 M2.35,82.2l-4.65-2.65v-5.4l4.65-2.7L7,74.15v5.4L2.35,82.2
-		z M16.3,79.55l-4.65,2.65L7,79.55 M2.35,87.6v-5.4 M11.65,87.6v-5.4 M16.3,74.15l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4 M2.35,71.45
-		v-5.4L7,63.35l4.65,2.7 M2.35,49.85L7,47.2l4.65,2.65v5.4L7,57.95l-4.65-2.7V49.85L-2.3,47.2v-5.4l4.65-2.7L7,41.8v5.4
-		 M11.65,55.25l4.65,2.7v5.4 M7,74.15l4.65-2.7 M7,57.95v5.4 M30.3,71.45v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.7 M16.3,57.95
-		l4.65-2.7l4.65,2.7v5.4l-4.65,2.7 M30.3,66.05l-4.7-2.7 M30.3,49.85l4.65-2.65l4.65,2.65v5.4l-4.65,2.7l-4.65-2.7V49.85l-4.7-2.65
-		v-5.4l-4.65-2.7v-5.4L25.6,31l4.7,2.7v5.4l-4.7,2.7 M11.65,49.85l4.65-2.65l4.65,2.65v5.4 M25.6,57.95l4.7-2.7 M34.95,57.95v5.4
-		 M34.95,47.2v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.65 M25.6,31v-5.4l4.7-2.7l4.65,2.7V31l-4.65,2.7 M34.95,25.6l4.65-2.7l4.65,2.7
-		V31l-4.65,2.7L34.95,31 M30.3,39.1l4.65,2.7 M39.6,39.1v-5.4 M20.95,39.1l-4.65,2.7l-4.65-2.7v-5.4L16.3,31l4.65,2.7 M16.3,41.8
-		v5.4 M2.35,33.7L-2.3,31v-5.4l4.65-2.7L7,25.6V31L2.35,33.7z M7,25.6l4.65-2.7l4.65,2.7V31 M2.35,39.1v-5.4 M11.65,33.7L7,31
-		 M7,41.8l4.65-2.7 M11.65,17.5L7,14.85v-5.4l4.65-2.7l4.65,2.7v5.4L11.65,17.5z M11.65,22.9v-5.4 M2.35,22.9v-5.4L7,14.85 M7,9.45
-		l-4.65-2.7v-5.4L7-1.35l4.65,2.7v5.4 M34.95,14.85v-5.4l4.65-2.7l4.65,2.7v5.4L39.6,17.5L34.95,14.85z M39.6,22.9v-5.4 M25.6,25.6
-		l-4.65-2.7v-5.4l4.65-2.65l4.7,2.65v5.4 M16.3,9.45l4.65-2.7l4.65,2.7v5.4 M34.95,9.45l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4
-		 M11.65,1.35l4.65-2.7l4.65,2.7v5.4 M25.6,9.45l4.7-2.7 M30.3,17.5l4.65-2.65 M16.3,25.6l4.65-2.7 M20.95,17.5l-4.65-2.65
-		 M76.85,49.85l-4.7-2.65v-5.4l4.7-2.7l4.65,2.7v5.4 M62.85,47.2v-5.4l4.65-2.7l4.65,2.7 M62.85,25.6l4.65-2.7l4.65,2.7V31
-		l-4.65,2.7L62.85,31V25.6l-4.65-2.7v-5.4 M72.15,25.6l4.7-2.7l4.65,2.7V31l-4.65,2.7l-4.7-2.7 M76.85,39.1v-5.4 M67.5,39.1v-5.4
-		 M53.55,47.2v-5.4l4.65-2.7l4.65,2.7 M44.25,41.8l4.65-2.7l4.65,2.7 M44.25,25.6l4.65-2.7l4.65,2.7V31l-4.65,2.7L44.25,31
-		 M62.85,31l-4.65,2.7L53.55,31 M58.2,39.1v-5.4 M48.9,39.1v-5.4 M53.55,14.85v-5.4l4.65-2.7l4.65,2.7v5.4L58.2,17.5L53.55,14.85
-		L48.9,17.5l-4.65-2.65 M48.9,22.9v-5.4 M53.55,9.45l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4 M44.25,9.45l4.65-2.7 M76.85,22.9v-5.4
-		l4.65-2.65l4.65,2.65v5.4l-4.65,2.7 M76.85,17.5l-4.7-2.65v-5.4l4.7-2.7l4.65,2.7v5.4 M67.5,22.9v-5.4l4.65-2.65 M67.5,17.5
-		l-4.65-2.65 M72.15,9.45l-4.65-2.7v-5.4l4.65-2.7l4.7,2.7v5.4 M62.85,9.45l4.65-2.7 M53.55,25.6l4.65-2.7 M44.25,63.35l-4.65,2.7
-		 M39.6,55.25l4.65,2.7 M39.6,71.45l4.65,2.7 M67.5,49.85l4.65-2.65 M48.9,49.85l-4.65-2.65 M25.6,47.2l-4.65,2.65 M104.75,87.6
-		l-4.65,2.7l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65V87.6l4.65,2.7 M109.4,79.55l-4.65,2.65 M100.1,95.7v-5.4 M81.5,90.3l4.65-2.7
-		l4.65,2.7v5.4 M81.5,74.15l4.65-2.7l4.65,2.7v5.4l-4.65,2.65l-4.65-2.65 M90.8,79.55l4.65,2.65 M86.15,87.6v-5.4 M90.8,90.3
-		l4.65-2.7 M95.45,71.45v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.7L95.45,71.45l-4.65,2.7 M86.15,55.25l4.65,2.7v5.4l-4.65,2.7
-		l-4.65-2.7 M86.15,71.45v-5.4 M95.45,55.25v-5.4l4.65-2.65l4.65,2.65v5.4l-4.65,2.7L95.45,55.25l-4.65,2.7 M100.1,63.35v-5.4
-		 M90.8,63.35l4.65,2.7 M109.4,63.35l-4.65,2.7 M104.75,71.45l4.65,2.7 M104.75,55.25l4.65,2.7 M100.1,79.55v-5.4 M100.1,47.2v-5.4
-		l4.65-2.7l4.65,2.7 M100.1,41.8l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4 M109.4,31l-4.65,2.7 M81.5,41.8l4.65-2.7l4.65,2.7v5.4
-		l-4.65,2.65 M86.15,22.9l4.65,2.7V31l-4.65,2.7L81.5,31 M100.1,31v-5.4l4.65-2.7l4.65,2.7 M90.8,31l4.65,2.7 M86.15,39.1v-5.4
-		 M90.8,41.8l4.65-2.7 M86.15,17.5l4.65-2.65l4.65,2.65v5.4l-4.65,2.7 M90.8,14.85v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.65
-		 M81.5,9.45l4.65-2.7l4.65,2.7 M86.15,6.75v-5.4l4.65-2.7l4.65,2.7v5.4 M100.1,14.85l4.65,2.65v5.4 M109.4,14.85l-4.65,2.65
-		 M100.1,9.45l4.65-2.7l4.65,2.7 M95.45,1.35l4.65-2.7l4.65,2.7v5.4 M95.45,22.9l4.65,2.7 M109.4,47.2l-4.65,2.65 M90.8,47.2
-		l4.65,2.65 M104.75-9.45l-4.65,2.7l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65V-9.45l4.65,2.7 M109.4-17.5l-4.65,2.65 M100.1-1.35v-5.4
-		 M90.8-1.35v-5.4l4.65-2.7 M81.5-6.75l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4L81.5-6.75v5.4l-4.65,2.7 M90.8-6.75l-4.65-2.7
-		 M95.45-14.85L90.8-17.5v-5.4l4.65-2.7l4.65,2.7v5.4 M76.85-14.85l-4.7-2.65v-5.4l4.7-2.7l4.65,2.7v5.4 M86.15-14.85l4.65-2.65
-		 M95.45-31l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4L95.45-31z M95.45-25.6V-31 M90.8-22.9l-4.65-2.7V-31l4.65-2.7 M86.15-31
-		l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M86.15-41.8v-5.4l4.65-2.65l4.65,2.65v5.4 M100.1-33.7l4.65,2.7v5.4l-4.65,2.7 M109.4-33.7
-		l-4.65,2.7 M95.45-47.2l4.65-2.65l4.65,2.65v5.4l-4.65,2.7 M104.75-41.8l4.65,2.7 M81.5-22.9l4.65-2.7 M104.75-25.6l4.65,2.7
-		 M100.1-49.85v-5.4l4.65-2.7l4.65,2.7 M109.4-66.05l-4.65,2.7l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M104.75-63.35v5.4 M100.1-55.25
-		l-4.65-2.7v-5.4l4.65-2.7 M86.15-47.2l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7v5.4 M86.15-74.15l4.65,2.7v5.4l-4.65,2.7l-4.65-2.7v-5.4
-		L86.15-74.15v-5.4l4.65-2.65l4.65,2.65 M90.8-71.45l4.65-2.7l4.65,2.7 M95.45-63.35l-4.65-2.7 M90.8-55.25l4.65-2.7 M86.15-57.95
-		v-5.4 M95.45-74.15v-5.4l4.65-2.65l4.65,2.65v5.4 M81.5-71.45l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65 M81.5-82.2v-5.4l4.65-2.7
-		l4.65,2.7v5.4 M86.15-90.3v-5.4 M104.75-95.7v5.4l-4.65,2.7l-4.65-2.7v-5.4 M100.1-82.2v-5.4 M95.45-90.3l-4.65,2.7 M109.4-82.2
-		l-4.65,2.65 M104.75-90.3l4.65,2.7 M109.4-49.85l-4.65,2.65 M72.15-1.35v-5.4l4.7-2.7 M67.5,1.35l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7
-		 M72.15-17.5l-4.65,2.65l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7 M67.5-14.85v5.4 M53.55-1.35v-5.4l4.65-2.7l4.65,2.7 M48.9,1.35
-		l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M44.25-22.9l4.65-2.7l4.65,2.7v5.4l-4.65,2.65l-4.65-2.65V-22.9l-4.65-2.7V-31 M53.55-17.5
-		l4.65,2.65v5.4 M48.9-9.45v-5.4 M53.55-33.7v-5.4l4.65-2.7l4.65,2.7v5.4L58.2-31L53.55-33.7z M62.85-22.9l-4.65-2.7V-31 M48.9-25.6
-		V-31l4.65-2.7 M48.9-31l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M48.9-41.8v-5.4l4.65-2.65l4.65,2.65v5.4 M76.85-25.6V-31l4.65-2.7
-		 M76.85-31l-4.7-2.7v-5.4l4.7-2.7l4.65,2.7 M62.85-33.7L67.5-31v5.4 M72.15-39.1l-4.65-2.7v-5.4l4.65-2.65l4.7,2.65v5.4
-		 M62.85-39.1l4.65-2.7 M72.15-33.7L67.5-31 M53.55-22.9l4.65-2.7 M58.2-14.85l4.65-2.65 M30.3,1.35l-4.7-2.7v-5.4l4.7-2.7l4.65,2.7
-		v5.4 M30.3-9.45v-5.4l4.65-2.65l4.65,2.65v5.4l-4.65,2.7 M16.3-1.35v-5.4l4.65-2.7l4.65,2.7 M30.3-14.85l-4.7-2.65v-5.4l4.7-2.7
-		l4.65,2.7v5.4 M25.6-17.5l-4.65,2.65L16.3-17.5v-5.4l4.65-2.7l4.65,2.7 M20.95-14.85v5.4 M16.3-6.75l-4.65-2.7v-5.4l4.65-2.65
-		 M2.35,1.35l-4.65-2.7v-5.4l4.65-2.7L7-6.75v5.4 M7-17.5l-4.65,2.65L-2.3-17.5v-5.4l4.65-2.7L7-22.9V-17.5l4.65,2.65 M11.65-9.45
-		L7-6.75 M2.35-9.45v-5.4 M11.65-31L7-33.7v-5.4l4.65-2.7l4.65,2.7v5.4L11.65-31z M16.3-22.9l-4.65-2.7V-31 M2.35-25.6V-31L7-33.7
-		 M7-39.1l-4.65-2.7v-5.4L7-49.85l4.65,2.65v5.4 M44.25-33.7L39.6-31l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M20.95-25.6V-31l4.65-2.7
-		l4.7,2.7v5.4 M20.95-47.2l4.65-2.65l4.7,2.65v5.4l-4.7,2.7l-4.65-2.7V-47.2l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7 M30.3-47.2
-		l4.65-2.65l4.65,2.65v5.4 M30.3-41.8l4.65,2.7 M25.6-33.7v-5.4 M34.95-33.7L30.3-31 M34.95-22.9l4.65-2.7 M20.95-31l-4.65-2.7
-		 M16.3-39.1l4.65-2.7 M7-22.9l4.65-2.7 M34.95-55.25l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4L34.95-55.25v5.4 M25.6-49.85v-5.4
-		l4.7-2.7 M30.3-63.35l-4.7-2.7v-5.4l4.7-2.7l4.65,2.7v5.4 M25.6-66.05l-4.65,2.7l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M30.3-74.15
-		v-5.4l4.65-2.65l4.65,2.65v5.4l-4.65,2.7 M20.95-63.35v5.4 M7-49.85v-5.4l4.65-2.7l4.65,2.7 M2.35-47.2l-4.65-2.65v-5.4l4.65-2.7
-		L7-55.25 M2.35-63.35l-4.65-2.7v-5.4l4.65-2.7L7-71.45v5.4L2.35-63.35z M16.3-71.45l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4
-		 M11.65-57.95v-5.4l4.65-2.7 M2.35-57.95v-5.4 M7-66.05l4.65,2.7 M11.65-74.15L7-71.45 M2.35-74.15v-5.4L7-82.2l4.65,2.65
-		 M11.65-95.7v5.4L7-87.6l-4.65-2.7v-5.4 M20.95-95.7v5.4l-4.65,2.7l-4.65-2.7 M7-87.6v5.4 M16.3-87.6v5.4 M20.95-90.3l4.65,2.7v5.4
-		l-4.65,2.65 M30.3-79.55l-4.7-2.65 M30.3-95.7v5.4l-4.7,2.7 M48.9-95.7v5.4l-4.65,2.7l-4.65-2.7v-5.4 M34.95-82.2v-5.4l4.65-2.7
-		 M30.3-90.3l4.65,2.7 M72.15-49.85v-5.4l4.7-2.7l4.65,2.7 M67.5-47.2l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7 M67.5-74.15l4.65,2.7v5.4
-		l-4.65,2.7l-4.65-2.7v-5.4L67.5-74.15v-5.4l4.65-2.65l4.7,2.65 M81.5-66.05l-4.65,2.7l-4.7-2.7 M72.15-71.45l4.7-2.7 M76.85-63.35
-		v5.4 M67.5-57.95v-5.4 M53.55-49.85v-5.4l4.65-2.7l4.65,2.7 M48.9-47.2l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7 M44.25-66.05v-5.4
-		l4.65-2.7l4.65,2.7v5.4l-4.65,2.7L44.25-66.05l-4.65,2.7 M62.85-66.05l-4.65,2.7l-4.65-2.7 M53.55-71.45l4.65-2.7l4.65,2.7
-		 M58.2-57.95v-5.4 M48.9-57.95v-5.4 M48.9-74.15v-5.4l4.65-2.65l4.65,2.65v5.4 M48.9-79.55l-4.65-2.65v-5.4 M58.2-95.7v5.4
-		l-4.65,2.7l-4.65-2.7 M53.55-87.6v5.4 M58.2-79.55l4.65-2.65l4.65,2.65 M62.85-82.2v-5.4l4.65-2.7l4.65,2.7v5.4 M67.5-90.3v-5.4
-		 M76.85-95.7v5.4l-4.7,2.7 M58.2-90.3l4.65,2.7 M44.25-17.5l-4.65,2.65 M39.6-9.45l4.65,2.7 M39.6-74.15l4.65,2.7 M39.6-57.95
-		l4.65,2.7 M44.25-49.85L39.6-47.2 M62.85-49.85L58.2-47.2 M16.3-49.85l-4.65,2.65 M44.25-82.2l-4.65,2.65 M76.85-90.3l4.65,2.7
-		 M81.5-49.85l-4.65,2.65 M86.15,1.35l-4.65-2.7 M44.25-1.35l-4.65,2.7 M62.85-1.35l-4.65,2.7 M109.4-1.35l-4.65,2.7 M25.6-1.35
-		l-4.65,2.7 M-95.4,95.7v-5.4l4.65-2.7l4.65,2.7v5.4 M-86.1,90.3l4.7-2.7l4.65,2.7v5.4 M-104.7,95.7v-5.4l4.65-2.7l4.65,2.7
-		 M-100.05,82.2l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7v5.4L-100.05,82.2z M-95.4,74.15l4.65-2.7l4.65,2.7v5.4l-4.65,2.65l-4.65-2.65
-		 M-86.1,74.15l4.7-2.7l4.65,2.7v5.4l-4.65,2.65l-4.7-2.65 M-100.05,87.6v-5.4 M-90.75,87.6v-5.4 M-81.4,87.6v-5.4 M-109.35,87.6
-		l4.65,2.7 M-104.7,79.55l-4.65,2.65 M-109.35,55.25l4.65,2.7v5.4l-4.65,2.7 M-109.35,71.45l4.65,2.7 M-90.75,66.05l-4.65-2.7v-5.4
-		l4.65-2.7l4.65,2.7v5.4L-90.75,66.05v5.4 M-86.1,57.95l4.7-2.7l4.65,2.7v5.4l-4.65,2.7l-4.7-2.7 M-81.4,71.45v-5.4 M-100.05,71.45
-		v-5.4l4.65-2.7 M-95.4,57.95l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4 M-81.4,55.25v-5.4l4.65-2.65l4.65,2.65v5.4l-4.65,2.7
-		 M-100.05,66.05l-4.65-2.7 M-104.7,57.95l4.65-2.7 M-86.1,41.8l-4.65-2.7v-5.4l4.65-2.7l4.7,2.7v5.4L-86.1,41.8z M-81.4,49.85
-		l-4.7-2.65v-5.4 M-100.05,49.85l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7v5.4 M-95.4,31l-4.65,2.7l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7V31
-		l4.65,2.7 M-86.1,31v-5.4l4.7-2.7l4.65,2.7V31l-4.65,2.7 M-100.05,39.1v-5.4 M-90.75,39.1l-4.65,2.7 M-109.35,39.1l4.65,2.7
-		 M-104.7,31l-4.65,2.7 M-109.35,6.75l4.65,2.7v5.4l-4.65,2.65 M-86.1,14.85v-5.4l4.7-2.7l4.65,2.7v5.4l-4.65,2.65L-86.1,14.85z
-		 M-81.4,22.9v-5.4 M-86.1,25.6l-4.65-2.7v-5.4l4.65-2.65 M-100.05,22.9v-5.4l4.65-2.65l4.65,2.65 M-100.05,6.75v-5.4l4.65-2.7
-		l4.65,2.7v5.4l-4.65,2.7L-100.05,6.75z M-81.4,6.75v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.7 M-90.75,6.75l4.65,2.7 M-95.4,14.85v-5.4
-		 M-95.4,25.6l4.65-2.7 M-100.05,17.5l-4.65-2.65 M-104.7,9.45l4.65-2.7 M-109.35,22.9l4.65,2.7 M-86.1,47.2l-4.65,2.65
-		 M-104.7,47.2l-4.65,2.65 M-11.6,95.7v-5.4l4.65-2.7l4.65,2.7 M-20.9,95.7v-5.4l4.65-2.7l4.65,2.7 M-16.25,82.2l-4.65-2.65v-5.4
-		l4.65-2.7l4.65,2.7v5.4L-16.25,82.2v5.4 M-2.3,79.55l-4.65,2.65l-4.65-2.65 M-6.95,82.2v5.4 M-30.2,95.7v-5.4l4.65-2.7l4.65,2.7
-		 M-39.55,95.7v-5.4l4.7-2.7l4.65,2.7 M-39.55,79.55v-5.4l4.7-2.7l4.65,2.7v5.4l-4.65,2.65L-39.55,79.55l-4.65,2.65l-4.65-2.65
-		 M-20.9,79.55l-4.65,2.65l-4.65-2.65 M-34.85,87.6v-5.4 M-25.55,87.6v-5.4 M-20.9,74.15l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4
-		 M-30.2,74.15l4.65-2.7 M-25.55,66.05l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4 M-39.55,74.15l-4.65-2.7v-5.4l4.65-2.7l4.7,2.7v5.4
-		 M-30.2,57.95l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4 M-39.55,63.35v-5.4l4.7-2.7 M-30.2,63.35l-4.65,2.7 M-11.6,74.15l4.65-2.7
-		l4.65,2.7 M-6.95,66.05l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4L-6.95,66.05v5.4 M-16.25,66.05l4.65-2.7 M-11.6,57.95l-4.65-2.7v-5.4
-		l4.65-2.65l4.65,2.65v5.4 M-16.25,55.25l-4.65,2.7 M-48.85,95.7v-5.4l4.65-2.7l4.65,2.7 M-58.15,95.7v-5.4l4.65-2.7l4.65,2.7
-		 M-58.15,79.55v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.65L-58.15,79.55l-4.65,2.65l-4.65-2.65 M-44.2,87.6v-5.4 M-53.5,87.6v-5.4
-		 M-67.45,95.7v-5.4l4.65-2.7l4.65,2.7 M-76.75,90.3l4.65-2.7l4.65,2.7 M-76.75,74.15l4.65-2.7l4.65,2.7v5.4l-4.65,2.65l-4.65-2.65
-		 M-62.8,87.6v-5.4 M-72.1,87.6v-5.4 M-67.45,74.15l4.65-2.7l4.65,2.7 M-62.8,71.45v-5.4l4.65-2.7l4.65,2.7v5.4 M-62.8,66.05
-		l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4 M-76.75,63.35l4.65,2.7v5.4 M-62.8,55.25v-5.4l4.65-2.65l4.65,2.65v5.4l-4.65,2.7
-		 M-67.45,63.35l-4.65,2.7 M-72.1,55.25l4.65,2.7 M-48.85,74.15l4.65-2.7 M-44.2,66.05l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7
-		 M-53.5,49.85l4.65-2.65l4.65,2.65v5.4 M-53.5,66.05l4.65-2.7 M-53.5,55.25l4.65,2.7 M-48.85,47.2v-5.4l4.65-2.7l4.65,2.7v5.4
-		l-4.65,2.65 M-58.15,47.2v-5.4l4.65-2.7l4.65,2.7 M-58.15,25.6l4.65-2.7l4.65,2.7V31l-4.65,2.7l-4.65-2.7V25.6l-4.65-2.7v-5.4
-		 M-48.85,25.6l4.65-2.7l4.65,2.7V31l-4.65,2.7l-4.65-2.7 M-44.2,39.1v-5.4 M-53.5,39.1v-5.4 M-62.8,49.85l-4.65-2.65v-5.4l4.65-2.7
-		l4.65,2.7 M-76.75,47.2v-5.4l4.65-2.7l4.65,2.7 M-76.75,25.6l4.65-2.7l4.65,2.7V31l-4.65,2.7l-4.65-2.7 M-58.15,31l-4.65,2.7
-		l-4.65-2.7 M-72.1,39.1v-5.4 M-62.8,39.1v-5.4 M-67.45,14.85v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.65L-67.45,14.85l-4.65,2.65
-		l-4.65-2.65 M-72.1,22.9v-5.4 M-62.8,6.75v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.7 M-72.1,6.75l4.65,2.7 M-44.2,22.9v-5.4l4.65-2.65
-		l4.7,2.65v5.4l-4.7,2.7 M-44.2,17.5l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7v5.4 M-48.85,14.85l-4.65,2.65l-4.65-2.65 M-53.5,22.9v-5.4
-		 M-44.2,6.75v-5.4l4.65-2.7l4.7,2.7v5.4l-4.7,2.7 M-53.5,6.75l4.65,2.7 M-67.45,25.6l4.65-2.7 M-11.6,47.2v-5.4l4.65-2.7l4.65,2.7
-		 M-11.6,41.8l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4 M-16.25,33.7L-20.9,31v-5.4l4.65-2.7l4.65,2.7V31 M-2.3,31l-4.65,2.7
-		 M-30.2,47.2v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.65 M-39.55,41.8l4.7-2.7l4.65,2.7 M-34.85,22.9l4.65,2.7V31l-4.65,2.7l-4.7-2.7
-		 M-20.9,31l-4.65,2.7L-30.2,31 M-34.85,39.1v-5.4 M-25.55,39.1v-5.4 M-20.9,25.6l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4
-		 M-25.55,17.5l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7v5.4 M-25.55,6.75v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.7 M-30.2,14.85l-4.65,2.65
-		 M-34.85,6.75l4.65,2.7 M-6.95,17.5l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7v5.4L-6.95,17.5v5.4l-4.65,2.7 M-11.6,14.85l-4.65,2.65
-		 M-16.25,6.75l4.65,2.7 M-16.25,1.35l4.65-2.7l4.65,2.7v5.4 M-6.95,22.9l4.65,2.7 M-30.2,25.6l4.65-2.7 M-16.25,39.1l-4.65,2.7
-		 M-67.45,47.2l-4.65,2.65 M-2.3,47.2l-4.65,2.65 M-34.85,49.85l-4.7-2.65 M-16.25,49.85l-4.65-2.65 M-81.4,39.1l4.65,2.7
-		 M-11.6-1.35v-5.4l4.65-2.7l4.65,2.7 M-11.6-6.75l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4 M-16.25-14.85l-4.65-2.65v-5.4l4.65-2.7
-		l4.65,2.7v5.4 M-2.3-17.5l-4.65,2.65 M-20.9-1.35v-5.4l4.65-2.7 M-20.9-6.75l-4.65-2.7v-5.4l4.65-2.65 M-25.55-9.45l-4.65,2.7
-		l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65 M-30.2-6.75v5.4l-4.65,2.7 M-39.55-1.35v-5.4l4.7-2.7 M-34.85-14.85l-4.7-2.65v-5.4l4.7-2.7
-		l4.65,2.7v5.4 M-30.2-33.7v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.7L-30.2-33.7l-4.65,2.7l-4.7-2.7v-5.4l4.7-2.7l4.65,2.7 M-20.9-22.9
-		l-4.65-2.7V-31 M-34.85-25.6V-31 M-39.55-39.1l-4.65-2.7v-5.4l4.65-2.65l4.7,2.65v5.4 M-25.55-41.8v-5.4l4.65-2.65l4.65,2.65v5.4
-		l-4.65,2.7 M-6.95-31l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4L-6.95-31v5.4l-4.65,2.7 M-16.25-25.6V-31l4.65-2.7 M-16.25-41.8
-		l4.65,2.7 M-16.25-47.2l4.65-2.65l4.65,2.65v5.4 M-30.2-22.9l4.65-2.7 M-16.25-31l-4.65-2.7 M-6.95-25.6l4.65,2.7 M-44.2,1.35
-		l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M-58.15-1.35v-5.4l4.65-2.7l4.65,2.7 M-58.15-6.75l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4
-		 M-62.8-14.85l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7v5.4 M-39.55-17.5l-4.65,2.65l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7 M-44.2-9.45v-5.4
-		 M-53.5-14.85l4.65-2.65 M-62.8,1.35l-4.65-2.7v-5.4l4.65-2.7 M-76.75-6.75l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4L-76.75-6.75
-		v5.4 M-76.75-17.5v-5.4l4.65-2.7l4.65,2.7 M-67.45-17.5l-4.65,2.65 M-72.1-9.45l4.65,2.7 M-67.45-33.7v-5.4l4.65-2.7l4.65,2.7v5.4
-		L-62.8-31L-67.45-33.7z M-62.8-25.6V-31 M-72.1-25.6V-31l4.65-2.7 M-72.1-31l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M-76.75-39.1
-		l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4 M-62.8-41.8v-5.4l4.65-2.65l4.65,2.65v5.4l-4.65,2.7 M-44.2-25.6V-31l4.65-2.7 M-44.2-31
-		l-4.65-2.7v-5.4l4.65-2.7 M-48.85-33.7L-53.5-31l-4.65-2.7 M-48.85-22.9l-4.65-2.7V-31 M-53.5-41.8l4.65,2.7 M-58.15-22.9l4.65-2.7
-		 M-58.15-49.85v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.65 M-48.85-55.25l4.65-2.7l4.65,2.7v5.4 M-58.15-71.45l4.65-2.7l4.65,2.7v5.4
-		l-4.65,2.7l-4.65-2.7V-71.45z M-48.85-71.45l4.65-2.7l4.65,2.7v5.4l-4.65,2.7l-4.65-2.7 M-44.2-57.95v-5.4 M-53.5-57.95v-5.4
-		 M-76.75-49.85v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.65 M-67.45-55.25l4.65-2.7l4.65,2.7 M-76.75-55.25l-4.65-2.7v-5.4l4.65-2.7
-		l4.65,2.7v5.4 M-81.4-63.35l-4.7-2.7v-5.4l4.7-2.7l4.65,2.7v5.4 M-81.4-74.15v-5.4l4.65-2.65l4.65,2.65v5.4l-4.65,2.7
-		 M-58.15-66.05l-4.65,2.7l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M-62.8-57.95v-5.4 M-72.1-74.15l4.65,2.7 M-67.45-66.05l-4.65,2.7
-		 M-67.45-82.2v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.65L-67.45-82.2l-4.65,2.65 M-76.75-82.2v-5.4l4.65-2.7l4.65,2.7 M-72.1-90.3
-		v-5.4 M-62.8-90.3v-5.4 M-53.5-74.15v-5.4l4.65-2.65l4.65,2.65v5.4 M-58.15-82.2l4.65,2.65 M-58.15-87.6l4.65-2.7l4.65,2.7v5.4
-		 M-53.5-90.3v-5.4 M-44.2-95.7v5.4l-4.65,2.7 M-62.8-74.15v-5.4 M-11.6-49.85v-5.4l4.65-2.7l4.65,2.7 M-20.9-49.85v-5.4l4.65-2.7
-		l4.65,2.7 M-16.25-63.35l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4L-16.25-63.35v5.4 M-2.3-66.05l-4.65,2.7l-4.65-2.7 M-11.6-71.45
-		l4.65-2.7l4.65,2.7 M-6.95-63.35v5.4 M-25.55-47.2l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7 M-39.55-55.25l4.7-2.7l4.65,2.7
-		 M-39.55-71.45l4.7-2.7l4.65,2.7v5.4l-4.65,2.7l-4.7-2.7 M-20.9-71.45l-4.65-2.7v-5.4l4.65-2.65l4.65,2.65v5.4 M-20.9-66.05
-		l-4.65,2.7l-4.65-2.7 M-25.55-74.15l-4.65,2.7 M-34.85-63.35v5.4 M-25.55-57.95v-5.4 M-34.85-74.15v-5.4l4.65-2.65l4.65,2.65
-		 M-44.2-79.55l4.65-2.65l4.7,2.65 M-39.55-82.2v-5.4l4.7-2.7l4.65,2.7v5.4 M-34.85-90.3v-5.4 M-16.25-95.7v5.4l-4.65,2.7l-4.65-2.7
-		v-5.4 M-25.55-90.3l-4.65,2.7 M-20.9-82.2v-5.4 M-6.95-79.55l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7v5.4L-6.95-79.55v5.4 M-16.25-79.55
-		l4.65-2.65 M-11.6-87.6l-4.65-2.7 M-6.95-95.7v5.4 M-44.2-90.3l4.65,2.7 M-62.8-47.2l-4.65-2.65 M-44.2-47.2l-4.65-2.65
-		 M-30.2-49.85l-4.65,2.65 M-2.3-49.85l-4.65,2.65 M-95.4-1.35v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.7 M-86.1-6.75l4.7-2.7
-		 M-100.05,1.35l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7 M-95.4-17.5l-4.65,2.65l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7V-17.5z M-95.4-22.9
-		l4.65-2.7l4.65,2.7v5.4l-4.65,2.65l-4.65-2.65 M-81.4-14.85l-4.7-2.65 M-100.05-9.45v-5.4 M-90.75-14.85v5.4 M-109.35-9.45
-		l4.65,2.7 M-104.7-17.5l-4.65,2.65 M-109.35-41.8l4.65,2.7v5.4l-4.65,2.7 M-90.75-25.6V-31l4.65-2.7l4.7,2.7v5.4l-4.7,2.7
-		 M-100.05-25.6V-31l4.65-2.7l4.65,2.7 M-100.05-47.2l4.65-2.65l4.65,2.65v5.4l-4.65,2.7l-4.65-2.7V-47.2l-4.65-2.65 M-90.75-41.8
-		l4.65,2.7v5.4 M-86.1-39.1l4.7-2.7 M-95.4-33.7v-5.4 M-109.35-25.6l4.65,2.7 M-100.05-31l-4.65-2.7 M-104.7-39.1l4.65-2.7
-		 M-95.4-49.85v-5.4l4.65-2.7l4.65,2.7v5.4l-4.65,2.65 M-86.1-55.25l4.7-2.7 M-95.4-55.25l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4
-		 M-100.05-63.35l-4.65-2.7v-5.4l4.65-2.7l4.65,2.7v5.4 M-95.4-71.45l4.65-2.7l4.65,2.7 M-86.1-66.05l-4.65,2.7 M-109.35-57.95
-		l4.65,2.7v5.4l-4.65,2.65 M-109.35-74.15l4.65,2.7 M-104.7-66.05l-4.65,2.7 M-109.35-90.3l4.65,2.7v5.4l-4.65,2.65 M-81.4-79.55
-		l-4.7-2.65v-5.4l4.7-2.7l4.65,2.7 M-86.1-82.2l-4.65,2.65l-4.65-2.65v-5.4l4.65-2.7l4.65,2.7 M-100.05-74.15v-5.4l4.65-2.65
-		 M-95.4-87.6l-4.65-2.7v-5.4 M-81.4-95.7v5.4 M-90.75-95.7v5.4 M-90.75-79.55v5.4 M-104.7-55.25l4.65-2.7 M-100.05-79.55
-		l-4.65-2.65 M-104.7-87.6l4.65-2.7 M-81.4-47.2l-4.7-2.65 M-76.75-33.7L-81.4-31 M-81.4-25.6l4.65,2.7 M-67.45-1.35l-4.65,2.7
-		 M-104.7-1.35l-4.65,2.7 M-81.4,1.35l-4.7-2.7 M-25.55,1.35l-4.65-2.7 M-53.5,1.35l4.65-2.7 M-2.3-1.35l-4.65,2.7 M-2.3,57.95
-		l4.65-2.7 M2.35,66.05l-4.65-2.7 M-2.3-39.1l4.65-2.7 M2.35-31l-4.65-2.7 M2.35-79.55L-2.3-82.2 M-2.3-87.6l4.65-2.7 M-2.3,9.45
-		l4.65-2.7 M2.35,17.5l-4.65-2.65"/>
-</symbol>
-<g id="Layer_1">
-</g>
-<g id="Layer_6">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#EFEEEE" d="M217.5,108.95c0,29.833-10.533,55.399-31.6,76.7
-		c-0.7,0.833-1.484,1.6-2.351,2.3c-3.466,3.399-7.134,6.483-11,9.25c-18.267,13.467-39.366,20.2-63.3,20.2
-		c-23.967,0-45.033-6.733-63.2-20.2c-4.8-3.4-9.3-7.25-13.5-11.55c-16.367-16.267-26.417-35.167-30.15-56.7
-		c-0.733-4.2-1.217-8.467-1.45-12.8c-0.1-2.4-0.15-4.801-0.15-7.2c0-2.534,0.05-4.95,0.15-7.25c0-0.233,0.066-0.467,0.2-0.7
-		c1.567-26.6,12.033-49.583,31.4-68.95C53.85,11.017,79.417,0.5,109.25,0.5c29.934,0,55.483,10.517,76.65,31.55
-		C206.967,53.483,217.5,79.117,217.5,108.95z"/>
-</g>
-<g id="Layer_5">
-	<path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M195.45,43l-22.4,22.4c-8.833,13-13.25,27.867-13.25,44.6
-		c0,17.934,5.067,33.833,15.2,47.7l19,18.95c-2.5,3.066-5.2,6.066-8.1,9c-0.7,0.833-1.484,1.6-2.351,2.3
-		c-2.533,2.5-5.167,4.816-7.899,6.95L158.1,177.35c-13.934-10.733-30.133-16.1-48.6-16.1c-17.933,0-33.833,5.1-47.7,15.3
-		L43.25,195.15c-3.767-2.867-7.333-6.034-10.7-9.5c-2.8-2.801-5.417-5.667-7.85-8.601l19.15-19.2
-		c10.066-13.966,15.1-29.916,15.1-47.85c0-17.5-4.867-33.017-14.6-46.55l-21.05-21c2.833-3.6,5.917-7.067,9.25-10.4
-		c2.934-2.867,5.934-5.55,9-8.05L61.9,44.35C75.7,54.583,91.567,59.7,109.5,59.7c18.467,0,34.666-5.367,48.6-16.1L177.4,24.35
-		c2.899,2.367,5.732,4.933,8.5,7.7C189.367,35.583,192.55,39.233,195.45,43z"/>
-</g>
-<g id="Layer_4">
-	<defs>
-		<path id="SVGID_1_" d="M159.8,110c0-16.733,4.417-31.6,13.25-44.6l22.4-22.4c-2.9-3.767-6.083-7.417-9.55-10.95
-			c-2.768-2.767-5.601-5.333-8.5-7.7L158.1,43.6c-13.934,10.733-30.133,16.1-48.6,16.1c-17.933,0-33.8-5.117-47.6-15.35L41.55,24
-			c-3.066,2.5-6.066,5.183-9,8.05c-3.333,3.333-6.417,6.8-9.25,10.4l21.05,21c9.733,13.533,14.6,29.05,14.6,46.55
-			c0,17.934-5.034,33.884-15.1,47.85l-19.15,19.2c2.433,2.934,5.05,5.8,7.85,8.601c3.367,3.466,6.934,6.633,10.7,9.5L61.8,176.55
-			c13.867-10.2,29.767-15.3,47.7-15.3c18.467,0,34.666,5.366,48.6,16.1L175.65,194.9c2.732-2.134,5.366-4.45,7.899-6.95
-			c0.866-0.7,1.65-1.467,2.351-2.3c2.899-2.934,5.6-5.934,8.1-9l-19-18.95C164.867,143.833,159.8,127.934,159.8,110z"/>
-	</defs>
-	<clipPath id="SVGID_2_">
-		<use xlink:href="#SVGID_1_"  overflow="visible"/>
-	</clipPath>
-	<g clip-path="url(#SVGID_2_)">
-		
-			<use xlink:href="#hex_grid"  width="228.55" height="197.233" x="-114.25" y="-98.617" transform="matrix(1.1415 0 0 -1.1415 105.5 107.75)" overflow="visible"/>
-	</g>
-</g>
-<g id="Layer_2">
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#35C6F4" d="M79.1,110.95c-0.033-0.667-0.05-1.333-0.05-2
-			c0-0.7,0.017-1.366,0.05-2c0-0.067,0.017-0.134,0.05-0.2c0.434-7.367,3.333-13.733,8.7-19.1c5.9-5.833,12.983-8.75,21.25-8.75
-			c8.301,0,15.384,2.917,21.25,8.75c5.834,5.934,8.75,13.033,8.75,21.3c0,8.267-2.916,15.35-8.75,21.25
-			c-0.199,0.233-0.416,0.45-0.649,0.649c-0.967,0.934-1.983,1.784-3.05,2.551c-5.066,3.733-10.917,5.6-17.551,5.6
-			c-6.633,0-12.466-1.866-17.5-5.6c-1.333-0.934-2.583-2-3.75-3.2c-4.533-4.5-7.317-9.733-8.35-15.7
-			C79.3,113.334,79.167,112.15,79.1,110.95z M126.1,127.25l3.601,3.6L126.1,127.25z"/>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#35C6F4" stroke-width="2" stroke-miterlimit="1" d="
-			M158.6,60.25l-15,14.65 M31.7,33.1l40.75,40.65 M126.1,127.25l3.601,3.6 M157.05,158l27.65,28.6 M153.05,153.95l-10.75-11.2
-			 M186.6,33l-28,27.25 M33.15,186.25l27.35-27.4"/>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#35C6F4" stroke-width="7" stroke-miterlimit="1" d="
-			M158.6,60.25l-16.949,17.2 M59.4,61.35L76.6,78.5 M60.5,158.85l16.75-17.399 M153.05,153.95l4,4.05 M139.45,140.4l13.6,13.55"/>
-	</g>
-</g>
-</svg>

Logo/dottrace.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-1.3318" y1="43.7371" x2="67.0419" y2="26.0967">
+			<stop  offset="0.1237" style="stop-color:#7866FF"/>
+			<stop  offset="0.5376" style="stop-color:#FE2EB6"/>
+			<stop  offset="0.8548" style="stop-color:#FD0486"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_1_);" points="67.3,16 43.7,0 0,31.1 11.1,70 58.9,60.3 		"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="45.9148" y1="38.9098" x2="67.6577" y2="9.0989">
+			<stop  offset="0.1237" style="stop-color:#FF0080"/>
+			<stop  offset="0.2587" style="stop-color:#FE0385"/>
+			<stop  offset="0.4109" style="stop-color:#FA0C92"/>
+			<stop  offset="0.5713" style="stop-color:#F41BA9"/>
+			<stop  offset="0.7363" style="stop-color:#EB2FC8"/>
+			<stop  offset="0.8656" style="stop-color:#E343E6"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_2_);" points="67.3,16 43.7,0 38,15.7 38,47.8 70,47.8 		"/>
+	</g>
+	<g>
+		<rect x="13.4" y="13.4" style="fill:#000000;" width="43.2" height="43.2"/>
+		<rect x="17.4" y="48.5" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
+		<g>
+			<path style="fill:#FFFFFF;" d="M17.4,19.1h6.9c5.6,0,9.5,3.8,9.5,8.9V28c0,5-3.9,8.9-9.5,8.9h-6.9V19.1z M21.4,22.7v10.7h3
+				c3.2,0,5.4-2.2,5.4-5.3V28c0-3.2-2.2-5.4-5.4-5.4H21.4z"/>
+			<polygon style="fill:#FFFFFF;" points="40.3,22.7 34.9,22.7 34.9,19.1 49.6,19.1 49.6,22.7 44.2,22.7 44.2,37 40.3,37 			"/>
+		</g>
+	</g>
+</g>
+</svg>

Logo/jetbrains.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;" xml:space="preserve"
+	>
+<g>
+	<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24">
+		<stop  offset="0" style="stop-color:#FCEE39"/>
+		<stop  offset="1" style="stop-color:#F37B3D"/>
+	</linearGradient>
+	<path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
+		c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0
+		c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/>
+	<linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
+		<stop  offset="0" style="stop-color:#EF5A6B"/>
+		<stop  offset="0.57" style="stop-color:#F26F4E"/>
+		<stop  offset="1" style="stop-color:#F37B3D"/>
+	</linearGradient>
+	<path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
+		c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3
+		c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/>
+	<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
+		<stop  offset="0" style="stop-color:#7C59A4"/>
+		<stop  offset="0.3852" style="stop-color:#AF4C92"/>
+		<stop  offset="0.7654" style="stop-color:#DC4183"/>
+		<stop  offset="0.957" style="stop-color:#ED3D7D"/>
+	</linearGradient>
+	<path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
+		c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0
+		c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/>
+	<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
+		<stop  offset="0" style="stop-color:#EF5A6B"/>
+		<stop  offset="0.364" style="stop-color:#EE4E72"/>
+		<stop  offset="1" style="stop-color:#ED3D7D"/>
+	</linearGradient>
+	<path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
+		l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0
+		c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/>
+	<g id="XMLID_3008_">
+		<rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/>
+		<rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
+		<g id="XMLID_3009_">
+			<path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0
+				l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/>
+			<path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
+				L45.3,43.8z"/>
+			<path id="XMLID_3026_" style="fill:#FFFFFF;" d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
+			<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
+				c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5
+				l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/>
+			<path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
+				c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1
+				l-1.5,0v2H50.6z"/>
+			<path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
+				 M58.8,59l-0.9-2.3L57,59L58.8,59z"/>
+			<path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
+			<path id="XMLID_3012_" style="fill:#FFFFFF;" d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
+				/>
+			<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
+				c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6
+				c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7
+				C76.1,62.5,74.7,62,73.7,61.1z"/>
+		</g>
+	</g>
+</g>
+</svg>

Logo/resharper.svg

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.9451" y1="75.7869" x2="74.7868" y2="20.6415">
+				<stop  offset="1.612903e-002" style="stop-color:#B35BA3"/>
+				<stop  offset="0.4044" style="stop-color:#C41E57"/>
+				<stop  offset="0.4677" style="stop-color:#C41E57"/>
+				<stop  offset="0.6505" style="stop-color:#EB8523"/>
+				<stop  offset="0.9516" style="stop-color:#FEBD11"/>
+			</linearGradient>
+			<polygon style="fill:url(#SVGID_1_);" points="49.8,15.2 36,36.7 58.4,70 70,23.1 			"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.7187" y1="73.2922" x2="69.5556" y2="18.1519">
+				<stop  offset="1.612903e-002" style="stop-color:#B35BA3"/>
+				<stop  offset="0.4044" style="stop-color:#C41E57"/>
+				<stop  offset="0.4677" style="stop-color:#C41E57"/>
+				<stop  offset="0.7043" style="stop-color:#EB8523"/>
+			</linearGradient>
+			<polygon style="fill:url(#SVGID_2_);" points="51.1,15.7 49,0 18.8,33.6 27.6,42.3 20.8,70 58.4,70 			"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="1.8281" y1="53.4275" x2="48.8245" y2="9.2255">
+			<stop  offset="1.612903e-002" style="stop-color:#B35BA3"/>
+			<stop  offset="0.6613" style="stop-color:#C41E57"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_3_);" points="49,0 11.6,0 0,47.1 55.6,47.1 		"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="49.8935" y1="-11.5569" x2="48.8588" y2="24.0352">
+			<stop  offset="0.5" style="stop-color:#C41E57"/>
+			<stop  offset="0.6668" style="stop-color:#D13F48"/>
+			<stop  offset="0.7952" style="stop-color:#D94F39"/>
+			<stop  offset="0.8656" style="stop-color:#DD5433"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_4_);" points="55.3,47.1 51.1,15.7 49,0 41.7,23 		"/>
+	</g>
+	<g>
+		
+			<rect x="13.4" y="13.5" transform="matrix(-1 2.577289e-003 -2.577289e-003 -1 70.0288 70.081)" style="fill:#000000;" width="43.2" height="43.2"/>
+		
+			<rect x="17.6" y="48.6" transform="matrix(1 -2.577289e-003 2.577289e-003 1 -0.1287 6.634109e-002)" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
+		<path style="fill:#FFFFFF;" d="M17.4,19.1l8.2,0c2.3,0,4,0.6,5.2,1.8c1,1,1.5,2.4,1.5,4.1l0,0.1c0,1.5-0.3,2.6-1.1,3.5
+			c-0.7,0.9-1.6,1.6-2.8,2l4.4,6.4l-4.6,0l-3.7-5.5l-3.3,0l0,5.5l-3.9,0L17.4,19.1z M25.3,27.8c1,0,1.7-0.2,2.2-0.7
+			c0.5-0.5,0.8-1.1,0.8-1.8l0-0.1c0-0.9-0.3-1.5-0.8-1.9c-0.5-0.4-1.3-0.6-2.3-0.6l-3.9,0l0,5.1L25.3,27.8z"/>
+		<path style="fill:#FFFFFF;" d="M36,33.2l-1.9,0l0-3.3l2.5,0l0.6-3.8l-2.3,0l0-3.3l2.8,0l0.6-3.7l3.4,0l-0.6,3.7l3.7,0l0.6-3.7
+			l3.4,0l-0.6,3.7l1.9,0l0,3.3l-2.5,0L47,29.9l2.3,0l0,3.3l-2.8,0L45.8,37l-3.4,0l0.7-3.8l-3.7,0L38.7,37l-3.4,0L36,33.2z
+			 M43.7,29.9l0.6-3.8l-3.7,0L40,29.9L43.7,29.9z"/>
+	</g>
+</g>
+</svg>

Logo/rider.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
+  <defs>
+    <linearGradient id="linear-gradient" x1="70.22612" y1="27.79912" x2="-5.13024" y2="63.12242" gradientTransform="matrix(1, 0, 0, -1, 0, 71.27997)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#c90f5e"/>
+      <stop offset="0.22111" stop-color="#c90f5e"/>
+      <stop offset="0.2356" stop-color="#c90f5e"/>
+      <stop offset="0.35559" stop-color="#ca135c"/>
+      <stop offset="0.46633" stop-color="#ce1e57"/>
+      <stop offset="0.5735" stop-color="#d4314e"/>
+      <stop offset="0.67844" stop-color="#dc4b41"/>
+      <stop offset="0.78179" stop-color="#e66d31"/>
+      <stop offset="0.88253" stop-color="#f3961d"/>
+      <stop offset="0.94241" stop-color="#fcb20f"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-2" x1="24.65904" y1="61.99608" x2="46.04762" y2="2.93445" gradientTransform="matrix(1, 0, 0, -1, 0, 71.27997)" gradientUnits="userSpaceOnUse">
+      <stop offset="0.04188" stop-color="#077cfb"/>
+      <stop offset="0.44503" stop-color="#c90f5e"/>
+      <stop offset="0.95812" stop-color="#077cfb"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-3" x1="17.39552" y1="63.34592" x2="33.19389" y2="7.20092" gradientTransform="matrix(1, 0, 0, -1, 0, 71.27997)" gradientUnits="userSpaceOnUse">
+      <stop offset="0.27749" stop-color="#c90f5e"/>
+      <stop offset="0.97382" stop-color="#fcb20f"/>
+    </linearGradient>
+  </defs>
+  <title>rider</title>
+  <g>
+    <polygon points="70 27.237 63.391 23.75 20.926 0 3.827 17.921 21.619 41.068 60.537 44.397 70 27.237" fill="url(#linear-gradient)"/>
+    <polygon points="50.423 16.132 44.271 1.107 27.643 17.471 11.768 50.194 49.411 70 70 57.98 50.423 16.132" fill="url(#linear-gradient-2)"/>
+    <polygon points="20.926 0 0 14.095 7.779 62.172 27.848 69.889 53.78 48.823 20.926 0" fill="url(#linear-gradient-3)"/>
+  </g>
+  <g>
+    <rect x="13.30219" y="13.19311" width="43.61371" height="43.61371"/>
+    <g>
+      <path d="M17.22741,18.86293h8.39564a7.38416,7.38416,0,0,1,5.34268,1.85358,5.86989,5.86989,0,0,1,1.52648,4.1433h0A5.74339,5.74339,0,0,1,28.567,30.5296l4.47041,6.54206H28.34891L24.42368,31.1838h-3.162v5.88785H17.22741V18.86293h0ZM25.296,27.69471c1.96262,0,3.053-1.09034,3.053-2.61682h0c0-1.74455-1.19938-2.61682-3.162-2.61682H21.15265v5.23365H25.296Z" fill="#fff"/>
+      <path d="M36.09034,18.86293H43.2866c5.77882,0,9.70405,3.92523,9.70405,9.15888h0c0,5.12461-3.92523,9.15888-9.70405,9.15888H36.09034V18.86293Zm4.03427,3.59813V33.47352h3.162a5.23727,5.23727,0,0,0,5.56075-5.45171h0a5.26493,5.26493,0,0,0-5.56075-5.56075h-3.162Z" fill="#fff"/>
+    </g>
+    <rect x="17.22741" y="48.62925" width="16.35514" height="2.72586" fill="#fff"/>
+  </g>
+</svg>

Logo/webstorm.svg

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.0676" y1="1.4599" x2="43.1829" y2="66.675">
+			<stop  offset="0.2849" style="stop-color:#00CDD7"/>
+			<stop  offset="0.9409" style="stop-color:#2086D7"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_1_);" points="9.4,63.3 0,7.3 17.5,0.1 28.6,6.7 38.8,1.2 60.1,9.4 48.1,70 		"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="30.7199" y1="9.7343" x2="61.365" y2="54.6713">
+			<stop  offset="0.1398" style="stop-color:#FFF045"/>
+			<stop  offset="0.3656" style="stop-color:#00CDD7"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_2_);" points="70,23.7 61,1.4 44.6,0 19.3,24.3 26.1,55.6 38.8,64.6 70,46 62.3,31.7 		"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="61.0819" y1="15.2899" x2="65.1065" y2="29.5436">
+			<stop  offset="0.2849" style="stop-color:#00CDD7"/>
+			<stop  offset="0.9409" style="stop-color:#2086D7"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_3_);" points="56,20.4 62.3,31.7 70,23.7 64.4,9.8 		"/>
+	</g>
+	<g>
+		<g>
+			<rect x="13.4" y="13.4" style="fill:#000000;" width="43.2" height="43.2"/>
+			<rect x="17.5" y="48.5" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
+			<path style="fill:#FFFFFF;" d="M38.7,34.3l2.3-2.8c1.6,1.3,3.3,2.2,5.3,2.2c1.6,0,2.5-0.6,2.5-1.7v-0.1c0-1-0.6-1.5-3.6-2.3
+				c-3.6-0.9-5.8-1.9-5.8-5.5v-0.1c0-3.3,2.6-5.4,6.2-5.4c2.6,0,4.8,0.8,6.6,2.3l-2,3c-1.6-1.1-3.1-1.8-4.6-1.8
+				c-1.5,0-2.3,0.7-2.3,1.6v0.1c0,1.2,0.8,1.6,3.8,2.4c3.6,1,5.6,2.3,5.6,5.4v0.1c0,3.6-2.7,5.6-6.5,5.6
+				C43.5,37.2,40.8,36.2,38.7,34.3"/>
+		</g>
+		<polygon style="fill:#FFFFFF;" points="35.2,19 32.5,29.4 29.5,19 26.5,19 23.4,29.4 20.7,19 16.6,19 21.7,36.9 25,36.9 28,26.5 
+			30.9,36.9 34.3,36.9 39.4,19 		"/>
+	</g>
+</g>
+</svg>

README.md

@@ -0,0 +1,159 @@
+<p align="center">
+<img src="/Logo/text256.png" alt="Radarr">
+</p>
+
+Radarr is an __independent__ fork of [Sonarr](https://github.com/Sonarr/Sonarr) reworked for automatically downloading movies via Usenet and BitTorrent.
+
+The project was inspired by other Usenet/BitTorrent movie downloaders such as CouchPotato.
+
+See the [Roadmap blogpost](https://blog.radarr.video/development/update/2018/11/11/roadmap-update.html) for an overview of planned features.
+
+## Getting Started
+
+[![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Installation)
+[![Docker](https://img.shields.io/badge/wiki-docker-1488C6.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Docker)
+[![Setup Guide](https://img.shields.io/badge/wiki-setup_guide-orange.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Setup-Guide)
+[![FAQ](https://img.shields.io/badge/wiki-FAQ-BF55EC.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/FAQ)
+
+* [Install Radarr for your desired OS](https://github.com/Radarr/Radarr/wiki/Installation) *or* use [Docker](https://github.com/Radarr/Radarr/wiki/Docker)
+* *For Linux users*, run `radarr` and *optionally* have [Radarr start automatically](https://github.com/Radarr/Radarr/wiki/Autostart-on-Linux)
+* Connect to the UI through <http://localhost:7878> or <http://your-ip:7878> in your web browser
+* See the [Setup Guide](https://github.com/Radarr/Radarr/wiki/Setup-Guide) for further configuration
+
+## Downloads
+
+Branch | develop (stable) | nightly (semi-unstable) |
+---|---|---
+Binary Releases | [![GitHub Releases](https://img.shields.io/badge/downloads-releases-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases) | [![AppVeyor Builds](https://img.shields.io/badge/downloads-continuous-green.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/radarr-usby1/branch/develop/artifacts)
+Docker (linuxserver.io, x86_64, arm64, armhf) | [![Docker release](https://img.shields.io/badge/linuxserver-radarr:latest-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://store.docker.com/community/images/linuxserver/radarr)  | [![Docker nightly](https://img.shields.io/badge/linuxserver-radarr:nightly-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://store.docker.com/community/images/linuxserver/radarr) 
+Docker (hotio, see [here](https://github.com/hotio/docker-radarr) for more information) | [![Docker release / nightly](https://img.shields.io/badge/docker-release/nightly-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr) | [![Docker release / nightly](https://img.shields.io/badge/docker-release/nightly-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)
+
+
+## Support
+
+[![OpenCollective](https://opencollective.com/radarr/tiers/backer/badge.svg)](#backers)
+[![OpenCollective](https://opencollective.com/radarr/tiers/flexible-sponsor/badge.svg)](#flexible-sponsors)
+[![OpenCollective](https://opencollective.com/radarr/tiers/sponsor/badge.svg)](#sponsors)
+
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/AD3UP37)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60&style=flat-square)](https://www.reddit.com/r/radarr)
+[![Feathub](https://img.shields.io/badge/feathub-requests-lightgrey.svg?maxAge=60&style=flat-square)](http://feathub.com/Radarr/Radarr)
+[![GitHub](https://img.shields.io/badge/github-issues-red.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
+[![GitHub Wiki](https://img.shields.io/badge/github-wiki-181717.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki)
+
+## Status
+
+[![GitHub issues](https://img.shields.io/github/issues/radarr/radarr.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
+[![GitHub pull requests](https://img.shields.io/github/issues-pr/radarr/radarr.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/pulls)
+[![GNU GPL v3](https://img.shields.io/badge/license-GNU%20GPL%20v3-blue.svg?maxAge=60&style=flat-square)](http://www.gnu.org/licenses/gpl.html)
+[![Copyright 2010-2017](https://img.shields.io/badge/copyright-2017-blue.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr)
+[![Github Releases](https://img.shields.io/github/downloads/Radarr/Radarr/total.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg?maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr/)
+[![Changelog](https://img.shields.io/github/commit-activity/w/radarr/radarr.svg?style=flat-square)](/CHANGELOG.md#unreleased)
+
+| Service  | Master                      | Develop                      |
+|----------|:---------------------------:|:----------------------------:|
+| AppVeyor | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr/master.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr) | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr-usby1/develop.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr-usby1) |
+| Travis   | [![Travis](https://img.shields.io/travis/Radarr/Radarr/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) | [![Travis](https://img.shields.io/travis/Radarr/Radarr/develop.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) |
+
+### [Site and API Status](https://status.radarr.video)
+
+| API | Updates | Sites  |
+|-------|:----:|:----:|
+| [![API V2 (develop)](http://status.radarr.video/component/1/shield?style=flat-square)](https://api.radarr.video/v2/) | [![Update Server](http://status.radarr.video/component/4/shield?style=flat-square)](https://radarr.aeonlucid.com) | [![Radarr Mappings](http://status.radarr.video/component/6/shield?style=flat-square)](https://mappings.radarr.video/)
+| [![API Staging (nightly)](http://status.radarr.video/component/2/shield?style=flat-square)](https://staging.api.radarr.video/) | [![Github Updates](http://status.radarr.video/component/5/shield?style=flat-square)](https://api.github.com/v3/) | [![Main Site](http://status.radarr.video/component/7/shield?style=flat-square)](https://radarr.video/)
+
+Radarr is currently undergoing rapid development and pull requests are actively added into the repository.
+
+## Features
+
+### Current Features
+
+* Adding new movies with lots of information, such as trailers, ratings, etc.
+* Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
+* Can watch for better quality of the movies you have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
+* Automatic failed download handling will try another release if one fails
+* Manual search so you can pick any release or to see why a release was not downloaded automatically
+* Full integration with SABnzbd and NZBGet
+* Automatically searching for releases as well as RSS Sync
+* Automatically importing downloaded movies
+* Recognizing Special Editions, Director's Cut, etc.
+* Identifying releases with hardcoded subs
+* All indexers supported by Sonarr also supported
+* New PassThePopcorn Indexer
+* QBittorrent, Deluge, rTorrent, Transmission and uTorrent download client (Other clients are coming)
+* New TorrentPotato Indexer
+* Torznab Indexer now supports Movies (Works well with [Jackett](https://github.com/Jackett/Jackett))
+* Scanning PreDB to know when a new release is available
+* Importing movies from various online sources, such as IMDb Watchlists (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114))
+* Full integration with Kodi, Plex (notification, library update)
+* And a beautiful UI
+* Importing Metadata such as trailers or subtitles
+* Adding metadata such as posters and information for Kodi and others to use
+* Advanced customization for profiles, such that Radarr will always download the copy you want
+
+### Planned Features
+
+See the [Roadmap blogpost](https://blog.radarr.video/development/update/2018/11/11/roadmap-update.html) for an overview of planned features.
+
+#### [Feature Requests](http://feathub.com/Radarr/Radarr)
+
+## Configuring the Development Environment
+
+### Requirements
+
+* [Visual Studio Community 2017](https://www.visualstudio.com/vs/community/) or [Rider](http://www.jetbrains.com/rider/)
+* [Git](https://git-scm.com/downloads)
+* [Node.js](https://nodejs.org/en/download/)
+
+### Setup
+
+* Make sure all the required software mentioned above are installed
+* Clone the repository into your development machine ([*info*](https://help.github.com/desktop/guides/contributing/working-with-your-remote-repository-on-github-or-github-enterprise))
+* Grab the submodules `git submodule init && git submodule update`
+* Install the required Node Packages `npm install`
+* Start gulp to monitor your dev environment for any changes that need post processing using `npm start` command.
+
+> **Notice**  
+> Gulp must be running at all times while you are working with Radarr client source files.
+
+### Build
+
+* To build run `sh build.sh`
+
+**Note:** Windows users must have bash available to do this. If you installed git, you should have a git bash utility that works.
+
+### Development
+
+* Open `NzbDrone.sln` in Visual Studio 2017 or run the build.sh script, if Mono is installed. Alternatively you can use Jetbrains Rider, since it works on all Platforms.
+* Make sure `NzbDrone.Console` is set as the startup project
+* Run `build.sh` before running
+
+## Supporters
+
+This project would not be possible without the support by these amazing folks. [**Become a sponsor or backer**](https://opencollective.com/radarr) to help us out!
+
+### Sponsors
+
+[![Sponsors](https://opencollective.com/radarr/tiers/sponsor.svg)](https://opencollective.com/radarr/order/3851)
+
+### Flexible Sponsors
+
+[![Flexible Sponsors](https://opencollective.com/radarr/tiers/flexible-sponsor.svg?avatarHeight=54)](https://opencollective.com/radarr/order/3856)
+
+### Backers
+
+[![Backers](https://opencollective.com/radarr/tiers/backer.svg?avatarHeight=48)](https://opencollective.com/radarr/order/3850)
+
+### JetBrains
+
+Thank you to [<img src="/Logo/jetbrains.svg" alt="JetBrains" width="32"> JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
+* [<img src="/Logo/resharper.svg" alt="ReSharper" width="32"> ReSharper](http://www.jetbrains.com/resharper/)
+* [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)
+* [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)
+* [<img src="/Logo/dottrace.svg" alt="dotTrace" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
+
+## License
+
+* [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
+* Copyright 2010-2018

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.ps1

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

build.sh

@@ -1,17 +1,25 @@
-#! /bin/bash
-msBuild='/c/Program Files (x86)/MSBuild/14.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,19 +66,16 @@ 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
-    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
 }
@@ -72,16 +83,19 @@ BuildWithMSBuild()
 BuildWithXbuild()
 {
     export MONO_IOMAP=case
-    CheckExitCode xbuild /t:Clean $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 xbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $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
@@ -91,157 +105,179 @@ Build()
 
     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/NzbDrone.exe*
-    for file in $outputFolderMono/NzbDrone.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/Sonarr $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/Sonarr.app $outputFolderOsxApp
-    cp -r $outputFolderOsx $outputFolderOsxApp/Sonarr.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.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
+        $nuget install NUnit.ConsoleRunner -Version 3.10.0 -Output $testPackageFolder
     else
-        mono $nuget install NUnit.ConsoleRunner -Version 3.2.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
@@ -256,10 +292,51 @@ case "$(uname -s)" in
         ;;
 esac
 
-Build
-RunGulp
-PackageMono
-PackageOsx
-PackageOsxApp
-PackageTests
-CleanupWindowsPackage
+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
+    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
+    PackageArtifacts
+fi

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

gulp/copy.js

@@ -25,7 +25,7 @@ gulp.task('copyHtml', function () {
 });
 
 gulp.task('copyContent', function () {
-  return gulp.src([paths.src.content + '**/*.*', '!**/*.less'])
+  return gulp.src([paths.src.content + '**/*.*', '!**/*.less', '!**/*.css'])
     .pipe(gulp.dest(paths.dest.content))
     .pipe(livereload());
 });

gulp/less.js

@@ -5,7 +5,7 @@ var postcss = require('gulp-postcss');
 var sourcemaps = require('gulp-sourcemaps');
 var autoprefixer = require('autoprefixer-core');
 var livereload = require('gulp-livereload');
-
+var cleancss = require('gulp-clean-css');
 var print = require('gulp-print');
 var paths = require('./paths');
 var errorHandler = require('./errorHandler');
@@ -16,16 +16,23 @@ gulp.task('less', function() {
         paths.src.content + 'bootstrap.less',
         paths.src.content + 'theme.less',
         paths.src.content + 'overrides.less',
+        paths.src.content + 'bootstrap.toggle-switch.css',
+        paths.src.content + 'fullcalendar.css',
+        paths.src.content + 'Messenger/messenger.css',
+        paths.src.content + 'Messenger/messenger.flat.css',
         paths.src.root + 'Series/series.less',
         paths.src.root + 'Activity/activity.less',
         paths.src.root + 'AddSeries/addSeries.less',
+                paths.src.root + 'AddMovies/addMovies.less',
         paths.src.root + 'Calendar/calendar.less',
         paths.src.root + 'Cells/cells.less',
         paths.src.root + 'ManualImport/manualimport.less',
         paths.src.root + 'Settings/settings.less',
         paths.src.root + 'System/Logs/logs.less',
         paths.src.root + 'System/Update/update.less',
-        paths.src.root + 'System/Info/info.less'
+        paths.src.root + 'System/Info/info.less',
+        paths.src.root + 'Movies/movies.less',
+
     ];
 
     return gulp.src(src)
@@ -33,12 +40,13 @@ gulp.task('less', function() {
         .pipe(sourcemaps.init())
         .pipe(less({
             dumpLineNumbers : 'false',
-            compress        : true,
-            yuicompress     : true,
+            compress        : false,
+            yuicompress     : false,
             ieCompat        : true,
             strictImports   : true
         }))
         .pipe(postcss([ autoprefixer({ browsers: ['last 2 versions'] }) ]))
+        .pipe(cleancss())
         .on('error', errorHandler.onError)
         .pipe(sourcemaps.write(paths.dest.content))
         .pipe(gulp.dest(paths.dest.content))

macOS/Radarr

@@ -4,12 +4,16 @@
 DIR=$(cd "$(dirname "$0")"; pwd)
 
 #change these values to match your app
-EXE_PATH="$DIR/NzbDrone.exe"
-APPNAME="Sonarr"
- 
+EXE_PATH="$DIR/Radarr.exe"
+APPNAME="Radarr"
+
 #set up environment
 if [[ -x '/opt/local/bin/mono' ]]; then
+    # Macports and mono-supplied installer path
     export PATH="/opt/local/bin:$PATH"
+elif [[ -x '/usr/local/bin/mono' ]]; then
+    # Homebrew-supplied path to mono
+    export PATH="/usr/local/bin:$PATH"
 fi
 
 export DYLD_FALLBACK_LIBRARY_PATH="$DIR"
@@ -29,11 +33,11 @@ export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$HOME/lib:/usr/lo
 #mono version check
 REQUIRED_MAJOR=3
 REQUIRED_MINOR=10
- 
+
 VERSION_TITLE="Cannot launch $APPNAME"
 VERSION_MSG="$APPNAME requires Mono Runtime Environment(MRE) $REQUIRED_MAJOR.$REQUIRED_MINOR or later."
 DOWNLOAD_URL="http://www.mono-project.com/download/#download-mac"
- 
+
 MONO_VERSION="$(mono --version | grep 'Mono JIT compiler version ' |  cut -f5 -d\ )"
 # if [[ -o DEBUG ]]; then osascript -e "display dialog \"MONO_VERSION: $MONO_VERSION\""; fi
 
@@ -42,7 +46,7 @@ MONO_VERSION_MAJOR="$(echo $MONO_VERSION | cut -f1 -d.)"
 MONO_VERSION_MINOR="$(echo $MONO_VERSION | cut -f2 -d.)"
 if [ -z "$MONO_VERSION" ] \
     || [ $MONO_VERSION_MAJOR -lt $REQUIRED_MAJOR ] \
-    || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ] 
+    || [ $MONO_VERSION_MAJOR -eq $REQUIRED_MAJOR -a $MONO_VERSION_MINOR -lt $REQUIRED_MINOR ]
 then
     osascript \
     -e "set question to display dialog \"$VERSION_MSG\" with title \"$VERSION_TITLE\" buttons {\"Cancel\", \"Download...\"} default button 2" \
@@ -51,8 +55,8 @@ then
     echo "$VERSION_MSG"
     exit 1
 fi
- 
+
 MONO_EXEC="exec mono --debug"
- 
+
 #run app using mono
-$MONO_EXEC "$EXE_PATH"
+$MONO_EXEC "$EXE_PATH"

macOS/Radarr.app/Contents/Info.plist

@@ -11,15 +11,15 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>Sonarr</string>
+	<string>Radarr</string>
 	<key>CFBundleIconFile</key>
-	<string>sonarr.icns</string>
+	<string>radarr.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.osx.sonarr.tv</string>
+	<string>com.osx.radarr.video</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Sonarr</string>
+	<string>Radarr</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "Sonarr",
-  "version": "2.0.0",
-  "description": "Sonarr",
+  "name": "radarr",
+  "version": "1.0.0",
+  "description": "Radarr",
   "main": "main.js",
   "scripts": {
     "build": "gulp build",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/Sonarr/Sonarr.git"
+    "url": "git://github.com/Radarr/Radarr.git"
   },
   "author": "",
   "license": "GPL-3.0",
@@ -20,6 +20,7 @@
     "del": "1.2.0",
     "gulp": "3.9.0",
     "gulp-cached": "1.1.0",
+    "gulp-clean-css": "^3.0.4",
     "gulp-concat": "2.6.0",
     "gulp-declare": "0.3.0",
     "gulp-handlebars": "3.0.1",
@@ -37,10 +38,13 @@
     "handlebars": "3.0.3",
     "jshint-loader": "0.8.3",
     "jshint-stylish": "2.0.1",
+    "npm": "^6.0.1",
     "run-sequence": "1.1.1",
     "streamqueue": "1.1.0",
     "tar.gz": "0.1.1",
+    "url-search-params": "^0.6.1",
     "webpack": "1.12.0",
-    "webpack-stream": "2.1.0"
+    "webpack-stream": "2.1.0",
+    "natives": "^1.1.3"
   }
 }

readme.md

@@ -1,53 +0,0 @@
-# Sonarr #
-
-
-Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
-
-## Major Features Include: ##
-
-* Support for major platforms: Windows, Linux, OSX, Raspberry Pi, etc.
-* Automatically detects new episodes
-* Can scan your existing library and download any missing episodes
-* Can watch for better quality of the episodes you already have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
-* Automatic failed download handling will try another release if one fails
-* Manual search so you can pick any release or to see why a release was not downloaded automatically
-* Fully configurable episode renaming
-* Full integration with SABNzbd and NzbGet
-* Full integration with XBMC, Plex (notification, library update, metadata)
-* Full support for specials and multi-episode releases
-* And a beautiful UI
-
-
-## Configuring Development Environment: ##
-
-### Requirements ###
-- Visual Studio 2015 [Free Community Edition](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
-- [Git](http://git-scm.com/downloads)
-- [NodeJS](http://nodejs.org/download/)
-
-### Setup ###
-
-- Make sure all the required software mentioned above are installed.
-- Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
-- Grab the submodules `git submodule init && git submodule update`
-- install the required Node Packages `npm install`
-- start gulp to monitor your dev environment for any changes that need post processing using `npm start` command.
-
-*Please note gulp must be running at all times while you are working with Sonarr client source files.*
-
-
-### Development ###
-- Open `NzbDrone.sln` in Visual Studio
-- Make sure `NzbDrone.Console` is set as the startup project
-
-
-### License ###
-* [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-Copyright 2010-2016
-
-
-### Sponsors ###
-- [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
-    - [ReSharper](http://www.jetbrains.com/resharper/)
-    - [WebStorm](http://www.jetbrains.com/webstorm/)
-    - [TeamCity](http://www.jetbrains.com/teamcity/)

schemas/torznab.xsd

@@ -75,6 +75,8 @@
       <xs:enumeration value="seedtype" /> <!-- TBD, which criteria must be met. was going for 'ratio,seedtime,both' but afaik it's always 'either' -->
       <xs:enumeration value="minimumratio" />
       <xs:enumeration value="minimumseedtime" />
+      <xs:enumeration value="downloadvolumefactor" /> <!-- factor for the download volume, in most cases it should be set to 1, if a torrent is set to freeleech set it to 0, if only 50% is counted set it to 0.5 -->
+      <xs:enumeration value="uploadvolumefactor" /> <!-- factor for the upload volume, in most cases it should be set to 1, if a torrent is set to neutral leech (upload is not counted) set it to 0, if it's set to double upload set it to 2 -->
     </xs:restriction>
   </xs:simpleType>
   <xs:element name="attr">

setup/nzbdrone.iss

@@ -1,60 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define AppName "Sonarr"
-#define AppPublisher "Team Sonarr"
-#define AppURL "https://sonarr.tv/"
-#define ForumsURL "https://forums.sonarr.tv/"
-#define AppExeName "NzbDrone.exe"
-#define BuildNumber "2.0"
-#define BuildNumber GetEnv('BUILD_NUMBER')
-#define BranchName GetEnv('branch')
-
-[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-6F73F67F7F71}
-AppName={#AppName}
-AppVersion=2.0
-AppPublisher={#AppPublisher}
-AppPublisherURL={#AppURL}
-AppSupportURL={#ForumsURL}
-AppUpdatesURL={#AppURL}
-DefaultDirName={commonappdata}\NzbDrone\bin
-DisableDirPage=yes
-DefaultGroupName={#AppName}
-DisableProgramGroupPage=yes
-OutputBaseFilename=NzbDrone.{#BranchName}.{#BuildNumber}
-SolidCompression=yes
-AppCopyright=Creative Commons 3.0 License
-AllowUNCPath=False
-UninstallDisplayIcon={app}\NzbDrone.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\NzbDrone.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}\nzbdrone.console.exe"; Parameters: "/u"; Flags: waituntilterminated;
-Filename: "{app}\nzbdrone.console.exe"; Parameters: "/i"; Flags: waituntilterminated; Tasks: windowsService
-
-[UninstallRun]
-Filename: "{app}\nzbdrone.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/.idea/.idea.NzbDrone/.idea/.name

@@ -0,0 +1 @@
+NzbDrone

src/.idea/.idea.NzbDrone/.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

src/.idea/.idea.NzbDrone/.idea/indexLayout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ContentModelUserStore">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>

src/.idea/.idea.NzbDrone/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="com.jetbrains.rider.android.RiderAndroidMiscFileCreationComponent">
+    <option name="ENSURE_MISC_FILE_EXISTS" value="true" />
+  </component>
+</project>

src/.idea/.idea.NzbDrone/.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/ExternalModules/CurlSharp" vcs="Git" />
+  </component>
+</project>

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,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-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,97 +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.3.4\lib\net40\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <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="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,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-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.3.4" targetFramework="net40" />
-</packages>

src/Marr.Data/DataMapper.cs

@@ -941,21 +941,21 @@ namespace Marr.Data
         {
             if (disposing)
             {
-                if (Command.Transaction != null)
+                if (_command != null)
                 {
-                    Command.Transaction.Dispose();
-                    Command.Transaction = null;
-                }
+                    if (_command.Transaction != null)
+                    {
+                        _command.Transaction.Dispose();
+                        _command.Transaction = null;
+                    }
 
-                if (Command.Connection != null)
-                {
-                    Command.Connection.Dispose();
-                    Command.Connection = null;
-                }
+                    if (_command.Connection != null)
+                    {
+                        _command.Connection.Dispose();
+                        _command.Connection = null;
+                    }
 
-                if (Command != null)
-                {
-                    Command.Dispose();
+                    _command.Dispose();
                     _command = null;
                 }
             }

src/Marr.Data/Mapping/FluentMappings.cs

@@ -198,7 +198,8 @@ namespace Marr.Data.Mapping
             {
                 return AutoMapPropertiesWhere(m =>
                     m.MemberType == MemberTypes.Property &&
-                    !DataHelper.IsSimpleType((m as PropertyInfo).PropertyType));
+                    !DataHelper.IsSimpleType((m as PropertyInfo).PropertyType) &&
+                    !MapRepository.Instance.TypeConverters.ContainsKey((m as PropertyInfo).PropertyType));
             }
 
             /// <summary>

src/Marr.Data/Mapping/MappingHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Data.Common;
@@ -91,9 +91,11 @@ namespace Marr.Data.Mapping
             Type entType = ent.GetType();
             if (_repos.Relationships.ContainsKey(entType))
             {
+                var provider = _db.ProviderFactory;
+                var connectionString = _db.ConnectionString;
                 Func<IDataMapper> dbCreate = () =>
                 {
-                    var db = new DataMapper(_db.ProviderFactory, _db.ConnectionString);
+                    var db = new DataMapper(provider, connectionString);
                     db.SqlMode = SqlModes.Text;
                     return db;
                 };

src/Marr.Data/Parameters/ParameterChainMethods.cs

@@ -14,8 +14,10 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library. If not, see <http://www.gnu.org/licenses/>. */
 
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Runtime.InteropServices.ComTypes;
 using Marr.Data.Converters;
 
 namespace Marr.Data.Parameters
@@ -42,15 +44,25 @@ namespace Marr.Data.Parameters
             Type valueType = value.GetType();
 
             // Check for a registered IConverter
-            IConverter converter = MapRepository.Instance.GetConverter(valueType);
-            if (converter != null)
+            //If we have a list of ints, we ignore the converter since we want to do an in statement!
+            var list = value as List<int>;
+            if (list != null)
             {
-                Parameter.Value = converter.ToDB(value);
+                Parameter.Value = $"{string.Join(",", list)}";
             }
             else
             {
-                Parameter.Value = value;
-            } 
+                IConverter converter = MapRepository.Instance.GetConverter(valueType);
+                if (converter != null)
+                {
+                    Parameter.Value = converter.ToDB(value);
+                }
+                else
+                {
+                    Parameter.Value = value;
+                } 
+            }
+            
 
             //// Determine the correct DbType based on the passed in value type
             //IDbTypeBuilder typeBuilder = MapRepository.Instance.DbTypeBuilder;

src/Marr.Data/QGen/Dialects/Dialect.cs

@@ -68,5 +68,13 @@ namespace Marr.Data.QGen.Dialects
         {
             get { return "({0} LIKE '%' + {1} + '%')"; }
         }
+
+        public virtual string InFormat
+        {
+            get
+            {
+                return "({0} in ({1}))";
+            }
+        }
     }
 }

src/Marr.Data/QGen/SelectQuery.cs

@@ -1,4 +1,5 @@
-using System.Text;
+using System.Linq;
+using System.Text;
 using Marr.Data.Mapping;
 using Marr.Data.QGen.Dialects;
 
@@ -129,7 +130,16 @@ namespace Marr.Data.QGen
         public void BuildOrderClause(StringBuilder sql)
         {
             sql.Append(OrderBy.ToString());
-        }       
+        }
+       
+        public void BuildGroupBy(StringBuilder sql)
+        {
+            var baseTable = this.Tables.First();
+            var primaryKeyColumn = baseTable.Columns.Single(c => c.ColumnInfo.IsPrimaryKey);
+
+            string token = this.Dialect.CreateToken(string.Concat(baseTable.Alias, ".", primaryKeyColumn.ColumnInfo.Name));
+            sql.AppendFormat(" GROUP BY {0}", token);
+        }
 
         private string TranslateJoin(JoinType join)
         {

src/Marr.Data/QGen/SqliteRowCountQueryDecorator.cs

@@ -14,8 +14,22 @@ namespace Marr.Data.QGen
         public string Generate()
         {
             StringBuilder sql = new StringBuilder();
-
+            
             BuildSelectCountClause(sql);
+
+            if (_innerQuery.IsJoin)
+            {
+                sql.Append(" FROM (");
+                _innerQuery.BuildSelectClause(sql);
+                _innerQuery.BuildFromClause(sql);
+                _innerQuery.BuildJoinClauses(sql);
+                _innerQuery.BuildWhereClause(sql);
+                _innerQuery.BuildGroupBy(sql);
+                sql.Append(") ");
+
+                return sql.ToString();
+            }
+            
             _innerQuery.BuildFromClause(sql);
             _innerQuery.BuildJoinClauses(sql);
             _innerQuery.BuildWhereClause(sql);

src/Marr.Data/QGen/TableCollection.cs

@@ -22,7 +22,7 @@ namespace Marr.Data.QGen
             if (this.Any(t => t.EntityType == table.EntityType))
             {
                 // Already exists -- don't add
-                return;
+                //return; This prevents joining on the same table!
             }
 
             // Create an alias (ex: "t0", "t1", "t2", etc...)
@@ -37,7 +37,7 @@ namespace Marr.Data.QGen
         }
 
         /// <summary>
-        /// Tries to find a table for a given member.  
+        /// Tries to find a table for a given member.
         /// </summary>
         public Table FindTable(Type declaringType)
         {

src/Marr.Data/QGen/WhereBuilder.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Text;
 using System.Linq.Expressions;
 using System.Data.Common;
@@ -92,6 +93,10 @@ namespace Marr.Data.QGen
                 case "EndsWith":
                     Write_EndsWith(expression);
                     break;
+                    
+                case "In":
+                    Write_In(expression);
+                    break;
 
                 default:
                     string msg = string.Format("'{0}' expressions are not yet implemented in the where clause expression tree parser.", method);
@@ -140,31 +145,47 @@ namespace Marr.Data.QGen
             return expression;
         }
 
-        private object GetRightValue(Expression rightExpression)
+        private object GetRightValue(Expression expression)
         {
             object rightValue = null;
-
-            var right = rightExpression as ConstantExpression;
-            if (right == null) // Value is not directly passed in as a constant
+			
+            var simpleConstExp = expression as ConstantExpression;
+            if (simpleConstExp == null) // Value is not directly passed in as a constant
             {
-                var rightMemberExp = (rightExpression as MemberExpression);
-                var parentMemberExpression = rightMemberExp.Expression as MemberExpression;
-                if (parentMemberExpression != null) // Value is passed in as a property on a parent entity
+                MemberExpression memberExp = expression as MemberExpression;
+                ConstantExpression constExp = null;
+
+                // Value may be nested in multiple levels of objects/properties, so traverse the MemberExpressions 
+                // until a ConstantExpression property value is found, and then unwind the stack to get the value.
+                var memberNames = new Stack<string>();
+
+                while (memberExp != null)
                 {
-                    string entityName = (rightMemberExp.Expression as MemberExpression).Member.Name;
-                    var container = ((rightMemberExp.Expression as MemberExpression).Expression as ConstantExpression).Value;
-                    var entity = _repos.ReflectionStrategy.GetFieldValue(container, entityName);
-                    rightValue = _repos.ReflectionStrategy.GetFieldValue(entity, rightMemberExp.Member.Name);
+                    memberNames.Push(memberExp.Member.Name);
+
+                    // Function calls are not supported - user needs to simplify their Where expression.
+                    var methodExp = memberExp.Expression as MethodCallExpression;
+                    if (methodExp != null)
+                    {
+                        var errMsg = string.Format("Function calls are not supported by the Where clause expression parser.  Please evaluate your function call, '{0}', manually and then use the resulting paremeter value in your Where expression.",  methodExp.Method.Name);
+                        throw new NotSupportedException(errMsg);
+                    }
+
+                    constExp = memberExp.Expression as ConstantExpression;
+                    memberExp = memberExp.Expression as MemberExpression;
                 }
-                else // Value is passed in as a variable
+
+                object entity = constExp.Value;
+                while (memberNames.Count > 0)
                 {
-                    var parent = (rightMemberExp.Expression as ConstantExpression).Value;
-                    rightValue = _repos.ReflectionStrategy.GetFieldValue(parent, rightMemberExp.Member.Name);
+                    string entityName = memberNames.Pop();
+                    entity = _repos.ReflectionStrategy.GetFieldValue(entity, entityName);
                 }
+                rightValue = entity;
             }
             else // Value is passed in directly as a constant
             {
-                rightValue = right.Value;
+                rightValue = simpleConstExp.Value;
             }
 
             return rightValue;
@@ -238,6 +259,17 @@ namespace Marr.Data.QGen
             _sb.AppendFormat(_dialect.ContainsFormat, fqColumn, paramName);
         }
 
+        private void Write_In(MethodCallExpression body)
+        {
+            object value = GetRightValue(body.Arguments[1]);
+            //string paramName = string.Concat(_paramPrefix, "P", _command.Parameters.Count.ToString());
+            //var parameter = new ParameterChainMethods(_command, paramName, value).Parameter;
+
+            MemberExpression memberExp = (body.Arguments[0] as MemberExpression);
+            string fqColumn = GetFullyQualifiedColumnName(memberExp.Member, memberExp.Expression.Type);
+            _sb.AppendFormat(_dialect.InFormat, fqColumn, string.Join(",", value as List<int>));
+        }
+
         private void Write_StartsWith(MethodCallExpression body)
         {
             // Add parameter to Command.Parameters

src/Microsoft.AspNet.SignalR.Core/Infrastructure/CancellationTokenExtensions.cs

@@ -1,9 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq.Expressions;
-using System.Reflection;
 using System.Threading;
 
 namespace Microsoft.AspNet.SignalR.Infrastructure

src/Microsoft.AspNet.SignalR.Core/Infrastructure/NoOpPerformanceCounter.cs

@@ -4,7 +4,7 @@ using System.Diagnostics;
 
 namespace Microsoft.AspNet.SignalR.Infrastructure
 {
-    internal class NoOpPerformanceCounter : IPerformanceCounter
+    public class NoOpPerformanceCounter : IPerformanceCounter
     {
         public string CounterName
         {

src/Microsoft.AspNet.SignalR.Core/PersistentConnection.cs

@@ -6,7 +6,6 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.SignalR.Configuration;
 using Microsoft.AspNet.SignalR.Hosting;

src/Microsoft.AspNet.SignalR.Core/TaskAsyncHelper.cs

@@ -1,13 +1,9 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.SignalR.Infrastructure;

src/Microsoft.AspNet.SignalR.Core/Transports/LongPollingTransport.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.SignalR.Hosting;
 using Microsoft.AspNet.SignalR.Infrastructure;

src/Microsoft.AspNet.SignalR.Owin/ServerRequest.cs

@@ -7,11 +7,9 @@ using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.SignalR.Owin.Infrastructure;
-using Microsoft.AspNet.SignalR.Hosting;
 
 namespace Microsoft.AspNet.SignalR.Owin
 {
-    using WebSocketFunc = Func<IDictionary<string, object>, Task>;
     public partial class ServerRequest : 
 #if NET45
         IWebSocketRequest

src/MonoTorrent/BEncoding/IBEncodedValue.cs

@@ -96,7 +96,7 @@ namespace MonoTorrent.BEncoding
             if (stream == null)
                 throw new ArgumentNullException("stream");
 
-            return Decode(new RawReader(stream));
+            return Decode(new RawReader(stream, false));
         }
 
 

src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj

@@ -38,16 +38,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.dll</HintPath>
+    <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.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
+    <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="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.2.0\lib\net40\nunit.framework.dll</HintPath>
+    <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="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" />
@@ -57,9 +61,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="FizzWare.NBuilder">
-      <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
-    </Reference>
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>