Merge pull request #160 from loresoft/develop

deploy latest updates
loresoft · Aug 6, 2023 · 10167d3 · 10167d3
2 parents 7509a4b + b861e54
commit 10167d3
Show file tree

Hide file tree

Showing 48 changed files with 6,411 additions and 7,226 deletions.
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/build.ps1 b/build.ps1
diff --git a/database/InstructorIQ/InstructorIQ.sqlproj b/database/InstructorIQ/InstructorIQ.sqlproj
@@ -17,7 +17,7 @@
     <ModelCollation>1033, CI</ModelCollation>
     <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
     <DeployToDatabase>True</DeployToDatabase>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetLanguage>CS</TargetLanguage>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <SqlServerVerification>False</SqlServerVerification>
@@ -29,6 +29,7 @@
     <ChangeTrackingRetentionUnit>Hours</ChangeTrackingRetentionUnit>
     <EnableFullTextSearch>False</EnableFullTextSearch>
     <DefaultSchema>IQ</DefaultSchema>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>

diff --git a/deploy/DbDeploy.ps1 b/deploy/DbDeploy.ps1
diff --git a/deploy/InstructorIQ.Database.Deploy.nuspec b/deploy/InstructorIQ.Database.Deploy.nuspec
diff --git a/deploy/InstructorIQ.Website.Deploy.nuspec b/deploy/InstructorIQ.Website.Deploy.nuspec
diff --git a/service/Directory.Build.props b/service/Directory.Build.props
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="Injectio" Version="2.5.87" PrivateAssets="all" />
+    <PackageReference Include="Injectio" Version="2.6.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/service/src/InstructorIQ.Core/Data/DataServiceModule.cs b/service/src/InstructorIQ.Core/Data/DataServiceModule.cs
@@ -1,7 +1,5 @@
 using FluentCommand;
 
-using Injectio.Attributes;
-
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
@@ -16,12 +14,12 @@ public class DataServiceModule
     [RegisterServices]
     public void Register(IServiceCollection services)
     {
-        services.AddDbContextPool<InstructorIQContext>((provider, options) =>
+        services.AddDbContext<InstructorIQContext>((provider, options) =>
         {
             var configuration = provider.GetRequiredService<IConfiguration>();
             var connectionString = configuration.GetConnectionString("InstructorIQ");
             options.UseSqlServer(connectionString, providerOptions => providerOptions.EnableRetryOnFailure());
-        });
+        }, ServiceLifetime.Transient);
 
         services.TryAddSingleton<IDataConfiguration>(provider =>
         {

diff --git a/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionReadModelProfile.cs b/service/src/InstructorIQ.Core/Domain/Discussion/Mapping/DiscussionReadModelProfile.cs
@@ -5,6 +5,7 @@
 // ReSharper disable once CheckNamespace
 namespace InstructorIQ.Core.Domain.Mapping;
 
+[RegisterSingleton(Duplicate = DuplicateStrategy.Append)]
 public class DiscussionReadModelProfile : EntityProfile<DiscussionReadModel>
 {
     public override void Configure()

diff --git a/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionInstructorModelProfile.cs b/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionInstructorModelProfile.cs
@@ -5,7 +5,7 @@
 // ReSharper disable once CheckNamespace
 namespace InstructorIQ.Core.Domain.Mapping;
 
-
+[RegisterSingleton(Duplicate = DuplicateStrategy.Append)]
 public class SessionInstructorModelProfile : EntityProfile<SessionInstructorModel>
 {
     public override void Configure()

diff --git a/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionReadModelProfile.cs b/service/src/InstructorIQ.Core/Domain/Session/Mapping/SessionReadModelProfile.cs
@@ -5,6 +5,7 @@
 // ReSharper disable once CheckNamespace
 namespace InstructorIQ.Core.Domain.Mapping;
 
+[RegisterSingleton(Duplicate = DuplicateStrategy.Append)]
 public class SessionReadModelProfile : EntityProfile<SessionReadModel>
 {
     public override void Configure()

diff --git a/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicReadModelProfile.cs b/service/src/InstructorIQ.Core/Domain/Topic/Mapping/TopicReadModelProfile.cs
@@ -5,6 +5,7 @@
 // ReSharper disable once CheckNamespace
 namespace InstructorIQ.Core.Domain.Mapping;
 
+[RegisterSingleton(Duplicate = DuplicateStrategy.Append)]
 public class TopicReadModelProfile : EntityProfile<TopicReadModel>
 {
     public override void Configure()

diff --git a/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj b/service/src/InstructorIQ.Core/InstructorIQ.Core.csproj
@@ -15,26 +15,26 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.0.1" />
+    <PackageReference Include="AngleSharp" Version="1.0.4" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Azure.Data.Tables" Version="12.8.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.15.1" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.17.0" />
     <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="EntityChange" Version="5.0.21" />
-    <PackageReference Include="FluentCommand.SqlServer" Version="10.0.707" />
+    <PackageReference Include="EntityChange" Version="5.1.0" />
+    <PackageReference Include="FluentCommand.SqlServer" Version="10.1.6" />
     <PackageReference Include="Handlebars.Net" Version="2.1.4" />
-    <PackageReference Include="MailKit" Version="3.6.0" />
-    <PackageReference Include="MediatR.CommandQuery.Audit" Version="12.0.919" />
-    <PackageReference Include="MediatR.CommandQuery.EntityFrameworkCore" Version="12.0.919" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
+    <PackageReference Include="MailKit" Version="4.1.0" />
+    <PackageReference Include="MediatR.CommandQuery.Audit" Version="12.1.0" />
+    <PackageReference Include="MediatR.CommandQuery.EntityFrameworkCore" Version="12.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="NaturalSort.Extension" Version="4.0.0" />
     <PackageReference Include="SendGrid" Version="9.28.1" />
     <PackageReference Include="SendGrid.Extensions.DependencyInjection" Version="1.0.1" />
-    <PackageReference Include="System.Text.Json" Version="7.0.2" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
     <PackageReference Include="UAParser" Version="3.1.47" />
-    <PackageReference Include="YamlDotNet" Version="13.0.2" />
+    <PackageReference Include="YamlDotNet" Version="13.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/service/src/InstructorIQ.Core/Services/RegisterServiceModule.cs b/service/src/InstructorIQ.Core/Services/RegisterServiceModule.cs
@@ -27,8 +27,10 @@ public void Register(IServiceCollection services)
         services.TryAddTransient<ITenantResolver<Guid>, TenantResolver>();
         services.TryAddTransient<IImportProcessService, ImportProcessService>();
 
-        services.TryAddSingleton<IStorageService, StorageService>();
+        services.TryAddSingleton<IEntityConfiguration>(sp => new EntityConfiguration(sp.GetServices<IEntityProfile>()));
         services.TryAddSingleton<IEntityComparer, EntityComparer>();
+
+        services.TryAddSingleton<IStorageService, StorageService>();
         services.TryAddSingleton<IHtmlService, HtmlService>();
         services.TryAddSingleton<IStateService, CookieStateService>();
         services.TryAddSingleton<ICleanupService, CleanupService>();

diff --git a/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj b/service/src/InstructorIQ.WebApplication/InstructorIQ.WebApplication.csproj
@@ -13,17 +13,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.0.1" />
+    <PackageReference Include="AngleSharp" Version="1.0.4" />
     <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
     <PackageReference Include="CommonMark.NET" Version="0.15.1" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="Ical.Net" Version="4.2.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.5" />
-    <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.18.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
-    <PackageReference Include="Serilog.Sinks.AzureTableStorage" Version="8.0.30-beta" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.8" />
+    <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.20.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Serilog.Sinks.AzureTableStorage" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/service/src/InstructorIQ.WebApplication/Program.cs b/service/src/InstructorIQ.WebApplication/Program.cs
@@ -26,7 +26,6 @@
 
 using Serilog;
 using Serilog.Events;
-using Serilog.Formatting.Compact;
 
 namespace InstructorIQ.WebApplication;
 
@@ -53,14 +52,6 @@ public static async Task<int> Main(string[] args)
                 outputTemplate: OutputTemplate,
                 retainedFileCountLimit: 10
             )
-            .WriteTo.File(
-                formatter: new CompactJsonFormatter(),
-                path: $"{logDirectory}/boot.clef",
-                rollingInterval: RollingInterval.Day,
-                shared: true,
-                flushToDiskInterval: TimeSpan.FromSeconds(1),
-                retainedFileCountLimit: 30
-            )
             .CreateBootstrapLogger();
 
         try
@@ -108,7 +99,7 @@ public static async Task<int> Main(string[] args)
         }
         finally
         {
-            Log.CloseAndFlush();
+            await Log.CloseAndFlushAsync();
         }
     }
 
@@ -182,6 +173,10 @@ private static void ConfigureServices(WebApplicationBuilder builder)
                 options.Conventions.AddFolderTenantRoute("/Template");
                 options.Conventions.AddFolderTenantRoute("/User", false);
             })
+            .AddMvcOptions(options =>
+            {
+                options.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true;
+            })
             .AddJsonOptions(options =>
             {
                 options.JsonSerializerOptions.Converters.Add(new TimeSpanConverter());

diff --git a/service/src/InstructorIQ.WebApplication/libman.json b/service/src/InstructorIQ.WebApplication/libman.json
@@ -3,29 +3,29 @@
   "defaultProvider": "cdnjs",
   "libraries": [
     {
-      "library": "jquery@3.3.1",
+      "library": "jquery@3.7.0",
       "destination": "wwwroot/lib/jquery/",
       "files": [
         "jquery.js"
       ]
     },
     {
-      "library": "[email protected].0",
+      "library": "[email protected].5",
       "destination": "wwwroot/lib/jquery-validate/",
       "files": [
         "jquery.validate.js"
       ]
     },
     {
-      "library": "jquery-validation-unobtrusive@3.2.11",
+      "library": "jquery-validation-unobtrusive@4.0.0",
       "destination": "wwwroot/lib/jquery-validation-unobtrusive/",
       "files": [
         "jquery.validate.unobtrusive.js"
       ]
     },
     {
       "provider": "unpkg",
-      "library": "bootstrap@4.4.1",
+      "library": "bootstrap@4.6.1",
       "destination": "wwwroot/lib/bootstrap/",
       "files": [
         "dist/css/bootstrap.css",
@@ -129,4 +129,4 @@
       ]
     }
   ]
-}
+}