Skip to content

Commit a2df471

Browse files
committed
Merge branch 'master' into 1304_format_json
# Conflicts: # src/ServicePulse/ServicePulse.csproj
2 parents 66e3245 + 53e2776 commit a2df471

File tree

16 files changed

+421
-217
lines changed

16 files changed

+421
-217
lines changed

.github/workflows/nuget-audit.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: NuGet Audit
2+
on:
3+
workflow_dispatch:
4+
env:
5+
DOTNET_NOLOGO: true
6+
jobs:
7+
build:
8+
name: Linux
9+
runs-on: ubuntu-22.04
10+
steps:
11+
- name: Checkout
12+
uses: actions/[email protected]
13+
- name: Setup .NET SDK
14+
uses: actions/[email protected]
15+
with:
16+
global-json-file: global.json
17+
- name: Restore
18+
id: restore
19+
run: dotnet restore src

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "8.0.400",
4+
"rollForward": "latestFeature"
5+
}
6+
}

src/Custom.Build.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@
55
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
66
</PropertyGroup>
77

8-
<PropertyGroup Label="Treat as warnings the transitive dependencies problems">
9-
<NuGetAuditMode>all</NuGetAuditMode>
10-
</PropertyGroup>
11-
128
</Project>

src/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>
88
<AnalysisLevel Condition="'$(AnalysisLevel)' == ''">5.0</AnalysisLevel>
99
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
10-
<!-- NuGetAuditMode set to 'all' for tool projects in Directory.Build.targets, other project types default to 'direct' -->
1110
<NuGetAuditLevel>low</NuGetAuditLevel>
11+
<NuGetAuditMode Condition="'$(NuGetAuditMode)' == ''">all</NuGetAuditMode>
1212
<!-- To lock the version of Particular.Analyzers, for example, in a release branch, set this property in Custom.Build.props -->
13-
<ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">2.1.2</ParticularAnalyzersVersion>
13+
<ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">2.1.3</ParticularAnalyzersVersion>
1414
<NServiceBusKey>0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92</NServiceBusKey>
1515
<NServiceBusTestsKey>00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5</NServiceBusTestsKey>
1616
</PropertyGroup>

src/Directory.Build.targets

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<NuGetAuditMode Condition="'$(PackAsTool)' == 'true'">all</NuGetAuditMode>
5-
</PropertyGroup>
3+
<Import Project="msbuild\AutomaticVersionRanges.targets" Condition="Exists('msbuild\AutomaticVersionRanges.targets')" />
64

75
</Project>

0 commit comments

Comments
 (0)