Update test projects to net47 to make them run again

Sustainsys · Sep 26, 2018 · 4901dc5 · 4901dc5
1 parent 5559a97
commit 4901dc5
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 43 deletions.
diff --git a/Tests/HttpModule.Tests/App.config b/Tests/HttpModule.Tests/App.config
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="system.identityModel" type="System.IdentityModel.Configuration.SystemIdentityModelSection, System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-    <section name="sustainsys.saml2" type="Sustainsys.Saml2.Configuration.SustainsysSaml2Section, Sustainsys.Saml2" />
+    <section name="system.identityModel" type="System.IdentityModel.Configuration.SystemIdentityModelSection, System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+    <section name="sustainsys.saml2" type="Sustainsys.Saml2.Configuration.SustainsysSaml2Section, Sustainsys.Saml2"/>
   </configSections>
   <sustainsys.saml2 entityId="https://github.com/SustainsysIT/Saml2">
     <identityProviders>
       <add entityId="https://idp.example.com" signOnUrl="https://idp.example.com/idp" logoutUrl="https://idp.example.com/logout" allowUnsolicitedAuthnResponse="true" binding="HttpRedirect">
-        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx" />
+        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx"/>
         <artifactResolutionServices>
-          <add index="4660" location="http://localhost:13428/ars" />
+          <add index="4660" location="http://localhost:13428/ars"/>
         </artifactResolutionServices>
       </add>
     </identityProviders>
   </sustainsys.saml2>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
diff --git a/Tests/HttpModule.Tests/HttpModule.Tests.csproj b/Tests/HttpModule.Tests/HttpModule.Tests.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sustainsys.Saml2.HttpModule.Tests</RootNamespace>
     <AssemblyName>HttpModule.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -19,6 +19,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Tests/Mvc.Tests/App.config b/Tests/Mvc.Tests/App.config
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="system.identityModel" type="System.IdentityModel.Configuration.SystemIdentityModelSection, System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-    <section name="sustainsys.saml2" type="Sustainsys.Saml2.Configuration.SustainsysSaml2Section, Sustainsys.Saml2" />
+    <section name="system.identityModel" type="System.IdentityModel.Configuration.SystemIdentityModelSection, System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+    <section name="sustainsys.saml2" type="Sustainsys.Saml2.Configuration.SustainsysSaml2Section, Sustainsys.Saml2"/>
   </configSections>
   <sustainsys.saml2 entityId="https://github.com/SustainsysIT/Saml2">
     <serviceCertificates>
-      <add fileName="Sustainsys.Saml2.Tests2.pfx" />
+      <add fileName="Sustainsys.Saml2.Tests2.pfx"/>
     </serviceCertificates>
     <identityProviders>
       <add entityId="https://idp.example.com" signOnUrl="https://idp.example.com/idp" logoutUrl="https://idp.example.com/logout" allowUnsolicitedAuthnResponse="true" binding="HttpRedirect">
-        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx" />
+        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx"/>
         <artifactResolutionServices>
-          <add index="4660" location="http://localhost:13428/ars" />
+          <add index="4660" location="http://localhost:13428/ars"/>
         </artifactResolutionServices>
       </add>
       <add entityId="https://idp2.example.com" signOnUrl="https://idp2.example.com/idp" allowUnsolicitedAuthnResponse="false" binding="HttpRedirect" wantAuthnRequestsSigned="true">
-        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx" />
+        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx"/>
       </add>
       <add entityId="https://idp4.example.com" signOnUrl="https://idp4.example.com/idp" allowUnsolicitedAuthnResponse="false" binding="HttpPost" outboundSigningAlgorithm="sha256" wantAuthnRequestsSigned="true">
-        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx" />
+        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx"/>
       </add>
     </identityProviders>
   </sustainsys.saml2>
   <system.identityModel>
     <identityConfiguration saveBootstrapContext="true">
       <securityTokenHandlers>
         <securityTokenHandlerConfiguration>
-          <audienceUris mode="Never" />
+          <audienceUris mode="Never"/>
         </securityTokenHandlerConfiguration>
       </securityTokenHandlers>
     </identityConfiguration>
   </system.identityModel>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-5.2.2.0" newVersion="5.2.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
diff --git a/Tests/Mvc.Tests/Mvc.Tests.csproj b/Tests/Mvc.Tests/Mvc.Tests.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sustainsys.Saml2.Mvc.Tests</RootNamespace>
     <AssemblyName>Mvc.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
@@ -19,6 +19,7 @@
     <TestProjectType>UnitTest</TestProjectType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Tests/Mvc.Tests/packages.config b/Tests/Mvc.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="4.2.1" targetFramework="net461" />
-  <package id="FluentAssertions" version="5.2.0" targetFramework="net461" />
+  <package id="FluentAssertions" version="5.2.0" targetFramework="net461" requireReinstallation="true" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net461" />
   <package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net461" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net461" />
@@ -23,5 +23,5 @@
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Xml" version="4.4.1" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.4.0" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" requireReinstallation="true" />
 </packages>
diff --git a/Tests/Owin.Tests/App.config b/Tests/Owin.Tests/App.config
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="system.identityModel" type="System.IdentityModel.Configuration.SystemIdentityModelSection, System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-    <section name="system.identityModel.services" type="System.IdentityModel.Services.Configuration.SystemIdentityModelServicesSection, System.IdentityModel.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-    <section name="sustainsys.saml2" type="Sustainsys.Saml2.Configuration.SustainsysSaml2Section, Sustainsys.Saml2" />
+    <section name="system.identityModel" type="System.IdentityModel.Configuration.SystemIdentityModelSection, System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+    <section name="system.identityModel.services" type="System.IdentityModel.Services.Configuration.SystemIdentityModelServicesSection, System.IdentityModel.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+    <section name="sustainsys.saml2" type="Sustainsys.Saml2.Configuration.SustainsysSaml2Section, Sustainsys.Saml2"/>
   </configSections>
   <sustainsys.saml2 entityId="https://github.com/SustainsysIT/Saml2" returnUrl="http://localhost/LoggedIn">
     <serviceCertificates>
-      <add fileName="Sustainsys.Saml2.Tests2.pfx" />
+      <add fileName="Sustainsys.Saml2.Tests2.pfx"/>
     </serviceCertificates>
     <identityProviders>
       <add entityId="https://idp.example.com" signOnUrl="https://idp.example.com/idp" logoutUrl="https://idp.example.com/logout" allowUnsolicitedAuthnResponse="true" binding="HttpRedirect">
-        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx" />
+        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx"/>
         <artifactResolutionServices>
-          <add index="4660" location="http://localhost:13428/ars" />
+          <add index="4660" location="http://localhost:13428/ars"/>
         </artifactResolutionServices>
       </add>
       <add entityId="https://idp2.example.com" signOnUrl="https://idp2.example.com/idp" allowUnsolicitedAuthnResponse="false" binding="HttpRedirect" wantAuthnRequestsSigned="true">
-        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx" />
+        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx"/>
       </add>
       <add entityId="https://idp4.example.com" signOnUrl="https://idp4.example.com/idp" allowUnsolicitedAuthnResponse="false" binding="HttpPost" outboundSigningAlgorithm="sha256" wantAuthnRequestsSigned="true">
-        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx" />
+        <signingCertificate fileName="Sustainsys.Saml2.Tests.pfx"/>
       </add>
     </identityProviders>
     <federations>
-      <add metadataLocation="federation.xml" allowUnsolicitedAuthnResponse="true" />
+      <add metadataLocation="federation.xml" allowUnsolicitedAuthnResponse="true"/>
     </federations>
   </sustainsys.saml2>
   <system.identityModel>
     <identityConfiguration saveBootstrapContext="true">
       <securityTokenHandlers>
         <securityTokenHandlerConfiguration>
-          <audienceUris mode="Never" />
+          <audienceUris mode="Never"/>
         </securityTokenHandlerConfiguration>
       </securityTokenHandlers>
     </identityConfiguration>
   </system.identityModel>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
diff --git a/Tests/Owin.Tests/Owin.Tests.csproj b/Tests/Owin.Tests/Owin.Tests.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sustainsys.Saml2.Owin.Tests</RootNamespace>
     <AssemblyName>Owin.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>

diff --git a/Tests/Owin.Tests/packages.config b/Tests/Owin.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="4.2.1" targetFramework="net462" />
-  <package id="FluentAssertions" version="5.2.0" targetFramework="net462" />
+  <package id="FluentAssertions" version="5.2.0" targetFramework="net462" requireReinstallation="true" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.1" targetFramework="net462" />
   <package id="Microsoft.Extensions.Caching.Memory" version="2.0.1" targetFramework="net462" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net462" />
@@ -22,5 +22,5 @@
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.Xml" version="4.4.1" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.4.0" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.4.0" targetFramework="net462" requireReinstallation="true" />
 </packages>