Merge pull request #88 from akunzai/update-dependencies

Update dependencies

Author: akunzai

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.1.10",
+      "version": "5.1.12",
       "commands": [
         "reportgenerator"
       ]

.github/workflows/ci.yml

@@ -27,7 +27,6 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            3.1.x
             6.0.x
       - name: Build
         run: |

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## 3.1.1 (2022-12-08)
+
+- Bump Spring.Core from 3.0.0 to 3.0.1
+- [The `System.Drawing.Common` before 4.7.2 is vulnerable](https://github.com/advisories/GHSA-rxg9-xrhp-64gj)
+
 ## 3.1.0 (2022-04-20)
 
 - [Use the ASP.NET Core shared framework](https://docs.microsoft.com/aspnet/core/fundamentals/target-aspnetcore#use-the-aspnet-core-shared-framework)

DependencyInjection.sln

@@ -30,6 +30,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B1FFCB66-AA48-45C8-A4C4-D6E0BFB551DE}"
 	ProjectSection(SolutionItems) = preProject
 		samples\Directory.Build.props = samples\Directory.Build.props
+		samples\Directory.Packages.props = samples\Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreWebSample", "samples\AspNetCoreWebSample\AspNetCoreWebSample.csproj", "{AD50418F-0F72-4738-9B60-E035F1730193}"

samples/AspNetCoreWebSample/AspNetCoreWebSample.csproj

@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NodaTime" Version="3.1.6"/>
-    <PackageReference Include="NodaTime.Testing" Version="3.1.6"/>
+    <PackageReference Include="NodaTime"/>
+    <PackageReference Include="NodaTime.Testing"/>
   </ItemGroup>
 
   <ItemGroup>

samples/ConsoleSample/ConsoleSample.csproj

@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NodaTime" Version="3.1.6"/>
-    <PackageReference Include="NodaTime.Testing" Version="3.1.6"/>
+    <PackageReference Include="NodaTime"/>
+    <PackageReference Include="NodaTime.Testing"/>
   </ItemGroup>
 
   <ItemGroup>

samples/Directory.Packages.props

@@ -0,0 +1,9 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="NodaTime" Version="3.1.6"/>
+    <PackageVersion Include="NodaTime.Testing" Version="3.1.6"/>
+  </ItemGroup>
+</Project>

src/Spring.Extensions.DependencyInjection/Spring.Extensions.DependencyInjection.csproj

@@ -4,11 +4,11 @@
     <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <Description>Integrate Spring.NET with Microsoft.Extensions.DependencyInjection</Description>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
-    <Version>3.1.0</Version>
+    <Version>3.1.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Spring.Core" Version="3.0.0"/>
+    <PackageReference Include="Spring.Core" Version="3.0.1"/>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
@@ -17,7 +17,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <FrameworkReference Include="Microsoft.AspNetCore.App"/>
-    <PackageReference Include="System.Drawing.Common" Version="4.7.3" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.3"/>
   </ItemGroup>
 
 </Project>

test/Spring.Extensions.DependencyInjection.Tests/Spring.Extensions.DependencyInjection.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
+    <TargetFrameworks>net6.0;net48</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>