Skip to content
This repository was archived by the owner on Oct 19, 2022. It is now read-only.

Commit 8c3db18

Browse files
nbarbettininbarbettini
committed
Update for 4.0 release
1 parent 867b29e commit 8c3db18

File tree

5 files changed

+55
-33
lines changed

5 files changed

+55
-33
lines changed

‎src/Stormpath.AspNet/Stormpath.AspNet.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>Stormpath middleware for ASP.NET 4.5+. Easily add authentication and authorization to ASP.NET applications.</Description>
55
<Copyright>(c) 2016 Stormpath, Inc.</Copyright>
6-
<VersionPrefix>4.0.0-rc5</VersionPrefix>
6+
<VersionPrefix>4.0.0</VersionPrefix>
77
<Authors>Nate Barbettini</Authors>
88
<TargetFramework>net451</TargetFramework>
99
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -24,8 +24,8 @@
2424
<PackageReference Include="Microsoft.Owin" Version="3.1.0" />
2525
<PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="3.1.0" />
2626
<PackageReference Include="Microsoft.Owin.Security" Version="3.1.0" />
27-
<PackageReference Include="Stormpath.Owin.Middleware" Version="4.0.0-rc5" />
28-
<PackageReference Include="Stormpath.Owin.Views.Precompiled" Version="1.0.0-beta5" />
27+
<PackageReference Include="Stormpath.Owin.Middleware" Version="4.0.0" />
28+
<PackageReference Include="Stormpath.Owin.Views.Precompiled" Version="1.0.0" />
2929
</ItemGroup>
3030

3131
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

‎test/Stormpath.AspNet.TckHarness/Startup.Auth.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ public void ConfigureAuth(IAppBuilder app)
1515

1616
var stormpathConfiguration = new StormpathConfiguration
1717
{
18+
// Replace with your Okta Base URL:
1819
Org = "https://dev-123456.oktapreview.com",
20+
// Replace with your Okta API token:
1921
ApiToken = "your_api_token",
2022
Application = new OktaApplicationConfiguration
2123
{
24+
// Replace with your Okta migrated Application ID:
2225
Id = "abcd12345"
2326
},
2427
Web = new WebConfiguration
2528
{
29+
ServerUri = "http://localhost:8080",
2630
ChangePassword = new WebChangePasswordRouteConfiguration
2731
{
2832
Enabled = true

‎test/Stormpath.AspNet.TckHarness/Stormpath.AspNet.TckHarness.csproj‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@
4545
<WarningLevel>4</WarningLevel>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<Reference Include="FlexibleConfiguration, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\FlexibleConfiguration.1.2.0\lib\net45\FlexibleConfiguration.dll</HintPath>
50-
<Private>True</Private>
48+
<Reference Include="FlexibleConfiguration, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\FlexibleConfiguration.1.2.1\lib\net45\FlexibleConfiguration.dll</HintPath>
5150
</Reference>
5251
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5352
<HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -57,17 +56,17 @@
5756
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
5857
<HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.1.1\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
5958
</Reference>
60-
<Reference Include="Microsoft.IdentityModel.Logging, Version=1.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<HintPath>..\..\packages\Microsoft.IdentityModel.Logging.1.1.3\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
59+
<Reference Include="Microsoft.IdentityModel.Logging, Version=1.1.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<HintPath>..\..\packages\Microsoft.IdentityModel.Logging.1.1.4\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
6261
</Reference>
6362
<Reference Include="Microsoft.IdentityModel.Protocols, Version=2.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6463
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.2.1.3\lib\net451\Microsoft.IdentityModel.Protocols.dll</HintPath>
6564
</Reference>
6665
<Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=2.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6766
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.2.1.3\lib\net451\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
6867
</Reference>
69-
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.1.3\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
68+
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.1.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69+
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.1.4\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
7170
</Reference>
7271
<Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7372
<HintPath>..\..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -98,25 +97,31 @@
9897
<Private>True</Private>
9998
</Reference>
10099
<Reference Include="Stormpath.Configuration, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
101-
<HintPath>..\..\packages\Stormpath.Configuration.7.0.0-beta3\lib\net45\Stormpath.Configuration.dll</HintPath>
100+
<HintPath>..\..\packages\Stormpath.Configuration.7.0.0\lib\net45\Stormpath.Configuration.dll</HintPath>
102101
</Reference>
103102
<Reference Include="Stormpath.Configuration.Abstractions, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
104-
<HintPath>..\..\packages\Stormpath.Configuration.Abstractions.7.0.0-beta3\lib\net45\Stormpath.Configuration.Abstractions.dll</HintPath>
103+
<HintPath>..\..\packages\Stormpath.Configuration.Abstractions.7.0.0\lib\net45\Stormpath.Configuration.Abstractions.dll</HintPath>
105104
</Reference>
106105
<Reference Include="Stormpath.Owin.Abstractions, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
107-
<HintPath>..\..\packages\Stormpath.Owin.Abstractions.2.0.0-beta1\lib\net45\Stormpath.Owin.Abstractions.dll</HintPath>
106+
<HintPath>..\..\packages\Stormpath.Owin.Abstractions.2.0.0\lib\net45\Stormpath.Owin.Abstractions.dll</HintPath>
108107
</Reference>
109108
<Reference Include="Stormpath.Owin.Middleware, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\Stormpath.Owin.Middleware.4.0.0-rc1\lib\net451\Stormpath.Owin.Middleware.dll</HintPath>
109+
<HintPath>..\..\packages\Stormpath.Owin.Middleware.4.0.0\lib\net451\Stormpath.Owin.Middleware.dll</HintPath>
111110
</Reference>
112111
<Reference Include="Stormpath.Owin.Views.Precompiled, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
113-
<HintPath>..\..\packages\Stormpath.Owin.Views.Precompiled.1.0.0-beta1\lib\net45\Stormpath.Owin.Views.Precompiled.dll</HintPath>
112+
<HintPath>..\..\packages\Stormpath.Owin.Views.Precompiled.1.0.0\lib\net45\Stormpath.Owin.Views.Precompiled.dll</HintPath>
114113
</Reference>
115114
<Reference Include="System" />
116115
<Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
117116
<HintPath>..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
118117
</Reference>
119118
<Reference Include="System.ComponentModel.Composition" />
119+
<Reference Include="System.ComponentModel.Primitives, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
120+
<HintPath>..\..\packages\System.ComponentModel.Primitives.4.3.0\lib\net45\System.ComponentModel.Primitives.dll</HintPath>
121+
</Reference>
122+
<Reference Include="System.ComponentModel.TypeConverter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
123+
<HintPath>..\..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\net45\System.ComponentModel.TypeConverter.dll</HintPath>
124+
</Reference>
120125
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121126
<HintPath>..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
122127
</Reference>
@@ -129,8 +134,8 @@
129134
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
130135
<HintPath>..\..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
131136
</Reference>
132-
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133-
<HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.1.3\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
137+
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.1.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
138+
<HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.1.4\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
134139
</Reference>
135140
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
136141
<HintPath>..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
@@ -167,8 +172,8 @@
167172
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
168173
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
169174
</Reference>
170-
<Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
171-
<HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
175+
<Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
176+
<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
172177
</Reference>
173178
<Reference Include="System.Web.DynamicData" />
174179
<Reference Include="System.Web.Entity" />
@@ -231,9 +236,8 @@
231236
<Private>True</Private>
232237
<HintPath>..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
233238
</Reference>
234-
<Reference Include="YamlDotNet, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
235-
<HintPath>..\..\packages\YamlDotNet.3.9.0\lib\net35\YamlDotNet.dll</HintPath>
236-
<Private>True</Private>
239+
<Reference Include="YamlDotNet, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
240+
<HintPath>..\..\packages\YamlDotNet.4.2.0\lib\net35\YamlDotNet.dll</HintPath>
237241
</Reference>
238242
</ItemGroup>
239243
<ItemGroup>

‎test/Stormpath.AspNet.TckHarness/Web.config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@
7272
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
7373
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
7474
</dependentAssembly>
75+
<dependentAssembly>
76+
<assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
77+
<bindingRedirect oldVersion="0.0.0.0-1.1.4.0" newVersion="1.1.4.0" />
78+
</dependentAssembly>
79+
<dependentAssembly>
80+
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
81+
<bindingRedirect oldVersion="0.0.0.0-5.1.4.0" newVersion="5.1.4.0" />
82+
</dependentAssembly>
83+
<dependentAssembly>
84+
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
85+
<bindingRedirect oldVersion="0.0.0.0-5.1.4.0" newVersion="5.1.4.0" />
86+
</dependentAssembly>
7587
</assemblyBinding>
7688
</runtime>
7789
<system.codedom>

‎test/Stormpath.AspNet.TckHarness/packages.config‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Antlr" version="3.4.1.9004" targetFramework="net451" />
44
<package id="bootstrap" version="3.0.0" targetFramework="net451" />
5-
<package id="FlexibleConfiguration" version="1.2.0" targetFramework="net461" />
5+
<package id="FlexibleConfiguration" version="1.2.1" targetFramework="net461" />
66
<package id="jQuery" version="1.10.2" targetFramework="net451" />
77
<package id="jQuery.Validation" version="1.11.1" targetFramework="net451" />
88
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net451" />
@@ -16,10 +16,10 @@
1616
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net451" />
1717
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net451" />
1818
<package id="Microsoft.Extensions.Logging.Abstractions" version="1.1.1" targetFramework="net461" />
19-
<package id="Microsoft.IdentityModel.Logging" version="1.1.3" targetFramework="net461" />
19+
<package id="Microsoft.IdentityModel.Logging" version="1.1.4" targetFramework="net461" />
2020
<package id="Microsoft.IdentityModel.Protocols" version="2.1.3" targetFramework="net461" />
2121
<package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="2.1.3" targetFramework="net461" />
22-
<package id="Microsoft.IdentityModel.Tokens" version="5.1.3" targetFramework="net461" />
22+
<package id="Microsoft.IdentityModel.Tokens" version="5.1.4" targetFramework="net461" />
2323
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net451" />
2424
<package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net451" developmentDependency="true" />
2525
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net461" />
@@ -35,22 +35,24 @@
3535
<package id="Polyglot" version="1.2.0" targetFramework="net461" />
3636
<package id="Respond" version="1.2.0" targetFramework="net451" />
3737
<package id="RestSharp" version="105.2.3" targetFramework="net461" />
38-
<package id="Stormpath.Configuration" version="7.0.0-beta3" targetFramework="net461" />
39-
<package id="Stormpath.Configuration.Abstractions" version="7.0.0-beta3" targetFramework="net461" />
40-
<package id="Stormpath.Owin.Abstractions" version="2.0.0-beta1" targetFramework="net461" />
41-
<package id="Stormpath.Owin.Middleware" version="4.0.0-rc1" targetFramework="net461" />
42-
<package id="Stormpath.Owin.Views.Precompiled" version="1.0.0-beta1" targetFramework="net461" />
38+
<package id="Stormpath.Configuration" version="7.0.0" targetFramework="net461" />
39+
<package id="Stormpath.Configuration.Abstractions" version="7.0.0" targetFramework="net461" />
40+
<package id="Stormpath.Owin.Abstractions" version="2.0.0" targetFramework="net461" />
41+
<package id="Stormpath.Owin.Middleware" version="4.0.0" targetFramework="net461" />
42+
<package id="Stormpath.Owin.Views.Precompiled" version="1.0.0" targetFramework="net461" />
4343
<package id="System.AppContext" version="4.3.0" targetFramework="net461" />
4444
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
4545
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
46+
<package id="System.ComponentModel.Primitives" version="4.3.0" targetFramework="net461" />
47+
<package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="net461" />
4648
<package id="System.Console" version="4.3.0" targetFramework="net461" />
4749
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
4850
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net461" />
4951
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
5052
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net461" />
5153
<package id="System.Globalization" version="4.3.0" targetFramework="net461" />
5254
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net461" />
53-
<package id="System.IdentityModel.Tokens.Jwt" version="5.1.3" targetFramework="net461" />
55+
<package id="System.IdentityModel.Tokens.Jwt" version="5.1.4" targetFramework="net461" />
5456
<package id="System.IO" version="4.3.0" targetFramework="net461" />
5557
<package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
5658
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net461" />
@@ -82,9 +84,9 @@
8284
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
8385
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
8486
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
85-
<package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
87+
<package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
8688
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
8789
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
8890
<package id="WebGrease" version="1.5.2" targetFramework="net451" />
89-
<package id="YamlDotNet" version="3.9.0" targetFramework="net461" />
91+
<package id="YamlDotNet" version="4.2.0" targetFramework="net461" />
9092
</packages>

0 commit comments

Comments
 (0)