From eec2777555c9a92b43cb52a2897a6c8322c415f5 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 14 Nov 2024 14:12:55 -0800 Subject: [PATCH 1/3] Only include the 'azure' and 'openai' agents --- tools/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/metadata.json b/tools/metadata.json index 14857f91..54f4334f 100644 --- a/tools/metadata.json +++ b/tools/metadata.json @@ -1,3 +1,3 @@ { - "AgentsToInclude": "*" + "AgentsToInclude": ["msaz", "openai-gpt"] } From 1485941cdd4c0521da6759e0c46ef14a70a91f8f Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 14 Nov 2024 15:25:45 -0800 Subject: [PATCH 2/3] Fix the module versioning --- build.psm1 | 16 ---------------- shell/AIShell.Integration/AIShell.psd1 | 3 ++- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/build.psm1 b/build.psm1 index d57e0645..30efc9fb 100644 --- a/build.psm1 +++ b/build.psm1 @@ -119,22 +119,6 @@ function Start-Build Write-Host "`n[Build the AIShell module ...]`n" -ForegroundColor Green $aish_module_csproj = GetProjectFile $module_dir dotnet publish $aish_module_csproj -c $Configuration -o $module_out_dir - - # Update version for the module manifest file. - $projectUrl = 'https://github.com/PowerShell/ProjectMercury' - $version = (Get-Item $module_out_dir/AIShell.Integration.dll).VersionInfo.ProductVersion - $privateData = "PrivateData = @{ PSData = @{ ProjectUri = '$projectUrl' } }" - if ($version -match "(.*)-(.*)") { - $version = $matches[1] - $prerelease = $matches[2] - # Put the prerelease tag in private data. - $privateData = "PrivateData = @{ PSData = @{ Prerelease = '$prerelease'; ProjectUri = '$projectUrl' } }" - } - - $moduleManifest = Get-Content $module_out_dir/AIShell.psd1 -Raw - $moduleManifest = $moduleManifest -replace "ModuleVersion = '.*'", "ModuleVersion = '$version'" - $moduleManifest = $moduleManifest -replace "}", " ${privateData}`n}`n" - Set-Content -Path $module_out_dir/AIShell.psd1 -Value $moduleManifest -NoNewline } if ($LASTEXITCODE -eq 0) { diff --git a/shell/AIShell.Integration/AIShell.psd1 b/shell/AIShell.Integration/AIShell.psd1 index 53f6b11c..d2cd2a98 100644 --- a/shell/AIShell.Integration/AIShell.psd1 +++ b/shell/AIShell.Integration/AIShell.psd1 @@ -1,7 +1,7 @@ @{ RootModule = 'AIShell.psm1' NestedModules = @("AIShell.Integration.dll") - ModuleVersion = '0.1.0' + ModuleVersion = '1.0.1' GUID = 'ECB8BEE0-59B9-4DAE-9D7B-A990B480279A' Author = 'Microsoft Corporation' CompanyName = 'Microsoft Corporation' @@ -13,4 +13,5 @@ VariablesToExport = '*' AliasesToExport = @('aish', 'askai', 'fixit') HelpInfoURI = 'https://aka.ms/aishell-help' + PrivateData = @{ PSData = @{ Prerelease = 'preview1'; ProjectUri = 'https://github.com/PowerShell/ProjectMercury' } } } From 8b3b9992068fb7bb9f1fd6d404df5b24ec0b09dd Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Fri, 15 Nov 2024 13:48:51 -0800 Subject: [PATCH 3/3] Revert to include all agents by default --- tools/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/metadata.json b/tools/metadata.json index 54f4334f..14857f91 100644 --- a/tools/metadata.json +++ b/tools/metadata.json @@ -1,3 +1,3 @@ { - "AgentsToInclude": ["msaz", "openai-gpt"] + "AgentsToInclude": "*" }