Skip to content

Commit 9e9b143

Browse files
authored
Merge pull request #85 from dorssel/fix_dependency_detector
Fix dependency detector
2 parents 8015e2d + beefbab commit 9e9b143

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@
2020
*.cs text eol=crlf
2121
*.props text
2222
*.targets text
23+
24+
packages.lock.json text linguist-generated

.github/workflows/dotnet.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,8 @@ jobs:
101101
- name: Submit Dependencies to GitHub
102102
uses: advanced-security/component-detection-dependency-submission-action@9c110eb34dee187cd9eca76a652b9f6a0ed22927 # v0.1.1
103103
with:
104-
detectorArgs: MSBuildBinaryLog=EnableIfDefaultOff
105-
# This should really read 'MSBuildBinaryLog', but since it is experimental we need this 'Linux' workaround.
106-
detectorsFilter: Linux
104+
detectorArgs: MSBuildBinaryLog=Enable
105+
detectorsFilter: MSBuildBinaryLog
107106

108107
- name: Dependency Review
109108
if: github.event_name == 'pull_request'

Directory.Build.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ SPDX-License-Identifier: MIT
3636
<IsTrimmable>true</IsTrimmable>
3737
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\strongname.snk</AssemblyOriginatorKeyFile>
3838

39+
<!-- GitVersion will handle this -->
40+
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
41+
3942
<!-- Bump MSTest.Sdk "transitive" dependencies (they are actually direct dependencies) -->
4043
<MicrosoftTestingExtensionsCodeCoverageVersion>18.8.0</MicrosoftTestingExtensionsCodeCoverageVersion>
4144

@@ -59,6 +62,12 @@ SPDX-License-Identifier: MIT
5962
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
6063
</PropertyGroup>
6164

65+
<!-- Required for Dependabot -->
66+
<PropertyGroup Label="Dependabot" Condition="'$(DEPENDABOT)' == 'true'">
67+
<RestoreLockedMode>false</RestoreLockedMode>
68+
<GitVersion_AllowShallowEnabled>true</GitVersion_AllowShallowEnabled>
69+
</PropertyGroup>
70+
6271
<ItemGroup>
6372
<PackageReference Include="GitVersion.MsBuild" PrivateAssets="all" />
6473
</ItemGroup>

0 commit comments

Comments
 (0)