Merge pull request #201 from loresoft/develop

update main
loresoft · Jan 3, 2024 · 6f0084e · 6f0084e
2 parents 10167d3 + c01100e
commit 6f0084e
Show file tree

Hide file tree

Showing 124 changed files with 976 additions and 708 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,5 +1,11 @@
 version: 2
 updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "02:00"   
+  open-pull-requests-limit: 10
 - package-ecosystem: nuget
   directory: "/service/"
   schedule:

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -1,15 +1,19 @@
 name: Build Project
 
 env:
-  BUILD_PATH: '${{github.workspace}}/publish'
-  BUILD_VERSION: '1.8.${{github.run_number}}'
-  BUILD_INFORMATION: '1.8.${{github.run_number}}+Branch.${{github.ref_name}}.Sha.${{github.sha}}'
+  DOTNET_NOLOGO: true
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_ENVIRONMENT: github
+  ASPNETCORE_ENVIRONMENT: github
+  BUILD_PATH: '${{github.workspace}}/artifacts'
 
 on:
   push:
     branches:
       - master
       - develop
+    tags:
+      - "v*"
   pull_request:
     branches:
       - master
@@ -21,23 +25,23 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup .NET 7.0
+      - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v1.3
 
       - name: Restore Dependencies
         run: dotnet restore ./service/InstructorIQ.sln
 
       - name: Build Solution
-        run: 'dotnet build ./service/InstructorIQ.sln --no-restore --configuration Release -p:Version="${{env.BUILD_VERSION}}" -p:InformationalVersion="${{env.BUILD_INFORMATION}}"'
+        run: 'dotnet build ./service/InstructorIQ.sln --no-restore --configuration Release'
 
       - name: Publish Web Application
         if: success()
@@ -61,58 +65,78 @@ jobs:
           name: Database
           path: '${{env.BUILD_PATH}}/Database'
 
-  deploy-website:
+
+  deploy-staging:
     runs-on: ubuntu-latest
     needs: build-project
     if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
 
+    environment:
+      name: Staging
+      url: https://staging.instructoriq.com/
+
     steps:
+      - name: Download Database Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: Database
+
       - name: Download Web Application Artifact
         uses: actions/download-artifact@v3
         with:
           name: WebApplication
 
-      - name: Deploy Web Application to Azure Staging
-        if: github.ref == 'refs/heads/develop'
-        uses: azure/webapps-deploy@v2
+      - name: Deploy SQL Server Database to Azure
+        if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
+        uses: azure/sql-action@v2.2
+        with:
+          connection-string: ${{secrets.AZURE_SQL_CONNECTION_STAGING}}
+          path: './InstructorIQ.dacpac'
+          action: 'publish'
+
+      - name: Deploy Web Application to Azure
+        if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
+        uses: azure/webapps-deploy@v3
         with:
           app-name: 'web-ls-app-eus-iq-stg-01'
           slot-name: 'Production'
           publish-profile: ${{secrets.PUBLISH_PROFILE_STAGING}}
           package: ./
 
-      - name: Deploy Web Application to Azure Production
-        if: github.ref == 'refs/heads/master'
-        uses: azure/webapps-deploy@v2
-        with:
-          app-name: 'web-ls-app-eus-iq-prd-01'
-          slot-name: 'Production'
-          publish-profile: ${{secrets.PUBLISH_PROFILE_PRODUCTION}}
-          package: ./
 
-  deploy-database:
-    runs-on: windows-latest
+  deploy-production:
+    runs-on: ubuntu-latest
     needs: build-project
-    if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
+    if: success() && github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/v')
+
+    environment:
+      name: Production
+      url: https://instructoriq.com/
 
     steps:
       - name: Download Database Artifact
         uses: actions/download-artifact@v3
         with:
           name: Database
 
-      - name: Deploy SQL Server Database to Azure Staging
-        if: github.ref == 'refs/heads/develop'
-        uses: azure/sql-action@v2.1
+      - name: Download Web Application Artifact
+        uses: actions/download-artifact@v3
         with:
-          connection-string: ${{secrets.AZURE_SQL_CONNECTION_STAGING}}
-          path: './InstructorIQ.dacpac'
-          action: 'publish'
+          name: WebApplication
 
-      - name: Deploy SQL Server Database to Azure Production
-        if: github.ref == 'refs/heads/master'
-        uses: azure/sql-action@v2.1
+      - name: Deploy SQL Server Database to Azure
+        if: success() && github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/v')
+        uses: azure/sql-action@v2.2
         with:
           connection-string: ${{secrets.AZURE_SQL_CONNECTION_PRODUCTION}}
           path: './InstructorIQ.dacpac'
           action: 'publish'
+
+      - name: Deploy Web Application to Azure
+        if: success() && github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/v')
+        uses: azure/webapps-deploy@v3
+        with:
+          app-name: 'web-ls-app-eus-iq-prd-01'
+          slot-name: 'Production'
+          publish-profile: ${{secrets.PUBLISH_PROFILE_PRODUCTION}}
+          package: ./
diff --git a/service/Directory.Build.props b/service/Directory.Build.props
@@ -16,9 +16,15 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <MinVerTagPrefix>v</MinVerTagPrefix>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="Injectio" Version="2.6.1" PrivateAssets="all" />
+    <PackageReference Include="AssemblyMetadata.Generators" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Injectio" Version="3.1.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/service/src/InstructorIQ.Core/Data/DataServiceModule.cs b/service/src/InstructorIQ.Core/Data/DataServiceModule.cs
@@ -14,12 +14,16 @@ public class DataServiceModule
     [RegisterServices]
     public void Register(IServiceCollection services)
     {
-        services.AddDbContext<InstructorIQContext>((provider, options) =>
-        {
-            var configuration = provider.GetRequiredService<IConfiguration>();
-            var connectionString = configuration.GetConnectionString("InstructorIQ");
-            options.UseSqlServer(connectionString, providerOptions => providerOptions.EnableRetryOnFailure());
-        }, ServiceLifetime.Transient);
+        services.AddDbContext<InstructorIQContext>(
+            optionsAction: (provider, options) =>
+            {
+                var configuration = provider.GetRequiredService<IConfiguration>();
+                var connectionString = configuration.GetConnectionString("InstructorIQ");
+                options.UseSqlServer(connectionString, providerOptions => providerOptions.EnableRetryOnFailure());
+            },
+            contextLifetime: ServiceLifetime.Transient,
+            optionsLifetime: ServiceLifetime.Transient
+        );
 
         services.TryAddSingleton<IDataConfiguration>(provider =>
         {

diff --git a/service/src/InstructorIQ.Core/Data/Entities/Attendance.cs b/service/src/InstructorIQ.Core/Data/Entities/Attendance.cs
@@ -121,7 +121,7 @@ public Attendance()
     /// <value>
     /// The property value representing column 'RowVersion'.
     /// </value>
-    public Byte[] RowVersion { get; set; }
+    public long RowVersion { get; set; }
 
     #endregion
 
@@ -130,7 +130,7 @@ public Attendance()
     /// Gets or sets the navigation property for entity <see cref="Session" />.
     /// </summary>
     /// <value>
-    /// The the navigation property for entity <see cref="Session" />.
+    /// The navigation property for entity <see cref="Session" />.
     /// </value>
     /// <seealso cref="SessionId" />
     public virtual Session Session { get; set; }
@@ -139,7 +139,7 @@ public Attendance()
     /// Gets or sets the navigation property for entity <see cref="Tenant" />.
     /// </summary>
     /// <value>
-    /// The the navigation property for entity <see cref="Tenant" />.
+    /// The navigation property for entity <see cref="Tenant" />.
     /// </value>
     /// <seealso cref="TenantId" />
     public virtual Tenant Tenant { get; set; }

diff --git a/service/src/InstructorIQ.Core/Data/Entities/AuthenticationEvent.cs b/service/src/InstructorIQ.Core/Data/Entities/AuthenticationEvent.cs
@@ -154,7 +154,7 @@ public AuthenticationEvent()
     /// <value>
     /// The property value representing column 'RowVersion'.
     /// </value>
-    public Byte[] RowVersion { get; set; }
+    public long RowVersion { get; set; }
 
     #endregion
 

diff --git a/service/src/InstructorIQ.Core/Data/Entities/Discussion.cs b/service/src/InstructorIQ.Core/Data/Entities/Discussion.cs
@@ -170,7 +170,7 @@ public Discussion()
     /// <value>
     /// The property value representing column 'RowVersion'.
     /// </value>
-    public Byte[] RowVersion { get; set; }
+    public long RowVersion { get; set; }
 
     /// <summary>
     /// Gets or sets the property value representing column 'PeriodStart'.
@@ -195,7 +195,7 @@ public Discussion()
     /// Gets or sets the navigation property for entity <see cref="Tenant" />.
     /// </summary>
     /// <value>
-    /// The the navigation property for entity <see cref="Tenant" />.
+    /// The navigation property for entity <see cref="Tenant" />.
     /// </value>
     /// <seealso cref="TenantId" />
     public virtual Tenant Tenant { get; set; }
@@ -204,7 +204,7 @@ public Discussion()
     /// Gets or sets the navigation property for entity <see cref="Topic" />.
     /// </summary>
     /// <value>
-    /// The the navigation property for entity <see cref="Topic" />.
+    /// The navigation property for entity <see cref="Topic" />.
     /// </value>
     /// <seealso cref="TopicId" />
     public virtual Topic Topic { get; set; }

diff --git a/service/src/InstructorIQ.Core/Data/Entities/EmailDelivery.cs b/service/src/InstructorIQ.Core/Data/Entities/EmailDelivery.cs
@@ -170,7 +170,7 @@ public EmailDelivery()
     /// <value>
     /// The property value representing column 'RowVersion'.
     /// </value>
-    public Byte[] RowVersion { get; set; }
+    public long RowVersion { get; set; }
 
     #endregion
 
@@ -179,7 +179,7 @@ public EmailDelivery()
     /// Gets or sets the navigation property for entity <see cref="Tenant" />.
     /// </summary>
     /// <value>
-    /// The the navigation property for entity <see cref="Tenant" />.
+    /// The navigation property for entity <see cref="Tenant" />.
     /// </value>
     /// <seealso cref="TenantId" />
     public virtual Tenant Tenant { get; set; }

diff --git a/service/src/InstructorIQ.Core/Data/Entities/EmailTemplate.cs b/service/src/InstructorIQ.Core/Data/Entities/EmailTemplate.cs
@@ -140,7 +140,7 @@ public EmailTemplate()
     /// <value>
     /// The property value representing column 'RowVersion'.
     /// </value>
-    public Byte[] RowVersion { get; set; }
+    public long RowVersion { get; set; }
 
     #endregion
 
@@ -149,7 +149,7 @@ public EmailTemplate()
     /// Gets or sets the navigation property for entity <see cref="Tenant" />.
     /// </summary>
     /// <value>
-    /// The the navigation property for entity <see cref="Tenant" />.
+    /// The navigation property for entity <see cref="Tenant" />.
     /// </value>
     /// <seealso cref="TenantId" />
     public virtual Tenant Tenant { get; set; }

diff --git a/service/src/InstructorIQ.Core/Data/Entities/Group.cs b/service/src/InstructorIQ.Core/Data/Entities/Group.cs
@@ -107,7 +107,7 @@ public Group()
     /// <value>
     /// The property value representing column 'RowVersion'.
     /// </value>
-    public Byte[] RowVersion { get; set; }
+    public long RowVersion { get; set; }
 
     /// <summary>
     /// Gets or sets the property value representing column 'PeriodStart'.
@@ -132,15 +132,15 @@ public Group()
     /// Gets or sets the navigation collection for entity <see cref="Session" />.
     /// </summary>
     /// <value>
-    /// The the navigation collection for entity <see cref="Session" />.
+    /// The navigation collection for entity <see cref="Session" />.
     /// </value>
     public virtual ICollection<Session> Sessions { get; set; }
 
     /// <summary>
     /// Gets or sets the navigation property for entity <see cref="Tenant" />.
     /// </summary>
     /// <value>
-    /// The the navigation property for entity <see cref="Tenant" />.
+    /// The navigation property for entity <see cref="Tenant" />.
     /// </value>
     /// <seealso cref="TenantId" />
     public virtual Tenant Tenant { get; set; }

diff --git a/service/src/InstructorIQ.Core/Data/Entities/HistoryRecord.cs b/service/src/InstructorIQ.Core/Data/Entities/HistoryRecord.cs
@@ -194,7 +194,7 @@ public HistoryRecord()
     /// <value>
     /// The property value representing column 'RowVersion'.
     /// </value>
-    public Byte[] RowVersion { get; set; }
+    public long RowVersion { get; set; }
 
     #endregion
 

diff --git a/service/src/InstructorIQ.Core/Data/Entities/ImportJob.cs b/service/src/InstructorIQ.Core/Data/Entities/ImportJob.cs
@@ -96,7 +96,7 @@ public ImportJob()
     /// <value>
     /// The property value representing column 'RowVersion'.
     /// </value>
-    public Byte[] RowVersion { get; set; }
+    public long RowVersion { get; set; }
 
     #endregion
 
@@ -105,7 +105,7 @@ public ImportJob()
     /// Gets or sets the navigation property for entity <see cref="Tenant" />.
     /// </summary>
     /// <value>
-    /// The the navigation property for entity <see cref="Tenant" />.
+    /// The navigation property for entity <see cref="Tenant" />.
     /// </value>
     /// <seealso cref="TenantId" />
     public virtual Tenant Tenant { get; set; }

diff --git a/service/src/InstructorIQ.Core/Data/Entities/InstructorRole.cs b/service/src/InstructorIQ.Core/Data/Entities/InstructorRole.cs
@@ -92,7 +92,7 @@ public InstructorRole()
     /// <value>
     /// The property value representing column 'RowVersion'.
     /// </value>
-    public Byte[] RowVersion { get; set; }
+    public long RowVersion { get; set; }
 
     #endregion
 
@@ -101,15 +101,15 @@ public InstructorRole()
     /// Gets or sets the navigation collection for entity <see cref="SessionInstructor" />.
     /// </summary>
     /// <value>
-    /// The the navigation collection for entity <see cref="SessionInstructor" />.
+    /// The navigation collection for entity <see cref="SessionInstructor" />.
     /// </value>
     public virtual ICollection<SessionInstructor> SessionInstructors { get; set; }
 
     /// <summary>
     /// Gets or sets the navigation property for entity <see cref="Tenant" />.
     /// </summary>
     /// <value>
-    /// The the navigation property for entity <see cref="Tenant" />.
+    /// The navigation property for entity <see cref="Tenant" />.
     /// </value>
     /// <seealso cref="TenantId" />
     public virtual Tenant Tenant { get; set; }
@@ -118,7 +118,7 @@ public InstructorRole()
     /// Gets or sets the navigation collection for entity <see cref="TopicInstructor" />.
     /// </summary>
     /// <value>
-    /// The the navigation collection for entity <see cref="TopicInstructor" />.
+    /// The navigation collection for entity <see cref="TopicInstructor" />.
     /// </value>
     public virtual ICollection<TopicInstructor> TopicInstructors { get; set; }