Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge the release branch for v1.0.0-preview.1 release into the main branch #301

Merged
merged 3 commits into from
Nov 15, 2024
Merged

Merge the release branch for v1.0.0-preview.1 release into the main branch #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eec2777
Only include the 'azure' and 'openai' agents
daxian-dbw Nov 14, 2024
1485941
Fix the module versioning
daxian-dbw Nov 14, 2024
8b3b999
Revert to include all agents by default
daxian-dbw Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion shell/AIShell.Integration/AIShell.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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' } }
}