Skip to content

Commit 040f775

Browse files
committed
Update build/test dependencies
1 parent e128cfc commit 040f775

File tree

5 files changed

+21
-22
lines changed

5 files changed

+21
-22
lines changed

.github/workflows/build.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,19 @@ jobs:
1515
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
with:
2020
submodules: recursive
2121
fetch-depth: 0 # GitVersioning needs deep clone
2222

2323
- name: Set up dotnet
24-
uses: actions/setup-dotnet@v2
24+
uses: actions/setup-dotnet@v4
2525
with:
2626
dotnet-version: |
2727
6.0.x
28-
7.0.x
28+
8.0.x
2929
30-
- name: Find MSBuild
31-
if: startsWith(matrix.os, 'windows')
32-
uses: microsoft/setup-msbuild@v1.1.0
33-
34-
- uses: actions/cache@v3
30+
- uses: actions/cache@v4
3531
with:
3632
path: ${{ env.NUGET_PACKAGES }}
3733
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -51,12 +47,12 @@ jobs:
5147

5248
- name: Upload Test Results
5349
if: failure()
54-
uses: actions/upload-artifact@v3
50+
uses: actions/upload-artifact@v4
5551
with:
5652
name: "TestResults-${{ matrix.os }}-${{ matrix.config }}"
5753
path: "TestResults-${{ matrix.os }}-${{ matrix.config }}"
5854

59-
- uses: actions/upload-artifact@v3
55+
- uses: actions/upload-artifact@v4
6056
if: matrix.config == 'Release' && startsWith(matrix.os, 'windows')
6157
with:
6258
name: packages

.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
publish:
1212
runs-on: windows-latest
1313
steps:
14-
- uses: actions/download-artifact@v3
14+
- uses: actions/download-artifact@v4
1515
with:
1616
path: packages
1717
name: packages

Mono.TextTemplating.Build.Tests/Mono.TextTemplating.Build.Tests.csproj

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
44
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net48;$(TargetFrameworks)</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<DefaultItemExcludes>$(DefaultItemExcludes);TestCases\**</DefaultItemExcludes>
@@ -11,23 +11,24 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Build.Locator" Version="1.6.10" />
14+
<PackageReference Include="Microsoft.Build.Locator" Version="1.7.8" />
1515
<PackageReference Include="Microsoft.Build" Version="17.3.2" ExcludeAssets="runtime" />
1616
<PackageReference Include="Microsoft.Build.Framework" Version="17.3.2" ExcludeAssets="runtime" />
1717
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.2" ExcludeAssets="runtime" />
18-
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
18+
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
1919
<!--
2020
Microsoft.NET.Test.Sdk brings in a version of NuGet.Frameworks that's older than the one used by MSBuild
2121
and loads first, thereby breaking loading of MSBuild assemblies. Force-upgrade it.
2222
-->
23-
<PackageReference Include="NuGet.Frameworks" Version="6.9.1" />
24-
<PackageReference Include="System.Text.Json" Version="7.0.3" />
23+
<PackageReference Include="NuGet.Frameworks" Version="6.10.2" />
24+
<!-- upgrade vulnerable transitive deps -->
25+
<PackageReference Include="System.Text.Json" Version="8.0.4" />
2526
</ItemGroup>
2627

2728
<ItemGroup>
28-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
29-
<PackageReference Include="xunit" Version="2.5.1" />
30-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" />
29+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
30+
<PackageReference Include="xunit" Version="2.9.0" />
31+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
3132
</ItemGroup>
3233

3334
<ItemGroup>

Mono.TextTemplating.Build/Mono.TextTemplating.Build.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<None Include="T4.BuildTools.targets.buildschema.json" PackagePath="build\$(PackageId).targets.buildschema.json" Pack="true" />
2323
<None Include="T4PropertyPage.xaml" PackagePath="build\T4PropertyPage.xaml" Pack="true" />
2424
<None Include="T4PropertySchema.xaml" PackagePath="build\T4PropertyPageSchema.xaml" Pack="true" />
25+
<!-- upgrade vulnerable transitive deps -->
26+
<PackageReference Include="System.Drawing.Common" Version="8.0.8" IncludeAssets="none" PrivateAssets="all"/>
2527
</ItemGroup>
2628

2729
<Target Name="AddCopyLocalToPack" BeforeTargets="_GetBuildOutputFilesWithTfm" DependsOnTargets="ReferenceCopyLocalPathsOutputGroup">

Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
17-
<PackageReference Include="xunit" Version="2.5.1" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
17+
<PackageReference Include="xunit" Version="2.9.0" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

0 commit comments

Comments
 (0)