Skip to content

Commit eec2f75

Browse files
committed
Merge branch 'maintenance/dependency-updates' into develop
Updated development NuGet and npm dependencies related to the build process. These have no impact on downstream consumer.
2 parents 752f9da + 14244d0 commit eec2f75

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

OnTopic.Editor.AspNetCore/OnTopic.Editor.AspNetCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<ItemGroup>
2828
<FrameworkReference Include="Microsoft.AspNetCore.App" />
29-
<PackageReference Include="GitVersionTask" Version="5.3.5">
29+
<PackageReference Include="GitVersionTask" Version="5.3.7">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>

OnTopic.Editor.AspNetCore/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

OnTopic.Editor.AspNetCore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"jquery-validation": "^1.19.2",
2525
"jquery.are-you-sure": "^1.9.0",
2626
"jshint": "^2.11.1",
27-
"merge2": "^1.3.0",
27+
"merge2": "^1.4.1",
2828
"popper.js": "^1.16.1"
2929
}
3030
}

OnTopic.Editor.Models/OnTopic.Editor.Models.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="GitVersionTask" Version="5.3.5">
26+
<PackageReference Include="GitVersionTask" Version="5.3.7">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>

0 commit comments

Comments
 (0)