Skip to content

Commit 47ec1bc

Browse files
ATrefzerATrefzer
committed
Upgrade to .net10
1 parent 446736f commit 47ec1bc

29 files changed

Lines changed: 588 additions & 591 deletions

‎Insight.Analyzers/Insight.Analyzers.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<OutputType>Library</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<OutputPath>..\Binaries\</OutputPath>

‎Insight.GitProvider/Insight.GitProvider.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<OutputType>Library</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<OutputPath>..\Binaries\</OutputPath>
@@ -10,10 +10,9 @@
1010
<ProjectReference Include="..\Insight.Shared\Insight.Shared.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
14-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
13+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
1514
</ItemGroup>
1615
<ItemGroup>
17-
<PackageReference Include="LibGit2Sharp" Version="0.27.2" />
16+
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
1817
</ItemGroup>
1918
</Project>

‎Insight.Metrics/Insight.Metrics.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<OutputType>Library</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<OutputPath>..\Binaries\</OutputPath>
@@ -11,6 +11,6 @@
1111
</ItemGroup>
1212
<ItemGroup>
1313

14-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
1515
</ItemGroup>
1616
</Project>

‎Insight.Shared/Exceptions/ProviderException.cs‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,26 @@
11
using System;
2-
using System.Runtime.Serialization;
32

4-
namespace Insight.Shared.Exceptions
5-
{
6-
[Serializable]
7-
public class ProviderException : Exception
8-
{
9-
//
10-
// For guidelines regarding the creation of new exception types, see
11-
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
12-
// and
13-
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
14-
//
3+
namespace Insight.Shared.Exceptions;
154

16-
public ProviderException()
17-
{
18-
}
5+
[Serializable]
6+
public class ProviderException : Exception
7+
{
8+
//
9+
// For guidelines regarding the creation of new exception types, see
10+
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
11+
// and
12+
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
13+
//
1914

20-
public ProviderException(string message) : base(message)
21-
{
22-
}
15+
public ProviderException()
16+
{
17+
}
2318

24-
public ProviderException(string message, Exception inner) : base(message, inner)
25-
{
26-
}
19+
public ProviderException(string message) : base(message)
20+
{
21+
}
2722

28-
protected ProviderException(
29-
SerializationInfo info,
30-
StreamingContext context) : base(info, context)
31-
{
32-
}
23+
public ProviderException(string message, Exception inner) : base(message, inner)
24+
{
3325
}
3426
}

‎Insight.Shared/Insight.Shared.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<OutputType>Library</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<OutputPath>..\Binaries\</OutputPath>

‎Insight.SvnProvider/Insight.SvnProvider.csproj‎

Lines changed: 2 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>net7.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<OutputType>Library</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<OutputPath>..\Binaries\</OutputPath>
@@ -10,7 +10,6 @@
1010
<ProjectReference Include="..\Insight.Shared\Insight.Shared.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
14-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
13+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
1514
</ItemGroup>
1615
</Project>

‎Insight/Insight.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0-windows</TargetFramework>
3+
<TargetFramework>net10.0-windows</TargetFramework>
44
<OutputType>WinExe</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<UseWPF>true</UseWPF>
@@ -39,10 +39,9 @@
3939

4040
<ItemGroup>
4141
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
42-
<PackageReference Include="OxyPlot.Wpf" Version="2.1.2" />
43-
<PackageReference Include="Prism.Wpf" Version="8.1.97" />
44-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
45-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
42+
<PackageReference Include="OxyPlot.Wpf" Version="2.2.0" />
43+
<PackageReference Include="Prism.Wpf" Version="9.0.537" />
44+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
4645
</ItemGroup>
4746
<ItemGroup>
4847
<Compile Update="Properties\Settings.Designer.cs">

‎Insight/Properties/PublishProfiles/StandaloneProfile.pubxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
99
<PublishDir>..\Binaries\publish\win-x64\</PublishDir>
1010
<PublishProtocol>FileSystem</PublishProtocol>
1111
<_TargetId>Folder</_TargetId>
12-
<TargetFramework>net7.0-windows</TargetFramework>
12+
<TargetFramework>net10.0-windows</TargetFramework>
1313
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1414
<SelfContained>true</SelfContained>
1515
<PublishSingleFile>true</PublishSingleFile>

‎Tests/AliasMapping.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Insight.Shared.Model;
55
using NSubstitute;
66
using NUnit.Framework;
7+
using NUnit.Framework.Legacy;
78

89
namespace Tests
910
{
@@ -42,20 +43,20 @@ public void TransformContribution()
4243

4344
// Assert
4445

45-
Assert.AreEqual(2, result.Count);
46+
Assert.That(result.Count, Is.EqualTo(2));
4647

4748
// File 1
4849
// Work was summed up since both developers are assigned the same alias
4950
file1Work = result["file1"].DeveloperToContribution;
50-
Assert.AreEqual(1, file1Work.Count);
51-
Assert.AreEqual(30, file1Work["MappedA"]);
51+
Assert.That(file1Work.Count, Is.EqualTo(1));
52+
Assert.That(file1Work["MappedA"], Is.EqualTo(30));
5253

5354

5455
// File 2
5556
file2Work = result["file2"].DeveloperToContribution;
56-
Assert.AreEqual(2, file2Work.Count);
57-
Assert.AreEqual(10, file2Work["MappedA"]);
58-
Assert.AreEqual(20, file2Work["MappedC"]);
57+
Assert.That(file2Work.Count, Is.EqualTo(2));
58+
Assert.That(file2Work["MappedA"], Is.EqualTo(10));
59+
Assert.That(file2Work["MappedC"], Is.EqualTo(20));
5960
}
6061
}
6162
}

‎Tests/CirclePackingLayoutTests.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Diagnostics;
44
using System.IO;
55
using System.Reflection;
6+
using NUnit.Framework.Legacy;
67
using Visualization.Controls.CirclePacking;
78
using Visualization.Controls.Data;
89

@@ -36,7 +37,7 @@ public void SingleRootNodeWithoutArea()
3637
// Restore assertions
3738
Trace.Listeners.AddRange(backup);
3839

39-
Assert.AreEqual("(x-0)^2+(y-0)^2=0^2", data.Layout.ToString());
40+
Assert.That(data.Layout.ToString(), Is.EqualTo("(x-0)^2+(y-0)^2=0^2"));
4041
}
4142

4243

@@ -82,14 +83,14 @@ private static void AssertLayouting(string path, double width, double height)
8283
// Includes layout info
8384
var reference = data.Dump();
8485

85-
Assert.IsTrue(File.Exists(path));
86+
ClassicAssert.IsTrue(File.Exists(path));
8687

8788
var clone = (HierarchicalData)data.Clone();
8889
// Clone does not copy the layout.
8990
layout.Layout(clone, width, height);
9091
var result = clone.Dump();
9192

92-
Assert.AreEqual(reference, result);
93+
Assert.That(result, Is.EqualTo(reference));
9394
}
9495

9596
[Ignore("Don't want to store the large binary test data in the repo. Generate new one via GenerateTestHierarchicalReferenceFile"), Test]

0 commit comments

Comments
 (0)