Skip to content

Commit 17e7d47

Browse files
1iveowl1iveowl
authored
Merge pull request #249 from 1iveowl/main
Service release
2 parents 8ab0e78 + e5c701c commit 17e7d47

File tree

22 files changed

+162
-160
lines changed

22 files changed

+162
-160
lines changed

‎.github/workflows/admin-service-api-deploy.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
contents: read
1010

1111
env:
12-
AZURE_WEBAPP_NAME: 'admin-api-asdk-test-5yb3' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'admin-api-asdk-test-83sx' # set this to your application's name
1313
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
1414
DOTNET_VERSION: 7.x.x
1515
PROJECT_DIR: ./src/Saas.Admin/Saas.Admin.Service
@@ -55,10 +55,12 @@ jobs:
5555
5656
# Deploy to Azure Web apps
5757
- name: Run Azure webapp deploy action using publish profile credentials
58-
uses: azure/webapps-deploy@v2
58+
uses: azure/webapps-deploy@v3
5959
with:
6060
app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
6161
package: ${{ env.OUTPUT_PATH }}/{{ env.AZURE_WEBAPP_NAME }}
62+
clean: true
63+
restart: true
6264
# slot-name: 'PermissionsApi-Staging'
6365

6466
# Azure logout

‎.github/workflows/permissions-api-deploy.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
contents: read
1010

1111
env:
12-
AZURE_WEBAPP_NAME: 'api-permission-asdk-test-5yb3' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'api-permission-asdk-test-83sx' # set this to your application's name
1313
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
1414
DOTNET_VERSION: 7.x.x
1515
PROJECT_DIR: ./src/Saas.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1
@@ -55,11 +55,12 @@ jobs:
5555
5656
# Deploy to Azure Web apps
5757
- name: Run Azure webapp deploy action using publish profile credentials
58-
uses: azure/webapps-deploy@v2
58+
uses: azure/webapps-deploy@v3
5959
with:
6060
app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
6161
package: ${{ env.OUTPUT_PATH }}/{{ env.AZURE_WEBAPP_NAME }}
62-
# slot-name: 'PermissionsApi-Staging'
62+
clean: true
63+
restart: true # slot-name: 'PermissionsApi-Staging'
6364

6465
# Azure logout
6566
- name: logout

‎.github/workflows/saas-app-deploy.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
contents: read
1010

1111
env:
12-
AZURE_WEBAPP_NAME: 'saas-app-asdk-test-aiuq' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'saas-app-asdk-test-83sx' # set this to your application's name
1313
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
1414
DOTNET_VERSION: 7.x.x
1515
PROJECT_DIR: ./src/Saas.Application/Saas.Application.Web
@@ -55,11 +55,12 @@ jobs:
5555
5656
# Deploy to Azure Web apps
5757
- name: Run Azure webapp deploy action using publish profile credentials
58-
uses: azure/webapps-deploy@v2
58+
uses: azure/webapps-deploy@v3
5959
with:
6060
app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
6161
package: ${{ env.OUTPUT_PATH }}/{{ env.AZURE_WEBAPP_NAME }}
62-
# slot-name: 'PermissionsApi-Staging'
62+
clean: true
63+
restart: true # slot-name: 'PermissionsApi-Staging'
6364

6465
# Azure logout
6566
- name: logout

‎.github/workflows/signup-administration-deploy.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
contents: read
1010

1111
env:
12-
AZURE_WEBAPP_NAME: 'signupadmin-app-asdk-test-aiuq' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'signupadmin-app-asdk-test-83sx' # set this to your application's name
1313
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
1414
DOTNET_VERSION: 7.x.x
1515
PROJECT_DIR: ./src/Saas.SignupAdministration/Saas.SignupAdministration.Web
@@ -55,10 +55,12 @@ jobs:
5555
5656
# Deploy to Azure Web apps
5757
- name: Run Azure webapp deploy action using publish profile credentials
58-
uses: azure/webapps-deploy@v2
58+
uses: azure/webapps-deploy@v3
5959
with:
6060
app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
6161
package: ${{ env.OUTPUT_PATH }}/{{ env.AZURE_WEBAPP_NAME }}
62+
clean: true
63+
restart: true
6264
# slot-name: 'PermissionsApi-Staging'
6365

6466
# Azure logout

‎src/Saas.Admin/Saas.Admin.Client/Saas.Admin.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
11+
<PackageReference Include="Microsoft.Identity.Web" Version="2.15.3" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/Saas.Admin/Saas.Admin.Service/Saas.Admin.Service.csproj‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,10 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
15-
<PackageReference Include="Azure.Identity" Version="1.8.2" />
16-
<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.4.0" />
1715
<PackageReference Include="Dawn.Guard" Version="1.12.0" />
1816
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
19-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" />
20-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.3" />
21-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.3" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="5.2.0" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
25-
<PrivateAssets>all</PrivateAssets>
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
</PackageReference>
28-
<PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
29-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.5.0" />
30-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
31-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
3219
</ItemGroup>
3320
<ItemGroup>
3421
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">

‎src/Saas.Admin/deployment/act/workflows/admin-service-api-deploy-debug.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
env:
1212
APP_NAME: admin-api
13-
AZURE_WEBAPP_NAME: admin-api-asdk-test-aiuq # set this to your application's name
13+
AZURE_WEBAPP_NAME: admin-api-asdk-test-83sx # set this to your application's name
1414
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
1515
DOTNET_VERSION: 7.x.x
1616
PROJECT_DIR: ./src/Saas.Admin/Saas.Admin.Service
@@ -60,10 +60,12 @@ jobs:
6060
6161
# Deploy to Azure Web apps
6262
- name: Run Azure webapp deploy action using publish profile credentials
63-
uses: azure/webapps-deploy@v2
63+
uses: azure/webapps-deploy@v3
6464
with:
6565
app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
6666
package: ${{ env.OUTPUT_PATH }}
67+
clean: true
68+
restart: true
6769

6870
######################
6971
# *** Debug only *** #

‎src/Saas.Application/Saas.Application.Web/Saas.Application.Web.csproj‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,10 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="5.2.0" />
14-
<PackageReference Include="Azure.Identity" Version="1.8.2" />
15-
<PackageReference Include="Humanizer" Version="2.14.1" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
1613
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
</PackageReference>
22-
<PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
23-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.5.0" />
24-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
14+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.15.3" />
15+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
2516
</ItemGroup>
2617

2718
<ItemGroup>

‎src/Saas.Application/deployment/act/workflows/saas-app-deploy-debug.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
env:
1212
APP_NAME: saas-app
13-
AZURE_WEBAPP_NAME: saas-app-asdk-test-aiuq # set this to your application's name
13+
AZURE_WEBAPP_NAME: saas-app-asdk-test-83sx # set this to your application's name
1414
AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
1515
DOTNET_VERSION: 7.x.x
1616
PROJECT_DIR: ./src/Saas.Application/Saas.Application.Web
@@ -60,10 +60,12 @@ jobs:
6060
6161
# Deploy to Azure Web apps
6262
- name: Run Azure webapp deploy action using publish profile credentials
63-
uses: azure/webapps-deploy@v2
63+
uses: azure/webapps-deploy@v3
6464
with:
6565
app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
6666
package: ${{ env.OUTPUT_PATH }}
67+
clean: true
68+
restart: true
6769

6870
######################
6971
# *** Debug only *** #

‎src/Saas.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1/Saas.Permissions.Service.csproj‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,11 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
20-
<PackageReference Include="Azure.Identity" Version="1.8.2" />
21-
<PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.4.0" />
2219
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
23-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="7.0.3" />
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" />
25-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
28-
<PrivateAssets>all</PrivateAssets>
29-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30-
</PackageReference>
31-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="5.2.0" />
32-
<PackageReference Include="Microsoft.Graph" Version="4.54.0" />
33-
<PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
34-
<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.5.0" />
35-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
36-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
37-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.3" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
23+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.13" />
3824
</ItemGroup>
3925

4026
<ItemGroup>

0 commit comments

Comments
 (0)