Skip to content

Commit bb88af6

Browse files
committed
Merge branch 'master' into openapi
2 parents 1882492 + 507851e commit bb88af6

File tree

8 files changed

+34
-7
lines changed

8 files changed

+34
-7
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2023.2.1",
6+
"version": "2023.2.2",
77
"commands": [
88
"jb"
99
]

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Bug report
3-
about: Create a report to help us improve
3+
about: Create a report to help us improve.
44
title: ''
55
labels: 'bug'
66
assignees: ''

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Documentation
4+
url: https://www.jsonapi.net/usage/resources/index.html
5+
about: Read our comprehensive documentation.
6+
- name: Sponsor JsonApiDotNetCore
7+
url: https://github.com/sponsors/json-api-dotnet
8+
about: Help the continued development.
9+
- name: Ask on Gitter
10+
url: https://gitter.im/json-api-dotnet-core/Lobby
11+
about: Get in touch with the whole community.
12+
- name: Ask on Stack Overflow
13+
url: https://stackoverflow.com/questions/tagged/json-api
14+
about: The best place for asking general-purpose questions.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Feature request
3-
about: Suggest an idea for this project
3+
about: Suggest an idea for this project.
44
title: ''
55
labels: 'enhancement'
66
assignees: ''

.github/ISSUE_TEMPLATE/question.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Question
3-
about: Ask a question
3+
about: Ask a question.
44
title: ''
55
labels: 'question'
66
assignees: ''

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
$versionSuffix = $segments.Length -eq 1 ? '' : $segments[1..$($segments.Length - 1)] -join '-'
103103
104104
[xml]$xml = Get-Content Directory.Build.props
105-
$configuredVersionPrefix = $xml.Project.PropertyGroup[0].JsonApiDotNetCoreVersionPrefix
105+
$configuredVersionPrefix = $xml.Project.PropertyGroup.JsonApiDotNetCoreVersionPrefix | Select-Object -First 1
106106
if ($configuredVersionPrefix -ne $versionPrefix) {
107107
Write-Error "Version prefix from git release tag '$versionPrefix' does not match version prefix '$configuredVersionPrefix' stored in Directory.Build.props."
108108
# To recover from this:

.github/workflows/deps-review.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: 'Dependency Review'
2+
on: [pull_request]
3+
4+
permissions:
5+
contents: read
6+
7+
jobs:
8+
dependency-review:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: 'Checkout Repository'
12+
uses: actions/checkout@v4
13+
- name: 'Dependency Review'
14+
uses: actions/dependency-review-action@v3

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ These are some steps you can take to help you understand what this project is an
3434

3535
- [Performance Reports](https://github.com/json-api-dotnet/PerformanceReports)
3636
- [JsonApiDotNetCore.MongoDb](https://github.com/json-api-dotnet/JsonApiDotNetCore.MongoDb)
37-
- [JsonApiDotNetCore.Marten](https://github.com/wayne-o/JsonApiDotNetCore.Marten)
38-
- [Todo List App](https://github.com/json-api-dotnet/TodoListExample)
37+
- [Ember.js Todo List App](https://github.com/json-api-dotnet/TodoListExample)
3938

4039
## Examples
4140

0 commit comments

Comments
 (0)