Skip to content

Commit 5e436e0

Browse files
authored
Merge pull request #4 from editor-tools/upgrade-to-0.29.0
Upgrade to 0.29.0
2 parents 2436b20 + d807d06 commit 5e436e0

File tree

887 files changed

+33851
-97400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

887 files changed

+33851
-97400
lines changed

.gitignore

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ Generated_Code #added for RIA/Silverlight projects
7272
nunit-*.xml
7373
*.userprefs
7474
packaging/
75-
tools/FAKE.Core
76-
tools/SourceLink.Fake
77-
tools/xunit.runner.console
78-
tools/Octokit.CodeFormatter
7975
*.ncrunch*
8076
*.GhostDoc.xml
8177

@@ -90,4 +86,19 @@ pingme.txt
9086
docs/_build
9187

9288
# it's 2015, no need to keep this around when migrating projects
93-
Backup/
89+
Backup/
90+
91+
# .NET Core
92+
*.lock.json
93+
94+
# VSCode
95+
**/.vscode/*
96+
!**/.vscode/settings.json
97+
!**/.vscode/tasks.json
98+
!**/.vscode/launch.json
99+
100+
# CAKE
101+
.dotnet/*
102+
tools/*
103+
!tools/gitversion_wrapper.sh
104+
!tools/LINQPad

.travis.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
language: csharp
2-
mono:
3-
- 4.2.3
42

5-
sudo: false # use the new container-based Travis infrastructure
6-
os:
7-
- osx
8-
- linux
9-
install:
10-
- nuget restore Octokit-Mono.sln
11-
script:
12-
- mono tools/nuget/NuGet.exe restore Octokit-Mono.sln
13-
- ./build.sh BuildMono
14-
- ./build.sh
3+
matrix:
4+
include:
5+
- os: linux
6+
dist: trusty
7+
sudo: required
8+
dotnet: 1.0.4
9+
- os: osx
10+
osx_image: xcode8
11+
dotnet: 1.0.4
12+
13+
before_script:
14+
- if test "$TRAVIS_OS_NAME" == "osx"; then export FrameworkPathOverride=/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/; else export FrameworkPathOverride=/usr/lib/mono/4.5/; fi
15+
16+
script:
17+
- git fetch --unshallow --tags
18+
- dotnet --info
19+
- ./build.sh --linksources=true

CODE_OF_CONDUCT.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, gender identity and expression, level of experience,
9+
nationality, personal appearance, race, religion, or sexual identity and
10+
orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at [[email protected]](mailto:[email protected]). All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at [http://contributor-covenant.org/version/1/4][version]
72+
73+
[homepage]: http://contributor-covenant.org
74+
[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ easiest way to do this. You can then clone down your fork instead:
2424

2525
`git clone https://github.com/MY-USERNAME-HERE/Octokit.net.git Octokit`
2626

27-
After doing that, run the `.\build` script at the root of the repository
27+
After doing that, run the `.\build.ps1` or `./build.sh` script at the root of the repository
2828
to ensure everything builds and the tests pass.
2929

3030
## How can I get involved?
@@ -56,23 +56,31 @@ potential conflicts that may occur in the future.
5656
If you make focused commits (instead of one monolithic commit) and have descriptive
5757
commit messages, this will help speed up the review process.
5858

59-
### Adding New files
59+
At any time you can build the project with
6060

61-
To ensure new files are available in the various projects, we have a helper script
62-
to synchronize these changes across all the projects in the solution.
61+
`.\build.ps1 -Target Build`
62+
or
63+
`./build.sh --target=build`
6364

64-
If you need to create new files:
65+
this will also run code analysis rules.
6566

66-
- add the file to the main `Octokit` project
67-
- build the project (to ensure the `csproj` change is saved)
68-
- run this command: `.\build FixProjects`
67+
### Running builds cross platform
6968

70-
At any time you can build the project with `.\build BuildApp` - this will also
71-
run FxCop analysis.
69+
Octokit.net uses a CAKE build script and can be built on multiple platforms.
70+
71+
To install dependencies and run the CAKE build script use the following wrapper scripts and parameter syntax:
72+
73+
- Windows (Powershell)
74+
75+
`.\build.ps1 -Target <target> -Configuration Release -LinkSources [Additional Parameters]`
76+
77+
- Linux/OSX (bash)
78+
79+
`./build.sh --target=<target> --configuration==Release --linksources=true [Additional Parameters]`
7280

7381
### Running Tests
7482

75-
Octokit.net also has a suite of tests which you can run to ensure existing
83+
Octokit.net has a suite of tests which you can run to ensure existing
7684
behaviour is not affected. If you're adding new features, please add some
7785
tests alongside so the maintainers can sleep at night, knowing their
7886
safety blanket is nice and green!
@@ -81,13 +89,21 @@ The test suite is arranged into fast and slow tests.
8189

8290
#### Fast Tests
8391

84-
**Unit Tests:** `.\build UnitTests`
92+
**Unit Tests:**
93+
94+
`.\build.ps1 -Target UnitTests` or `./build.sh --target=UnitTests`
95+
96+
Alternatively, you can run the `Octokit.Tests` assembly in the Visual Studio test runner.
8597

8698
These tests verify specific behaviour while being isolated from the rest of the
8799
library. If you are not familiar with unit testing, have a look at the existing
88100
examples - they should be easy to apply to your work.
89101

90-
**Convention Tests:** `.\build ConventionTests`
102+
**Convention Tests:**
103+
104+
`.\build.ps1 -Target ConventionTests` or `./build.sh --target=ConventionTests`
105+
106+
Alternatively, you can run the `Octokit.Tests.Conventions` assembly in the Visual Studio test runner.
91107

92108
These tests verify conventions and structure across the entire codebase -
93109
ensuring everything is consistent and predictable. When writing new features,
@@ -108,17 +124,21 @@ variables:
108124

109125
`.\script\configure-integration-tests.ps1`
110126

127+
NOTE: On Linux/OSX the environment variables currently need to be configured manually.
128+
111129
After running this, ensure any existing instances of Visual Studio are restarted
112130
so they pick up the new environment variables are detected.
113131

114132
With these variables set, you can run the integration tests locally using
115-
`.\build IntegrationTests` or by running the `Octokit.Tests.Integration`
116-
assembly in the Visual Studio test runner.
117133

118-
**Note:** as the integration tests rely on using the actual GitHub API, you may
119-
encounter issues if running the tests too frequently. Please use a test account
120-
so that you're not impacted in the unlikely scenario of your account being
121-
flagged as a spammer.
134+
`.\build.ps1 -Target IntegrationTests` or `./build.sh --target=IntegrationTests`
135+
136+
Alternatively, you can run the `Octokit.Tests.Integration` assembly in the Visual Studio test runner.
137+
138+
**Note:** as the integration tests rely on using the actual GitHub API, you will encounter
139+
API rate limit/abuse detection issues if running the tests too frequently. Please use a test account
140+
so that your main account is not impacted in the event that the tests trigger the GitHub abuse
141+
detection mechanism.
122142

123143
### Testing Documentation
124144

GitVersion.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
branches:
2+
master:
3+
mode: ContinuousDeployment
4+
increment: Minor
5+
tag: beta
6+
dotnetcore:
7+
mode: ContinuousDeployment
8+
increment: Minor
9+
tag: alpha
10+
ignore:
11+
sha: []

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012 GitHub, Inc.
1+
Copyright (c) 2017 GitHub, Inc.
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of
44
this software and associated documentation files (the "Software"), to deal in

Octokit-Mono.sln

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)