Skip to content

[Ignore] Update changelog and ADS script #2209

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.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tools/changelog/updateChangelog.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ $cloneParams = @{
CheckoutBranch = $branchName
CloneBranch = $PsesBaseBranch
Clobber = $true
Remotes = @{ 'upstream' = "https://github.com/$TargetFork/$vscodeRepoName" }
Remotes = @{ 'upstream' = "https://github.com/$TargetFork/$psesRepoName" }
}
Copy-GitRepository @cloneParams -Verbose:$VerbosePreference

Expand Down
10 changes: 7 additions & 3 deletions tools/postReleaseScripts/updateAzureDataStudio.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ param(
[string[]]
$GalleryFileName = ('extensionsGallery.json','extensionsGallery-insider.json'),

[Parameter()]
[string]
$SourceFork = 'rjmholt',

[Parameter()]
[string]
$TargetFork = 'Microsoft',
Expand Down Expand Up @@ -52,7 +56,7 @@ function NewReleaseVersionEntry
files = @(
[ordered]@{
assetType = 'Microsoft.VisualStudio.Services.VSIXPackage'
source = "https://sqlopsextensions.blob.core.windows.net/extensions/powershell/PowerShell-$Version.vsix"
source = "https://sqlopsextensions.blob.core.windows.net/extensions/powershell/ms-vscode.PowerShell-$Version.vsix"
}
[ordered]@{
assetType = 'Microsoft.VisualStudio.Services.Icons.Default'
Expand Down Expand Up @@ -244,7 +248,7 @@ function UpdateGalleryFile
$repoLocation = Join-Path ([System.IO.Path]::GetTempPath()) 'ads-temp-checkout'

$cloneParams = @{
OriginRemote = 'https://github.com/rjmholt/AzureDataStudio'
OriginRemote = "https://github.com/$SourceFork/AzureDataStudio"
Destination = $repoLocation
CloneBranch = 'release/extensions'
CheckoutBranch = $branchName
Expand All @@ -271,6 +275,6 @@ $prParams = @{
Title = "Update PowerShell extension to v$ExtensionVersion"
Description = $PRDescription
GitHubToken = $GitHubToken
FromOrg = 'rjmholt'
FromOrg = $SourceFork
}
New-GitHubPR @prParams