Skip to content

Commit

Permalink
add Net 9 support (#1146)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Feb 14, 2024
1 parent 185d699 commit c77400f
Show file tree
Hide file tree
Showing 46 changed files with 59 additions and 38 deletions.
2 changes: 1 addition & 1 deletion src/DeterministicTests/DeterministicTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<IsPackageProject>false</IsPackageProject>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
Expand Down
2 changes: 1 addition & 1 deletion src/FSharpTests/FSharpTests.fsproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateProgramFile>false</GenerateProgramFile>
<LangVersion>preview</LangVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/FakeDiffTool/FakeDiffTool.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin</OutputPath>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ModuleInitDocs/ModuleInitDocs.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>SortedPropertiesTests</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/NugetUsage/FixieNugetUsage/FixieNugetUsage.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<!-- begin-snippet: Fixie-nugets -->
Expand Down
2 changes: 1 addition & 1 deletion src/NugetUsage/MSTestNugetUsage/MSTestNugetUsage.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<!-- begin-snippet: mstest-nugets -->
Expand Down
2 changes: 1 addition & 1 deletion src/NugetUsage/NUnitNugetUsage/NUnitNugetUsage.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<!-- begin-snippet: nunit-nugets -->
Expand Down
2 changes: 1 addition & 1 deletion src/NugetUsage/XunitNugetUsage/XunitNugetUsage.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<!-- begin-snippet: xunit-nugets -->
Expand Down
2 changes: 1 addition & 1 deletion src/NullComparer/NullComparer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<OutputType Condition=" '$(OS)' == 'Windows_NT' ">WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion src/StaticSettingsTests/StaticSettingsTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<IsPackageProject>false</IsPackageProject>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UniqueForTargetFrameworkAndVersion
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"exception": {
"Type": "Exception",
"Message": "the message",
"StackTrace": "at SerializationTests.MethodThatThrows()\nat System.RuntimeMethodHandle.InvokeMethod(Object target, Void** arguments, Signature sig, Boolean isConstructor)\nat System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Type": "Exception",
"Message": "the message",
"StackTrace": "at SerializationTests.MethodThatThrows()\nat InvokeStub_SerializationTests.MethodThatThrows(Object, Object, IntPtr*)"
}
2 changes: 1 addition & 1 deletion src/StrictJsonTests/StrictJsonTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
Expand Down
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'">net472;net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ProjectDefaults" Version="1.0.110" PrivateAssets="all" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.ClipboardAccept/Verify.ClipboardAccept.csproj
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'">net472;net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DiffEngine" Version="15.2.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<SignAssembly>False</SignAssembly>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Expecto.Tests/Verify.Expecto.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<SignAssembly>False</SignAssembly>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Expecto/Verify.Expecto.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Expecto" Version="10.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Fixie.Tests/Verify.Fixie.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<PlatformTarget>x64</PlatformTarget>
<SignAssembly>false</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Fixie/Verify.Fixie.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<SignAssembly>false</SignAssembly>
<TestProject>false</TestProject>
<IsTestProject>false</IsTestProject>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
value
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
value
2 changes: 1 addition & 1 deletion src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.MSTest/Verify.MSTest.csproj
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'">net472;net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ProjectDefaults" Version="1.0.110" PrivateAssets="all" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
value
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
value
2 changes: 1 addition & 1 deletion src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.NUnit/Verify.NUnit.csproj
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'">net472;net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="4.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Tests/Comparer/ComparerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public async Task Instance()
await Verify("thetext", settings);
}

#if NET8_0
#if NET9_0
[Fact]
public async Task Instance_with_message()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Tests/CultureToDateBuilder.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if NET8_0
#if NET9_0
public class CultureToDateBuilder
{
const string monthDayFormat = "MMMM MMM dddd ddd";
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Tests/NewLineTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public async Task WithNestedNewlineAddedByScrubber()
public Task Newlines() =>
Verify("a\r\nb\nc\rd\r\n");

#if NET8_0
#if NET9_0
[Fact]
public async Task StringWithDifferingNewline()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Tests/ThrowsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void IgnoreStackTraceSettingsGlobal()

#endregion

#if NET8_0
#if NET9_0

#region TestMethodThatThrowsTask

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>Verify.DerivePaths.Tests</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
value
2 changes: 1 addition & 1 deletion src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Xunit/Verify.Xunit.csproj
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'">net472;net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
Expand Down
1 change: 1 addition & 0 deletions src/Verify.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=BC2D76E54BBA65499DDED823A15FC688/@KeyIndexDefined">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileBC2D76E54BBA65499DDED823A15FC688/@KeyIndexDefined">True</s:Boolean>
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileBC2D76E54BBA65499DDED823A15FC688/RelativePriority/@EntryValue">1</s:Double>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Namer/@EntryIndexedValue">True</s:Boolean>
</wpf:ResourceDictionary>
2 changes: 2 additions & 0 deletions src/Verify/Naming/Namer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ internal static (string runtime, Version Version) GetRuntimeAndVersion()
return ("DotNet", new(7, 0));
#elif NET8_0
return ("DotNet", new(8, 0));
#elif NET9_0
return ("DotNet", new(9, 0));
#elif NETFRAMEWORK
// Mono can only be detected at runtime, and will use .NET Framework targets, so we have to check it first.
if (RuntimeInformation.FrameworkDescription.StartsWith("Mono", StringComparison.OrdinalIgnoreCase))
Expand Down
4 changes: 2 additions & 2 deletions src/Verify/Verify.csproj
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'">net472;net48</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<DiffEngine>true</DiffEngine>
</PropertyGroup>
<PropertyGroup Condition="$(DiffEngine)">
Expand All @@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="Polyfill" Version="2.3.0" PrivateAssets="all" />
<PackageReference Include="System.IO.Compression" Version="4.3.0" Condition="$(TargetFrameworkIdentifier) == '.NETFramework'" />
<PackageReference Include="System.IO.Hashing" Version="8.0.0" Condition="$(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework) == 'net6.0' or $(TargetFramework) == 'net7.0' or $(TargetFramework) == 'net8.0'" />
<PackageReference Include="System.IO.Hashing" Version="8.0.0" Condition="$(TargetFrameworkIdentifier) == '.NETFramework' or $(TargetFramework) == 'net6.0' or $(TargetFramework) == 'net7.0' or $(TargetFramework) == 'net8.0' or $(TargetFramework) == 'net9.0'" />
<PackageReference Include="System.Memory" Version="4.5.5" Condition="$(TargetFrameworkIdentifier) == '.NETFramework'" />
<PackageReference Include="DiffEngine" Version="15.2.0" />
<PackageReference Include="EmptyFiles" Version="8.1.0" PrivateAssets="None" />
Expand Down
4 changes: 2 additions & 2 deletions src/appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
- Visual Studio 2022
- macOS
- Ubuntu
# - macOS
# - Ubuntu
environment:
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.200",
"version": "9.0.100-preview.1.24101.2",
"allowPrerelease": true,
"rollForward": "latestFeature"
}
Expand Down

0 comments on commit c77400f

Please sign in to comment.