Skip to content

Commit 2371f94

Browse files
StuartFergusonStuartFerguson
committed
Fix broken UI Tests
1 parent 453afee commit 2371f94

8 files changed

Lines changed: 26 additions & 166 deletions

File tree

‎SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<PackageReference Include="Duende.IdentityServer" Version="6.2.0-rc.1" />
99
<PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="6.2.0-rc.1" />
1010
<PackageReference Include="Duende.IdentityServer.Storage" Version="6.2.0-rc.1" />
11-
<PackageReference Include="MessagingService.Client" Version="1.1.5-build9" />
11+
<PackageReference Include="MessagingService.Client" Version="2022.12.1" />
1212
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
1313
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="7.0.0" />
15-
<PackageReference Include="Shared" Version="1.5.1" />
15+
<PackageReference Include="Shared" Version="2022.12.2" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎SecurityService.Client/SecurityService.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ClientProxyBase" Version="1.5.1" />
9+
<PackageReference Include="ClientProxyBase" Version="2022.12.2" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎SecurityService.Database/SecurityService.Database.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
2323
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0-alpha.1" />
24-
<PackageReference Include="Shared" Version="1.5.1" />
24+
<PackageReference Include="Shared" Version="2022.12.2" />
2525
</ItemGroup>
2626
<ItemGroup>
2727
<Folder Include="DbContexts\" />

‎SecurityService.IntegrationTests/SecurityService.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
1212

13-
<PackageReference Include="Shared.IntegrationTesting" Version="1.5.1" />
13+
<PackageReference Include="Shared.IntegrationTesting" Version="2022.12.2" />
1414
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
1515
<PackageReference Include="xunit" Version="2.4.2" />
1616
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />

‎SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<PackageReference Include="Selenium.Support" Version="4.6.0" />
1616
<PackageReference Include="Selenium.WebDriver" Version="4.6.0" />
17-
<PackageReference Include="Shared.IntegrationTesting" Version="1.5.1" />
17+
<PackageReference Include="Shared.IntegrationTesting" Version="2022.12.2" />
1818
<PackageReference Include="xunit" Version="2.4.2" />
1919
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
2020
<PrivateAssets>all</PrivateAssets>

‎SecurityService.UserInterface/Pages/Account/ChangePassword/Index.cshtml.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Duende.IdentityServer.Events;
2-
using Duende.IdentityServer.Models;
2+
using
3+
Duende.IdentityServer.Models;
34
using Duende.IdentityServer.Services;
45
using Duende.IdentityServer.Stores;
56
using Microsoft.AspNetCore.Authentication;

‎SecurityService.UserInterface/SecurityService.UserInterface.csproj‎

Lines changed: 12 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1,164 +1,23 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
44
<TargetFramework>net7.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings><DebugType>None</DebugType>
65
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
8+
<DebugType>None</DebugType>
79
</PropertyGroup>
810

9-
<!--<ItemGroup>
10-
<None Remove="Pages\Account\AccessDenied.cshtml" />
11-
<None Remove="Pages\Account\ChangePassword\Index.cshtml" />
12-
<None Remove="Pages\Account\EmailConfirmation\Confirm.cshtml" />
13-
<None Remove="Pages\Account\ForgotPassword\Confirm.cshtml" />
14-
<None Remove="Pages\Account\ForgotPassword\Index.cshtml" />
15-
<None Remove="Pages\Account\Login\Index.cshtml" />
16-
<None Remove="Pages\Account\Logout\Index.cshtml" />
17-
<None Remove="Pages\Account\Logout\LoggedOut.cshtml" />
18-
<None Remove="Pages\Ciba\All.cshtml" />
19-
<None Remove="Pages\Ciba\Consent.cshtml" />
20-
<None Remove="Pages\Ciba\Index.cshtml" />
21-
<None Remove="Pages\Ciba\_ScopeListItem.cshtml" />
22-
<None Remove="Pages\Consent\Index.cshtml" />
23-
<None Remove="Pages\Consent\_ScopeListItem.cshtml" />
24-
<None Remove="Pages\Device\Index.cshtml" />
25-
<None Remove="Pages\Device\Success.cshtml" />
26-
<None Remove="Pages\Device\_ScopeListItem.cshtml" />
27-
<None Remove="Pages\Diagnostics\Index.cshtml" />
28-
<None Remove="Pages\ExternalLogin\Callback.cshtml" />
29-
<None Remove="Pages\ExternalLogin\Challenge.cshtml" />
30-
<None Remove="Pages\Grants\Index.cshtml" />
31-
<None Remove="Pages\Home\Error\Index.cshtml" />
32-
<None Remove="Pages\Index.cshtml" />
33-
<None Remove="Pages\Redirect\Index.cshtml" />
34-
<None Remove="Pages\Shared\_Layout.cshtml" />
35-
<None Remove="Pages\Shared\_Nav.cshtml" />
36-
<None Remove="Pages\Shared\_ValidationSummary.cshtml" />
37-
<None Remove="Pages\_ViewImports.cshtml" />
38-
<None Remove="Pages\_ViewStart.cshtml" />
39-
</ItemGroup>-->
40-
4111
<ItemGroup>
42-
<Content Include="Pages\Account\AccessDenied.cshtml">
43-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
44-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
45-
</Content>
46-
<Content Include="Pages\Account\ChangePassword\Index.cshtml">
47-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
48-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
49-
</Content>
50-
<Content Include="Pages\Account\EmailConfirmation\Confirm.cshtml">
51-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
52-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
53-
</Content>
54-
<Content Include="Pages\Account\ForgotPassword\Confirm.cshtml">
55-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
56-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
57-
</Content>
58-
<Content Include="Pages\Account\ForgotPassword\Index.cshtml">
59-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
60-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
61-
</Content>
62-
<Content Include="Pages\Account\Login\Index.cshtml">
63-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
64-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
65-
</Content>
66-
<Content Include="Pages\Account\Logout\Index.cshtml">
67-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
68-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
69-
</Content>
70-
<Content Include="Pages\Account\Logout\LoggedOut.cshtml">
71-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
72-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
73-
</Content>
74-
<Content Include="Pages\Ciba\All.cshtml">
75-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
76-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
77-
</Content>
78-
<Content Include="Pages\Ciba\Consent.cshtml">
79-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
80-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
81-
</Content>
82-
<Content Include="Pages\Ciba\Index.cshtml">
83-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
84-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
85-
</Content>
86-
<Content Include="Pages\Ciba\_ScopeListItem.cshtml">
87-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
88-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
89-
</Content>
90-
<Content Include="Pages\Consent\Index.cshtml">
91-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
92-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
93-
</Content>
94-
<Content Include="Pages\Consent\_ScopeListItem.cshtml">
95-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
96-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
97-
</Content>
98-
<Content Include="Pages\Device\Index.cshtml">
99-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
100-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
101-
</Content>
102-
<Content Include="Pages\Device\Success.cshtml">
103-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
104-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
105-
</Content>
106-
<Content Include="Pages\Device\_ScopeListItem.cshtml">
107-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
108-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
109-
</Content>
110-
<Content Include="Pages\Diagnostics\Index.cshtml">
111-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
112-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
113-
</Content>
114-
<Content Include="Pages\ExternalLogin\Callback.cshtml">
115-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
116-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
117-
</Content>
118-
<Content Include="Pages\ExternalLogin\Challenge.cshtml">
119-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
120-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
121-
</Content>
122-
<Content Include="Pages\Grants\Index.cshtml">
123-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
124-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
125-
</Content>
126-
<Content Include="Pages\Home\Error\Index.cshtml">
127-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
128-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
129-
</Content>
130-
<Content Include="Pages\Index.cshtml">
131-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
132-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
133-
</Content>
134-
<Content Include="Pages\Redirect\Index.cshtml">
135-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
136-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
137-
</Content>
138-
<Content Include="Pages\Shared\_Layout.cshtml">
139-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
140-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
141-
</Content>
142-
<Content Include="Pages\Shared\_Nav.cshtml">
143-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
144-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
145-
</Content>
146-
<Content Include="Pages\Shared\_ValidationSummary.cshtml">
147-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
148-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
149-
</Content>
150-
<Content Include="Pages\_ViewImports.cshtml">
151-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
152-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
153-
</Content>
154-
<Content Include="Pages\_ViewStart.cshtml">
155-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
156-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
157-
</Content>
12+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
15813
</ItemGroup>
15914

160-
<ItemGroup>
161-
<ProjectReference Include="..\SecurityService.BusinessLogic\SecurityService.BusinessLogic.csproj" />
162-
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="Shared" Version="2022.12.2" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<ProjectReference Include="..\SecurityService.BusinessLogic\SecurityService.BusinessLogic.csproj" />
21+
</ItemGroup>
16322

16423
</Project>

‎SecurityService.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityService.SqlServerMi
3131
EndProject
3232
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecurityService.MySqlMigrations", "SecurityService.MySqlMigrations\SecurityService.MySqlMigrations.csproj", "{701F392A-0D5B-4FDD-8135-DA037ECA7A8F}"
3333
EndProject
34-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecurityService.UserInterface", "SecurityService.UserInterface\SecurityService.UserInterface.csproj", "{E439EDF0-DB5C-4759-93B1-9DBB15FAE2B3}"
34+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecurityService.UserInterface", "SecurityService.UserInterface\SecurityService.UserInterface.csproj", "{DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7}"
3535
EndProject
3636
Global
3737
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -87,10 +87,10 @@ Global
8787
{701F392A-0D5B-4FDD-8135-DA037ECA7A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
8888
{701F392A-0D5B-4FDD-8135-DA037ECA7A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
8989
{701F392A-0D5B-4FDD-8135-DA037ECA7A8F}.Release|Any CPU.Build.0 = Release|Any CPU
90-
{E439EDF0-DB5C-4759-93B1-9DBB15FAE2B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
91-
{E439EDF0-DB5C-4759-93B1-9DBB15FAE2B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
92-
{E439EDF0-DB5C-4759-93B1-9DBB15FAE2B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
93-
{E439EDF0-DB5C-4759-93B1-9DBB15FAE2B3}.Release|Any CPU.Build.0 = Release|Any CPU
90+
{DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
91+
{DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
92+
{DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
93+
{DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7}.Release|Any CPU.Build.0 = Release|Any CPU
9494
EndGlobalSection
9595
GlobalSection(SolutionProperties) = preSolution
9696
HideSolutionNode = FALSE
@@ -108,7 +108,7 @@ Global
108108
{5BAEC61F-39FF-4197-A73A-A8A8B5BDFE86} = {62BD199E-BDB7-4D33-92E4-3FE97D5EBC91}
109109
{06507A50-DFDF-4842-9BA4-F70F194741D7} = {FBA324D4-A2B7-4539-B63E-AF254EA7DA50}
110110
{701F392A-0D5B-4FDD-8135-DA037ECA7A8F} = {FBA324D4-A2B7-4539-B63E-AF254EA7DA50}
111-
{E439EDF0-DB5C-4759-93B1-9DBB15FAE2B3} = {FBA324D4-A2B7-4539-B63E-AF254EA7DA50}
111+
{DA8C3E4B-5ACB-4941-B05F-EC46D1D60CD7} = {FBA324D4-A2B7-4539-B63E-AF254EA7DA50}
112112
EndGlobalSection
113113
GlobalSection(ExtensibilityGlobals) = postSolution
114114
SolutionGuid = {91D97431-DF9A-4A33-860E-27734BFD4496}

0 commit comments

Comments
 (0)