Update build/test dependencies

mono · Sep 3, 2024 · 2939d4e · 2939d4e
1 parent cb559e2
commit 2939d4e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,23 +15,19 @@ jobs:
  NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  with:
  submodules: recursive
  fetch-depth: 0 # GitVersioning needs deep clone
 
  - name: Set up dotnet
- uses: actions/setup-dotnet@v2
+ uses: actions/setup-dotnet@v4
  with:
  dotnet-version: |
  6.0.x
- 7.0.x
+ 8.0.x
 
- - name: Find MSBuild
- if: startsWith(matrix.os, 'windows')
- uses: microsoft/setup-msbuild@v1.1.0
-
- - uses: actions/cache@v3
+ - uses: actions/cache@v4
  with:
  path: ${{ env.NUGET_PACKAGES }}
  key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -51,12 +47,12 @@ jobs:
 
  - name: Upload Test Results
  if: failure()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: "TestResults-${{ matrix.os }}-${{ matrix.config }}"
  path: "TestResults-${{ matrix.os }}-${{ matrix.config }}"
 
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  if: matrix.config == 'Release' && startsWith(matrix.os, 'windows')
  with:
  name: packages

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
  publish:
  runs-on: windows-latest
  steps:
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
  with:
  path: packages
  name: packages

diff --git a/Mono.TextTemplating.Build.Tests/Mono.TextTemplating.Build.Tests.csproj b/Mono.TextTemplating.Build.Tests/Mono.TextTemplating.Build.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+ <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
  <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net48;$(TargetFrameworks)</TargetFrameworks>
  <IsPackable>false</IsPackable>
  <DefaultItemExcludes>$(DefaultItemExcludes);TestCases\**</DefaultItemExcludes>
@@ -11,23 +11,24 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.Build.Locator" Version="1.6.10" />
+ <PackageReference Include="Microsoft.Build.Locator" Version="1.7.8" />
  <PackageReference Include="Microsoft.Build" Version="17.3.2" ExcludeAssets="runtime" />
  <PackageReference Include="Microsoft.Build.Framework" Version="17.3.2" ExcludeAssets="runtime" />
  <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.2" ExcludeAssets="runtime" />
- <PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
+ <PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
  <!--
  Microsoft.NET.Test.Sdk brings in a version of NuGet.Frameworks that's older than the one used by MSBuild
  and loads first, thereby breaking loading of MSBuild assemblies. Force-upgrade it.
  -->
- <PackageReference Include="NuGet.Frameworks" Version="6.9.1" />
- <PackageReference Include="System.Text.Json" Version="7.0.3" />
+ <PackageReference Include="NuGet.Frameworks" Version="6.11.0" />
+ <!-- upgrade vulnerable transitive deps -->
+ <PackageReference Include="System.Text.Json" Version="8.0.4" />
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
- <PackageReference Include="xunit" Version="2.5.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+ <PackageReference Include="xunit" Version="2.9.0" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj b/Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj
@@ -22,6 +22,8 @@
  <None Include="T4.BuildTools.targets.buildschema.json" PackagePath="build\$(PackageId).targets.buildschema.json" Pack="true" />
  <None Include="T4PropertyPage.xaml" PackagePath="build\T4PropertyPage.xaml" Pack="true" />
  <None Include="T4PropertySchema.xaml" PackagePath="build\T4PropertyPageSchema.xaml" Pack="true" />
+ <!-- upgrade vulnerable transitive deps -->
+ <PackageReference Include="System.Drawing.Common" Version="8.0.8" IncludeAssets="none" PrivateAssets="all"/>
  </ItemGroup>
 
  <Target Name="AddCopyLocalToPack" BeforeTargets="_GetBuildOutputFilesWithTfm" DependsOnTargets="ReferenceCopyLocalPathsOutputGroup">

diff --git a/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj b/Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj
@@ -13,9 +13,9 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
- <PackageReference Include="xunit" Version="2.5.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+ <PackageReference Include="xunit" Version="2.9.0" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
  </ItemGroup>
 
  <ItemGroup>