Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
pwelter34 committed May 10, 2024
1 parent e245fef commit 0abd6f9
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 36 deletions.
67 changes: 55 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,57 @@
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:
interval: daily
time: "01:00"
open-pull-requests-limit: 10
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: daily
time: "01:00"
timezone: "America/Chicago"
open-pull-requests-limit: 10

- package-ecosystem: nuget
directory: "/service/"
schedule:
interval: daily
time: "02:00"
timezone: "America/Chicago"
open-pull-requests-limit: 10
groups:
Azure:
patterns:
- "Azure.*"
- "Microsoft.Azure.*"
- "Microsoft.Extensions.Azure"
AspNetCoreHealthChecks:
patterns:
- "AspNetCore.HealthChecks.*"
AspNetCore:
patterns:
- "Microsoft.AspNetCore.*"
- "Microsoft.Extensions.Features"
MicrosoftExtensions:
patterns:
- "Microsoft.Extensions.*"
EntityFrameworkCore:
patterns:
- "Microsoft.EntityFrameworkCore.*"
OpenTelemetry:
patterns:
- "OpenTelemetry.*"
Serilog:
patterns:
- "Serilog"
- "Serilog.*"
Hangfire:
patterns:
- "Hangfire"
- "Hangfire.*"
Testcontainers:
patterns:
- "Testcontainers.*"
xUnit:
patterns:
- "xunit"
- "xunit.assert"
- "xunit.core"
- "xunit.extensibility.*"
- "xunit.runner.*"
26 changes: 12 additions & 14 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_ENVIRONMENT: github
ASPNETCORE_ENVIRONMENT: github
BUILD_PATH: '${{github.workspace}}/artifacts'
BUILD_PATH: "${{github.workspace}}/artifacts"

on:
push:
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
run: dotnet restore ./service/InstructorIQ.sln

- name: Build Solution
run: 'dotnet build ./service/InstructorIQ.sln --no-restore --configuration Release'
run: "dotnet build ./service/InstructorIQ.sln --no-restore --configuration Release"

- name: Publish Web Application
if: success()
Expand All @@ -56,15 +56,14 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: WebApplication
path: '${{env.BUILD_PATH}}/WebApplication'
path: "${{env.BUILD_PATH}}/WebApplication"

- name: Upload Database Artifact
if: success()
uses: actions/upload-artifact@v3
with:
name: Database
path: '${{env.BUILD_PATH}}/Database'

path: "${{env.BUILD_PATH}}/Database"

deploy-staging:
runs-on: ubuntu-latest
Expand All @@ -91,19 +90,18 @@ jobs:
uses: azure/[email protected]
with:
connection-string: ${{secrets.AZURE_SQL_CONNECTION_STAGING}}
path: './InstructorIQ.dacpac'
action: 'publish'
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'
app-name: "web-ls-app-eus-iq-stg-01"
slot-name: "Production"
publish-profile: ${{secrets.PUBLISH_PROFILE_STAGING}}
package: ./


deploy-production:
runs-on: ubuntu-latest
needs: build-project
Expand All @@ -129,14 +127,14 @@ jobs:
uses: azure/[email protected]
with:
connection-string: ${{secrets.AZURE_SQL_CONNECTION_PRODUCTION}}
path: './InstructorIQ.dacpac'
action: 'publish'
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'
app-name: "web-ls-app-eus-iq-prd-01"
slot-name: "Production"
publish-profile: ${{secrets.PUBLISH_PROFILE_PRODUCTION}}
package: ./
8 changes: 4 additions & 4 deletions service/src/InstructorIQ.Core/InstructorIQ.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<PackageReference Include="AngleSharp" Version="1.1.2" />
<PackageReference Include="Azure.Data.Tables" Version="12.8.3" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
<PackageReference Include="CsvHelper" Version="32.0.1" />
<PackageReference Include="FluentCommand.SqlServer" Version="12.9.1" />
<PackageReference Include="CsvHelper" Version="32.0.2" />
<PackageReference Include="FluentCommand.SqlServer" Version="12.10.2" />
<PackageReference Include="Handlebars.Net" Version="2.1.6" />
<PackageReference Include="MediatR.CommandQuery.Audit" Version="15.6.1" />
<PackageReference Include="MediatR.CommandQuery.EntityFrameworkCore" Version="15.6.1" />
<PackageReference Include="MediatR.CommandQuery.Audit" Version="15.8.0" />
<PackageReference Include="MediatR.CommandQuery.EntityFrameworkCore" Version="15.8.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
<PackageReference Include="NaturalSort.Extension" Version="4.3.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
<PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.21.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Sinks.AzureTableStorage" Version="9.6.0" />
<PackageReference Include="Serilog.Sinks.AzureTableStorage" Version="9.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions service/src/InstructorIQ.WebApplication/appsettings.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"ConnectionStrings": {
"InstructorIQ": "Data Source=(local);Initial Catalog=InstructorIQ;Integrated Security=True;TrustServerCertificate=True;",
"StorageAccount": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;"
"StorageAccount": "UseDevelopmentStorage=true"
},
"SendGrid": {
"ApiKey": "",
"FromName": "InstructorIQ",
"FromEmail": "[email protected]"
},
"Storage": {
"ConnectionString": "",
"ConnectionString": "UseDevelopmentStorage=true",
"Container": "uploads"
},
"AllowedHosts": "*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@

namespace InstructorIQ.Core.Tests;

public class DependencyInjectionFixture : TestHostFixture
public class DependencyInjectionFixture : TestApplicationFixture
{
protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
protected override void ConfigureApplication(HostApplicationBuilder builder)
{
base.ConfigureApplication(builder);

var services = builder.Services;

services.AddTransient<ITenant<TenantReadModel>>(provider => new TenantValue<TenantReadModel>(new TenantReadModel
{
Id = Data.Constants.Tenant.Test,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="XUnit.Hosting" Version="1.5.0" />
<PackageReference Include="XUnit.Hosting" Version="1.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down

0 comments on commit 0abd6f9

Please sign in to comment.