Skip to content

Commit 12cd057

Browse files
Merge pull request #104 from Stravaig-Projects/#102/package-update
Update dependencies.
2 parents 0f4df8a + c76e6ba commit 12cd057

File tree

9 files changed

+61
-97
lines changed

9 files changed

+61
-97
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Stravaig Configuration SQL Server Provider
2-
on:
2+
on:
33
push:
4-
branches:
4+
branches:
55
- main
66

77
paths-ignore:
@@ -25,7 +25,7 @@ on:
2525
workflow_dispatch:
2626
inputs:
2727
isPublic:
28-
description: 'Is Public Release'
28+
description: 'Is Public Release'
2929
required: false
3030
default: "false"
3131
isPreview:
@@ -41,7 +41,7 @@ jobs:
4141
STRAVAIG_SOLUTION: src/Stravaig.Configuration.SqlServer.sln
4242
STRAVAIG_TESTS: Stravaig.Configuration.SqlServer.Tests
4343
STRAVAIG_PROJECT: Stravaig.Configuration.SqlServer
44-
44+
4545
steps:
4646
- name: Check out code
4747
uses: actions/checkout@v2
@@ -64,22 +64,22 @@ jobs:
6464
echo "Publish To NuGet: $STRAVAIG_PUBLISH_TO_NUGET"
6565
echo "Is Preview: $STRAVAIG_IS_PREVIEW"
6666
echo "Is Stable: $STRAVAIG_IS_STABLE"
67-
67+
6868
- uses: actions/setup-dotnet@v1
69-
name: Setup .NET 6.0 (Current LTS)
69+
name: Setup .NET 6.0 (LTS)
7070
with:
7171
dotnet-version: 6.0.x
7272

7373
- name: Build Solution
7474
run: dotnet build $STRAVAIG_SOLUTION --configuration Release
75-
75+
7676
- name: Run Tests
7777
run: dotnet test src/$STRAVAIG_TESTS/$STRAVAIG_TESTS.csproj --configuration Release
78-
78+
7979
- name: Package Preview Release
8080
if: ${{ env.STRAVAIG_IS_PREVIEW == 'true' }}
8181
run: dotnet pack ./src/$STRAVAIG_PROJECT/$STRAVAIG_PROJECT.csproj --configuration Release --output ./out --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
82-
82+
8383
- name: Package Stable Release
8484
if: ${{ env.STRAVAIG_IS_STABLE == 'true' }}
8585
run: dotnet pack ./src/$STRAVAIG_PROJECT/$STRAVAIG_PROJECT.csproj --configuration Release --output ./out --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
@@ -104,7 +104,7 @@ jobs:
104104

105105
- name: Archive Simulated Release Information
106106
if: ${{ env.STRAVAIG_PUBLISH_TO_NUGET == 'false' }}
107-
uses: actions/upload-artifact@v2
107+
uses: actions/upload-artifact@v4
108108
with:
109109
name: simulated-release-information
110110
path: |
@@ -116,20 +116,20 @@ jobs:
116116

117117
- name: Archive Release Notes
118118
if: ${{ env.STRAVAIG_PUBLISH_TO_NUGET == 'true' }}
119-
uses: actions/upload-artifact@v2
119+
uses: actions/upload-artifact@v4
120120
with:
121121
name: release-information
122122
path: |
123123
contributors.md
124124
release-notes/full-release-notes.md
125125
release-notes/release-notes-${{ env.STRAVAIG_PACKAGE_FULL_VERSION }}.md
126126
out/**
127-
127+
128128
- name: Create Release
129129
if: ${{ env.STRAVAIG_PUBLISH_TO_NUGET == 'true' }}
130-
shell: pwsh
131-
env:
132-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
130+
shell: pwsh
131+
env:
132+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
133133
run: |
134134
$assets = @();
135135
$assets += "./out/*.nupkg"
@@ -139,7 +139,7 @@ jobs:
139139
$assets += "README.md"
140140
$assets += "./release-notes/release-notes-${{ env.STRAVAIG_PACKAGE_FULL_VERSION }}.md"
141141
./Create-Release.ps1 -NotesFile "./release-body.md" -Assets $assets
142-
142+
143143
- name: Bump version
144144
#IF Publishing & Stable release
145145
if: ${{ env.STRAVAIG_PUBLISH_TO_NUGET == 'true' && env.STRAVAIG_IS_STABLE == 'true' }}
@@ -151,7 +151,7 @@ jobs:
151151
if: ${{ env.STRAVAIG_PUBLISH_TO_NUGET == 'true' && env.STRAVAIG_IS_STABLE == 'true' }}
152152
shell: pwsh
153153
run: ./Reset-WipReleaseNotes.ps1
154-
154+
155155
- name: Commit post release updates
156156
#IF Publishing & Stable release
157157
if: ${{ env.STRAVAIG_PUBLISH_TO_NUGET == 'true' && env.STRAVAIG_IS_STABLE == 'true' }}

contributors.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,17 @@
22

33
This is a list of all the contributors to this repository in ascending order by the contributor name.
44

5-
**Colin Mackay** contributed 86 commits from Friday, 28 January, 2022 @ 22:52:08 +00:00 to Monday, 14 November, 2022 @ 21:28:37 +00:00.
5+
**Colin Mackay** contributed 107 commits from Friday, 28 January, 2022 @ 22:52:08 +00:00 to Monday, 2 December, 2024 @ 22:28:08 +00:00.
66

7-
**dependabot[bot]** contributed 29 commits from Monday, 31 January, 2022 @ 14:31:26 +00:00 to Monday, 14 November, 2022 @ 20:56:14 +00:00.
7+
**dependabot[bot]** contributed 48 commits from Monday, 31 January, 2022 @ 14:31:26 +00:00 to Wednesday, 2 August, 2023 @ 14:17:50 +01:00.
88

9-
**StravaigBot** contributed 4 commits from Thursday, 3 February, 2022 @ 12:20:25 +00:00 to Wednesday, 9 February, 2022 @ 22:29:07 +00:00.
9+
**StravaigBot** contributed 5 commits from Thursday, 3 February, 2022 @ 12:20:25 +00:00 to Monday, 14 November, 2022 @ 21:56:12 +00:00.
1010

1111
## Summary
1212

13-
:octocat: 119 commits in total.
13+
:octocat: 160 commits in total.
1414

1515
:date: From Friday, 28 January, 2022 @ 22:52:08 +00:00.
1616

17-
:date: Until Monday, 14 November, 2022 @ 21:28:37 +00:00.
18-
19-
:1st_place_medal: Gold medal to Colin Mackay with 86 commits which represents 72.27 % of all commits.
20-
21-
:2nd_place_medal: Silver medal to dependabot[bot] with 29 commits which represents 24.37 % of all commits.
22-
23-
:3rd_place_medal: Bronze medal to StravaigBot with 4 commits which represents 3.36 % of all commits.
17+
:date: Until Monday, 2 December, 2024 @ 22:28:08 +00:00.
2418

list-contributors.ps1

Lines changed: 17 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function Get-IgnoredNamesList($IgnoredNamesPath, $AkaContributors)
101101
}
102102
}
103103

104-
$IgnoredNamesPath = Get-ConfigFilePath -configFilePath $IgnoredNamesPath -defaultConfigFilePath "$PSScriptRoot/.stravaig/list-contributor-ignore-names.txt" -friendlyName "list of ignored names";
104+
$IgnoredNamesPath = Get-ConfigFilePath -configFilePath $IgnoredNamesPath -defaultConfigFilePath "$PSScriptRoot/.stravaig/list-contributor-ignore-names.txt" -friendlyName "list of ignored names";
105105
if ($null -ne $IgnoredNamesPath)
106106
{
107107
$ignoredNames = Get-Content -Path $IgnoredNamesPath;
@@ -156,8 +156,8 @@ function Get-InitialContributors($AkaFilePath)
156156
}
157157
catch
158158
{
159-
# For some reason it isn't stopping the script when erroring with
160-
# -ErrorAction Stop in the ConvertFrom-Json
159+
# For some reason it isn't stopping the script when erroring with
160+
# -ErrorAction Stop in the ConvertFrom-Json
161161
throw $_
162162
}
163163

@@ -218,7 +218,7 @@ function Get-InitialContributors($AkaFilePath)
218218
$contributors = Get-InitialContributors -AkaFilePath $AkaFilePath;
219219
$ignoredNamesList = Get-IgnoredNamesList -IgnoredNamesPath $IgnoredNamesPath -AkaContributors $contributors
220220
$ignoredEmailsList = Get-IgnoredEmailsList -IgnoredEmailsPath $IgnoredEmailsPath -AkaContributors $contributors
221-
& git log --format="\`"%ai\`",\`"%an\`",\`"%ae\`",\`"%H\`"" > raw-contributors.csv
221+
& git log --format="`"%ai`",`"%an`",`"%ae`",`"%H`"" > raw-contributors.csv
222222
$commits = Import-Csv raw-contributors.csv -Header Time,Name,Email,Hash | Sort-Object Time;
223223
Remove-Item .\raw-contributors.csv
224224

@@ -241,9 +241,9 @@ for($i = 0; $i -lt $totalCommits; $i++)
241241
$contributor = New-Object -TypeName PSObject -Property @{
242242
Names=@($nextCommit.Name);
243243
PrimaryName = $nextCommit.Name;
244-
Emails=@($nextCommit.Email);
245-
FirstCommit=$commitTime;
246-
LastCommit=$commitTime;
244+
Emails=@($nextCommit.Email);
245+
FirstCommit=$commitTime;
246+
LastCommit=$commitTime;
247247
CommitCount=1
248248
};
249249
$contributors += $contributor;
@@ -252,13 +252,13 @@ for($i = 0; $i -lt $totalCommits; $i++)
252252
}
253253
else
254254
{
255-
if ((-not(Test-IgnoredItem -Item $nextCommit.Email -IgnoredItemsList $ignoredEmailsList)) -and
255+
if ((-not(Test-IgnoredItem -Item $nextCommit.Email -IgnoredItemsList $ignoredEmailsList)) -and
256256
(-not (Test-Email -Contributor $contributor -CommitterEmail $nextCommit.Email)))
257257
{
258258
Write-Verbose "Adding email `"$($nextCommit.Email)`" to $($contributor.PrimaryName) from commit $($nextCommit.Hash)."
259259
$contributor.Emails += $nextCommit.Email;
260260
}
261-
if ((-not(Test-IgnoredItem -Item $nextCommit.Name -IgnoredItemsList $ignoredNamesList)) -and
261+
if ((-not(Test-IgnoredItem -Item $nextCommit.Name -IgnoredItemsList $ignoredNamesList)) -and
262262
(-not (Test-Name -Contributor $contributor -CommitterName $nextCommit.Name)))
263263
{
264264
Write-Verbose "Adding name `"$($nextCommit.Name)`" to $($contributor.PrimaryName) from commit $($nextCommit.Hash)."
@@ -282,20 +282,20 @@ $contributors = $contributors | Where-Object CommitCount -gt 0
282282
$isDescending = $SortDirection -eq "Descending";
283283
Switch($SortOrder)
284284
{
285-
"Name" {
285+
"Name" {
286286
$contributors = $contributors | Sort-Object PrimaryName -Descending:$isDescending;
287287
$textOrderBy = "contributor name";
288288
}
289289
"FirstCommit" {
290-
$contributors = $contributors | Sort-Object FirstCommit -Descending:$isDescending;
290+
$contributors = $contributors | Sort-Object FirstCommit -Descending:$isDescending;
291291
$textOrderBy = "first commit date";
292292
}
293293
"LastCommit" {
294-
$contributors = $contributors | Sort-Object LastCommit -Descending:$isDescending;
294+
$contributors = $contributors | Sort-Object LastCommit -Descending:$isDescending;
295295
$textOrderBy = "last commit date";
296296
}
297297
"CommitCount" {
298-
$contributors = $contributors | Sort-Object CommitCount -Descending:$isDescending;
298+
$contributors = $contributors | Sort-Object CommitCount -Descending:$isDescending;
299299
$textOrderBy = "number of commits";
300300
}
301301
}
@@ -331,14 +331,14 @@ foreach($contributor in $contributors)
331331
$end = $contributor.LastCommit.ToString($TimeFormat);
332332
}
333333
else {
334-
$end = $contributor.LastCommit.ToString($DateTimeFormat);
334+
$end = $contributor.LastCommit.ToString($DateTimeFormat);
335335
}
336336
"**$name**$aka contributed $numCommits $commitMsg" | Out-File $OutputFile -Append -Encoding utf8 -NoNewline
337337
if ($numCommits -eq 1)
338338
{
339339
" on $start." | Out-File $OutputFile -Append -Encoding utf8
340340
}
341-
else
341+
else
342342
{
343343
" from $start to $end." | Out-File $OutputFile -Append -Encoding utf8
344344
}
@@ -348,42 +348,13 @@ foreach($contributor in $contributors)
348348
"" | Out-File $OutputFile -Append -Encoding utf8
349349

350350
$firstCommit = $commits[0];
351-
$firstCommitMsg = [DateTime]::ParseExact($firstCommit.Time, "yyyy-MM-dd HH:mm:ss zzz", [CultureInfo]::InvariantCulture).ToString($DateTimeFormat);
351+
$firstCommitMsg = [DateTime]::ParseExact($firstCommit.Time, "yyyy-MM-dd HH:mm:ss zzz", [CultureInfo]::InvariantCulture).ToString($DateTimeFormat);
352352
$lastCommit = $commits[$totalCommits - 1];
353-
$lastCommitMsg = [DateTime]::ParseExact($lastCommit.Time, "yyyy-MM-dd HH:mm:ss zzz", [CultureInfo]::InvariantCulture).ToString($DateTimeFormat);
353+
$lastCommitMsg = [DateTime]::ParseExact($lastCommit.Time, "yyyy-MM-dd HH:mm:ss zzz", [CultureInfo]::InvariantCulture).ToString($DateTimeFormat);
354354

355355
":octocat: $totalCommits commits in total." | Out-File $OutputFile -Append -Encoding utf8
356356
"" | Out-File $OutputFile -Append -Encoding utf8
357357
":date: From $firstCommitMsg." | Out-File $OutputFile -Append -Encoding utf8
358358
"" | Out-File $OutputFile -Append -Encoding utf8
359359
":date: Until $lastCommitMsg." | Out-File $OutputFile -Append -Encoding utf8
360360
"" | Out-File $OutputFile -Append -Encoding utf8
361-
362-
$topCommitters = ($contributors | Sort-Object CommitCount -Descending);
363-
$topCommitter = $topCommitters[0];
364-
$name = $topCommitter.PrimaryName;
365-
$commitCount = $topCommitter.CommitCount;
366-
$percentage = $topCommitter.CommitCount / $totalCommits;
367-
368-
":1st_place_medal: Gold medal to $name with $commitCount commits which represents "+("{0:P2}" -f $percentage)+" of all commits." | Out-File $OutputFile -Append -Encoding utf8
369-
"" | Out-File $OutputFile -Append -Encoding utf8
370-
371-
$topCommitter = $topCommitters[1];
372-
if ($null -ne $topCommitter)
373-
{
374-
$name = $topCommitter.PrimaryName;
375-
$commitCount = $topCommitter.CommitCount;
376-
$percentage = $topCommitter.CommitCount / $totalCommits;
377-
":2nd_place_medal: Silver medal to $name with $commitCount commits which represents "+("{0:P2}" -f $percentage)+" of all commits." | Out-File $OutputFile -Append -Encoding utf8
378-
"" | Out-File $OutputFile -Append -Encoding utf8
379-
}
380-
381-
$topCommitter = $topCommitters[2];
382-
if ($null -ne $topCommitter)
383-
{
384-
$name = $topCommitter.PrimaryName;
385-
$commitCount = $topCommitter.CommitCount;
386-
$percentage = $topCommitter.CommitCount / $totalCommits;
387-
":3rd_place_medal: Bronze medal to $name with $commitCount commits which represents "+("{0:P2}" -f $percentage)+" of all commits." | Out-File $OutputFile -Append -Encoding utf8
388-
"" | Out-File $OutputFile -Append -Encoding utf8
389-
}

release-notes/wip-release-notes.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44

55
Date: ???
66

7-
### Bugs
8-
9-
### Features
10-
11-
### Miscellaneous
12-
137
### Dependent Packages
148

15-
- No changes
9+
- Bump Microsoft.Extensions.Configuration
10+
- Bump Microsoft.Extensions.Configuration.Abstractions
11+
- Bump Microsoft.Extensions.Configuration.Binder
12+
- Bump Microsoft.Extensions.Logging.Abstractions
13+
- Bump Microsoft.SourceLink.GitHub"
14+
- Bump System.Data.SqlClient
1615

1716
---
18-
19-

src/.idea/.idea.Stravaig.Configuration.SqlServer/.idea/projectSettingsUpdater.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Example/Example.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.2" />
1717
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
18-
<PackageReference Include="Microsoft.FeatureManagement" Version="2.5.1" />
18+
<PackageReference Include="Microsoft.FeatureManagement" Version="2.6.1" />
1919
<PackageReference Include="Stravaig.Configuration.Diagnostics.Logging" Version="2.0.0" />
2020
</ItemGroup>
2121

src/Stravaig.Configuration.SqlServer.Tests/Stravaig.Configuration.SqlServer.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
12-
<PackageReference Include="NUnit" Version="3.13.3" />
13-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
14-
<PackageReference Include="coverlet.collector" Version="3.2.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
12+
<PackageReference Include="NUnit" Version="3.14.0" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
14+
<PackageReference Include="coverlet.collector" Version="6.0.2" />
1515
<PackageReference Include="Shouldly" Version="4.2.1" />
16-
<PackageReference Include="Stravaig.Extensions.Logging.Diagnostics" Version="2.1.0" />
16+
<PackageReference Include="Stravaig.Extensions.Logging.Diagnostics" Version="3.0.1" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

src/Stravaig.Configuration.SqlServer.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__BuildAndDeploy", "__Build
1212
..\Reset-WipReleaseNotes.ps1 = ..\Reset-WipReleaseNotes.ps1
1313
..\Set-Version.ps1 = ..\Set-Version.ps1
1414
..\version.txt = ..\version.txt
15+
..\list-contributors.ps1 = ..\list-contributors.ps1
1516
EndProjectSection
1617
EndProject
1718
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__Documentation", "__Documentation", "{61C05782-A253-4EDD-9463-04912EB73870}"

src/Stravaig.Configuration.SqlServer/Stravaig.Configuration.SqlServer.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
</PropertyGroup>
4343

4444
<ItemGroup>
45-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
45+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
4646
</ItemGroup>
4747

4848
<ItemGroup>
49-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
50-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
51-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
52-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
53-
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
49+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.2" />
50+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.1" />
51+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.1" />
52+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
53+
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
5454
</ItemGroup>
5555
</Project>

0 commit comments

Comments
 (0)