Skip to content

test on net10 #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test on net10 #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/DiffEngine.Tests/DiffEngine.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net9.0;net48</TargetFrameworks>
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net9.0;net10.0;net48</TargetFrameworks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<NoWarn>$(NoWarn);SYSLIB0012</NoWarn>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/DiffEngine/DiffEngine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net462;net472;net48;net9.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net462;net472;net48;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<Using Include="DiffEngine" />
Expand All @@ -18,7 +18,7 @@
<PackageReference Include="EmptyFiles" PrivateAssets="None" />
<PackageReference Include="Fody" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable"
Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0'" />
Condition="'$(TargetFramework)' != 'net8.0' AND '$(TargetFramework)' != 'net9.0' AND '$(TargetFramework)' != 'net10.0'" />
<PackageReference Include="Polyfill" PrivateAssets="all" />
<PackageReference Include="System.Management" />
<PackageReference Include="ProjectDefaults" PrivateAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion src/DiffEngineTray/DiffEngineTray.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackAsTool>True</PackAsTool>
<Description>A utility that runs in the windows tray and handles the results of file differences.</Description>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<NoWarn>NETSDK1137;WFAC010</NoWarn>
<NoWarn>$(NoWarn);NU1510;NETSDK1137;WFAC010</NoWarn>
<ApplicationManifest>app.manifest</ApplicationManifest>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<RollForward>LatestMajor</RollForward>
Expand Down
4 changes: 1 addition & 3 deletions src/VersionTests/VersionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Collections.Frozen;

public class VersionTests
public class VersionTests
{
// work around https://github.com/orgs/VerifyTests/discussions/1366
#if !NET9_0_OR_GREATER
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.203",
"version": "10.0.100-preview.4.25215.47",
"allowPrerelease": true,
"rollForward": "latestFeature"
}
Expand Down