Skip to content

Commit e422685

Browse files
authored
Switch master -> main (#43)
* Switch master -> main * CODEOWNERS added
1 parent d813664 commit e422685

File tree

8 files changed

+20
-13
lines changed

8 files changed

+20
-13
lines changed

.editorconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
14
root = true
25

36
[*]
7+
charset = utf-8
48
end_of_line = lf
59
insert_final_newline = true
10+
trim_trailing_whitespace = true
611

712
[*.cs]
813
indent_style = space
914
indent_size = 4
15+
max_line_length = 120
1016

11-
[Makefile]
17+
[{CODEOWNERS,Makefile}]
1218
indent_style = tab

.github/workflows/check-urls.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: "Check URLs"
22

33
# Controls when the action will run. Triggers the workflow on push or pull request
4-
# events but only for the master branch
4+
# events but only for the main branch
55
on:
66
push:
7-
branches: [ master ]
7+
branches: [ master, main ]
88
pull_request:
9-
branches: [ master ]
9+
branches: [ master, main ]
1010

1111
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1212
jobs:

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ master, main ]
88

99
jobs:
1010
analyze:

.github/workflows/dotnet-core.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: .NET Core
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ master, main ]
88

99
jobs:
1010
build-and-test:

.github/workflows/net-framework.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: .NET Framework
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ master, main ]
88

99
jobs:
1010
build-and-test:

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Aspose.BarCode Cloud SDK for .NET
22

33
[![License](https://img.shields.io/github/license/aspose-barcode-cloud/aspose-barcode-cloud-dotnet)](LICENSE)
4-
[![.NET Core](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/dotnet-core.yml/badge.svg?branch=master)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/dotnet-core.yml)
5-
[![.NET Framework](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/net-framework.yml/badge.svg?branch=master)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/net-framework.yml)
4+
[![.NET Core](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/dotnet-core.yml/badge.svg)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/dotnet-core.yml)
5+
[![.NET Framework](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/net-framework.yml/badge.svg)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/actions/workflows/net-framework.yml)
66
[![Nuget](https://img.shields.io/nuget/v/Aspose.BarCode-Cloud)](https://www.nuget.org/packages/Aspose.BarCode-Cloud/)
77

88
- API version: 3.0

scripts/build_package.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
REM Check state
22
git fetch origin || EXIT /B 1
3-
git diff origin/master --exit-code || (
3+
git diff origin/main --exit-code || (
44
echo Unmerged state
55
EXIT /B 1
66
)

0 commit comments

Comments
 (0)