Merge branch 'master' into dev

Author: sayedimac

.github/workflows/dotnet.yml

@@ -0,0 +1,29 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: dotnet
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 9.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

.github/workflows/master_alwaysazure(test).yml

@@ -0,0 +1,58 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Deploy to alwaysazure
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read #This is required for actions/checkout
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up .NET Core
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9.x'
+
+      - name: Build with dotnet
+        run: dotnet build --configuration Release
+
+      - name: dotnet publish
+        run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v4
+        with:
+          name: .net-app
+          path: ${{env.DOTNET_ROOT}}/myapp
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'test'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: .net-app
+      
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v3
+        with:
+          app-name: 'alwaysazure'
+          slot-name: 'test'
+          package: .
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_A0188C5895614E539E8122CE8618FB82 }}

Program.cs

@@ -4,33 +4,39 @@
 var builder = WebApplication.CreateBuilder(args);
 
 IConfiguration _configuration = new ConfigurationBuilder()
+
 .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
     .AddEnvironmentVariables()
     .Build();
 
-var clientId = _configuration["ClientId"] ?? throw new ArgumentNullException("ClientId");
-var clientSecret = _configuration["ClientSecret"] ?? throw new ArgumentNullException("ClientSecret");
-var tenantId = _configuration["TenantId"] ?? throw new ArgumentNullException("TenantId");
+
+var clientId = _configuration["ClientId"];
+var clientSecret = _configuration["ClientSecret"];
+var tenantId = _configuration["TenantId"];
 var subscriptionId = _configuration["SubscriptionId"];
 
 IConfidentialClientApplication authapp = ConfidentialClientApplicationBuilder.Create(clientId)
-    .WithClientSecret(clientSecret)
-    .WithAuthority(new Uri($"https://login.microsoftonline.com/{tenantId}"))
-    .Build();
+.WithClientSecret(clientSecret)
+.WithAuthority(new Uri($"https://login.microsoftonline.com/{tenantId}"))
+.Build();
 
 string[] scopes = ["https://management.azure.com/.default"];
-var authResult = await authapp.AcquireTokenForClient(scopes).ExecuteAsync();
+var authResult = authapp.AcquireTokenForClient(scopes).ExecuteAsync();
 
 
 builder.Services.AddHttpClient("AzureServices", httpClient =>
 {
     httpClient.BaseAddress = new Uri($"https://management.azure.com/subscriptions/{subscriptionId}/");
-    httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authResult.AccessToken);
+    httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authResult.Result.AccessToken);
 });
 
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
+// Add configuration
+builder.Configuration.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+.AddEnvironmentVariables();
+
 // Register the HTTP client
 builder.Services.AddHttpClient();
 
@@ -43,7 +49,6 @@
     options.Cookie.HttpOnly = true;
     options.Cookie.IsEssential = true;
 });
-
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
@@ -60,7 +65,7 @@
 app.UseAuthorization();
 
 app.MapControllerRoute(
-    name: "default",
-    pattern: "{controller=Home}/{action=Index}/{id?}");
+name: "default",
+pattern: "{controller=Home}/{action=Index}/{id?}");
 
-await app.RunAsync();
+app.Run();

README.md

@@ -1 +1,3 @@
-# AzureIntegration
+# Build Process (dotnet 9.0)
+
+![](https://github.com/sayedimac/AzureIntegration/workflows/dotnet/badge.svg)