Merge branch 'main' into fix/pathbase-not-captured

getsentry · Sep 21, 2021 · ae0bd95 · ae0bd95
2 parents bfe8b33 + 3146b63
commit ae0bd95
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,10 +6,11 @@ For big feature it's advised to raise an issue to discuss it first.
 ## TLDR: 
 
 * Install [the .NET Core SDK](https://dot.net/) 
-* run `./build.sh` on macOS/Linux or `powershell ./build.ps1` on Windows.
+* To quickly get up and running, you can just run `dotnet build`
+* To run a full build and test locally before pushing, run `./build.sh` or `./buld.ps1`
 
 ## Dependencies
 
-* The .NET Core SDK (version that is pinned on `global.json` is advised but not required, remove the file if needed).
+* The .NET Core SDK
 * On Windows: .NET Framework 4.6.2 or higher.
-* On macOS/Linux: Mono 6 or higher if you expexct to run the unit tests on the `net4x` targets.
+* On macOS/Linux: Mono 6 or higher if you expect to run the unit tests on the `net4x` targets.
diff --git a/Sentry.sln b/Sentry.sln
@@ -25,6 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{9D7E2F87
 		build.ps1 = build.ps1
 		build.sh = build.sh
 		CHANGELOG.md = CHANGELOG.md
+		CONTRIBUTING.md = CONTRIBUTING.md
 		Directory.Build.props = Directory.Build.props
 		README.md = README.md
 	EndProjectSection