Skip to content

Commit 8f9eddb

Browse files
NinjaRocksNinjaRocks
authored
Merge pull request #4 from CodeShayk/release/v2.0
Release/v2.0.0
2 parents 86ad8d3 + e3dd9ea commit 8f9eddb

File tree

9 files changed

+36
-28
lines changed

9 files changed

+36
-28
lines changed

‎.github/workflows/Master-Build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Setup .NET
1515
uses: actions/setup-dotnet@v3
1616
with:
17-
dotnet-version: 6.0.x
17+
dotnet-version: 9.0.x
1818
- name: Restore dependencies
1919
run: dotnet restore
2020
- name: Build

‎.github/workflows/PullRequest-CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Step-04 Install .NET
5353
uses: actions/setup-dotnet@v3
5454
with:
55-
dotnet-version: 6.0.x
55+
dotnet-version: 9.0.x
5656

5757
- name: Step-05 Restore dependencies
5858
run: dotnet restore

‎GitVersion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
next-version: 1.0.0
1+
next-version: 2.0.0
22
tag-prefix: '[vV]'
33
mode: ContinuousDeployment
44
branches:

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# <img src="https://github.com/CodeShayk/ApiAggregator/blob/master/Images/ninja-icon-16.png" alt="ninja" style="width:30px;"/> ApiAggregator v1.0
1+
# <img src="https://github.com/CodeShayk/ApiAggregator/blob/master/Images/ninja-icon-16.png" alt="ninja" style="width:30px;"/> ApiAggregator v2.0.0
22
[![NuGet version](https://badge.fury.io/nu/ApiAggregator.svg)](https://badge.fury.io/nu/ApiAggregator) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/CodeShayk/ApiAggregator/blob/master/LICENSE.md)
33
[![Master-Build](https://github.com/CodeShayk/ApiAggregator/actions/workflows/Master-Build.yml/badge.svg)](https://github.com/CodeShayk/ApiAggregator/actions/workflows/Master-Build.yml)
44
[![GitHub Release](https://img.shields.io/github/v/release/CodeShayk/ApiAggregator?logo=github&sort=semver)](https://github.com/CodeShayk/ApiAggregator/releases/latest)
55
[![Master-CodeQL](https://github.com/CodeShayk/ApiAggregator/actions/workflows/Master-CodeQL.yml/badge.svg)](https://github.com/CodeShayk/ApiAggregator/actions/workflows/Master-CodeQL.yml)
6-
[![.Net 8.0](https://img.shields.io/badge/.Net-8.0-blue)](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
6+
[![.Net 9.0](https://img.shields.io/badge/.Net-9.0-blue)](https://dotnet.microsoft.com/en-us/download/dotnet/9.0)
77
--
88
## Introduction
99
### What is ApiAggregator?
@@ -38,9 +38,10 @@ If you are having problems, please let me know by [raising a new issue](https://
3838
This project is licensed with the [MIT license](LICENSE).
3939

4040
## Version History
41-
The main branch is now on .NET 8.0. The following previous versions are available:
41+
The main branch is now on .NET 9.0. The following previous versions are available:
4242
| Version | Release Notes |
4343
| -------- | --------|
44+
| [`v2.0.0`](https://github.com/CodeShayk/ApiAggregator/tree/v2.0.0) | [Notes](https://github.com/CodeShayk/ApiAggregator/releases/tag/v2.0.0) |
4445
| [`v1.0.0`](https://github.com/CodeShayk/ApiAggregator/tree/v1.0.0) | [Notes](https://github.com/CodeShayk/ApiAggregator/releases/tag/v1.0.0) |
4546

4647
## Credits

‎src/ApiAggregator/ApiAggregator.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<Title>ApiAggregator</Title>
@@ -20,8 +20,9 @@
2020
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2121
<PackageProjectUrl>https://github.com/CodeShayk/ApiAggregator/wiki</PackageProjectUrl>
2222
<RepositoryUrl>https://github.com/CodeShayk/ApiAggregator</RepositoryUrl>
23-
<PackageReleaseNotes>v1.0
23+
<PackageReleaseNotes>v2.0 - Targets .Net9.0
2424
- Includes core functionality for aggregating apis.</PackageReleaseNotes>
25+
<Version>2.0.0</Version>
2526
</PropertyGroup>
2627

2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -44,7 +45,7 @@
4445
</ItemGroup>
4546

4647
<ItemGroup>
47-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
48+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
4849
</ItemGroup>
4950

5051
<ItemGroup>

‎tests/ApiAggregator.Tests/Aggregator.Tests/ApiBuilderTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void TestApiBuilderForCorrectParentApiList()
2828

2929
var result = _apiBuilder.Build(context);
3030

31-
Assert.IsNotNull(result);
31+
Assert.That(result, Is.Not.Null);
3232

3333
Assert.That(result.ApiNestingDepth == 0);
3434
Assert.That(result.Apis.Count, Is.EqualTo(1));
@@ -45,7 +45,7 @@ public void TestApiBuilderForCorrectParentApiListWithOneChildren()
4545

4646
var result = _apiBuilder.Build(context);
4747

48-
Assert.IsNotNull(result);
48+
Assert.That(result, Is.Not.Null);
4949

5050
Assert.That(result.ApiNestingDepth == 0);
5151
Assert.That(result.Apis.Count, Is.EqualTo(1));
@@ -65,7 +65,7 @@ public void TestApiBuilderForCorrectParentApiListWithTwoChildren()
6565

6666
var result = _apiBuilder.Build(context);
6767

68-
Assert.IsNotNull(result);
68+
Assert.That(result, Is.Not.Null);
6969

7070
Assert.That(result.ApiNestingDepth == 0);
7171
Assert.That(result.Apis.Count, Is.EqualTo(1));
@@ -77,8 +77,8 @@ public void TestApiBuilderForCorrectParentApiListWithTwoChildren()
7777
var communicationApi = parentApi.Children.FirstOrDefault(x => x.GetType() == typeof(CommunicationApi));
7878
var ordersApi = parentApi.Children.FirstOrDefault(x => x.GetType() == typeof(OrdersApi));
7979

80-
Assert.IsNotNull(communicationApi);
81-
Assert.IsNotNull(ordersApi);
80+
Assert.That(communicationApi, Is.Not.Null);
81+
Assert.That(ordersApi, Is.Not.Null);
8282

8383
Assert.That(ordersApi.Children.Count, Is.EqualTo(0));
8484
}
@@ -90,7 +90,7 @@ public void TestApiBuilderForCorrectParentApiListWithTwoChildrenAndOneChildFurth
9090

9191
var result = _apiBuilder.Build(context);
9292

93-
Assert.IsNotNull(result);
93+
Assert.That(result, Is.Not.Null);
9494

9595
Assert.That(result.ApiNestingDepth == 0);
9696
Assert.That(result.Apis.Count, Is.EqualTo(1));
@@ -102,14 +102,14 @@ public void TestApiBuilderForCorrectParentApiListWithTwoChildrenAndOneChildFurth
102102
var communicationApi = parentApi.Children.FirstOrDefault(x => x.GetType() == typeof(CommunicationApi));
103103
var ordersApi = parentApi.Children.FirstOrDefault(x => x.GetType() == typeof(OrdersApi));
104104

105-
Assert.IsNotNull(communicationApi);
106-
Assert.IsNotNull(ordersApi);
105+
Assert.That(communicationApi, Is.Not.Null);
106+
Assert.That(ordersApi, Is.Not.Null);
107107

108108
// nested child query for order item in order query children as order items are included in paths
109109
Assert.That(ordersApi.Children.Count, Is.EqualTo(1));
110110

111111
var orderItemsApi = ordersApi.Children.FirstOrDefault(x => x.GetType() == typeof(OrderItemsApi));
112-
Assert.IsNotNull(orderItemsApi);
112+
Assert.That(orderItemsApi, Is.Not.Null);
113113
}
114114
}
115115
}

‎tests/ApiAggregator.Tests/Aggregator.Tests/ContractBuilderTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void TestContractBuilderForCorrectExecutionOfConfiguredTransforms()
5151
Assert.That(orderItemsCollectionTransforms.Count() == 1);
5252
Assert.That(orderItemsCollectionTransforms.ElementAt(0).InvocationCount == 1);
5353

54-
Assert.IsNotNull(contract);
54+
Assert.That(contract, Is.Not.Null);
5555
}
5656

5757
public class MockTransform<TResult, TContract> : ResultTransformer<TResult, TContract>

‎tests/ApiAggregator.Tests/Aggregator.Tests/StringContainsMatcherTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void TestMatcher(string input, string config)
1414
{
1515
var matcher = new StringContainsMatcher();
1616

17-
Assert.True(matcher.IsMatch(input, With.Name(config)));
17+
Assert.That(matcher.IsMatch(input, With.Name(config)), Is.True);
1818
}
1919
}
2020
}

‎tests/ApiAggregator.Tests/ApiAggregator.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -10,12 +10,18 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="6.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15-
<PackageReference Include="NUnit" Version="3.14.0" />
16-
<PackageReference Include="Moq" Version="4.20.69" />
17-
<PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
18-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
13+
<PackageReference Include="coverlet.collector" Version="6.0.2">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
18+
<PackageReference Include="NUnit" Version="4.2.2" />
19+
<PackageReference Include="Moq" Version="4.20.72" />
20+
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
24+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1925
<PackageReference Include="WireMock.Net" Version="1.6.7" />
2026
</ItemGroup>
2127

0 commit comments

Comments
 (0)