Merge pull request #249 from 1iveowl/main

Service release
Azure · Oct 30, 2023 · 17e7d47 · 17e7d47
2 parents 8ab0e78 + e5c701c
commit 17e7d47
Show file tree

Hide file tree

Showing 22 changed files with 162 additions and 160 deletions.
diff --git a/.github/workflows/admin-service-api-deploy.yml b/.github/workflows/admin-service-api-deploy.yml
@@ -9,7 +9,7 @@ permissions:
   contents: read
 
 env:
-  AZURE_WEBAPP_NAME: 'admin-api-asdk-test-5yb3'       # set this to your application's name
+  AZURE_WEBAPP_NAME: 'admin-api-asdk-test-83sx'       # set this to your application's name
   AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
   DOTNET_VERSION: 7.x.x
   PROJECT_DIR: ./src/Saas.Admin/Saas.Admin.Service
@@ -55,10 +55,12 @@ jobs:
 
       # Deploy to Azure Web apps
       - name: Run Azure webapp deploy action using publish profile credentials
-        uses: azure/webapps-deploy@v2
+        uses: azure/webapps-deploy@v3
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
           package: ${{ env.OUTPUT_PATH }}/{{ env.AZURE_WEBAPP_NAME }}
+          clean: true
+          restart: true
           # slot-name: 'PermissionsApi-Staging'
 
       # Azure logout

diff --git a/.github/workflows/permissions-api-deploy.yml b/.github/workflows/permissions-api-deploy.yml
@@ -9,7 +9,7 @@ permissions:
   contents: read
 
 env:
-  AZURE_WEBAPP_NAME: 'api-permission-asdk-test-5yb3' # set this to your application's name
+  AZURE_WEBAPP_NAME: 'api-permission-asdk-test-83sx' # set this to your application's name
   AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
   DOTNET_VERSION: 7.x.x
   PROJECT_DIR: ./src/Saas.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1
@@ -55,11 +55,12 @@ jobs:
 
       # Deploy to Azure Web apps
       - name: Run Azure webapp deploy action using publish profile credentials
-        uses: azure/webapps-deploy@v2
+        uses: azure/webapps-deploy@v3
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
           package: ${{ env.OUTPUT_PATH }}/{{ env.AZURE_WEBAPP_NAME }}
-          # slot-name: 'PermissionsApi-Staging'
+          clean: true
+          restart: true          # slot-name: 'PermissionsApi-Staging'
 
       # Azure logout
       - name: logout

diff --git a/.github/workflows/saas-app-deploy.yml b/.github/workflows/saas-app-deploy.yml
@@ -9,7 +9,7 @@ permissions:
   contents: read
 
 env:
-  AZURE_WEBAPP_NAME: 'saas-app-asdk-test-aiuq'       # set this to your application's name
+  AZURE_WEBAPP_NAME: 'saas-app-asdk-test-83sx'       # set this to your application's name
   AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
   DOTNET_VERSION: 7.x.x
   PROJECT_DIR: ./src/Saas.Application/Saas.Application.Web
@@ -55,11 +55,12 @@ jobs:
 
       # Deploy to Azure Web apps
       - name: Run Azure webapp deploy action using publish profile credentials
-        uses: azure/webapps-deploy@v2
+        uses: azure/webapps-deploy@v3
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
           package: ${{ env.OUTPUT_PATH }}/{{ env.AZURE_WEBAPP_NAME }}
-          # slot-name: 'PermissionsApi-Staging'
+          clean: true
+          restart: true          # slot-name: 'PermissionsApi-Staging'
 
       # Azure logout
       - name: logout

diff --git a/.github/workflows/signup-administration-deploy.yml b/.github/workflows/signup-administration-deploy.yml
@@ -9,7 +9,7 @@ permissions:
   contents: read
 
 env:
-  AZURE_WEBAPP_NAME: 'signupadmin-app-asdk-test-aiuq' # set this to your application's name
+  AZURE_WEBAPP_NAME: 'signupadmin-app-asdk-test-83sx' # set this to your application's name
   AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
   DOTNET_VERSION: 7.x.x
   PROJECT_DIR: ./src/Saas.SignupAdministration/Saas.SignupAdministration.Web
@@ -55,10 +55,12 @@ jobs:
 
       # Deploy to Azure Web apps
       - name: Run Azure webapp deploy action using publish profile credentials
-        uses: azure/webapps-deploy@v2
+        uses: azure/webapps-deploy@v3
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
           package: ${{ env.OUTPUT_PATH }}/{{ env.AZURE_WEBAPP_NAME }}
+          clean: true
+          restart: true
           # slot-name: 'PermissionsApi-Staging'
 
       # Azure logout

diff --git a/src/Saas.Admin/Saas.Admin.Client/Saas.Admin.Client.csproj b/src/Saas.Admin/Saas.Admin.Client/Saas.Admin.Client.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.15.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Saas.Admin/Saas.Admin.Service/Saas.Admin.Service.csproj b/src/Saas.Admin/Saas.Admin.Service/Saas.Admin.Service.csproj
@@ -12,23 +12,10 @@
 
 	<ItemGroup>
 		<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
-		<PackageReference Include="Azure.Identity" Version="1.8.2" />
-		<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.4.0" />
 		<PackageReference Include="Dawn.Guard" Version="1.12.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.3" />
-		<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="5.2.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
-		<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.5.0" />
-		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
 	</ItemGroup>
 	<ItemGroup>
 		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">

diff --git a/src/Saas.Admin/deployment/act/workflows/admin-service-api-deploy-debug.yml b/src/Saas.Admin/deployment/act/workflows/admin-service-api-deploy-debug.yml
@@ -10,7 +10,7 @@ permissions:
 
 env:
   APP_NAME: admin-api
-  AZURE_WEBAPP_NAME: admin-api-asdk-test-aiuq          # set this to your application's name
+  AZURE_WEBAPP_NAME: admin-api-asdk-test-83sx          # set this to your application's name
   AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
   DOTNET_VERSION: 7.x.x
   PROJECT_DIR: ./src/Saas.Admin/Saas.Admin.Service
@@ -60,10 +60,12 @@ jobs:
 
       # Deploy to Azure Web apps
       - name: Run Azure webapp deploy action using publish profile credentials
-        uses: azure/webapps-deploy@v2
+        uses: azure/webapps-deploy@v3
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
           package: ${{ env.OUTPUT_PATH }}
+          clean: true
+          restart: true
 
       ######################
       # *** Debug only *** #

diff --git a/src/Saas.Application/Saas.Application.Web/Saas.Application.Web.csproj b/src/Saas.Application/Saas.Application.Web/Saas.Application.Web.csproj
@@ -9,19 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="5.2.0" />
-    <PackageReference Include="Azure.Identity" Version="1.8.2" />
-    <PackageReference Include="Humanizer" Version="2.14.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.5.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.15.3" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Saas.Application/deployment/act/workflows/saas-app-deploy-debug.yml b/src/Saas.Application/deployment/act/workflows/saas-app-deploy-debug.yml
@@ -10,7 +10,7 @@ permissions:
 
 env:
   APP_NAME: saas-app
-  AZURE_WEBAPP_NAME: saas-app-asdk-test-aiuq       # set this to your application's name
+  AZURE_WEBAPP_NAME: saas-app-asdk-test-83sx       # set this to your application's name
   AZURE_WEBAPP_PACKAGE_PATH: . # set this to the path to your web app project, defaults to the repository root
   DOTNET_VERSION: 7.x.x
   PROJECT_DIR: ./src/Saas.Application/Saas.Application.Web
@@ -60,10 +60,12 @@ jobs:
 
       # Deploy to Azure Web apps
       - name: Run Azure webapp deploy action using publish profile credentials
-        uses: azure/webapps-deploy@v2
+        uses: azure/webapps-deploy@v3
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }} # Replace with your app name
           package: ${{ env.OUTPUT_PATH }}
+          clean: true
+          restart: true
 
       ######################
       # *** Debug only *** #

diff --git a/...s.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1/Saas.Permissions.Service.csproj b/...s.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1/Saas.Permissions.Service.csproj
@@ -16,25 +16,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
-    <PackageReference Include="Azure.Identity" Version="1.8.2" />
-    <PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.4.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Certificate" Version="7.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="5.2.0" />
-    <PackageReference Include="Microsoft.Graph" Version="4.54.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.5.0" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.5.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-	  <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
+	  <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.13" />
   </ItemGroup>
 
   <ItemGroup>