Skip to content

Commit dcab4ba

Browse files
ADefWebserverADefWebserver
committed
Updated to .Net 6
1 parent b6d389c commit dcab4ba

37 files changed

+820
-812
lines changed

‎.config/dotnet-tools.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22
"version": 1,
33
"isRoot": true,
44
"tools": {
5+
"microsoft.dotnet-msidentity": {
6+
"version": "1.0.0",
7+
"commands": [
8+
"dotnet-msidentity"
9+
]
10+
},
511
"dotnet-ef": {
6-
"version": "3.1.7",
12+
"version": "6.0.0",
713
"commands": [
814
"dotnet-ef"
915
]

‎.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[*.cs]
2+
3+
# CS8600: Converting null literal or possible null value to non-nullable type.
4+
dotnet_diagnostic.CS8600.severity = none

‎App.razor

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
2-
<CascadingAuthenticationState>
3-
<Router AppAssembly="@typeof(Program).Assembly">
1+
<CascadingAuthenticationState>
2+
<Router AppAssembly="@typeof(App).Assembly">
43
<Found Context="routeData">
54
<AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
5+
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
66
</Found>
77
<NotFound>
8+
<PageTitle>Not found</PageTitle>
89
<LayoutView Layout="@typeof(MainLayout)">
9-
<p>Sorry, there's nothing at this address.</p>
10+
<p role="alert">Sorry, there's nothing at this address.</p>
1011
</LayoutView>
1112
</NotFound>
1213
</Router>

‎BlazorSimpleSurvey.csproj

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
5-
<UserSecretsId>aspnet-BlazorSimpleSurvey-B0F344E2-7F38-4C06-9C2F-57F33F3073F6</UserSecretsId>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<UserSecretsId>aspnet-BlazorSimpleSurvey-3E69748D-FFF9-494F-BA27-26E025C276E5</UserSecretsId>
8+
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
69
</PropertyGroup>
710

811
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
10-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
11-
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
12-
<PackageReference Include="Microsoft.Graph.Beta" Version="0.29.0-preview" />
13-
<PackageReference Include="Microsoft.Identity.Web" Version="1.17.0" />
14-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="1.17.0" />
15-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
16-
<PackageReference Include="Radzen.Blazor" Version="3.10.1" />
17-
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="5.2.13" />
12+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" NoWarn="NU1605" />
13+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" NoWarn="NU1605" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
15+
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
16+
<PackageReference Include="Microsoft.Graph.Beta" Version="0.29.0-preview" />
17+
<PackageReference Include="Microsoft.Identity.Web" Version="1.20.0" />
18+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="1.20.0" />
19+
<PackageReference Include="Radzen.Blazor" Version="3.12.0" />
20+
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.13.0" />
1821
</ItemGroup>
1922

2023
</Project>

‎BlazorSimpleSurvey.sln

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30413.136
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSimpleSurvey", "BlazorSimpleSurvey.csproj", "{D1A305D4-4F3D-4C4D-BCC5-DA5C8BB5A954}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorSimpleSurvey", "BlazorSimpleSurvey.csproj", "{E6A8476C-F118-49CA-BEA5-31DE4D5FB00B}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{56FF7749-FB5E-4EBC-A40E-3F8B5149B6BB}"
79
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Any CPU = Debug|Any CPU
1113
Release|Any CPU = Release|Any CPU
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{D1A305D4-4F3D-4C4D-BCC5-DA5C8BB5A954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{D1A305D4-4F3D-4C4D-BCC5-DA5C8BB5A954}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{D1A305D4-4F3D-4C4D-BCC5-DA5C8BB5A954}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{D1A305D4-4F3D-4C4D-BCC5-DA5C8BB5A954}.Release|Any CPU.Build.0 = Release|Any CPU
16+
{E6A8476C-F118-49CA-BEA5-31DE4D5FB00B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{E6A8476C-F118-49CA-BEA5-31DE4D5FB00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{E6A8476C-F118-49CA-BEA5-31DE4D5FB00B}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{E6A8476C-F118-49CA-BEA5-31DE4D5FB00B}.Release|Any CPU.Build.0 = Release|Any CPU
1820
EndGlobalSection
1921
GlobalSection(SolutionProperties) = preSolution
2022
HideSolutionNode = FALSE
2123
EndGlobalSection
2224
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {9E1CD0BC-4720-443F-A248-ABB69363042A}
25+
SolutionGuid = {8F5F5C3E-AEBF-4B34-B6B8-E66BFAD97128}
2426
EndGlobalSection
2527
EndGlobal

‎BlazorSimpleSurveyLogo_Large.png

-202 KB
Binary file not shown.

‎Data/DTOSurvey.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,35 @@ namespace BlazorSimpleSurvey.Data
88
public class DTOSurvey
99
{
1010
public int Id { get; set; }
11-
public string SurveyName { get; set; }
11+
public string? SurveyName { get; set; }
1212
public DateTime DateCreated { get; set; }
1313
public DateTime? DateUpdated { get; set; }
1414
public int UserId { get; set; }
15-
public List<DTOSurveyItem> SurveyItem { get; set; }
15+
public List<DTOSurveyItem>? SurveyItem { get; set; }
1616
}
1717
public class DTOSurveyItem
1818
{
1919
public int Id { get; set; }
20-
public string ItemLabel { get; set; }
21-
public string ItemType { get; set; }
22-
public string ItemValue { get; set; }
20+
public string? ItemLabel { get; set; }
21+
public string? ItemType { get; set; }
22+
public string? ItemValue { get; set; }
2323
public int Position { get; set; }
2424
public int Required { get; set; }
2525
public int? SurveyChoiceId { get; set; }
26-
public string AnswerValueString { get; set; }
27-
public IEnumerable<string> AnswerValueList { get; set; }
26+
public string? AnswerValueString { get; set; }
27+
public IEnumerable<string>? AnswerValueList { get; set; }
2828
public DateTime? AnswerValueDateTime { get; set; }
29-
public List<DTOSurveyItemOption> SurveyItemOption { get; set; }
30-
public List<AnswerResponse> AnswerResponses { get; set; }
29+
public List<DTOSurveyItemOption>? SurveyItemOption { get; set; }
30+
public List<AnswerResponse>? AnswerResponses { get; set; }
3131
}
3232
public partial class DTOSurveyItemOption
3333
{
3434
public int Id { get; set; }
35-
public string OptionLabel { get; set; }
35+
public string? OptionLabel { get; set; }
3636
}
3737
public class AnswerResponse
3838
{
39-
public string OptionLabel { get; set; }
39+
public string? OptionLabel { get; set; }
4040
public double Responses { get; set; }
4141
}
4242
}

‎Data/SimpleSurveyService.cs

Lines changed: 58 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public async Task<List<Survey>> GetAllSurveysAsync()
4646
}
4747
#endregion
4848

49-
#region public Task<Survey> GetSurvey(int Id)
50-
public Task<Survey> GetSurvey(int Id)
49+
#region public Task<Survey?> GetSurvey(int Id)
50+
public Task<Survey?> GetSurvey(int Id)
5151
{
5252
return Task.FromResult(_context.Survey
5353
.Include(x => x.SurveyItem)
@@ -82,16 +82,19 @@ public Task<Survey> CreateSurveyAsync(Survey NewSurvey)
8282
}
8383
#endregion
8484

85-
#region public Task<Survey> UpdateSurveyAsync(Survey objExistingSurvey)
86-
public Task<Survey> UpdateSurveyAsync(Survey objExistingSurvey)
85+
#region public Task<Survey?> UpdateSurveyAsync(Survey objExistingSurvey)
86+
public Task<Survey?> UpdateSurveyAsync(Survey objExistingSurvey)
8787
{
8888
try
8989
{
9090
var ExistingSurvey = _context.Survey
9191
.Where(x => x.Id == objExistingSurvey.Id)
9292
.FirstOrDefault();
9393

94-
ExistingSurvey.SurveyName = objExistingSurvey.SurveyName;
94+
if (ExistingSurvey != null)
95+
{
96+
ExistingSurvey.SurveyName = objExistingSurvey.SurveyName;
97+
}
9598

9699
_context.SaveChanges();
97100

@@ -140,8 +143,8 @@ public async Task<List<SurveyItem>> GetAllSurveyItemsAsync(int SurveyId)
140143
}
141144
#endregion
142145

143-
#region public Task<SurveyItem> GetSurveyItemAsync(int SurveyItemId)
144-
public Task<SurveyItem> GetSurveyItemAsync(int SurveyItemId)
146+
#region public Task<SurveyItem?> GetSurveyItemAsync(int SurveyItemId)
147+
public Task<SurveyItem?> GetSurveyItemAsync(int SurveyItemId)
145148
{
146149
return Task.FromResult(_context.SurveyItem
147150
.Where(x => x.Id == SurveyItemId)
@@ -198,22 +201,25 @@ public Task<SurveyItem> CreateSurveyItemAsync(SurveyItem NewSurveyItem)
198201
}
199202
#endregion
200203

201-
#region public Task<SurveyItem> UpdateSurveyItemAsync(SurveyItem objExistingSurveyItem)
202-
public Task<SurveyItem> UpdateSurveyItemAsync(SurveyItem objExistingSurveyItem)
204+
#region public Task<SurveyItem?> UpdateSurveyItemAsync(SurveyItem objExistingSurveyItem)
205+
public Task<SurveyItem?> UpdateSurveyItemAsync(SurveyItem objExistingSurveyItem)
203206
{
204207
try
205208
{
206209
var ExistingSurveyItem = _context.SurveyItem
207-
.Where(x => x.Id == objExistingSurveyItem.Id)
208-
.Include(x => x.SurveyItemOption)
209-
.FirstOrDefault();
210+
.Where(x => x.Id == objExistingSurveyItem.Id)
211+
.Include(x => x.SurveyItemOption)
212+
.FirstOrDefault();
210213

211-
ExistingSurveyItem.ItemLabel = objExistingSurveyItem.ItemLabel;
212-
ExistingSurveyItem.ItemType = objExistingSurveyItem.ItemType;
213-
ExistingSurveyItem.ItemValue = objExistingSurveyItem.ItemValue;
214-
ExistingSurveyItem.Required = objExistingSurveyItem.Required;
214+
if (ExistingSurveyItem != null)
215+
{
216+
ExistingSurveyItem.ItemLabel = objExistingSurveyItem.ItemLabel;
217+
ExistingSurveyItem.ItemType = objExistingSurveyItem.ItemType;
218+
ExistingSurveyItem.ItemValue = objExistingSurveyItem.ItemValue;
219+
ExistingSurveyItem.Required = objExistingSurveyItem.Required;
215220

216-
ExistingSurveyItem.SurveyItemOption = objExistingSurveyItem.SurveyItemOption;
221+
ExistingSurveyItem.SurveyItemOption = objExistingSurveyItem.SurveyItemOption;
222+
}
217223

218224
_context.SaveChanges();
219225

@@ -256,49 +262,52 @@ public Task<bool> CreateSurveyAnswersAsync(DTOSurvey paramDTOSurvey)
256262
{
257263
try
258264
{
259-
List<SurveyAnswer> SurveyAnswers = new List<SurveyAnswer>();
265+
List<SurveyAnswer> SurveyAnswers = new List<SurveyAnswer>();
260266

261-
foreach (var SurveyItem in paramDTOSurvey.SurveyItem)
267+
if (paramDTOSurvey.SurveyItem != null)
262268
{
263-
// Delete possible existing answer
264-
var ExistingAnswers = _context.SurveyAnswer
265-
.Where(x => x.SurveyItemId == SurveyItem.Id)
266-
.Where(x => x.UserId == paramDTOSurvey.UserId)
267-
.ToList();
268-
269-
if(ExistingAnswers != null)
269+
foreach (var SurveyItem in paramDTOSurvey.SurveyItem)
270270
{
271-
_context.SurveyAnswer.RemoveRange(ExistingAnswers);
272-
_context.SaveChanges();
273-
}
271+
// Delete possible existing answer
272+
var ExistingAnswers = _context.SurveyAnswer
273+
.Where(x => x.SurveyItemId == SurveyItem.Id)
274+
.Where(x => x.UserId == paramDTOSurvey.UserId)
275+
.ToList();
276+
277+
if (ExistingAnswers != null)
278+
{
279+
_context.SurveyAnswer.RemoveRange(ExistingAnswers);
280+
_context.SaveChanges();
281+
}
274282

275-
// Save Answer
283+
// Save Answer
276284

277-
if (SurveyItem.ItemType != "Multi-Select Dropdown")
278-
{
279-
SurveyAnswer NewSurveyAnswer = new SurveyAnswer();
285+
if (SurveyItem.ItemType != "Multi-Select Dropdown")
286+
{
287+
SurveyAnswer NewSurveyAnswer = new SurveyAnswer();
280288

281-
NewSurveyAnswer.AnswerValue = SurveyItem.AnswerValueString;
282-
NewSurveyAnswer.AnswerValueDateTime = SurveyItem.AnswerValueDateTime;
283-
NewSurveyAnswer.SurveyItemId = SurveyItem.Id;
284-
NewSurveyAnswer.UserId = paramDTOSurvey.UserId;
289+
NewSurveyAnswer.AnswerValue = SurveyItem.AnswerValueString;
290+
NewSurveyAnswer.AnswerValueDateTime = SurveyItem.AnswerValueDateTime;
291+
NewSurveyAnswer.SurveyItemId = SurveyItem.Id;
292+
NewSurveyAnswer.UserId = paramDTOSurvey.UserId;
285293

286-
_context.SurveyAnswer.Add(NewSurveyAnswer);
287-
_context.SaveChanges();
288-
}
294+
_context.SurveyAnswer.Add(NewSurveyAnswer);
295+
_context.SaveChanges();
296+
}
289297

290-
if (SurveyItem.AnswerValueList != null)
291-
{
292-
foreach (var item in SurveyItem.AnswerValueList)
298+
if (SurveyItem.AnswerValueList != null)
293299
{
294-
SurveyAnswer NewSurveyAnswerValueList = new SurveyAnswer();
300+
foreach (var item in SurveyItem.AnswerValueList)
301+
{
302+
SurveyAnswer NewSurveyAnswerValueList = new SurveyAnswer();
295303

296-
NewSurveyAnswerValueList.AnswerValue = item;
297-
NewSurveyAnswerValueList.SurveyItemId = SurveyItem.Id;
298-
NewSurveyAnswerValueList.UserId = paramDTOSurvey.UserId;
304+
NewSurveyAnswerValueList.AnswerValue = item;
305+
NewSurveyAnswerValueList.SurveyItemId = SurveyItem.Id;
306+
NewSurveyAnswerValueList.UserId = paramDTOSurvey.UserId;
299307

300-
_context.SurveyAnswer.Add(NewSurveyAnswerValueList);
301-
_context.SaveChanges();
308+
_context.SurveyAnswer.Add(NewSurveyAnswerValueList);
309+
_context.SaveChanges();
310+
}
302311
}
303312
}
304313
}

0 commit comments

Comments
 (0)