Merge remote-tracking branch 'origin/dev' into waf-prdc

Author: Prajwal-Microsoft

App/backend-api/Microsoft.GS.DPS.Host/Microsoft.GS.DPS.Host.csproj

@@ -19,8 +19,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.6" />
-    <PackageReference Include="Microsoft.KernelMemory.WebClient" Version="0.98.250508.3" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.59.0" />
+    <PackageReference Include="Microsoft.KernelMemory.WebClient" Version="0.79.241014.2" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.32.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="MimeTypesMap" Version="1.0.9" />
 	<PackageReference Include="MongoDB.Bson" Version="2.29.0" />

App/backend-api/Microsoft.GS.DPS/Microsoft.GS.DPS.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Azure.Search.Documents" Version="11.6.1" />
     <PackageReference Include="FluentValidation" Version="12.0.0" />
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
-    <PackageReference Include="Microsoft.KernelMemory.WebClient" Version="0.98.250508.3" />
+    <PackageReference Include="Microsoft.KernelMemory.WebClient" Version="0.79.241014.2" />
     <PackageReference Include="Microsoft.Maui.Graphics" Version="9.0.81" />
     <PackageReference Include="Microsoft.Maui.Graphics.Skia" Version="9.0.81" />
     <PackageReference Include="MongoDB.Driver" Version="2.29.0" />

App/kernel-memory/Directory.Packages.props

@@ -66,7 +66,7 @@
   <!-- Semantic Kernel -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.1" />
-    <PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.44.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.15.1" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.15.1" />
   </ItemGroup>
   <!-- Documentation -->

Deployment/main.bicep

@@ -23,6 +23,18 @@ var resourceGroupLocation = resourceGroup().location
 // Load the abbrevations file required to name the azure resources.
 var abbrs = loadJsonContent('./abbreviations.json')
 
+@description('Optional created by user name')
+param createdBy string
+
+resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
+  name: 'default'
+  properties: {
+    tags: {
+      TemplateName: 'DKM'
+      CreatedBy: createdBy
+    }
+  }
+}
 
 // Create a storage account
 module gs_storageaccount 'bicep/azurestorageaccount.bicep' = {
@@ -202,3 +214,5 @@ output gs_containerregistry_endpoint string = gs_containerregistry.outputs.acrEn
 //return resourcegroup resource ID
 output gs_resourcegroup_id string = resourceGroup().id
 
+output createdByOutput string = createdBy
+

Deployment/resourcedeployment.ps1

@@ -74,7 +74,8 @@ function ValidateVariableIsNullOrEmpty {
 function PromptForParameters {
     param(
         [string]$email
-    )
+
+)
 
     Clear-Host
 
@@ -109,7 +110,7 @@ function LoginAzure([string]$tenantId, [string]$subscriptionID) {
         az login --service-principal `
             --username $env:AZURE_CLIENT_ID `
             --password $env:AZURE_CLIENT_SECRET `
-            --tenant $env:AZURE_TENANT_ID
+            --tenant $env:AZURE_TENANT_ID `
         Write-Host "CI deployment mode"
     }
     else{
@@ -125,7 +126,7 @@ function LoginAzure([string]$tenantId, [string]$subscriptionID) {
         Write-Host "manual deployment mode"
     }
     az account set --subscription $subscriptionID
-    Write-Host "Switched subscription to '$subscriptionID' `r`n" -ForegroundColor Yellow
+    Write-Host "Switched subscription to '$subscriptionID' `r`n" -ForegroundColor Yellow  
 }
 
 function DisplayResult([DeploymentResult]$displayResult) {