Skip to content

Commit 6779272

Browse files
Merge pull request #21 from IowaComputerGurus/feature/build-fixes
Updated Packages & Build
2 parents 79fdb03 + 22ffda3 commit 6779272

File tree

8 files changed

+538
-499
lines changed

8 files changed

+538
-499
lines changed

.github/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ changelog:
1717
labels:
1818
- administrative
1919
- documentation
20+
- dependencies
2021
- title: Other Changes
2122
labels:
2223
- "*"

.github/workflows/ci-build.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@ jobs:
2424
dotnet-version: 9.0.x
2525

2626
- name: Install GitVersion
27-
uses: gittools/actions/gitversion/setup@v4.1.0
27+
uses: gittools/actions/gitversion/setup@v4.2.0
2828
with:
2929
versionSpec: '6.4.0'
3030

3131
- name: Determine Version
3232
id: gitversion
33-
uses: gittools/actions/gitversion/[email protected]
34-
with:
35-
useConfigFile: true
33+
uses: gittools/actions/gitversion/[email protected]
3634

3735
- name: Restore Packages
3836
run: dotnet restore "${{ env.solution-path }}"
@@ -80,24 +78,22 @@ jobs:
8078
dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
8179
8280
- name: Install GitVersion
83-
uses: gittools/actions/gitversion/setup@v4.1.0
81+
uses: gittools/actions/gitversion/setup@v4.2.0
8482
with:
8583
versionSpec: '6.4.0'
8684

8785
- name: Determine Version
8886
id: gitversion
89-
uses: gittools/actions/gitversion/[email protected]
90-
with:
91-
useConfigFile: true
87+
uses: gittools/actions/gitversion/[email protected]
9288

9389
- name: Build and analyze
9490
env:
9591
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
9692
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
9793
shell: powershell
9894
run: |
99-
.\.sonar\scanner\dotnet-sonarscanner begin /k:"IowaComputerGurus_netcore.utilities.email.resend" /o:"iowacomputergurus-github" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /n:".NET Core Utilities Email Resend"
95+
.\.sonar\scanner\dotnet-sonarscanner begin /k:"IowaComputerGurus_netcore.utilities.email.resend" /o:"iowacomputergurus-github" /d:sonar.token="${{ env.SONAR_TOKEN }}" /n:".NET Core Utilities Email Resend"
10096
dotnet restore "${{ env.solution-path }}"
10197
dotnet build "${{ env.solution-path }}" --no-restore --configuration Release -p:version=${{ steps.gitversion.outputs.majorMinorPatch }}
10298
dotnet test "${{ env.solution-path }}" --no-build --configuration Release --collect "XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover --logger "trx;LogFileName=unittests.trx"
103-
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
99+
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ env.SONAR_TOKEN }}"

.github/workflows/release-build.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ jobs:
2323
dotnet-version: 9.0.x
2424

2525
- name: Install GitVersion
26-
uses: gittools/actions/gitversion/setup@v3.1.11
26+
uses: gittools/actions/gitversion/setup@v4.2.0
2727
with:
28-
versionSpec: '6.0.5'
28+
versionSpec: '6.4.0'
2929

3030
- name: Determine Version
3131
id: gitversion
32-
uses: gittools/actions/gitversion/[email protected]
33-
with:
34-
useConfigFile: true
32+
uses: gittools/actions/gitversion/[email protected]
3533

3634
- name: Restore Packages
3735
run: dotnet restore "${{ env.solution-path }}"

src/NetCore.Utilities.Email.Resend.IntegrationTest/Program.cs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
using ICG.NetCore.Utilities.Email;
22
using Microsoft.Extensions.DependencyInjection;
33
using Microsoft.Extensions.Hosting;
4-
using Microsoft.Extensions.Logging;
54

65
namespace NetCore.Utilities.Email.Resend.IntegrationTest
76
{
8-
internal class Program
7+
internal static class Program
98
{
109
static void Main(string[] args)
1110
{
@@ -30,20 +29,12 @@ public interface IMyService
3029
void Run();
3130
}
3231

33-
public class MyService : IMyService
32+
public class MyService(IEmailService emailService) : IMyService
3433
{
35-
private readonly ILogger<MyService> _logger;
36-
private readonly IEmailService _emailService;
37-
38-
public MyService(ILogger<MyService> logger, IEmailService emailService)
39-
{
40-
_logger = logger;
41-
_emailService = emailService;
42-
}
43-
4434
public void Run()
4535
{
46-
var result = _emailService.SendMessageAsync("[email protected]", "Testing", "<p>Hello from Resend</p>").Result;
36+
var result = emailService.SendMessageAsync("[email protected]", "Testing", "<p>Hello from Resend</p>").Result;
37+
Console.WriteLine($"Email sent result: {result}");
4738
}
4839
}
4940
}

src/NetCore.Utilities.Email.Resend.Tests/NetCore.Utilities.Email.Resend.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
</PackageReference>
1414
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
1515
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1717
<PackageReference Include="Moq" Version="4.20.72" />
1818
<PackageReference Include="xunit" Version="2.9.3" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
19+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2222
</PackageReference>

0 commit comments

Comments
 (0)