Skip to content

Commit

Permalink
Merge branch 'master' into chore/git-pr-template
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathanio123 authored Oct 25, 2024
2 parents fb89bde + 1791e0e commit 4efe784
Show file tree
Hide file tree
Showing 24 changed files with 73 additions and 78 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards" Version="3.1.0" />
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.1"/>
<PackageReference Include="Fusion.Integration" Version="8.0.7"/>
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.4"/>
<PackageReference Include="Fusion.Integration" Version="8.0.8"/>
<PackageReference Include="Fusion.Events.Azure.Functions.Extensions" Version="6.0.5"/>
<PackageReference Include="Fusion.Events.Services" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0"/>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.8"/>
<PackageReference Include="Fusion.Events.Services" Version="8.0.2"/>
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1"/>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.10"/>

</ItemGroup>

Expand Down
26 changes: 13 additions & 13 deletions src/Fusion.Summary.Api/Fusion.Summary.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,28 @@
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.10.0"/>
<PackageReference Include="Fusion.AspNetCore" Version="8.0.6"/>
<PackageReference Include="Fusion.AspNetCore.FluentAuthorization" Version="8.0.1"/>
<PackageReference Include="Fusion.Infrastructure.Database" Version="8.0.5"/>
<PackageReference Include="Fusion.Integration" Version="8.0.7"/>
<PackageReference Include="Fusion.Infrastructure.Database" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration" Version="8.0.8"/>
<PackageReference Include="MediatR" Version="12.4.1"/>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.8"/>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.8"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10"/>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10"/>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.10"/>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.8"/>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.10"/>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0"/>
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.8">
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.4"/>
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1"/>
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.5.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
</ItemGroup>
<ItemGroup>
Expand Down
9 changes: 3 additions & 6 deletions src/Fusion.Summary.Functions/local.settings.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"Values": {
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
"FUNCTIONS_WORKER_RUNTIME": "dotnet",
"FUNCTIONS_INPROC_NET8_ENABLED": "1",
"FUNCTIONS_EXTENSION_VERSION": "~4",
"AzureAd_TenantId": "3aa4a235-b6e2-48d5-9195-7fcf05b459b0",
"AzureAd_ClientId": "5a842df8-3238-415d-b168-9f16a6a6031b",
"AzureAd_Secret": "[REPLACE WITH SECRET]",
Expand All @@ -16,11 +18,6 @@
"Endpoints_summary": "https://summary-api.ci.fusion-dev.net/",
"Endpoints_context": "https://fusion-s-context-ci.azurewebsites.net",
"Endpoints_notifications": "https://fusion-s-notification-ci.azurewebsites.net",
"Endpoints_Resources_Fusion": "5a842df8-3238-415d-b168-9f16a6a6031b",
"AzureWebJobs.profile-sync.Disabled": "true",
"AzureWebJobs.profile-sync-event.Disabled": "true",
"AzureWebJobs.provision-position-request.Disabled": "true",
"AzureWebJobs.sent-notifications-cleanup.Disabled": "true",
"AzureWebJobs.internal-requests-reassign-invalid-departments.Disabled": "true"
"Endpoints_Resources_Fusion": "5a842df8-3238-415d-b168-9f16a6a6031b"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.10"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\api\Fusion.Resources.Database\Fusion.Resources.Database.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<ItemGroup>
<PackageReference Include="Fusion.AspNetCore" Version="8.0.6"/>
<PackageReference Include="Fusion.AspNetCore.Versioning" Version="8.1.0"/>
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Authorization" Version="8.0.10"/>
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2"/>
<PackageReference Include="swashbuckle.AspNetCore.Swagger" Version="6.7.3" />
<PackageReference Include="swashbuckle.AspNetCore.SwaggerGen" Version="6.7.3" />
<PackageReference Include="swashbuckle.AspNetCore.SwaggerUi" Version="6.7.3" />
<PackageReference Include="swashbuckle.AspNetCore.Swagger" Version="6.9.0"/>
<PackageReference Include="swashbuckle.AspNetCore.SwaggerGen" Version="6.9.0"/>
<PackageReference Include="swashbuckle.AspNetCore.SwaggerUi" Version="6.9.0"/>
</ItemGroup>


Expand Down
18 changes: 9 additions & 9 deletions src/backend/api/Fusion.Resources.Api/Fusion.Resources.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
<ItemGroup>
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2"/>
<PackageReference Include="Bogus" Version="35.6.1"/>
<PackageReference Include="Fusion.Infrastructure.MediatR" Version="8.0.2"/>
<PackageReference Include="Fusion.Integration" Version="8.0.7"/>
<PackageReference Include="Fusion.Infrastructure.MediatR" Version="8.0.4"/>
<PackageReference Include="Fusion.Integration" Version="8.0.8"/>
<PackageReference Include="Fusion.Events.Client" Version="8.1.1"/>
<PackageReference Include="Fusion.Events.Server" Version="8.0.4"/>
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Org" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Roles" Version="8.0.8"/>
<PackageReference Include="Fusion.Integration.Notification" Version="8.0.7"/>
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.1"/>
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.7"/>
<PackageReference Include="Fusion.Integration.Org" Version="8.0.9"/>
<PackageReference Include="Fusion.Integration.Roles" Version="8.0.9"/>
<PackageReference Include="Fusion.Integration.Notification" Version="8.0.8"/>
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.4"/>
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="JSM.FluentValidation.AspNet.AsyncFilter" Version="2.0.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10"/>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.1"/>
<PackageReference Include="Fusion.Integration.Profile" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.6"/>
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.2"/>
<PackageReference Include="Fusion.Integration.Profile" Version="8.0.7"/>
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.7"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2"/>

</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.6.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8"/>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10"/>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1"/>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Notification" Version="8.0.7" />
<PackageReference Include="Fusion.Integration.LineOrg" Version="8.0.7"/>
<PackageReference Include="Fusion.Integration.Notification" Version="8.0.8"/>
<PackageReference Include="MediatR" Version="12.4.1"/>
<PackageReference Include="Fusion.AspNetCore" Version="8.0.6"/>
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.1"/>
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.4"/>
<PackageReference Include="Fusion.Integration.Profile.Abstractions" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Org.Abstractions" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Roles.Abstractions" Version="8.0.8"/>
<PackageReference Include="Fusion.Integration.Org.Abstractions" Version="8.0.8"/>
<PackageReference Include="Fusion.Integration.Roles.Abstractions" Version="8.0.9"/>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />

<PackageReference Include="TimePeriodCore" Version="1.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.1"/>
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.5.0"/>
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.4"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
"Values": {
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
"FUNCTIONS_WORKER_RUNTIME": "dotnet",
"FUNCTIONS_INPROC_NET8_ENABLED": "1",
"FUNCTIONS_EXTENSION_VERSION": "~4",
"provision_position_queue": "provision-position-[REPLACE WITH DEV QUEUE]",
"scheduled_notification_report_queue": "scheduled-notification-[REPLACE WITH DEV QUEUE]",
"department_summary_weekly_queue": "department-summary-weekly-queue-[REPLACE WITH DEV QUEUE]",
"AzureWebJobsServiceBus": "[REPLACE WITH SB CONNECTION STRING]",
"AzureAd_TenantId": "3aa4a235-b6e2-48d5-9195-7fcf05b459b0",
"AzureAd_ClientId": "5a842df8-3238-415d-b168-9f16a6a6031b",
Expand All @@ -17,10 +18,7 @@
"Endpoints_context": "https://fusion-s-context-ci.azurewebsites.net",
"Endpoints_notifications": "https://fusion-s-notification-ci.azurewebsites.net",
"Endpoints_Resources_Fusion": "5a842df8-3238-415d-b168-9f16a6a6031b",
"AzureWebJobs.profile-sync.Disabled": "true",
"AzureWebJobs.profile-sync-event.Disabled": "true",
"AzureWebJobs.provision-position-request.Disabled": "true",
"AzureWebJobs.sent-notifications-cleanup.Disabled": "true",
"AzureWebJobs.internal-requests-reassign-invalid-departments.Disabled": "true"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit" Version="2.9.2"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -32,7 +32,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10"/>

</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit" Version="2.9.2"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageReference Include="Moq" Version="4.20.72"/>
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit" Version="2.9.2"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit" Version="2.9.2"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<PackageReference Include="Fusion.Integration.Profile.Abstractions" Version="8.0.6" />
<PackageReference Include="Fusion.ApiClients.People" Version="8.0.1" />
<PackageReference Include="Fusion.Infrastructure.Authentication" Version="8.0.4" />
<PackageReference Include="Fusion.Infrastructure.Authentication" Version="8.0.6"/>

</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<!--<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />-->
<PackageReference Include="FluentAssertions" Version="6.12.1"/>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1"/>
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="Fusion.Integration.Profile.Abstractions" Version="8.0.6" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

<ItemGroup>
<PackageReference Include="Fusion.AspNetCore" Version="8.0.6"/>
<PackageReference Include="Fusion.Integration.Context" Version="8.0.6" />
<PackageReference Include="Fusion.Integration.Context.Abstractions" Version="8.0.6" />
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.1" />
<PackageReference Include="Fusion.Integration.Context" Version="8.0.7"/>
<PackageReference Include="Fusion.Integration.Context.Abstractions" Version="8.0.7"/>
<PackageReference Include="Fusion.ApiClients.Org" Version="8.0.4"/>

</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Bogus" Version="35.6.1"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 4efe784

Please sign in to comment.