From 11adc3e8da95d59d13b79284a116e97255a920c1 Mon Sep 17 00:00:00 2001 From: larenelg Date: Mon, 31 Aug 2020 20:44:14 +1000 Subject: [PATCH 1/2] rename master to release --- Build.ps1 | 2 +- README.md | 4 ++-- appveyor.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Build.ps1 b/Build.ps1 index ff877e2..41dbb82 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -14,7 +14,7 @@ if($LASTEXITCODE -ne 0) { exit 1 } $branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL]; $revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL]; -$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"] +$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "release" -and $revision -ne "local"] echo "build: Version suffix is $suffix" diff --git a/README.md b/README.md index 71ee848..55a6974 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ var installedApps = await connection.Apps.ListAsync(); **To authenticate**, the `SeqConnection` constructor accepts an `apiKey` parameter (make sure the API key permits _user-level access_) or, if you want to log in with personal credentials you can `await connection.Users.LoginAsync(username, password)`. -For a more complete example, see the [seq-tail app included in the source](https://github.com/datalust/seq-api/blob/master/example/SeqTail/Program.cs). +For a more complete example, see the [seq-tail app included in the source](https://github.com/datalust/seq-api/blob/release/example/SeqTail/Program.cs). #### Creating entities @@ -43,7 +43,7 @@ signal.Title = "Signal 123"; await connection.Signals.AddAsync(signal); ``` -See the [signal-copy app](https://github.com/datalust/seq-api/blob/master/example/SignalCopy/Program.cs) for an example of this pattern in action. +See the [signal-copy app](https://github.com/datalust/seq-api/blob/release/example/SignalCopy/Program.cs) for an example of this pattern in action. ### Reading events diff --git a/appveyor.yml b/appveyor.yml index 4743d67..104b12e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,11 +12,11 @@ deploy: secure: sMicBLl7Z83H/mhX10DL7Yqwa80ZHUbb9fRHKmxd5m2MN2DWAE1kbYH/GPQPFajZ skip_symbols: true on: - branch: /^(master|dev)$/ + branch: /^(release|dev)$/ - provider: GitHub auth_token: secure: hX+cZmW+9BCXy7vyH8myWsYdtQHyzzil9K5yvjJv7dK9XmyrGYYDj/DPzMqsXSjo artifact: /Seq.Api.*\.nupkg/ tag: v$(appveyor_build_version) on: - branch: master + branch: release From e42b29b64f6a87c9e5e5892c30fbc3dbab74714d Mon Sep 17 00:00:00 2001 From: larenelg Date: Tue, 1 Sep 2020 10:29:48 +1000 Subject: [PATCH 2/2] use 'main' in our C# projects --- Build.ps1 | 2 +- README.md | 4 ++-- appveyor.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Build.ps1 b/Build.ps1 index 41dbb82..40b95c7 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -14,7 +14,7 @@ if($LASTEXITCODE -ne 0) { exit 1 } $branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL]; $revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL]; -$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "release" -and $revision -ne "local"] +$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "main" -and $revision -ne "local"] echo "build: Version suffix is $suffix" diff --git a/README.md b/README.md index 55a6974..5ad2fc5 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ var installedApps = await connection.Apps.ListAsync(); **To authenticate**, the `SeqConnection` constructor accepts an `apiKey` parameter (make sure the API key permits _user-level access_) or, if you want to log in with personal credentials you can `await connection.Users.LoginAsync(username, password)`. -For a more complete example, see the [seq-tail app included in the source](https://github.com/datalust/seq-api/blob/release/example/SeqTail/Program.cs). +For a more complete example, see the [seq-tail app included in the source](https://github.com/datalust/seq-api/blob/main/example/SeqTail/Program.cs). #### Creating entities @@ -43,7 +43,7 @@ signal.Title = "Signal 123"; await connection.Signals.AddAsync(signal); ``` -See the [signal-copy app](https://github.com/datalust/seq-api/blob/release/example/SignalCopy/Program.cs) for an example of this pattern in action. +See the [signal-copy app](https://github.com/datalust/seq-api/blob/main/example/SignalCopy/Program.cs) for an example of this pattern in action. ### Reading events diff --git a/appveyor.yml b/appveyor.yml index 104b12e..73bec11 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,11 +12,11 @@ deploy: secure: sMicBLl7Z83H/mhX10DL7Yqwa80ZHUbb9fRHKmxd5m2MN2DWAE1kbYH/GPQPFajZ skip_symbols: true on: - branch: /^(release|dev)$/ + branch: /^(main|dev)$/ - provider: GitHub auth_token: secure: hX+cZmW+9BCXy7vyH8myWsYdtQHyzzil9K5yvjJv7dK9XmyrGYYDj/DPzMqsXSjo artifact: /Seq.Api.*\.nupkg/ tag: v$(appveyor_build_version) on: - branch: release + branch: main