Skip to content

Commit 5bc41fa

Browse files
aesalazaraesalazar
committed
Merge branch 'dotnet-10-upgrade'
2 parents 285d613 + 1876ffc commit 5bc41fa

9 files changed

Lines changed: 21 additions & 23 deletions

File tree

‎ColorPickerPlugin/ColorPickerPlugin.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
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFramework>net9.0-windows</TargetFramework>
4+
<TargetFramework>net10.0-windows</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UseWPF>true</UseWPF>

‎Kaxaml.Benchmarks/Kaxaml.Benchmarks.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0-windows</TargetFramework>
4+
<TargetFramework>net10.0-windows</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
12+
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
1313
<PackageReference Include="TurboXml" Version="2.0.2" />
1414
</ItemGroup>
1515

‎Kaxaml.Tests/Kaxaml.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0-windows</TargetFramework>
4+
<TargetFramework>net10.0-windows</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
@@ -21,17 +21,17 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="coverlet.collector" Version="6.0.4">
24+
<PackageReference Include="coverlet.collector" Version="8.0.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
2828
<PackageReference Include="FluentAssertions" Version="8.8.0" />
29-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
30-
<PackageReference Include="xunit" Version="2.9.3" />
29+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
3130
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
3231
<PrivateAssets>all</PrivateAssets>
3332
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3433
</PackageReference>
34+
<PackageReference Include="xunit.v3" Version="3.2.2" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎Kaxaml.Tests/Utilities/AssemblyUtilitiesTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Reflection;
22
using KaxamlPlugins.Utilities;
3-
using Xunit.Abstractions;
43

54
namespace Kaxaml.Tests.Utilities;
65

‎Kaxaml.Tests/XamlScrubberPlugin/XamlPrettyPrintTest.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Kaxaml.Plugins.XamlScrubber.XamlPrettyPrint;
2-
using Xunit.Abstractions;
32

43
namespace Kaxaml.Tests.XamlScrubberPlugin;
54

@@ -637,12 +636,12 @@ public void Indent_WhenCommentsArePresent_AreIgnored()
637636
";
638637
var printer = CreatePrinter(
639638
indentWidth: 4,
640-
isLongLineWrapping:true,
639+
isLongLineWrapping: true,
641640
longLineWrappingThreshold: 5);
642641
var result = printer.Indent(input);
643642
var splits = result.Split(Environment.NewLine);
644643
output.WriteLine(result);
645-
644+
646645
Assert.Equal(8, splits.Length);
647646
Assert.Contains("<!--Comment0 Line0 Line1-->", splits[0]);
648647
Assert.Contains("<Page>", splits[1]);

‎Kaxaml/Kaxaml.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0-windows</TargetFramework>
3+
<TargetFramework>net10.0-windows</TargetFramework>
44
<OutputType>WinExe</OutputType>
55
<UseWPF>true</UseWPF>
66
<UseWindowsForms>true</UseWindowsForms>
@@ -109,8 +109,8 @@
109109
</None>
110110
</ItemGroup>
111111
<ItemGroup>
112-
<PackageReference Include="ICSharpCode.TextEditorEx" Version="1.3.0" />
113-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.11" />
112+
<PackageReference Include="ICSharpCode.TextEditorEx" Version="1.4.0" />
113+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.3" />
114114
</ItemGroup>
115115

116116
<ItemGroup>

‎KaxamlPlugins/KaxamlPlugins.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFramework>net9.0-windows</TargetFramework>
4+
<TargetFramework>net10.0-windows</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UseWPF>true</UseWPF>
@@ -26,12 +26,12 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.11" />
30-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.11" />
31-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.11" />
32-
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
33-
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.0" />
34-
<PackageReference Include="NLog" Version="6.0.6" />
29+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
30+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
31+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
32+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.141" />
33+
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.2" />
34+
<PackageReference Include="NLog" Version="6.1.1" />
3535
<PackageReference Include="TurboXml" Version="2.0.2" />
3636
</ItemGroup>
3737
</Project>

‎SnapshotPlugin/SnapshotPlugin.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
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFramework>net9.0-windows</TargetFramework>
4+
<TargetFramework>net10.0-windows</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UseWPF>true</UseWPF>

‎XamlScrubberPlugin/XamlScrubberPlugin.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
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFramework>net9.0-windows</TargetFramework>
4+
<TargetFramework>net10.0-windows</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UseWPF>true</UseWPF>

0 commit comments

Comments
 (0)