Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ resharper_return_value_of_pure_method_is_not_used_highlighting = error

resharper_all_underscore_local_parameter_name_highlighting = none

resharper_misleading_body_like_statement_highlighting = error

# Xml files
[*.{xml,config,nuspec,resx,vsixmanifest,csproj,targets,props,fsproj}]
indent_size = 2
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<Version>3.0.4</Version>
<Version>3.1.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<LangVersion>preview</LangVersion>
<PackageTags>NServiceBus, Handler Ordering</PackageTags>
Expand Down
3 changes: 2 additions & 1 deletion src/HandlerOrdering.sln
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Visual Studio Version 16
VisualStudioVersion = 16.0.29201.188
MinimumVisualStudioVersion = 16.0.29201.188
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.HandlerOrdering", "HandlerOrdering\NServiceBus.HandlerOrdering.csproj", "{6252324B-3DE9-4DA1-B531-C1555B8D7C8D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Community.HandlerOrdering", "HandlerOrdering\NServiceBus.Community.HandlerOrdering.csproj", "{6252324B-3DE9-4DA1-B531-C1555B8D7C8D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "Sample\Sample.csproj", "{161F9409-B0F7-4940-9C3A-988B8A9DBDD0}"
EndProject
Expand All @@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
appveyor.yml = appveyor.yml
Directory.Build.props = Directory.Build.props
global.json = global.json
..\readme.source.md = ..\readme.source.md
EndProjectSection
EndProject
Global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>NServiceBus.HandlerOrdering</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus" Version="9.2.7" />
<PackageReference Include="ProjectDefaults" Version="1.0.150" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Sample/Sample.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<OutputType>Exe</OutputType>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NServiceBus" Version="9.2.7" />
<ProjectReference Include="..\HandlerOrdering\NServiceBus.HandlerOrdering.csproj" />
<ProjectReference Include="..\HandlerOrdering\NServiceBus.Community.HandlerOrdering.csproj" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Tests/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>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>testing</RootNamespace>
</PropertyGroup>
<ItemGroup>
Expand All @@ -11,7 +11,7 @@
<PackageReference Include="XunitContext" Version="3.3.2" />
<PackageReference Include="MarkdownSnippets.MsBuild" Version="27.0.2" />
<PackageReference Include="Verify.Xunit" Version="29.4.0" />
<ProjectReference Include="..\HandlerOrdering\NServiceBus.HandlerOrdering.csproj" />
<ProjectReference Include="..\HandlerOrdering\NServiceBus.Community.HandlerOrdering.csproj" />
<PackageReference Include="ProjectDefaults" Version="1.0.150" PrivateAssets="all" />
</ItemGroup>
</Project>
37 changes: 14 additions & 23 deletions src/Tests/TypeSorterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ public void Run()
{
var dependencies = new Dictionary<Type, List<Type>>
{
[typeof(Class1)] = new()
{
[typeof(Class1)] =
[
typeof(Class2),
typeof(Class3)
},
[typeof(Class2)] = new()
{
typeof(Class3)
}
],
[typeof(Class2)] = [typeof(Class3)]
};
var sorted = new TypeSorter(dependencies).Sorted;
Assert.Equal(3, sorted.Count);
Expand All @@ -39,18 +36,12 @@ public void Run()
{
var dependencies = new Dictionary<Type, List<Type>>
{
[typeof(Class1)] = new()
{
typeof(Class2),
},
[typeof(Class2)] = new()
{
typeof(Class3)
},
[typeof(Class3)] = new()
{
typeof(Class1)
}
[typeof(Class1)] =
[
typeof(Class2)
],
[typeof(Class2)] = [typeof(Class3)],
[typeof(Class3)] = [typeof(Class1)]
};
var exception = Assert.Throws<Exception>(() => new TypeSorter(dependencies));
var expected =
Expand All @@ -76,10 +67,10 @@ public void Run()
{
var dependencies = new Dictionary<Type, List<Type>>
{
[typeof(Class1)] = new()
{
typeof(Class1),
}
[typeof(Class1)] =
[
typeof(Class1)
]
};
var exception = Assert.Throws<Exception>(() => new TypeSorter(dependencies));
var expected = """
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": "9.0.201",
"version": "10.0.102",
"allowPrerelease": true,
"rollForward": "latestFeature"
}
Expand Down