diff --git a/Kentor.AuthServices.Mvc/AuthServicesController.cs b/Kentor.AuthServices.Mvc/AuthServicesController.cs
index bffb4b770..55ea72e0a 100644
--- a/Kentor.AuthServices.Mvc/AuthServicesController.cs
+++ b/Kentor.AuthServices.Mvc/AuthServicesController.cs
@@ -5,6 +5,7 @@
using Kentor.AuthServices.HttpModule;
using Kentor.AuthServices.Configuration;
using Kentor.AuthServices.WebSso;
+using System.Diagnostics.CodeAnalysis;
namespace Kentor.AuthServices.Mvc
{
@@ -68,6 +69,9 @@ public ActionResult Acs()
/// SignOut action that signs out the current user.
///
/// Redirect to base url /
+ // Exclude from code coverage as it a) is very simple and b) can't be
+ // tested without shims that are only available in VSPremium.
+ [ExcludeFromCodeCoverage]
public ActionResult SignOut()
{
FederatedAuthentication.SessionAuthenticationModule.SignOut();
diff --git a/Kentor.AuthServices.VSPremium.Tests/AuthServicesControllerTests.cs b/Kentor.AuthServices.VSPremium.Tests/AuthServicesControllerTests.cs
deleted file mode 100644
index 68a606324..000000000
--- a/Kentor.AuthServices.VSPremium.Tests/AuthServicesControllerTests.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Microsoft.QualityTools.Testing.Fakes;
-using NSubstitute;
-using System.IdentityModel.Services;
-using Kentor.AuthServices.Mvc;
-using FluentAssertions;
-using System.Web.Mvc;
-using System.Web.Routing;
-using System.Web;
-
-namespace Kentor.AuthServices.VSPremium.Tests
-{
- [TestClass]
- public class AuthServicesControllerTests
- {
- [TestMethod]
- public void AuthServicesController_SignOut()
- {
- using(ShimsContext.Create())
- {
- var substituteSessionAuthModule = Substitute.For();
-
- System.IdentityModel.Services.Fakes.ShimFederatedAuthentication.SessionAuthenticationModuleGet =
- () => substituteSessionAuthModule;
-
- var substituteRequestContext = Substitute.For();
- substituteRequestContext.HttpContext = Substitute.For();
- substituteRequestContext.HttpContext.Request.Returns(Substitute.For());
- substituteRequestContext.HttpContext.Request.ApplicationPath.Returns("/path");
-
- var subject = new AuthServicesController()
- {
- Url = new UrlHelper(substituteRequestContext)
- }.SignOut();
-
- subject.Should().BeOfType().And
- .Subject.As().Url.Should().Be("/path/");
-
- substituteSessionAuthModule.Received().SignOut();
- }
- }
- }
-}
diff --git a/Kentor.AuthServices.VSPremium.Tests/Fakes/System.Security.fakes b/Kentor.AuthServices.VSPremium.Tests/Fakes/System.Security.fakes
deleted file mode 100644
index 48deff182..000000000
Binary files a/Kentor.AuthServices.VSPremium.Tests/Fakes/System.Security.fakes and /dev/null differ
diff --git a/Kentor.AuthServices.VSPremium.Tests/Fakes/System.identitymodel.services.fakes b/Kentor.AuthServices.VSPremium.Tests/Fakes/System.identitymodel.services.fakes
deleted file mode 100644
index daf229be3..000000000
Binary files a/Kentor.AuthServices.VSPremium.Tests/Fakes/System.identitymodel.services.fakes and /dev/null differ
diff --git a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.IdentityModel.Services.4.0.0.0.Fakes.dll b/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.IdentityModel.Services.4.0.0.0.Fakes.dll
deleted file mode 100644
index dca56befd..000000000
Binary files a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.IdentityModel.Services.4.0.0.0.Fakes.dll and /dev/null differ
diff --git a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.IdentityModel.Services.4.0.0.0.Fakes.fakesconfig b/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.IdentityModel.Services.4.0.0.0.Fakes.fakesconfig
deleted file mode 100644
index 3c9ea9734..000000000
Binary files a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.IdentityModel.Services.4.0.0.0.Fakes.fakesconfig and /dev/null differ
diff --git a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.IdentityModel.Services.4.0.0.0.Fakes.xml b/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.IdentityModel.Services.4.0.0.0.Fakes.xml
deleted file mode 100644
index 30ba09730..000000000
--- a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.IdentityModel.Services.4.0.0.0.Fakes.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
- System.identitymodel.services.4.0.0.0.Fakes
-
-
-
- Shim type of System.IdentityModel.Services.FederatedAuthentication
-
-
- Initializes a new shim instance
-
-
- Assigns the 'Current' behavior for all methods of the shimmed type
-
-
- Assigns the 'NotImplemented' behavior for all methods of the shimmed type
-
-
- Sets the shim of FederatedAuthentication.GetHttpModule()
-
-
- Assigns the behavior for all methods of the shimmed type
-
-
- Sets the shim of FederatedAuthentication.get_ClaimsAuthorizationModule()
-
-
- Sets the shim of FederatedAuthentication.add_FederationConfigurationCreated(EventHandler`1<FederationConfigurationCreatedEventArgs> value)
-
-
- Sets the shim of FederatedAuthentication.remove_FederationConfigurationCreated(EventHandler`1<FederationConfigurationCreatedEventArgs> value)
-
-
- Sets the shim of FederatedAuthentication.get_FederationConfiguration()
-
-
- Sets the shim of FederatedAuthentication.get_SessionAuthenticationModule()
-
-
- Sets the shim of FederatedAuthentication.FederatedAuthentication()
-
-
- Sets the shim of FederatedAuthentication.get_WSFederationAuthenticationModule()
-
-
- Shim type of System.IdentityModel.Services.FederatedAuthenticationSessionEndingException
-
-
- Initializes a new shim instance
-
-
- Initializes a new shim for the given instance
-
-
- Assigns the 'Current' behavior for all methods of the shimmed type
-
-
- Assigns the 'NotImplemented' behavior for all methods of the shimmed type
-
-
- Binds the members of the interface to the shim.
-
-
- Assigns the behavior for all methods of the shimmed type
-
-
- Sets the shim of FederatedAuthenticationSessionEndingException.FederatedAuthenticationSessionEndingException()
-
-
- Sets the shim of FederatedAuthenticationSessionEndingException.FederatedAuthenticationSessionEndingException(SerializationInfo info, StreamingContext context)
-
-
- Sets the shim of FederatedAuthenticationSessionEndingException.FederatedAuthenticationSessionEndingException(String message)
-
-
- Sets the shim of FederatedAuthenticationSessionEndingException.FederatedAuthenticationSessionEndingException(String message, Exception inner)
-
-
- Define shims for all instances members
-
-
-
diff --git a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.Security.4.0.0.0.Fakes.dll b/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.Security.4.0.0.0.Fakes.dll
deleted file mode 100644
index 5d9de56c1..000000000
Binary files a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.Security.4.0.0.0.Fakes.dll and /dev/null differ
diff --git a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.Security.4.0.0.0.Fakes.fakesconfig b/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.Security.4.0.0.0.Fakes.fakesconfig
deleted file mode 100644
index 7c8769275..000000000
Binary files a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.Security.4.0.0.0.Fakes.fakesconfig and /dev/null differ
diff --git a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.Security.4.0.0.0.Fakes.xml b/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.Security.4.0.0.0.Fakes.xml
deleted file mode 100644
index 229d6712a..000000000
--- a/Kentor.AuthServices.VSPremium.Tests/FakesAssemblies/System.Security.4.0.0.0.Fakes.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
- System.Security.4.0.0.0.Fakes
-
-
-
- Shim type of System.Security.Cryptography.Xml.SignedInfo
-
-
- Initializes a new shim instance
-
-
- Initializes a new shim for the given instance
-
-
- Assigns the 'Current' behavior for all methods of the shimmed type
-
-
- Assigns the 'NotImplemented' behavior for all methods of the shimmed type
-
-
- Binds the members of the interface to the shim.
-
-
- Binds the members of the interface to the shim.
-
-
- Sets the shim of SignedInfo.AddReference(Reference reference)
-
-
- Assigns the behavior for all methods of the shimmed type
-
-
- Sets the shim of SignedInfo.get_CanonicalizationMethod()
-
-
- Sets the shim of SignedInfo.get_CanonicalizationMethodObject()
-
-
- Sets the shim of SignedInfo.set_CanonicalizationMethod(String value)
-
-
- Sets the shim of SignedInfo.SignedInfo()
-
-
- Sets the shim of SignedInfo.CopyTo(Array array, Int32 index)
-
-
- Sets the shim of SignedInfo.get_Count()
-
-
- Sets the shim of SignedInfo.GetEnumerator()
-
-
- Sets the shim of SignedInfo.GetXml()
-
-
- Sets the shim of SignedInfo.get_Id()
-
-
- Sets the shim of SignedInfo.set_Id(String value)
-
-
- Sets the shim of SignedInfo.get_IsReadOnly()
-
-
- Sets the shim of SignedInfo.get_IsSynchronized()
-
-
- Sets the shim of SignedInfo.LoadXml(XmlElement value)
-
-
- Sets the shim of SignedInfo.get_References()
-
-
- Sets the shim of SignedInfo.get_SignatureLength()
-
-
- Sets the shim of SignedInfo.set_SignatureLength(String value)
-
-
- Sets the shim of SignedInfo.get_SignatureMethod()
-
-
- Sets the shim of SignedInfo.set_SignatureMethod(String value)
-
-
- Sets the shim of SignedInfo.get_SyncRoot()
-
-
- Define shims for all instances members
-
-
- Sets the shim of SignedInfo.AddReference(Reference reference)
-
-
- Sets the shim of SignedInfo.get_CanonicalizationMethod()
-
-
- Sets the shim of SignedInfo.get_CanonicalizationMethodObject()
-
-
- Sets the shim of SignedInfo.set_CanonicalizationMethod(String value)
-
-
- Sets the shim of SignedInfo.CopyTo(Array array, Int32 index)
-
-
- Sets the shim of SignedInfo.get_Count()
-
-
- Sets the shim of SignedInfo.GetEnumerator()
-
-
- Sets the shim of SignedInfo.GetXml()
-
-
- Sets the shim of SignedInfo.get_Id()
-
-
- Sets the shim of SignedInfo.set_Id(String value)
-
-
- Sets the shim of SignedInfo.get_IsReadOnly()
-
-
- Sets the shim of SignedInfo.get_IsSynchronized()
-
-
- Sets the shim of SignedInfo.LoadXml(XmlElement value)
-
-
- Sets the shim of SignedInfo.get_References()
-
-
- Sets the shim of SignedInfo.get_SignatureLength()
-
-
- Sets the shim of SignedInfo.set_SignatureLength(String value)
-
-
- Sets the shim of SignedInfo.get_SignatureMethod()
-
-
- Sets the shim of SignedInfo.set_SignatureMethod(String value)
-
-
- Sets the shim of SignedInfo.get_SyncRoot()
-
-
-
diff --git a/Kentor.AuthServices.VSPremium.Tests/Kentor.AuthServices.VSPremium.Tests.csproj b/Kentor.AuthServices.VSPremium.Tests/Kentor.AuthServices.VSPremium.Tests.csproj
deleted file mode 100644
index 122e6906e..000000000
--- a/Kentor.AuthServices.VSPremium.Tests/Kentor.AuthServices.VSPremium.Tests.csproj
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {5E7D63E4-B661-4D9A-929A-9E4EF9DE515C}
- Library
- Properties
- Kentor.AuthServices.VSPremium.Tests
- Kentor.AuthServices.VSPremium.Tests
- v4.5
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
- UnitTest
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- False
- ..\packages\FluentAssertions.3.2.1\lib\net45\FluentAssertions.dll
-
-
- ..\packages\FluentAssertions.3.2.1\lib\net45\FluentAssertions.Core.dll
-
-
- False
- ..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll
-
-
- ..\packages\Microsoft.Owin.Host.HttpListener.3.0.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll
-
-
- ..\packages\Microsoft.Owin.Hosting.3.0.0\lib\net45\Microsoft.Owin.Hosting.dll
-
-
-
- True
- ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
-
-
- False
- ..\packages\NSubstitute.1.7.2.0\lib\NET45\NSubstitute.dll
-
-
- False
- ..\packages\Owin.1.0\lib\net40\Owin.dll
-
-
-
-
- FakesAssemblies\System.IdentityModel.Services.4.0.0.0.Fakes.dll
-
-
-
- FakesAssemblies\System.Security.4.0.0.0.Fakes.dll
-
-
-
- False
- ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll
-
-
- False
- ..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll
-
-
- False
- ..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll
-
-
- False
- ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll
-
-
- False
- ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll
-
-
- False
- ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- MetadataServer.cs
-
-
-
-
-
-
- {7d32f0a3-cec8-4dc6-a096-5905ea9c3770}
- Kentor.AuthServices.Mvc
-
-
- {45e0ac77-5bc6-4926-ad1a-7108a46ecb10}
- Kentor.AuthServices.TestHelpers
-
-
- {93ba675e-a159-4701-b68b-c4b81015c556}
- Kentor.AuthServices
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Kentor.AuthServices.VSPremium.Tests/Properties/AssemblyInfo.cs b/Kentor.AuthServices.VSPremium.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index a1d099f36..000000000
--- a/Kentor.AuthServices.VSPremium.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -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("Kentor.AuthServices.VSPremium.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Kentor.AuthServices.VSPremium.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
-[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("aa124401-288b-4392-a93c-9e986293cdd2")]
-
-// 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Kentor.AuthServices.VSPremium.Tests/app.config b/Kentor.AuthServices.VSPremium.Tests/app.config
deleted file mode 100644
index f74704adc..000000000
--- a/Kentor.AuthServices.VSPremium.Tests/app.config
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Kentor.AuthServices.VSPremium.Tests/packages.config b/Kentor.AuthServices.VSPremium.Tests/packages.config
deleted file mode 100644
index ddbaa8cbc..000000000
--- a/Kentor.AuthServices.VSPremium.Tests/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Kentor.AuthServices.sln b/Kentor.AuthServices.sln
index b2573a1d8..36b618fb3 100644
--- a/Kentor.AuthServices.sln
+++ b/Kentor.AuthServices.sln
@@ -44,8 +44,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleMvcApplication", "Sam
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentor.AuthServices.StubIdp", "Kentor.AuthServices.StubIdp\Kentor.AuthServices.StubIdp.csproj", "{7B60747D-6337-4424-ACB5-7D580EC1E1A1}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentor.AuthServices.VSPremium.Tests", "Kentor.AuthServices.VSPremium.Tests\Kentor.AuthServices.VSPremium.Tests.csproj", "{5E7D63E4-B661-4D9A-929A-9E4EF9DE515C}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentor.AuthServices.TestHelpers", "Kentor.AuthServices.TestHelpers\Kentor.AuthServices.TestHelpers.csproj", "{45E0AC77-5BC6-4926-AD1A-7108A46ECB10}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kentor.AuthServices.Owin", "Kentor.AuthServices.Owin\Kentor.AuthServices.Owin.csproj", "{FA1E7723-124C-4D2D-A731-E16400B0073B}"
@@ -81,10 +79,6 @@ Global
{7B60747D-6337-4424-ACB5-7D580EC1E1A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B60747D-6337-4424-ACB5-7D580EC1E1A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B60747D-6337-4424-ACB5-7D580EC1E1A1}.Release|Any CPU.Build.0 = Release|Any CPU
- {5E7D63E4-B661-4D9A-929A-9E4EF9DE515C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5E7D63E4-B661-4D9A-929A-9E4EF9DE515C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5E7D63E4-B661-4D9A-929A-9E4EF9DE515C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5E7D63E4-B661-4D9A-929A-9E4EF9DE515C}.Release|Any CPU.Build.0 = Release|Any CPU
{45E0AC77-5BC6-4926-AD1A-7108A46ECB10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45E0AC77-5BC6-4926-AD1A-7108A46ECB10}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45E0AC77-5BC6-4926-AD1A-7108A46ECB10}.Release|Any CPU.ActiveCfg = Release|Any CPU