Skip to content

fix oai regen preview script #10141

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

Merged
jorgerangel-msft merged 2 commits into from
Mar 27, 2026
Merged

fix oai regen preview script #10141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8906459
fix oai regen preview script
jorgerangel-msft Mar 25, 2026
6667f9c
Merge branch 'main' into fix-oai-regen
jorgerangel-msft Mar 26, 2026
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
45 changes: 26 additions & 19 deletions packages/http-client-csharp/eng/scripts/RegenPreview.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,15 +554,24 @@ function Update-OpenAIGenerator {

$packageJson | ConvertTo-Json -Depth 100 | Set-Content $codegenPackageJsonPath -Encoding UTF8

# Delete package-lock.json to force regeneration with new dependencies
# Remove stale node_modules and package-lock.json to ensure clean dependency resolution
Write-Host "Removing stale node_modules and package-lock.json..." -ForegroundColor Gray
$rootNodeModules = Join-Path $OpenAIRepoPath "node_modules"
if (Test-Path $rootNodeModules) {
Remove-Item $rootNodeModules -Recurse -Force
}
$codegenNodeModules = Join-Path $OpenAIRepoPath "codegen" "node_modules"
if (Test-Path $codegenNodeModules) {
Remove-Item $codegenNodeModules -Recurse -Force
}
$packageLockPath = Join-Path $OpenAIRepoPath "package-lock.json"
if (Test-Path $packageLockPath) {
Write-Host "Deleting package-lock.json..." -ForegroundColor Gray
Remove-Item $packageLockPath -Force
}

# Run npm install to regenerate package-lock.json with local dependencies
Write-Host "Installing dependencies in openai directory..." -ForegroundColor Gray
# Install dependencies
Write-Host "Installing dependencies..." -ForegroundColor Gray
Push-Location $OpenAIRepoPath
try {
$npmOutput = Invoke "npm install" $OpenAIRepoPath
Expand All @@ -576,25 +585,23 @@ function Update-OpenAIGenerator {
Pop-Location
}

# Update OpenAI.Library.Plugin.csproj
$pluginCsprojPath = Join-Path $OpenAIRepoPath "codegen" "generator" "src" "OpenAI.Library.Plugin.csproj"
if (-not (Test-Path $pluginCsprojPath)) {
throw "OpenAI.Library.Plugin.csproj not found: $pluginCsprojPath"
# Update Directory.Packages.props
$directoryPackagesPropsPath = Join-Path $OpenAIRepoPath "Directory.Packages.props"
if (-not (Test-Path $directoryPackagesPropsPath)) {
throw "Directory.Packages.props not found: $directoryPackagesPropsPath"
}

Write-Host "Updating OpenAI.Library.Plugin.csproj..." -ForegroundColor Gray
[xml]$csproj = Get-Content $pluginCsprojPath

$packageReference = $csproj.Project.ItemGroup.PackageReference |
Where-Object { $_.Include -eq "Microsoft.TypeSpec.Generator.ClientModel" } |
Select-Object -First 1
Write-Host "Updating Directory.Packages.props..." -ForegroundColor Gray
$propsContent = Get-Content $directoryPackagesPropsPath -Raw
$pattern = '(<PackageVersion\s+Include="Microsoft\.TypeSpec\.Generator\.ClientModel"\s+Version=")([^"]+)(")'

if ($packageReference) {
$packageReference.Version = $LocalVersion
$csproj.Save($pluginCsprojPath)
Write-Host " Updated Microsoft.TypeSpec.Generator.ClientModel to $LocalVersion" -ForegroundColor Green
if ($propsContent -match $pattern) {
$oldVersion = $Matches[2]
$newContent = $propsContent -replace $pattern, "`${1}$LocalVersion`${3}"
Set-Content $directoryPackagesPropsPath -Value $newContent -Encoding utf8 -NoNewline
Write-Host " Updated Microsoft.TypeSpec.Generator.ClientModel from $oldVersion to $LocalVersion" -ForegroundColor Green
} else {
throw "Microsoft.TypeSpec.Generator.ClientModel package reference not found in csproj"
throw "Microsoft.TypeSpec.Generator.ClientModel PackageVersion not found in Directory.Packages.props"
}

# Invoke Invoke-CodeGen.ps1 with Clean option
Expand Down Expand Up @@ -628,7 +635,7 @@ function Update-OpenAIGenerator {
"codegen/package.json"
"package-lock.json"
"nuget.config"
"codegen/generator/src/OpenAI.Library.Plugin.csproj"
"Directory.Packages.props"
)
$restoreCmd = "git restore $($filesToRestore -join ' ')"
Invoke $restoreCmd $OpenAIRepoPath
Expand Down
Loading