Merge branch 'markus' into kay.one

IISExpress/AppServer/applicationhost.config

@@ -155,6 +155,7 @@
         -->
     <globalModules>
       <add name="UriCacheModule" image="%IIS_BIN%\cachuri.dll" />
+      <!--<add name="TokenCacheModule" image="%IIS_BIN%\cachtokn.dll" />-->
       <!--            <add name="FileCacheModule" image="%IIS_BIN%\cachfile.dll" />  -->
       <!--            <add name="HttpCacheModule" image="%IIS_BIN%\cachhttp.dll" /> -->
       <add name="StaticCompressionModule" image="%IIS_BIN%\compstat.dll" />
@@ -163,7 +164,9 @@
       <add name="ServerSideIncludeModule" image="%IIS_BIN%\iis_ssi.dll" />
       <add name="StaticFileModule" image="%IIS_BIN%\static.dll" />
       <add name="AnonymousAuthenticationModule" image="%IIS_BIN%\authanon.dll" />
+      <add name="UrlAuthorizationModule" image="%IIS_BIN%\urlauthz.dll" />
       <add name="BasicAuthenticationModule" image="%IIS_BIN%\authbas.dll" />
+      <add name="WindowsAuthenticationModule" image="%IIS_BIN%\authsspi.dll" />
       <!--            <add name="DigestAuthenticationModule" image="%IIS_BIN%\authmd5.dll" /> -->
       <add name="RequestFilteringModule" image="%IIS_BIN%\modrqflt.dll" />
       <add name="CustomErrorModule" image="%IIS_BIN%\custerr.dll" />
@@ -629,6 +632,8 @@
         <add name="StaticFileModule" lockItem="true" />
         <add name="AnonymousAuthenticationModule" lockItem="true" />
         <add name="BasicAuthenticationModule" lockItem="true" />
+        <add name="WindowsAuthenticationModule" lockItem="true" />
+        <add name="UrlAuthorizationModule" lockItem="true" />
         <!--
                 <add name="DigestAuthenticationModule" lockItem="true" />
 -->
@@ -637,9 +642,11 @@
         <add name="ConfigurationValidationModule" lockItem="true" />
         <add name="OutputCache" type="System.Web.Caching.OutputCacheModule" preCondition="managedHandler" />
         <add name="Session" type="System.Web.SessionState.SessionStateModule" preCondition="managedHandler" />
+        <add name="WindowsAuthentication" type="System.Web.Security.WindowsAuthenticationModule" preCondition="managedHandler" />
         <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" preCondition="managedHandler" />
         <add name="DefaultAuthentication" type="System.Web.Security.DefaultAuthenticationModule" preCondition="managedHandler" />
         <add name="RoleManager" type="System.Web.Security.RoleManagerModule" preCondition="managedHandler" />
+        <add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule" preCondition="managedHandler" />
         <add name="FileAuthorization" type="System.Web.Security.FileAuthorizationModule" preCondition="managedHandler" />
         <add name="AnonymousIdentification" type="System.Web.Security.AnonymousIdentificationModule" preCondition="managedHandler" />
         <add name="Profile" type="System.Web.Profile.ProfileModule" preCondition="managedHandler" />

NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -91,6 +91,7 @@
     <Compile Include="BacklogSearchJobTest.cs" />
     <Compile Include="BannerDownloadJobTest.cs" />
     <Compile Include="ConfigFileProviderTest.cs" />
+    <Compile Include="SortHelperTest.cs" />
     <Compile Include="EpisodeProviderTest_DeleteInvalidEpisodes.cs" />
     <Compile Include="InventoryProvider_IsAcceptableSizeTest.cs" />
     <Compile Include="QualityTypeProviderTest.cs" />