Skip to content

Commit

Permalink
Merge pull request #870 from rabbitmq/rabbitmq-dotnet-client-6.1.1-prep
Browse files Browse the repository at this point in the history
Prep for 6.1.1

(cherry picked from commit f991662)
  • Loading branch information
lukebakken committed Jun 16, 2020
1 parent dc52fb1 commit efa3676
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Changes Between 6.1.0 and 6.1.1

A full list of changes can be found in the GitHub milestone: [`6.1.0`](https://github.com/rabbitmq/rabbitmq-dotnet-client/milestone/50?closed=1).

## Changes Between 6.0.0 and 6.1.0

This release continues with improvements to memory use and object allocations.
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "6.1.0.{build}"
version: "6.1.1.{build}"

platform: Any CPU
configuration: Release
Expand All @@ -9,8 +9,8 @@ image: Visual Studio 2019
cache:
# Note: this must match the $rabbitmq_installer_path and $erlang_installer_path values in
# tools\appveyor\install.ps1
- "%HOMEDRIVE%%HOMEPATH%\\rabbitmq-server-3.8.3.exe"
- "%HOMEDRIVE%%HOMEPATH%\\otp_win64_23.0.1.exe"
- "%HOMEDRIVE%%HOMEPATH%\\rabbitmq-server-3.8.5.exe"
- "%HOMEDRIVE%%HOMEPATH%\\otp_win64_23.0.2.exe"

install:
- ps: .\tools\appveyor\install.ps1
Expand Down
8 changes: 4 additions & 4 deletions tools/appveyor/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Set-StrictMode -Version 2.0
Write-Host '[INFO] Removing all existing versions of Erlang...'
Get-ChildItem -Path 'C:\Program Files\erl*\Uninstall.exe' | %{ Start-Process -Wait -NoNewWindow -FilePath $_ -ArgumentList '/S' }

$erlang_download_url = 'http://erlang.org/download/otp_win64_23.0.1.exe'
$erlang_installer_path = Join-Path -Path $HOME -ChildPath 'otp_win64_23.0.1.exe'
$erlang_download_url = 'http://erlang.org/download/otp_win64_23.0.2.exe'
$erlang_installer_path = Join-Path -Path $HOME -ChildPath 'otp_win64_23.0.2.exe'
$erlang_install_dir = Join-Path -Path $HOME -ChildPath 'erlang'

Write-Host '[INFO] Downloading Erlang...'
Expand All @@ -25,8 +25,8 @@ else
Write-Host "[INFO] Installing Erlang to $erlang_install_dir..."
& $erlang_installer_path '/S' "/D=$erlang_install_dir" | Out-Null

$rabbitmq_installer_download_url = 'https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.3/rabbitmq-server-3.8.3.exe'
$rabbitmq_installer_path = Join-Path -Path $HOME -ChildPath 'rabbitmq-server-3.8.3.exe'
$rabbitmq_installer_download_url = 'https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.3/rabbitmq-server-3.8.5.exe'
$rabbitmq_installer_path = Join-Path -Path $HOME -ChildPath 'rabbitmq-server-3.8.5.exe'

$erlang_reg_path = 'HKLM:\SOFTWARE\Ericsson\Erlang'
if (Test-Path 'HKLM:\SOFTWARE\WOW6432Node\')
Expand Down

0 comments on commit efa3676

Please sign in to comment.