diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 87c651d..a26f6f7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,15 @@ jobs: - name: Restore dependencies run: dotnet restore + - name: Extract version from .csproj + id: version + run: | + $version = [xml](Get-Content ./ZYZ-CSharp-Extension.csproj) + $projectVersion = $version.Project.PropertyGroup.Version + echo "PROJECT_VERSION=$projectVersion" >> $GITHUB_ENV + echo "::set-output name=project_version::$projectVersion" + shell: pwsh + - name: Build and generate NuGet package run: dotnet build --configuration Release --output ${{ github.workspace }}/build # 构建的同时生成 NuGet 包,因为 GeneratePackageOnBuild 设置为 True @@ -38,8 +47,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: v${{ github.run_number }} - release_name: Release v${{ github.run_number }} + tag_name: v${{ steps.version.outputs.project_version }} + release_name: Release v${{ steps.version.outputs.project_version }} draft: false prerelease: false @@ -49,8 +58,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ github.workspace }}/build/*.nupkg - asset_name: ZYZ_CSharp_Extension-${{ github.run_number }}.nupkg + asset_path: ${{ github.workspace }}/build/ZYZ_CSharp_Extension${{ steps.version.outputs.project_version }}.nupkg + asset_name: ZYZ_CSharp_Extension-${{ steps.version.outputs.project_version }}.nupkg asset_content_type: application/zip - name: Upload Release Asset (DLL files) @@ -59,6 +68,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ github.workspace }}/build/*.dll - asset_name: ZYZ_CSharp_Extension-${{ github.run_number }}.dll + asset_path: ${{ github.workspace }}/build/ZYZ_CSharp_Extension.dll + asset_name: ZYZ_CSharp_Extension-${{ steps.version.outputs.project_version }}.dll asset_content_type: application/octet-stream diff --git a/Net/Http/HttpClientWrapper.cs b/Net/Http/HttpClientWrapper.cs index 0fbca81..98976e2 100644 --- a/Net/Http/HttpClientWrapper.cs +++ b/Net/Http/HttpClientWrapper.cs @@ -8,6 +8,6 @@ namespace ZYZ_CSharp_Extension.Net.Http { public class HttpClientWrapper { - //private HttpClient httpClient; + private HttpClient httpClient; } }