Skip to content

Commit 518bd98

Browse files
martincostellomartincostello
authored
Merge branch 'master' into dotnet-vnext
2 parents 583958b + 265e280 commit 518bd98

11 files changed

Lines changed: 23 additions & 20 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,21 @@ jobs:
107107
if-no-files-found: ignore
108108

109109
- name: Upload coverage to Codecov
110-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
110+
uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
111111
with:
112112
flags: ${{ runner.os }}
113113
token: ${{ secrets.CODECOV_TOKEN }}
114114

115115
- name: Upload test results to Codecov
116-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
116+
uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
117117
if: ${{ !cancelled() }}
118118
with:
119119
flags: ${{ runner.os }}
120120
report_type: test_results
121121
token: ${{ secrets.CODECOV_TOKEN }}
122122

123123
- name: Generate SBOM
124-
uses: anchore/sbom-action@57aae528053a48a3f6235f2d9461b05fbcb7366d # v0.23.1
124+
uses: anchore/sbom-action@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
125125
if: runner.os == 'Windows'
126126
with:
127127
artifact-name: Swashbuckle.AspNetCore.spdx.json

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
show-progress: false
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
33+
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
3434
with:
3535
languages: csharp
3636
build-mode: none
3737

3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
39+
uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
4040
with:
4141
category: '/language:csharp'

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ jobs:
4141
retention-days: 5
4242

4343
- name: Upload to code-scanning
44-
uses: github/codeql-action/upload-sarif@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
44+
uses: github/codeql-action/upload-sarif@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
4545
with:
4646
sarif_file: results.sarif

‎Directory.Build.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PackageReadmeFile>package-readme.md</PackageReadmeFile>
3232
<PackageReleaseNotes>See $(PackageProjectUrl)/releases for details.</PackageReleaseNotes>
3333
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
34-
<PackageValidationBaselineVersion>10.1.5</PackageValidationBaselineVersion>
34+
<PackageValidationBaselineVersion>10.1.6</PackageValidationBaselineVersion>
3535
<PublishRepositoryUrl>true</PublishRepositoryUrl>
3636
<RepositoryType>git</RepositoryType>
3737
<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
@@ -67,4 +67,7 @@
6767
<Include>[Swashbuckle.*]*</Include>
6868
<Threshold></Threshold>
6969
</PropertyGroup>
70+
<PropertyGroup>
71+
<IsDependabotJob Condition=" '$(GITHUB_ACTIONS)' == 'true' AND '$(DEPENDABOT_JOB_ID)' != '' ">true</IsDependabotJob>
72+
</PropertyGroup>
7073
</Project>

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageVersion Include="Microsoft.Build" Version="18.4.0" />
1717
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
1818
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="11.0.0-preview.2.26159.112" />
19-
<PackageVersion Include="Microsoft.Kiota.Bundle" Version="1.22.0" />
19+
<PackageVersion Include="Microsoft.Kiota.Bundle" Version="1.22.1" />
2020
<PackageVersion Include="Microsoft.OpenApi" Version="3.4.0" />
2121
<PackageVersion Include="Microsoft.OpenApi.YamlReader" Version="3.4.0" />
2222
<PackageVersion Include="Microsoft.Playwright" Version="1.58.0" />

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ for more details.
5151

5252
[openapi-version-vnext-badge]: https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2FHEAD%2Fsrc%2FSwashbuckle.AspNetCore.Swagger%2FSwashbuckle.AspNetCore.Swagger.csproj&query=%2F%2FPackageReference%5B%40Include%3D'Microsoft.OpenApi'%5D%2F%40VersionOverride&logo=openapiinitiative&label=Microsoft.OpenApi
5353
[openapi-version-vnext-release]: https://github.com/domaindrivendev/Swashbuckle.AspNetCore/blob/HEAD/src/Swashbuckle.AspNetCore.Swagger/Swashbuckle.AspNetCore.Swagger.csproj#L20
54-
[openapi-version-latest-badge]: https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv10.1.5%2Fsrc%2FSwashbuckle.AspNetCore.Swagger%2FSwashbuckle.AspNetCore.Swagger.csproj&query=%2F%2FPackageReference%5B%40Include%3D'Microsoft.OpenApi'%5D%2F%40VersionOverride&logo=openapiinitiative&label=Microsoft.OpenApi
54+
[openapi-version-latest-badge]: https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv10.1.6%2Fsrc%2FSwashbuckle.AspNetCore.Swagger%2FSwashbuckle.AspNetCore.Swagger.csproj&query=%2F%2FPackageReference%5B%40Include%3D'Microsoft.OpenApi'%5D%2F%40VersionOverride&logo=openapiinitiative&label=Microsoft.OpenApi
5555
[openapi-version-latest-release]: https://github.com/microsoft/OpenAPI.NET/releases/tag/v2.4.1
5656
[openapi-version-v9-badge]: https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv9.0.6%2FDirectory.Packages.props&query=%2F%2FPackageVersion%5B%40Include%3D'Microsoft.OpenApi'%5D%2F%40Version&logo=openapiinitiative&label=Microsoft.OpenApi
5757
[openapi-version-v9-release]: https://github.com/microsoft/OpenAPI.NET/releases/tag/v1.6.25
@@ -60,16 +60,16 @@ for more details.
6060

6161
[swaggerui-version-vnext-badge]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2FHEAD%2Fsrc%2FSwashbuckle.AspNetCore.SwaggerUI%2Fpackage.json&query=%24.dependencies.swagger-ui-dist&style=flat&label=swagger-ui
6262
[swaggerui-version-vnext-release]: https://github.com/domaindrivendev/Swashbuckle.AspNetCore/blob/HEAD/src/Swashbuckle.AspNetCore.SwaggerUI/package.json#L6
63-
[swaggerui-version-latest-badge]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv10.1.5%2Fsrc%2FSwashbuckle.AspNetCore.SwaggerUI%2Fpackage.json&query=%24.dependencies.swagger-ui-dist&style=flat&label=swagger-ui
64-
[swaggerui-version-latest-release]: https://github.com/swagger-api/swagger-ui/releases/tag/v5.31.1
63+
[swaggerui-version-latest-badge]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv10.1.6%2Fsrc%2FSwashbuckle.AspNetCore.SwaggerUI%2Fpackage.json&query=%24.dependencies.swagger-ui-dist&style=flat&label=swagger-ui
64+
[swaggerui-version-latest-release]: https://github.com/swagger-api/swagger-ui/releases/tag/v5.32.1
6565
[swaggerui-version-v9-badge]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv9.0.6%2Fsrc%2FSwashbuckle.AspNetCore.SwaggerUI%2Fpackage.json&query=%24.dependencies.swagger-ui-dist&style=flat&label=swagger-ui
6666
[swaggerui-version-v9-release]: https://github.com/swagger-api/swagger-ui/releases/tag/v5.29.2
6767
[swaggerui-version-v8-badge]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv8.1.4%2Fsrc%2FSwashbuckle.AspNetCore.SwaggerUI%2Fpackage.json&query=%24.dependencies.swagger-ui-dist&style=flat&label=swagger-ui
6868
[swaggerui-version-v8-release]: https://github.com/swagger-api/swagger-ui/releases/tag/v5.22.0
6969

7070
[redoc-version-vnext-badge]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2FHEAD%2Fsrc%2FSwashbuckle.AspNetCore.ReDoc%2Fpackage.json&query=%24.dependencies.redoc&style=flat&label=Redoc
7171
[redoc-version-vnext-release]: https://github.com/domaindrivendev/Swashbuckle.AspNetCore/blob/HEAD/src/Swashbuckle.AspNetCore.ReDoc/package.json#L6
72-
[redoc-version-latest-badge]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv10.1.5%2Fsrc%2FSwashbuckle.AspNetCore.ReDoc%2Fpackage.json&query=%24.dependencies.redoc&style=flat&label=Redoc
72+
[redoc-version-latest-badge]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv10.1.6%2Fsrc%2FSwashbuckle.AspNetCore.ReDoc%2Fpackage.json&query=%24.dependencies.redoc&style=flat&label=Redoc
7373
[redoc-version-latest-release]: https://github.com/Redocly/redoc/releases/tag/v2.5.2
7474
[redoc-version-v9-badge]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fdomaindrivendev%2FSwashbuckle.AspNetCore%2Frefs%2Ftags%2Fv9.0.6%2Fsrc%2FSwashbuckle.AspNetCore.ReDoc%2Fpackage.json&query=%24.dependencies.redoc&style=flat&label=Redoc
7575
[redoc-version-v9-release]: https://github.com/Redocly/redoc/releases/tag/v2.5.1

‎src/Swashbuckle.AspNetCore.ReDoc/Swashbuckle.AspNetCore.ReDoc.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<Compile Include="..\Shared\EmbeddedResourceProvider.cs" Link="EmbeddedResourceProvider.cs" />
4646
</ItemGroup>
4747

48-
<Target Name="NpmInstall" BeforeTargets="DispatchToInnerBuilds" Condition=" '$(CI)' != '' OR !Exists('$(MSBuildThisFileDirectory)\node_modules') ">
48+
<Target Name="NpmInstall" BeforeTargets="DispatchToInnerBuilds" Condition=" ('$(CI)' != '' OR !Exists('$(MSBuildThisFileDirectory)\node_modules')) AND '$(IsDependabotJob)' != 'true' ">
4949
<Exec Command="npm ci" ContinueOnError="true">
5050
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
5151
</Exec>
@@ -85,7 +85,7 @@
8585
<ItemGroup>
8686
<CompressFiles Include="node_modules/redoc/bundles/redoc.standalone.js" />
8787
</ItemGroup>
88-
<Target Name="_CompressAssets" BeforeTargets="CheckForDuplicateItems">
88+
<Target Name="_CompressAssets" BeforeTargets="CheckForDuplicateItems" Condition=" '$(IsDependabotJob)' != 'true' ">
8989
<GZipCompress FilesToCompress="@(CompressFiles)" OutputDirectory="$(IntermediateOutputPath)CompressedAssets">
9090
<Output TaskParameter="CompressedFiles" ItemName="_CompressedAssetsFile" />
9191
</GZipCompress>

‎src/Swashbuckle.AspNetCore.SwaggerUI/Swashbuckle.AspNetCore.SwaggerUI.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Compile Include="..\Shared\EmbeddedResourceProvider.cs" Link="EmbeddedResourceProvider.cs" />
3939
</ItemGroup>
4040

41-
<Target Name="NpmInstall" BeforeTargets="DispatchToInnerBuilds" Condition=" '$(CI)' != '' OR !Exists('$(MSBuildThisFileDirectory)\node_modules') ">
41+
<Target Name="NpmInstall" BeforeTargets="DispatchToInnerBuilds" Condition=" ('$(CI)' != '' OR !Exists('$(MSBuildThisFileDirectory)\node_modules')) AND '$(IsDependabotJob)' != 'true' ">
4242
<Exec Command="npm ci" ContinueOnError="true">
4343
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
4444
</Exec>
@@ -79,7 +79,7 @@
7979
<ItemGroup>
8080
<CompressFiles Include="node_modules/swagger-ui-dist/**/*" Exclude="**/*/index.html;**/*/*.map;**/*/*.json;**/*/*.md;**/*/*.txt;**/*/swagger-ui-es-*" />
8181
</ItemGroup>
82-
<Target Name="_CompressAssets" BeforeTargets="CheckForDuplicateItems">
82+
<Target Name="_CompressAssets" BeforeTargets="CheckForDuplicateItems" Condition=" '$(IsDependabotJob)' != 'true' ">
8383
<GZipCompress FilesToCompress="@(CompressFiles)" OutputDirectory="$(IntermediateOutputPath)CompressedAssets">
8484
<Output TaskParameter="CompressedFiles" ItemName="_CompressedAssetsFile" />
8585
</GZipCompress>

‎test/WebSites/CliExample/CliExample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
HOWEVER ... This example invokes the CLI DLL directly so that its source code can be tested during the Swashbuckle build process
2828
-->
2929

30-
<Target Name="SwaggerToFile" AfterTargets="AfterBuild">
30+
<Target Name="SwaggerToFile" AfterTargets="AfterBuild" Condition=" '$(IsDependabotJob)' != 'true' ">
3131
<Exec Command="dotnet dotnet-swagger.dll tofile --host http://localhost:51071 --output %22$(MSBuildThisFileDirectory)wwwroot/swagger/v1/swagger_$(TargetFramework).json%22 %22$(OutputPath)$(AssemblyName).dll%22 v1"
3232
WorkingDirectory="$(DotNetSwaggerPath)" />
3333
</Target>

‎test/WebSites/CliExampleWithFactory/CliExampleWithFactory.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
HOWEVER ... This example invokes the CLI DLL directly so that its source code can be tested during the Swashbuckle build process
3131
-->
3232

33-
<Target Name="SwaggerToFile" AfterTargets="AfterBuild">
33+
<Target Name="SwaggerToFile" AfterTargets="AfterBuild" Condition=" '$(IsDependabotJob)' != 'true' ">
3434
<Exec Command="dotnet dotnet-swagger.dll tofile --host http://localhost:57556/ --output %22$(MSBuildThisFileDirectory)wwwroot/swagger/v1/swagger_$(TargetFramework).json%22 %22$(OutputPath)$(AssemblyName).dll%22 v1"
3535
WorkingDirectory="$(DotNetSwaggerPath)" />
3636
</Target>

0 commit comments

Comments
 (0)