Skip to content

Commit fa17eda

Browse files
author
Vidar Kongsli
committed
Rewrite for IdSrv3 version 2.0.1
1 parent 88068a8 commit fa17eda

11 files changed

+26
-20
lines changed

‎source/IdentityServer3.Localization/GlobalizedLocalizationService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using IdentityServer3.Core.Services;
45
using Thinktecture.IdentityServer.Core.Services.Contrib.Internals;
56

67
namespace Thinktecture.IdentityServer.Core.Services.Contrib

‎source/IdentityServer3.Localization/IdentityServer3.Localization.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36+
<Reference Include="IdentityServer3, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\IdentityServer3.2.0.1\lib\net45\IdentityServer3.dll</HintPath>
38+
<Private>True</Private>
39+
</Reference>
3640
<Reference Include="Owin">
3741
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
3842
</Reference>
@@ -43,10 +47,6 @@
4347
<Reference Include="Microsoft.CSharp" />
4448
<Reference Include="System.Data" />
4549
<Reference Include="System.Xml" />
46-
<Reference Include="Thinktecture.IdentityServer3, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Thinktecture.IdentityServer3.1.4.2\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
48-
<Private>True</Private>
49-
</Reference>
5050
</ItemGroup>
5151
<ItemGroup>
5252
<Compile Include="Constants.cs" />

‎source/IdentityServer3.Localization/Internals/FallbackDecorator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Thinktecture.IdentityServer.Core.Services.Default;
1+
using IdentityServer3.Core.Services;
2+
using IdentityServer3.Core.Services.Default;
23

34
namespace Thinktecture.IdentityServer.Core.Services.Contrib.Internals
45
{

‎source/IdentityServer3.Localization/Internals/LocalizationServiceFactory.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Generic;
22
using System.Globalization;
3-
using Thinktecture.IdentityServer.Core.Services.Default;
3+
using IdentityServer3.Core.Services;
4+
using IdentityServer3.Core.Services.Default;
45

56
namespace Thinktecture.IdentityServer.Core.Services.Contrib.Internals
67
{

‎source/IdentityServer3.Localization/Internals/PirateLocalizationService.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using Thinktecture.IdentityServer.Core.Events;
2-
using Thinktecture.IdentityServer.Core.Resources;
1+
using IdentityServer3.Core.Resources;
2+
using IdentityServer3.Core.Services;
33

44
namespace Thinktecture.IdentityServer.Core.Services.Contrib.Internals
55
{
@@ -10,11 +10,11 @@ public string GetString(string category, string id)
1010
var lowerCased = id;
1111
switch (category)
1212
{
13-
case Core.Constants.LocalizationCategories.Messages:
13+
case IdentityServer3.Core.Constants.LocalizationCategories.Messages:
1414
return PirateMessages.GetString(lowerCased);
15-
case Core.Constants.LocalizationCategories.Events:
15+
case IdentityServer3.Core.Constants.LocalizationCategories.Events:
1616
return PirateEvents.GetString(lowerCased);
17-
case Core.Constants.LocalizationCategories.Scopes:
17+
case IdentityServer3.Core.Constants.LocalizationCategories.Scopes:
1818
return PirateScopes.GetString(lowerCased);
1919
}
2020
return null;

‎source/IdentityServer3.Localization/Internals/ResourceFileLocalizationService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Globalization;
2+
using IdentityServer3.Core.Services;
23
using Thinktecture.IdentityServer.Core.Services.Contrib.Resources;
34

45
namespace Thinktecture.IdentityServer.Core.Services.Contrib.Internals

‎source/IdentityServer3.Localization/LocaleOptions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using IdentityServer3.Core.Services;
2+
13
namespace Thinktecture.IdentityServer.Core.Services.Contrib
24
{
35
public class LocaleOptions

‎source/IdentityServer3.Localization/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="IdentityServer3" version="2.0.1" targetFramework="net45" />
34
<package id="Owin" version="1.0" targetFramework="net45" />
4-
<package id="Thinktecture.IdentityServer3" version="1.4.2" targetFramework="net45" />
55
</packages>

‎source/Unittests/TheService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
using System.Diagnostics;
44
using System.Linq;
55
using FakeItEasy;
6-
using Thinktecture.IdentityServer.Core.Resources;
7-
using Thinktecture.IdentityServer.Core.Services;
6+
using IdentityServer3.Core.Resources;
7+
using IdentityServer3.Core.Services;
88
using Thinktecture.IdentityServer.Core.Services.Contrib;
99
using Xunit;
1010
using Xunit.Sdk;
11-
using IdSrvConstants = Thinktecture.IdentityServer.Core.Constants.LocalizationCategories;
11+
using IdSrvConstants = IdentityServer3.Core.Constants.LocalizationCategories;
1212

1313
namespace Unittests
1414
{

‎source/Unittests/Unittests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
<SpecificVersion>False</SpecificVersion>
3838
<HintPath>..\packages\FakeItEasy.2.0.0-beta007\lib\net40\FakeItEasy.dll</HintPath>
3939
</Reference>
40+
<Reference Include="IdentityServer3, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\IdentityServer3.2.0.1\lib\net45\IdentityServer3.dll</HintPath>
42+
<Private>True</Private>
43+
</Reference>
4044
<Reference Include="Owin">
4145
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
4246
</Reference>
@@ -47,10 +51,6 @@
4751
<Reference Include="Microsoft.CSharp" />
4852
<Reference Include="System.Data" />
4953
<Reference Include="System.Xml" />
50-
<Reference Include="Thinktecture.IdentityServer3, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
51-
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\packages\Thinktecture.IdentityServer3.1.3.0\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
53-
</Reference>
5454
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
5555
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
5656
</Reference>

0 commit comments

Comments
 (0)