Migrate to .NET 8

amphasis · Mar 20, 2024 · 1ea5c15 · 1ea5c15
1 parent 4542323
commit 1ea5c15
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 17 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,13 +1,37 @@
+# This workflow will build and push a .NET Core app to an Azure Web App when a commit is pushed to your default branch.
+#
+# This workflow assumes you have already created the target Azure App Service web app.
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-dotnetcore?tabs=net60&pivots=development-environment-vscode
+#
+# To configure this workflow:
+#
+# 1. Download the Publish Profile for your Azure Web App. You can download this file from the Overview page of your Web App in the Azure Portal.
+#    For more information: https://docs.microsoft.com/en-us/azure/app-service/deploy-github-actions?tabs=applevel#generate-deployment-credentials
+#
+# 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
+#    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
+#
+# 3. Change the value for the AZURE_WEBAPP_NAME. Optionally, change the AZURE_WEBAPP_PACKAGE_PATH and DOTNET_VERSION environment variables below.
+#
+# For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
+# For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# For more samples to get started with GitHub Action workflows to deploy to Azure: https://github.com/Azure/actions-workflow-samples
+
 name: Deploy ASP.NET Core app to Azure Web App
 
 on:
   push:
     branches: [ master ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
 
 env:
   NUGET_USERNAME: amphasis
   NUGET_SOURCE: https://nuget.pkg.github.com/amphasis/index.json
-  DOTNET_VERSION: '6.0.100'
+  NUGET_SOURCE_NAME: nuget.pkg.github.com/amphasis
+  DOTNET_VERSION: '8.0.x'
   AZURE_WEBAPP_NAME: 'leff'
   AZURE_WEBAPP_PACKAGE_PATH: '.'
   AZURE_WEBAPP_PROJECT_PATH: 'Amphasis.Azure.WebPortal'
@@ -18,18 +42,18 @@ jobs:
     steps:
 
       # Checkout the repo
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
 
       # Setup .NET Core SDK
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: ${{ env.DOTNET_VERSION }} 
+          dotnet-version: ${{ env.DOTNET_VERSION }}
 
       # Restore packages
       - name: Restore packages
         run: |
-          dotnet nuget add source ${{ env.NUGET_SOURCE }} --name "private-packages" --store-password-in-clear-text --username ${{ env.NUGET_USERNAME }} --password ${{ secrets.PACKAGES_TOKEN }}
+          dotnet nuget update source ${{ env.NUGET_SOURCE_NAME }} --store-password-in-clear-text --username ${{ env.NUGET_USERNAME }} --password ${{ secrets.PACKAGES_TOKEN }}
           dotnet restore
 
       # Run dotnet build and publish
@@ -40,8 +64,9 @@ jobs:
 
       # Deploy to Azure Web apps
       - name: 'Run Azure webapp deploy action using publish profile credentials'
+        id: deploy-to-webapp
         uses: azure/webapps-deploy@v2
-        with: 
+        with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }}
           publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE  }}
           package: '${{ env.AZURE_WEBAPP_PACKAGE_PATH }}/${{ env.AZURE_WEBAPP_PROJECT_PATH }}'
diff --git a/Amphasis.Azure.WebPortal/Amphasis.Azure.WebPortal.csproj b/Amphasis.Azure.WebPortal/Amphasis.Azure.WebPortal.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <UserSecretsId>3ad90e84-123b-437a-ad29-dd08e1e3db34</UserSecretsId>
   </PropertyGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="Amphasis.SimaLand" Version="1.0.14" />
-    <PackageReference Include="AspNet.Security.OAuth.MailRu" Version="6.0.6" />
-    <PackageReference Include="AspNet.Security.OAuth.Vkontakte" Version="6.0.6" />
-    <PackageReference Include="AspNet.Security.OAuth.Yandex" Version="6.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.6" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.6" />
-    <PackageReference Include="SkiaSharp" Version="2.88.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.21.0" />
+    <PackageReference Include="Amphasis.SimaLand" Version="1.1.13" />
+    <PackageReference Include="AspNet.Security.OAuth.MailRu" Version="8.0.0" />
+    <PackageReference Include="AspNet.Security.OAuth.Vkontakte" Version="8.0.0" />
+    <PackageReference Include="AspNet.Security.OAuth.Yandex" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.3" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
+    <PackageReference Include="SkiaSharp" Version="2.88.7" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Amphasis.Azure.sln b/Amphasis.Azure.sln
@@ -1,10 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34714.143
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amphasis.Azure.WebPortal", "Amphasis.Azure.WebPortal\Amphasis.Azure.WebPortal.csproj", "{79F4B347-9FDF-4545-AFF5-BF6D1A52839C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{45D72010-48B6-4155-ABEC-BD2CB5CF6CC9}"
+	ProjectSection(SolutionItems) = preProject
+		nuget.config = nuget.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<packageSources>
+		<add key="nuget.pkg.github.com/amphasis" value="https://nuget.pkg.github.com/amphasis/index.json" protocolVersion="3" />
+	</packageSources>
+</configuration>