Skip to content

Commit cddb689

Browse files
authored
Merge pull request #4315 from GitTools/dependabot/nuget/src/microsoft-0d914ed135
(deps): Bump the microsoft group across 1 directory with 4 updates
2 parents 1c3b097 + eaa4447 commit cddb689

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/_unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ jobs:
3737
-
3838
name: Test Summary
3939
uses: test-summary/[email protected]
40-
if: matrix.dotnetVersion == '8.0'
40+
if: matrix.dotnetVersion == '9.0'
4141
with:
4242
paths: artifacts/test-results/*.results.xml

src/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<PackageVersion Include="JunitXml.TestLogger" Version="4.1.0" />
2424
<PackageVersion Include="MSBuild.ProjectCreation" Version="14.0.0" />
2525
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
26-
<PackageVersion Include="Microsoft.Build" Version="17.11.4" />
27-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.4" />
26+
<PackageVersion Include="Microsoft.Build" Version="17.12.6" />
27+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
2828
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.0" />
2929
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
3030
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />

src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<!-- Validates the target framework and sets the GitVersionTargetFramework property to the target framework that is compatible with the target framework of the project -->
1212
<GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == '' and $([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0')) == 'true'">net8.0</GitVersionTargetFramework>
13-
<GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == '' and $([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net6.0')) == 'true'">net6.0</GitVersionTargetFramework>
14-
<!-- Fall back to net8.0 if the target framework is not compatible with net6.0 and net8.0 -->
13+
<GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == '' and $([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0')) == 'true'">net9.0</GitVersionTargetFramework>
14+
<!-- Fall back to net8.0 if the target framework is not compatible with net9.0 and net8.0 -->
1515
<GitVersionTargetFramework Condition="'$(GitVersionTargetFramework)' == ''">net8.0</GitVersionTargetFramework>
1616
<GitVersionFileExe Condition="'$(GitVersionFileExe)' == ''">dotnet --roll-forward Major &quot;$([MSBuild]::EnsureTrailingSlash($(MSBuildThisFileDirectory)$(GitVersionTargetFramework)))gitversion.dll&quot;</GitVersionFileExe>
1717
<GitVersionAssemblyFile Condition="'$(GitVersionAssemblyFile)' == ''">$([MSBuild]::EnsureTrailingSlash($(MSBuildThisFileDirectory)$(GitVersionTargetFramework)))GitVersion.MsBuild.dll</GitVersionAssemblyFile>

0 commit comments

Comments
 (0)