Skip to content

Commit c124f55

Browse files
committed
Merge branch 'main' into classloader-thread-init
* main: [tests] Bump NUnit versions to latest (dotnet#7802) [Microsoft.Android.Sdk.ILLink] target `net7.0` temporarily (dotnet#7803)
2 parents 091d75d + 3a2e629 commit c124f55

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build-tools/scripts/NUnitReferences.projitems

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<!-- This file assumes Configuration.props has been imported -->
33
<ItemGroup>
4-
<PackageReference Include="NUnit" Version="3.13.2" />
4+
<PackageReference Include="NUnit" Version="3.13.3" />
55
<PackageReference Include="NUnit.ConsoleRunner" Version="$(NUnitConsoleVersion)" />
6-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
6+
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
77
</ItemGroup>
88
<!-- Required packages for .NET Core -->
99
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' and '$(TargetFramework)' != 'netstandard2.0' ">

src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\Configuration.props" />
33
<PropertyGroup>
4-
<TargetFramework>$(DotNetTargetFramework)</TargetFramework>
4+
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
55
<DefineConstants>ILLINK</DefineConstants>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<OutputPath>$(MicrosoftAndroidSdkOutDir)</OutputPath>

0 commit comments

Comments
 (0)