Skip to content

Commit 8405fa5

Browse files
authored
Merge pull request #253 from 1iveowl/main
Upgrading to .NET 8 - adding Apple Silicon Fixes and dependency fixes
2 parents 17e7d47 + b5ac372 commit 8405fa5

File tree

35 files changed

+151
-65
lines changed

35 files changed

+151
-65
lines changed

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

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

1111
env:
12-
AZURE_WEBAPP_NAME: 'admin-api-asdk-test-83sx' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'admin-api-asdk-test-v23y' # 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
14-
DOTNET_VERSION: 7.x.x
14+
DOTNET_VERSION: 8.x.x
1515
PROJECT_DIR: ./src/Saas.Admin/Saas.Admin.Service
1616
PROJECT_PATH: ./src/Saas.Admin/Saas.Admin.Service/Saas.Admin.Service.csproj
1717
OUTPUT_PATH: ./publish/admin-api

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

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

1111
env:
12-
AZURE_WEBAPP_NAME: 'api-permission-asdk-test-83sx' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'api-permission-asdk-test-v23y' # 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
14-
DOTNET_VERSION: 7.x.x
14+
DOTNET_VERSION: 8.x.x
1515
PROJECT_DIR: ./src/Saas.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1
1616
PROJECT_PATH: ./src/Saas.Identity/Saas.Permissions/Saas.Permissions.Service_v1.1/Saas.Permissions.Service.csproj
1717
OUTPUT_PATH: ./publish/api-permission

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

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

1111
env:
12-
AZURE_WEBAPP_NAME: 'saas-app-asdk-test-83sx' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'saas-app-asdk-test-v23y' # 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
14-
DOTNET_VERSION: 7.x.x
14+
DOTNET_VERSION: 8.x.x
1515
PROJECT_DIR: ./src/Saas.Application/Saas.Application.Web
1616
PROJECT_PATH: ./src/Saas.Application/Saas.Application.Web/Saas.Application.Web.csproj
1717
OUTPUT_PATH: ./publish/saas-app

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

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

1111
env:
12-
AZURE_WEBAPP_NAME: 'signupadmin-app-asdk-test-83sx' # set this to your application's name
12+
AZURE_WEBAPP_NAME: 'signupadmin-app-asdk-test-v23y' # 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
14-
DOTNET_VERSION: 7.x.x
14+
DOTNET_VERSION: 8.x.x
1515
PROJECT_DIR: ./src/Saas.SignupAdministration/Saas.SignupAdministration.Web
1616
PROJECT_PATH: ./src/Saas.SignupAdministration/Saas.SignupAdministration.Web/Saas.SignupAdministration.Web.csproj
1717
OUTPUT_PATH: ./publish/signupadmin

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<Configurations>Debug;Release;Multi Debug</Configurations>
88
</PropertyGroup>
99

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

1414
<ItemGroup>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>aspnet-Saas.Admin.Service-5358E0C3-EA51-44EA-B381-CA2F9D9710D3</UserSecretsId>
@@ -11,11 +11,11 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
14+
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
1515
<PackageReference Include="Dawn.Guard" Version="1.12.0" />
16-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.13" />
16+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.0.0" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">

src/Saas.Admin/deployment/act/deploy.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ container_deployment_dir="/asdk/src/Saas.Admin/deployment"
1717

1818
# running the './act/script/patch-app-name.sh' script using our ASDK deployment script container - i.e., not the act container
1919
docker run \
20+
--platform linux/amd64 \
2021
--interactive \
2122
--tty \
2223
--rm \

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

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

1111
env:
1212
APP_NAME: admin-api
13-
AZURE_WEBAPP_NAME: admin-api-asdk-test-83sx # set this to your application's name
13+
AZURE_WEBAPP_NAME: admin-api-asdk-test-v23y # 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
15-
DOTNET_VERSION: 7.x.x
15+
DOTNET_VERSION: 8.x.x
1616
PROJECT_DIR: ./src/Saas.Admin/Saas.Admin.Service
1717
PROJECT_PATH: ${{ env.PROJECT_DIR }}/Saas.Admin.Service.csproj
1818
PUBLISH_PATH: ./publish

src/Saas.Admin/deployment/run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ container_deployment_dir="/asdk/src/Saas.Admin/deployment"
1111
# using volumes '--volume' to mount only the needed directories to the container.
1212
# using ':ro' to make scrip directories etc. read-only. Only config and log directories are writable.
1313
docker run \
14+
--platform linux/amd64 \
1415
--interactive \
1516
--tty \
1617
--rm \

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>a45ad9f7-37e3-4dc7-bf2c-9f1f3e449cba</UserSecretsId>
88
<Configurations>Debug;Release;Multi Debug</Configurations>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="6.1.1" />
13-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
14-
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.15.3" />
15-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.0.0" />
13+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
14+
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.16.0" />
15+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

0 commit comments

Comments
 (0)