Skip to content

Commit 824339f

Browse files
committed
test on net10
1 parent 1ad0fa5 commit 824339f

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

src/DiffEngine.Tests/DiffEngine.Tests.csproj

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

22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net9.0</TargetFrameworks>
5-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net9.0;net48</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
5+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net9.0;net10.0;net48</TargetFrameworks>
66
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
77
<NoWarn>$(NoWarn);SYSLIB0012</NoWarn>
88
</PropertyGroup>

src/DiffEngine/DiffEngine.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net462;net472;net48;net9.0</TargetFrameworks>
4-
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net462;net472;net48;net9.0;net10.0</TargetFrameworks>
4+
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup>
77
<Using Include="DiffEngine" />
@@ -18,7 +18,7 @@
1818
<PackageReference Include="EmptyFiles" PrivateAssets="None" />
1919
<PackageReference Include="Fody" PrivateAssets="all" />
2020
<PackageReference Include="System.Collections.Immutable"
21-
Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0'" />
21+
Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0' AND '$(TargetFramework)' != 'net10.0'" />
2222
<PackageReference Include="Polyfill" PrivateAssets="all" />
2323
<PackageReference Include="System.Management" />
2424
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />

src/DiffEngineTray/DiffEngineTray.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackAsTool>True</PackAsTool>
88
<Description>A utility that runs in the windows tray and handles the results of file differences.</Description>
99
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
10-
<NoWarn>NETSDK1137;WFAC010</NoWarn>
10+
<NoWarn>$(NoWarn);NU1510;NETSDK1137;WFAC010</NoWarn>
1111
<ApplicationManifest>app.manifest</ApplicationManifest>
1212
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1313
<RollForward>LatestMajor</RollForward>

src/VersionTests/VersionTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System.Collections.Frozen;
2-
3-
public class VersionTests
1+
public class VersionTests
42
{
53
// work around https://github.com/orgs/VerifyTests/discussions/1366
64
#if !NET9_0_OR_GREATER

src/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.203",
3+
"version": "10.0.100-preview.4.25215.47",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature"
66
}

0 commit comments

Comments
 (0)