Skip to content

Merge master (v5.1.0) into openapi branch #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 60 commits into from
Dec 14, 2022
Merged

Merge master (v5.1.0) into openapi branch #1209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
6b69ed3
Fixed error in documentation example
bkoelman Sep 9, 2022
79d918a
Update links to JSON:API v1.1-final
bkoelman Oct 1, 2022
1dc249b
Improve error message when duplicate controllers are found, to includ…
bkoelman Sep 28, 2022
70c06b9
Multi-target Annotations against .NET Standard 1.0
bkoelman Sep 28, 2022
ba0278b
Update to latest Resharper version (disabled in Ubuntu cibuild)
bkoelman Sep 23, 2022
4c61b49
Revert workaround for bug that was fixed in recent Resharper version
bkoelman Sep 24, 2022
add5bda
Reduce the severity of 'Introduce optional parameters' for non-privat…
bkoelman Sep 23, 2022
3a1e039
Reduce the use of nameof() in parameter validations by using CallerAr…
bkoelman Sep 23, 2022
a5217e6
Remove end_of_line from .editorconfig to avoid dialog in Visual Studi…
bkoelman Sep 24, 2022
4b68308
Update .editorconfig to better align with Resharper settings
bkoelman Sep 24, 2022
2aae844
Include ruleset in solution, so it gets reformatted
bkoelman Sep 24, 2022
8008e5e
Refresh .gitignore from source, preserving our additions
bkoelman Sep 28, 2022
292fb45
Add Rider-specific formatter settings
bkoelman Sep 28, 2022
2e2c123
Merge pull request #1191 from json-api-dotnet/update-resharper-skip-l…
maurei Oct 3, 2022
ea3ab72
Merge pull request #1192 from json-api-dotnet/multi-target-annotations
bkoelman Oct 3, 2022
6c11bae
Add missing CDATA sections to code fragments
bkoelman Sep 30, 2022
78b1f51
Add capabilities for relationships
bkoelman Oct 1, 2022
45b1136
Allow empty include query string parameter value
bkoelman Oct 1, 2022
f2c6029
Fixed: full linkage does not allow primary resources to occur in incl…
bkoelman Oct 1, 2022
935224d
Remove unneeded dependencies
bkoelman Oct 3, 2022
8726518
Fix SourceLink and IntelliSense on doc-comments in Annotations
bkoelman Oct 3, 2022
b13ede9
Update compatibility table
bkoelman Oct 7, 2022
cdf3c0b
Update compatibility table (remove v)
bkoelman Oct 7, 2022
da9048f
Merge pull request #1193 from json-api-dotnet/duplicate-controllers-e…
maurei Oct 19, 2022
2113302
Update docs/usage/resources/relationships.md
bkoelman Oct 19, 2022
4b725bd
Fixed typo
bkoelman Oct 19, 2022
01e132b
Correct pattern that is used in null-check refactorings
bkoelman Oct 20, 2022
af46168
Merge pull request #1197 from json-api-dotnet/relationship-capabilities
maurei Oct 20, 2022
993ed61
Updates tests to write SQL statements to the Output Window, so we don…
bkoelman Oct 25, 2022
2e4f15e
Update guidance on one-to-one relationship mapping in EF Core to avoi…
bkoelman Oct 26, 2022
bbec95b
Fix naming inconsistency
bkoelman Oct 26, 2022
75fad29
Updated example to match with current implementation
bkoelman Oct 27, 2022
6acf0cd
Merge pull request #1206 from json-api-dotnet/dump-sql-in-tests
maurei Nov 3, 2022
d6286c3
Merge pull request #1207 from json-api-dotnet/docs-one-to-one-relatio…
maurei Nov 3, 2022
ac285b0
Merge pull request #1208 from json-api-dotnet/docs-queries-example
maurei Nov 3, 2022
13a47d2
Update version to 5.1.0
bkoelman Nov 8, 2022
ceb27c3
Increment version to 5.1.1 (used for pre-release builds from ci)
bkoelman Nov 8, 2022
e39a870
Merge branch 'master' into merge-v5.1-into-openapi
bkoelman Nov 8, 2022
f476ce2
Post-merge fixes
bkoelman Nov 8, 2022
833312d
Run cibuild on Ubuntu 20.04 LTS instead of 18.04.4 LTS
bkoelman Nov 8, 2022
d5735df
Merge pull request #1210 from json-api-dotnet/update-linux-in-cibuild
bkoelman Nov 9, 2022
ac6a210
Merge branch 'master' into merge-v5.1-into-openapi
bkoelman Nov 9, 2022
3d4be05
Use built-in HashSet<>.UnionWith() instead of our own .AddRange()
bkoelman Nov 11, 2022
1ab58db
Merge branch 'master' into merge-v5.1-into-openapi
bkoelman Nov 11, 2022
1fff6cd
Update to PostgreSQL v15
bkoelman Nov 12, 2022
9039dcd
Update for changed nullability annotations in .NET 7
bkoelman Nov 12, 2022
023cdcc
Package updates
bkoelman Nov 12, 2022
c14637c
Merge pull request #1216 from json-api-dotnet/package-updates
bkoelman Nov 12, 2022
d1fb4d0
Turn off constraints for running tests in parallel
bkoelman Nov 12, 2022
bfecdeb
Add throttling on integration tests that are running in parallel
bkoelman Nov 12, 2022
a349fb9
Fixed: temporary database created by test not deleted afterwards
bkoelman Nov 12, 2022
fd16904
Avoid potential database name clashes in tests
bkoelman Nov 12, 2022
7cdf273
Apply global convention for all integration tests: change DeleteBehav…
bkoelman Nov 12, 2022
c7b8601
Start PostgreSQL service explicitly on Windows
bkoelman Nov 14, 2022
109d098
Update to latest version of regitlint and switch to full cleanup when…
bkoelman Nov 16, 2022
aecf4c7
Merge pull request #1215 from json-api-dotnet/postgres-update
maurei Nov 26, 2022
afa80e8
Merge pull request #1218 from json-api-dotnet/xunit-perf-throttling
maurei Nov 26, 2022
008bc00
Merge pull request #1219 from json-api-dotnet/update-regitlint
maurei Nov 26, 2022
84d01c3
Suppress typo warnings in faker-generated text
bkoelman Dec 8, 2022
ec52cf7
Merge branch 'master' into merge-v5.1-into-openapi
maurei Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Package updates
  • Loading branch information
@bkoelman
bkoelman committed Nov 12, 2022
commit 023cdcca1e1b9a34a44fdd4af2e7ded57af70e77
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"jetbrains.resharper.globaltools": {
"version": "2022.2.3",
"version": "2022.2.4",
"commands": [
"jb"
]
Expand All @@ -21,7 +21,7 @@
]
},
"dotnet-reportgenerator-globaltool": {
"version": "5.1.3",
"version": "5.1.11",
"commands": [
"reportgenerator"
]
Expand Down
6 changes: 3 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.2" PrivateAssets="All" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
</ItemGroup>
Expand All @@ -33,8 +33,8 @@

<!-- Test Project Dependencies -->
<PropertyGroup>
<CoverletVersion>3.1.2</CoverletVersion>
<CoverletVersion>3.2.0</CoverletVersion>
<MoqVersion>4.18.2</MoqVersion>
<TestSdkVersion>17.3.1</TestSdkVersion>
<TestSdkVersion>17.4.0</TestSdkVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion test/TestBuildingBlocks/TestBuildingBlocks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="Bogus" Version="34.0.2" />
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
Expand Down