Skip to content

Commit 1882492

Browse files
bkoelmanbkoelman
authored
Merge pull request #1344 from json-api-dotnet/merge-master-v5.4.0-into-openapi
Merge master v5.4.0 into openapi
2 parents 69e3a58 + f45af86 commit 1882492

File tree

29 files changed

+148
-112
lines changed

29 files changed

+148
-112
lines changed

‎.github/FUNDING.yml

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

‎.github/workflows/build.yml

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ on:
1313
branches: [ 'master', 'release/**', 'openapi' ]
1414
pull_request:
1515
branches: [ 'master', 'release/**', 'openapi' ]
16-
tags:
17-
- 'v*'
16+
release:
17+
types: [published]
1818

1919
concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}
@@ -52,12 +52,27 @@ jobs:
5252
if: matrix.os == 'ubuntu-latest'
5353
run: |
5454
dotnet tool install --global PowerShell
55+
- name: Find latest PowerShell version (Windows)
56+
if: matrix.os == 'windows-latest'
57+
shell: pwsh
58+
run: |
59+
$packageName = "powershell"
60+
$outputText = dotnet tool search $packageName --take 1
61+
$outputLine = ("" + $outputText)
62+
$indexOfVersionLine = $outputLine.IndexOf($packageName)
63+
$latestVersion = $outputLine.substring($indexOfVersionLine + $packageName.length).trim().split(" ")[0].trim()
64+
65+
Write-Output "Found PowerShell version: $latestVersion"
66+
Write-Output "POWERSHELL_LATEST_VERSION=$latestVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
5567
- name: Setup PowerShell (Windows)
5668
if: matrix.os == 'windows-latest'
5769
shell: cmd
5870
run: |
59-
curl --location --output "%RUNNER_TEMP%\PowerShell-7.3.6-win-x64.msi" https://github.com/PowerShell/PowerShell/releases/download/v7.3.6/PowerShell-7.3.6-win-x64.msi
60-
msiexec.exe /package "%RUNNER_TEMP%\PowerShell-7.3.6-win-x64.msi" /quiet USE_MU=1 ENABLE_MU=1 ADD_PATH=1 DISABLE_TELEMETRY=1
71+
set DOWNLOAD_LINK=https://github.com/PowerShell/PowerShell/releases/download/v%POWERSHELL_LATEST_VERSION%/PowerShell-%POWERSHELL_LATEST_VERSION%-win-x64.msi
72+
set OUTPUT_PATH=%RUNNER_TEMP%\PowerShell-%POWERSHELL_LATEST_VERSION%-win-x64.msi
73+
echo Downloading from: %DOWNLOAD_LINK% to: %OUTPUT_PATH%
74+
curl --location --output %OUTPUT_PATH% %DOWNLOAD_LINK%
75+
msiexec.exe /package %OUTPUT_PATH% /quiet USE_MU=1 ENABLE_MU=1 ADD_PATH=1 DISABLE_TELEMETRY=1
6176
- name: Setup PowerShell (macOS)
6277
if: matrix.os == 'macos-latest'
6378
run: |
@@ -84,15 +99,15 @@ jobs:
8499
# Get the version prefix/suffix from the git tag. For example: 'v1.0.0-preview1-final' => '1.0.0' and 'preview1-final'
85100
$segments = $env:GITHUB_REF_NAME -split "-"
86101
$versionPrefix = $segments[0].TrimStart('v')
87-
$versionSuffix = $segments[1..-1] -join "-"
102+
$versionSuffix = $segments.Length -eq 1 ? '' : $segments[1..$($segments.Length - 1)] -join '-'
88103
89104
[xml]$xml = Get-Content Directory.Build.props
90105
$configuredVersionPrefix = $xml.Project.PropertyGroup[0].JsonApiDotNetCoreVersionPrefix
91106
if ($configuredVersionPrefix -ne $versionPrefix) {
92107
Write-Error "Version prefix from git release tag '$versionPrefix' does not match version prefix '$configuredVersionPrefix' stored in Directory.Build.props."
93108
# To recover from this:
94109
# - Delete the GitHub release
95-
# - Run: git push --delete the-invalid-tag-name
110+
# - Run: git push --delete origin the-invalid-tag-name
96111
# - Adjust JsonApiDotNetCoreVersionPrefix in Directory.Build.props, commit and push
97112
# - Recreate the GitHub release
98113
}
@@ -109,7 +124,7 @@ jobs:
109124
- name: Build
110125
shell: pwsh
111126
run: |
112-
dotnet build --no-restore --configuration Release --version-suffix=$env:PACKAGE_VERSION_SUFFIX
127+
dotnet build --no-restore --configuration Release /p:VersionSuffix=$env:PACKAGE_VERSION_SUFFIX
113128
- name: Test
114129
run: |
115130
dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --logger "GitHubActions;summary.includeSkippedTests=true" -- RunConfiguration.CollectSourceInformation=true DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.DeterministicReport=true
@@ -119,7 +134,7 @@ jobs:
119134
- name: Generate packages
120135
shell: pwsh
121136
run: |
122-
dotnet pack --no-build --configuration Release --output $env:GITHUB_WORKSPACE/artifacts/packages --version-suffix=$env:PACKAGE_VERSION_SUFFIX
137+
dotnet pack --no-build --configuration Release --output $env:GITHUB_WORKSPACE/artifacts/packages /p:VersionSuffix=$env:PACKAGE_VERSION_SUFFIX
123138
- name: Upload packages to artifacts
124139
if: matrix.os == 'ubuntu-latest'
125140
uses: actions/upload-artifact@v3
@@ -160,12 +175,12 @@ jobs:
160175
permissions:
161176
contents: read
162177
steps:
163-
- name: Git checkout
164-
uses: actions/checkout@v4
165178
- name: Setup .NET
166179
uses: actions/setup-dotnet@v3
167180
with:
168181
dotnet-version: 6.0.x
182+
- name: Git checkout
183+
uses: actions/checkout@v4
169184
- name: Restore tools
170185
run: |
171186
dotnet tool restore
@@ -211,14 +226,14 @@ jobs:
211226
permissions:
212227
contents: read
213228
steps:
214-
- name: Git checkout
215-
uses: actions/checkout@v4
216-
with:
217-
fetch-depth: 2
218229
- name: Setup .NET
219230
uses: actions/setup-dotnet@v3
220231
with:
221232
dotnet-version: 6.0.x
233+
- name: Git checkout
234+
uses: actions/checkout@v4
235+
with:
236+
fetch-depth: 2
222237
- name: Restore tools
223238
run: |
224239
dotnet tool restore
@@ -237,7 +252,7 @@ jobs:
237252
Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request."
238253
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
239254
- name: CleanupCode (on branch)
240-
if: github.event_name == 'push'
255+
if: github.event_name == 'push' || github.event_name == 'release'
241256
shell: pwsh
242257
run: |
243258
Write-Output "Running code cleanup on all files."
@@ -255,7 +270,7 @@ jobs:
255270
- name: Download artifacts
256271
uses: actions/download-artifact@v3
257272
- name: Publish to GitHub Packages
258-
if: github.event_name == 'push'
273+
if: github.event_name == 'push' || github.event_name == 'release'
259274
env:
260275
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
261276
shell: pwsh
@@ -271,7 +286,7 @@ jobs:
271286
publish_dir: ./documentation
272287
commit_message: 'Auto-generated documentation from'
273288
- name: Publish to NuGet
274-
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
289+
if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags/v')
275290
env:
276291
NUGET_ORG_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }}
277292
shell: pwsh

‎Build.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
$versionSuffix="pre"
2+
13
function VerifySuccessExitCode {
24
if ($LastExitCode -ne 0) {
35
throw "Command failed with exit code $LastExitCode."
@@ -6,11 +8,12 @@ function VerifySuccessExitCode {
68

79
Write-Host "$(pwsh --version)"
810
Write-Host "Active .NET SDK: $(dotnet --version)"
11+
Write-Host "Using version suffix: $versionSuffix"
912

1013
dotnet tool restore
1114
VerifySuccessExitCode
1215

13-
dotnet build --configuration Release --version-suffix="pre"
16+
dotnet build --configuration Release /p:VersionSuffix=$versionSuffix
1417
VerifySuccessExitCode
1518

1619
dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.DeterministicReport=true
@@ -19,5 +22,5 @@ VerifySuccessExitCode
1922
dotnet reportgenerator -reports:**\coverage.cobertura.xml -targetdir:artifacts\coverage -filefilters:-*.g.cs
2023
VerifySuccessExitCode
2124

22-
dotnet pack --no-build --configuration Release --output artifacts/packages --version-suffix="pre"
25+
dotnet pack --no-build --configuration Release --output artifacts/packages /p:VersionSuffix=$versionSuffix
2326
VerifySuccessExitCode

‎Directory.Build.props

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,6 @@
11
<Project>
2-
<PropertyGroup>
3-
<TargetFrameworkName>net6.0</TargetFrameworkName>
4-
<AspNetVersion>6.0.*</AspNetVersion>
5-
<EFCoreVersion>7.0.*</EFCoreVersion>
6-
<EFCorePostgresVersion>7.0.*</EFCorePostgresVersion>
7-
<MicrosoftCodeAnalysisVersion>4.7.*</MicrosoftCodeAnalysisVersion>
8-
<HumanizerVersion>2.14.1</HumanizerVersion>
9-
<SwashbuckleVersion>6.5.*</SwashbuckleVersion>
10-
<NSwagApiClientVersion>13.20.*</NSwagApiClientVersion>
11-
<MicrosoftApiClientVersion>7.0.*</MicrosoftApiClientVersion>
12-
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
13-
<JsonApiDotNetCoreVersionPrefix>5.3.1</JsonApiDotNetCoreVersionPrefix>
14-
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
15-
<WarningLevel>9999</WarningLevel>
16-
<Nullable>enable</Nullable>
17-
<ImplicitUsings>enable</ImplicitUsings>
18-
<IsPackable>false</IsPackable>
19-
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
20-
</PropertyGroup>
21-
22-
<ItemGroup>
23-
<PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
24-
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.3" PrivateAssets="All" />
25-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
26-
</ItemGroup>
27-
28-
<PropertyGroup Condition="'$(CI)' != ''">
29-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
2+
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
3+
<NoWarn>$(NoWarn);AV2210</NoWarn>
304
</PropertyGroup>
315

326
<PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -35,14 +9,56 @@
359
<GenerateDocumentationFile>true</GenerateDocumentationFile>
3610
</PropertyGroup>
3711

38-
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
39-
<NoWarn>$(NoWarn);AV2210</NoWarn>
12+
<PropertyGroup Condition="'$(CI)' != ''">
13+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
4014
</PropertyGroup>
4115

42-
<!-- Test Project Dependencies -->
4316
<PropertyGroup>
17+
<!-- Published dependencies (only update on major version change) -->
18+
<TargetFrameworkName>net6.0</TargetFrameworkName>
19+
<CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
20+
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
21+
<EntityFrameworkCoreFrozenVersion>6.0.0</EntityFrameworkCoreFrozenVersion>
22+
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
23+
<SwashbuckleFrozenVersion>6.5.0</SwashbuckleFrozenVersion>
24+
25+
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
26+
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
27+
<BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
28+
<BlushingPenguinVersion>1.0.*</BlushingPenguinVersion>
29+
<BogusVersion>34.0.*</BogusVersion>
30+
<CSharpGuidelinesAnalyzerVersion>3.8.*</CSharpGuidelinesAnalyzerVersion>
31+
<CodeAnalysisVersion>4.7.*</CodeAnalysisVersion>
4432
<CoverletVersion>6.0.*</CoverletVersion>
33+
<DateOnlyTimeOnlyVersion>2.1.*</DateOnlyTimeOnlyVersion>
34+
<EntityFrameworkCoreVersion>7.0.*</EntityFrameworkCoreVersion>
35+
<FluentAssertionsVersion>6.12.*</FluentAssertionsVersion>
4536
<GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
37+
<InheritDocVersion>1.3.*</InheritDocVersion>
38+
<JetBrainsAnnotationsVersion>2023.2.*</JetBrainsAnnotationsVersion>
39+
<MicrosoftApiClientVersion>7.0.*</MicrosoftApiClientVersion>
40+
<NSwagApiClientVersion>13.20.*</NSwagApiClientVersion>
41+
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
42+
<NpgsqlVersion>7.0.*</NpgsqlVersion>
43+
<SourceLinkVersion>1.1.*</SourceLinkVersion>
44+
<SwashbuckleVersion>6.5.*</SwashbuckleVersion>
45+
<SystemTextJsonVersion>7.0.*</SystemTextJsonVersion>
4646
<TestSdkVersion>17.7.*</TestSdkVersion>
47+
<XunitVersion>2.5.*</XunitVersion>
48+
</PropertyGroup>
49+
50+
<ItemGroup>
51+
<PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsAnnotationsVersion)" PrivateAssets="All" />
52+
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="$(CSharpGuidelinesAnalyzerVersion)" PrivateAssets="All" />
53+
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
54+
</ItemGroup>
55+
56+
<PropertyGroup>
57+
<Nullable>enable</Nullable>
58+
<ImplicitUsings>enable</ImplicitUsings>
59+
<IsPackable>false</IsPackable>
60+
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
61+
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
62+
<JsonApiDotNetCoreVersionPrefix>5.4.1</JsonApiDotNetCoreVersionPrefix>
4763
</PropertyGroup>
4864
</Project>

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# JsonApiDotNetCore
66
A framework for building [JSON:API](http://jsonapi.org/) compliant REST APIs using .NET Core and Entity Framework Core. Includes support for [Atomic Operations](https://jsonapi.org/ext/atomic/).
77

8-
[![Build](https://github.com/json-api-dotnet/JsonApiDotNetCore/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/json-api-dotnet/JsonApiDotNetCore/actions/workflows/build.yml)
8+
[![Build](https://github.com/json-api-dotnet/JsonApiDotNetCore/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/json-api-dotnet/JsonApiDotNetCore/actions/workflows/build.yml?query=branch%3Amaster)
99
[![Coverage](https://codecov.io/gh/json-api-dotnet/JsonApiDotNetCore/branch/master/graph/badge.svg?token=pn036tWV8T)](https://codecov.io/gh/json-api-dotnet/JsonApiDotNetCore)
1010
[![NuGet](https://img.shields.io/nuget/v/JsonApiDotNetCore.svg)](https://www.nuget.org/packages/JsonApiDotNetCore/)
1111
[![Chat](https://badges.gitter.im/json-api-dotnet-core/Lobby.svg)](https://gitter.im/json-api-dotnet-core/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

‎benchmarks/Benchmarks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="BenchmarkDotNet" Version="0.13.*" />
14-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" PrivateAssets="all">
13+
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisVersion)" PrivateAssets="all">
1515
<!-- This reference solely exists to prevent build warnings for conflicting versions of Microsoft.CodeAnalysis. -->
1616
</PackageReference>
1717
</ItemGroup>

‎docs/getting-started/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ We use a similar approach for accessing [MongoDB](https://github.com/json-api-do
158158
#### I love JsonApiDotNetCore! How can I support the team?
159159
The best way to express your gratitude is by starring our repository.
160160
This increases our leverage when asking for bug fixes in dependent projects, such as the .NET runtime and Entity Framework Core.
161+
You can also [sponsor](https://github.com/sponsors/json-api-dotnet) our project.
161162
Of course, a simple thank-you message in our [Gitter channel](https://gitter.im/json-api-dotnet-core/Lobby) is appreciated too!
162-
We don't take monetary contributions at the moment.
163163

164164
If you'd like to do more: try things out, ask questions, create GitHub bug reports or feature requests, or upvote existing issues that are important to you.
165165
We welcome PRs, but keep in mind: The worst thing in the world is opening a PR that gets rejected after you've put a lot of effort into it.

‎src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
14-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
14+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlVersion)" />
1515
</ItemGroup>
1616
</Project>

‎src/Examples/GettingStarted/GettingStarted.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkCoreVersion)" />
1414
</ItemGroup>
1515
</Project>

‎src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
15-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
15+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlVersion)" />
1616
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="$(SwashbuckleVersion)" />
1717
</ItemGroup>
1818
</Project>

‎src/Examples/MultiDbContextExample/MultiDbContextExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkCoreVersion)" />
1414
</ItemGroup>
1515
</Project>

‎src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
1414
</ItemGroup>
1515
</Project>

‎src/Examples/ReportsExample/ReportsExample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
14-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
14+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlVersion)" />
1515
</ItemGroup>
1616
</Project>

‎src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</ItemGroup>
4747

4848
<ItemGroup>
49-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
50-
<PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
49+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(SourceLinkVersion)" PrivateAssets="All" />
50+
<PackageReference Include="SauceControl.InheritDoc" Version="$(InheritDocVersion)" PrivateAssets="All" />
5151
</ItemGroup>
5252
</Project>

‎src/JsonApiDotNetCore.OpenApi.Client/JsonApiDotNetCore.OpenApi.Client.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
31-
<PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
32-
<PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleVersion)" />
33-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleVersion)" />
34-
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="$(SwashbuckleVersion)" />
30+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(SourceLinkVersion)" PrivateAssets="All" />
31+
<PackageReference Include="SauceControl.InheritDoc" Version="$(InheritDocVersion)" PrivateAssets="All" />
32+
<PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleFrozenVersion)" />
33+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleFrozenVersion)" />
34+
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="$(SwashbuckleFrozenVersion)" />
3535
</ItemGroup>
3636
</Project>

‎src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
35-
<PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
36-
<PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleVersion)" />
37-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleVersion)" />
34+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(SourceLinkVersion)" PrivateAssets="All" />
35+
<PackageReference Include="SauceControl.InheritDoc" Version="$(InheritDocVersion)" PrivateAssets="All" />
36+
<PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleFrozenVersion)" />
37+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="$(SwashbuckleFrozenVersion)" />
3838
</ItemGroup>
3939
</Project>

0 commit comments

Comments
 (0)