Skip to content

Commit a0727a9

Browse files
arika0093arika0093
authored
release v2.0.2 (#38)
* Ver 2.0.2 fix: change Dependabot auto-merge strategy from merge to squash Bump nbgv from 3.7.115 to 3.8.118 (#24) --- updated-dependencies: - dependency-name: nbgv dependency-version: 3.8.118 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> devcontainer: update base image to Ubuntu and adjust .NET versions BlazorLocalTimeExtension: simplify AddBlazorLocalTimeService method by removing unused parameters Add package.json and dotnet-tools.json to workflow Bump nbgv from 3.8.118 to 3.9.50 (#26) --- updated-dependencies: - dependency-name: nbgv dependency-version: 3.9.50 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Add authors field to Directory.Build.props BlazorLocalTime: update package references to use version ranges for better compatibility Bump AntDesign from 1.4.3 to 1.5.0 (#28) --- updated-dependencies: - dependency-name: AntDesign dependency-version: 1.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bump csharpier from 1.1.2 to 1.2.1 (#30) --- updated-dependencies: - dependency-name: csharpier dependency-version: 1.2.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bump Microsoft.AspNetCore.Components.WebAssembly.DevServer from 10.0.0-rc.1.25451.107 to 10.0.0 (#31) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Components.WebAssembly.DevServer dependency-version: 10.0.0 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bump Microsoft.FluentUI.AspNetCore.Components from 4.12.1 to 4.13.1 (#32) --- updated-dependencies: - dependency-name: Microsoft.FluentUI.AspNetCore.Components dependency-version: 4.13.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bump PublicApiGenerator from 11.4.6 to 11.5.0 (#35) --- updated-dependencies: - dependency-name: PublicApiGenerator dependency-version: 11.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bump PublishSPAforGitHubPages.Build from 3.0.1 to 3.0.3 (#36) --- updated-dependencies: - dependency-name: PublishSPAforGitHubPages.Build dependency-version: 3.0.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bump TimeZoneConverter from 7.0.0 to 7.2.0 (#37) --- updated-dependencies: - dependency-name: TimeZoneConverter dependency-version: 7.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bump MudBlazor from 8.10.0 to 8.14.0 (#34) --- updated-dependencies: - dependency-name: MudBlazor dependency-version: 8.14.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Refactor code structure for improved readability and maintainability Refactor GitHub Actions workflow for package release and update dependencies * fix: correct closing tag for PackageIcon in Directory.Build.props * fix: update package versions for Nerdbank.GitVersioning, PolySharp, and SonarAnalyzer.CSharp
1 parent f070615 commit a0727a9

15 files changed

Lines changed: 232 additions & 233 deletions

File tree

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"nbgv": {
6-
"version": "3.7.115",
6+
"version": "3.9.50",
77
"commands": [
88
"nbgv"
99
],
1010
"rollForward": false
1111
},
1212
"csharpier": {
13-
"version": "1.1.2",
13+
"version": "1.2.1",
1414
"commands": [
1515
"csharpier"
1616
],

‎.devcontainer/devcontainer.json‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@
33
{
44
"name": "C# (.NET)",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/debian:bullseye",
7-
"customizations": {
8-
"vscode": {
9-
"extensions": [
10-
"ms-dotnettools.csdevkit",
11-
"ms-dotnettools.csharp",
12-
"csharpier.csharpier-vscode"
13-
]
14-
}
15-
},
6+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
167
// Features to add to the dev container. More info: https://containers.dev/features.
178
"features": {
9+
// https://github.com/devcontainers/features/tree/main/src/dotnet
1810
"ghcr.io/devcontainers/features/dotnet:2": {
1911
"version": "lts",
20-
"additionalDotnetVersions": "8.0, 7.0, 6.0"
12+
"additionalVersions": "10.0, 9.0, 8.0"
2113
}
14+
},
15+
"containerEnv": {
16+
// disable Git Versioning in the container
17+
"NBGV_GitEngine": "Disabled"
2218
}
2319
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2420
// "forwardPorts": [5000, 5001],

‎.github/workflows/dependabot-merge.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818
- name: Enable auto-merge for Dependabot PRs
19-
run: gh pr merge --auto --merge "$PR_URL"
19+
run: gh pr merge --auto --squash "$PR_URL"
2020
env:
2121
PR_URL: ${{github.event.pull_request.html_url}}
2222
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/release-github.yaml‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎.github/workflows/release.yaml‎

Lines changed: 65 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,42 @@
1-
name: Release Package to NuGet
1+
name: Package Release to GitHub and Nuget
22

33
on:
44
workflow_dispatch:
5+
push:
6+
branches:
7+
- release/*
58

9+
permissions:
10+
contents: write
11+
12+
env:
13+
DOTNET_VERSION: '10.0.x'
14+
615
jobs:
7-
release-nuget:
16+
package-build:
817
runs-on: ubuntu-latest
18+
outputs:
19+
VERSION: ${{ steps.version.outputs.VERSION }}
920
steps:
1021
- name: Checkout repository
11-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
1223
with:
1324
fetch-depth: 0
1425

1526
- name: Setup .NET
16-
uses: actions/setup-dotnet@v4
27+
uses: actions/setup-dotnet@v5
1728
with:
18-
dotnet-version: |
19-
10.x
20-
9.x
21-
8.x
29+
dotnet-version: ${{ env.DOTNET_VERSION }}
2230
cache: true
2331
cache-dependency-path: '**/packages.lock.json'
24-
32+
33+
- uses: dotnet/nbgv@master
34+
id: nbgv
35+
36+
- name: export version to env
37+
id: version
38+
run: echo "VERSION=${{ steps.nbgv.outputs.SemVer2 }}" >> $GITHUB_ENV
39+
2540
- name: Restore dependencies
2641
run: dotnet restore --locked-mode
2742

@@ -30,6 +45,47 @@ jobs:
3045

3146
- name: Generate Nuget Package
3247
run: dotnet pack --no-build -c Release --output ./artifacts
48+
49+
- name: Upload Artifacts
50+
uses: actions/upload-artifact@v4
51+
with:
52+
name: nuget-packages
53+
path: ./artifacts/*.nupkg
54+
retention-days: 1
55+
56+
release-github:
57+
runs-on: ubuntu-latest
58+
needs: package-build
59+
steps:
60+
- name: Download Artifacts
61+
uses: actions/download-artifact@v5
62+
with:
63+
name: nuget-packages
64+
path: ./artifacts
65+
66+
- name: Create Release
67+
id: create_release
68+
uses: softprops/action-gh-release@v2
69+
with:
70+
name: ${{ needs.package-build.outputs.VERSION }}
71+
tag_name: ${{ needs.package-build.outputs.VERSION }}
72+
target_commitish: ${{ github.ref }}
73+
generate_release_notes: true
74+
files: ./artifacts/*.nupkg
75+
# if hyphen contains in the tag name, it will be prerelease
76+
prerelease: ${{ contains(needs.package-build.outputs.VERSION, '-') }}
77+
env:
78+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
79+
80+
release-nuget:
81+
runs-on: ubuntu-latest
82+
needs: package-build
83+
steps:
84+
- name: Download Artifacts
85+
uses: actions/download-artifact@v5
86+
with:
87+
name: nuget-packages
88+
path: ./artifacts
3389

3490
- name: Publish Nuget Package
3591
run: dotnet nuget push ./artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key $NUGET_API_KEY

‎.github/workflows/test.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
- '**.cs'
99
- '**.razor'
1010
- '**.yaml'
11+
# for auto mergie
12+
- '**/package*.json'
13+
- '**/dotnet-tools.json'
1114

1215
jobs:
1316
test:
@@ -38,4 +41,4 @@ jobs:
3841
run: dotnet build --no-restore
3942

4043
- name: Run tests
41-
run: dotnet test --no-build --verbosity normal
44+
run: dotnet test --no-build --verbosity normal

‎.vscode/extensions.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"recommendations": [
3+
"ms-dotnettools.csdevkit",
4+
"ms-dotnettools.csharp",
35
"csharpier.csharpier-vscode"
46
]
57
}

‎assets/blazorlocaltime.png‎

19.8 KB
Loading

‎assets/blazorlocaltime_512.png‎

196 KB
Loading

‎example/BlazorLocalTimeSample/BlazorLocalTimeSample.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="AntDesign" Version="1.4.3" />
8+
<PackageReference Include="AntDesign" Version="1.5.0" />
99
<PackageReference
1010
Include="Microsoft.AspNetCore.Components.WebAssembly"
1111
Version="10.0.0-rc.1.25451.107"
1212
/>
1313
<PackageReference
1414
Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer"
15-
Version="10.0.0-rc.1.25451.107"
15+
Version="10.0.0"
1616
PrivateAssets="all"
1717
/>
18-
<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.12.1" />
19-
<PackageReference Include="MudBlazor" Version="8.10.0" />
20-
<PackageReference Include="PublishSPAforGitHubPages.Build" Version="3.0.1" />
18+
<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.13.1" />
19+
<PackageReference Include="MudBlazor" Version="8.14.0" />
20+
<PackageReference Include="PublishSPAforGitHubPages.Build" Version="3.0.3" />
2121
</ItemGroup>
2222
<ItemGroup>
2323
<ProjectReference Include="..\..\src\BlazorLocalTime\BlazorLocalTime.csproj" />

0 commit comments

Comments
 (0)