Skip to content

Commit f99e133

Browse files
Merge pull request #35 from IowaComputerGurus/Feature/UpdateToNet8
updated to net 8
2 parents 663baad + 9eae681 commit f99e133

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

.github/workflows/ci-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@ jobs:
2121
- name: Ensure .NET Installed
2222
uses: actions/setup-dotnet@v3
2323
with:
24-
dotnet-version: 6.0.x
24+
dotnet-version: 8.0.x
2525

2626
- name: Install GitVersion
27-
run: dotnet tool install --global GitVersion.Tool
27+
uses: gittools/actions/gitversion/[email protected]
28+
with:
29+
versionSpec: '6.x'
2830

2931
- name: Determine Version
3032
id: gitversion
31-
uses: gittools/actions/gitversion/execute@v0.10.2
33+
uses: gittools/actions/gitversion/execute@v3.0.0
3234
with:
33-
useConfigFile: true
35+
useConfigFile: true
3436

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

.github/workflows/release-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,18 @@ jobs:
2020
- name: Ensure .NET Installed
2121
uses: actions/setup-dotnet@v3
2222
with:
23-
dotnet-version: 6.0.x
23+
dotnet-version: 8.0.x
2424

2525
- name: Install GitVersion
26-
run: dotnet tool install --global GitVersion.Tool
26+
uses: gittools/actions/gitversion/[email protected]
27+
with:
28+
versionSpec: '6.x'
2729

2830
- name: Determine Version
2931
id: gitversion
30-
uses: gittools/actions/gitversion/execute@v0.10.2
32+
uses: gittools/actions/gitversion/execute@v3.0.0
3133
with:
32-
useConfigFile: true
34+
useConfigFile: true
3335

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

GitVersion.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ next-version: 5.1.4
33
branches:
44
develop:
55
regex: develop
6-
tag: 'alpha'
6+
label: 'alpha'
77
increment: Patch
8+
prevent-increment:
9+
when-current-commit-tagged: true
810
source-branches: []
911
pull-request:
1012
regex: (pull|pull\-requests|pr)[/-]
11-
tag: 'pr'
12-
tag-number-pattern: '[/-](?<number>\d+)[-/]'
13+
label: 'pr'
14+
label-number-pattern: '[/-](?<number>\d+)[-/]'
1315
increment: Patch
14-
prevent-increment-of-merged-branch-version: false
1516
is-release-branch: false
1617
source-branches: []
1718
ignore:

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

Lines changed: 3 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>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>ICG.NetCore.Utilities.Email.SendGrid.Tests</RootNamespace>
77
</PropertyGroup>
@@ -12,8 +12,8 @@
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
1414
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
1717
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1818
<PackageReference Include="Moq" Version="4.20.70" />
1919
<PackageReference Include="xunit" Version="2.7.0" />

src/NetCore.Utilities.Email.SendGrid/NetCore.Utilities.Email.SendGrid.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RootNamespace>ICG.NetCore.Utilities.Email.SendGrid</RootNamespace>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -35,11 +35,11 @@
3535

3636
<ItemGroup>
3737
<PackageReference Include="icg.netcore.utilities.email" Version="7.0.0" />
38-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
39-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
40-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
42-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
38+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
4343
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
4444
<PrivateAssets>all</PrivateAssets>
4545
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)