diff --git a/.github/version.yml b/.github/version.yml new file mode 100644 index 0000000..a013f09 --- /dev/null +++ b/.github/version.yml @@ -0,0 +1,6 @@ +mode: ContinuousDeployment +branches: + master: + tag: beta + hotfix: + tag: useBranchName \ No newline at end of file diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 0000000..c46cf94 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,83 @@ +name: Release + +on: + push: + tags: + - "*" + +jobs: + calculate-version: + name: Calculate Version + runs-on: ubuntu-latest + outputs: + semVer: ${{ steps.gitversion.outputs.semVer }} + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install GitVersion + uses: gittools/actions/gitversion/setup@v0.10.2 + with: + versionSpec: "5.x" + + - name: Determine Version + id: gitversion + uses: gittools/actions/gitversion/execute@v0.10.2 + with: + useConfigFile: true + configFilePath: ./.github/version.yml + + build: + name: Build and Release + runs-on: windows-latest + needs: calculate-version + env: + SEMVER: ${{ needs.calculate-version.outputs.semVer }} + ZipName: NFive.SDK.Plugins-${{ needs.calculate-version.outputs.semVer }}.zip + + steps: + - uses: actions/checkout@v4 + + - name: Setup NuGet + uses: NuGet/setup-nuget@v2 + + - name: Restore dependencies + run: nuget restore NFive.SDK.Plugins.sln + + - name: Build the solution + run: dotnet build -c Release -o Build /p:Version=${{env.SEMVER}} NFive.SDK.Plugins.sln + + - uses: vimtor/action-zip@v1 + with: + files: Build/ + dest: ${{ env.ZipName }} + + - name: Create release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.SEMVER }} + release_name: ${{ env.SEMVER }} + draft: false + prerelease: false + + - name: Update release asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: .\${{ env.ZipName }} + asset_name: ${{ env.ZipName }} + asset_content_type: application/zip + + - name: Pack + run: dotnet pack NFive.SDK.Plugins.csproj -p:PackageVersion=${{ env.SEMVER }} --configuration Release + + - name: Push nuget package + run: dotnet nuget push **/*.nupkg --skip-duplicate --source "https://api.nuget.org/v3/index.json" --api-key ${{secrets.nuget_api_key}} \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..40bb105 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,59 @@ +name: Continuous Integration + +on: + push: + branches: + - "**" + tags: + - "v*.*.*" + pull_request: + branches: + - "**" + +jobs: + calculate-version: + name: Calculate Version + runs-on: ubuntu-latest + outputs: + semVer: ${{ steps.gitversion.outputs.semVer }} + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Install GitVersion + uses: gittools/actions/gitversion/setup@v0.10.2 + with: + versionSpec: "5.x" + + - name: Determine Version + id: gitversion + uses: gittools/actions/gitversion/execute@v0.10.2 + with: + useConfigFile: true + configFilePath: ./.github/version.yml + + build: + runs-on: windows-latest + needs: calculate-version + env: + SEMVER: ${{ needs.calculate-version.outputs.semVer }} + + steps: + - uses: actions/checkout@v4 + + - name: Setup NuGet + uses: NuGet/setup-nuget@v2 + + - name: Restore dependencies + run: nuget restore NFive.SDK.Plugins.sln + + - name: Build the solution + run: dotnet build -c Release -o Build /p:Version=${{env.SEMVER}} NFive.SDK.Plugins.sln + + - name: Attach Zip as build artifact + uses: actions/upload-artifact@v3.1.0 + with: + name: NFive.SDK.Plugins-${{ env.SEMVER }} + path: Build \ No newline at end of file diff --git a/Configuration/VersionConverter.cs b/Configuration/VersionConverter.cs index 8dd399d..a3e922b 100644 --- a/Configuration/VersionConverter.cs +++ b/Configuration/VersionConverter.cs @@ -33,7 +33,7 @@ public object ReadYaml(IParser parser, Type type) var value = ((Scalar)parser.Current).Value; parser.MoveNext(); - var version = new SemanticVersioning.Version(value); + var version = new SemVer.Version(value); return new Version { diff --git a/Configuration/VersionRangeConverter.cs b/Configuration/VersionRangeConverter.cs index f305813..e23b1b5 100644 --- a/Configuration/VersionRangeConverter.cs +++ b/Configuration/VersionRangeConverter.cs @@ -1,6 +1,6 @@ using System; using NFive.SDK.Core.Plugins; -using SemanticVersioning; +using SemVer; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; diff --git a/NFive.SDK.Plugins.csproj b/NFive.SDK.Plugins.csproj index 82da39d..c364ddc 100644 --- a/NFive.SDK.Plugins.csproj +++ b/NFive.SDK.Plugins.csproj @@ -1,84 +1,52 @@ - - - + + - Debug - AnyCPU - {6E4AFD28-EE33-446C-B4C4-A700FD0D7CCF} - Library - Properties - NFive.SDK.Plugins + net471 NFive.SDK.Plugins - v4.5.2 - 512 - - - false - none - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - .allowedextension - - - - false - none - true - bin\Release\ - TRACE - prompt - 4 - - .allowedextension - + NFive.SDK.Plugins + + NFive.SDK.Plugins + NFive + NFive + LGPL-3.0-only + nfive fivem gtav + false + https://github.com/NFive/SDK.Plugins + git + NFive plugin SDK for plugin parsing and loading + NFive Plugins SDK + https://github.com/NFive + icon.png + nfive fivem gtav + 0.1.4 + README.md + Copyright © NFive 2018-2024 + en-US + - - packages\JetBrains.Annotations.2021.2.0\lib\net20\JetBrains.Annotations.dll - False - - - - packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - False - - - packages\NFive.SDK.Core.0.1.0.62\lib\net452\NFive.SDK.Core.net.dll - False - - - packages\SemanticVersioning.2.0.0\lib\net45\SemanticVersioning.dll - False - - - - packages\YamlDotNet.11.2.1\lib\net45\YamlDotNet.dll - False - + + True + \ + + - - - - - - - - - - - - - - - + + True + \ + + - + + + + + + + $(PkgNewtonsoft_Json)\lib\portable-net40+sl5+win8+wp8+wpa81\Newtonsoft.Json.dll + - - \ No newline at end of file + + diff --git a/NFive.SDK.Plugins.nuspec b/NFive.SDK.Plugins.nuspec deleted file mode 100644 index 18f0a9d..0000000 --- a/NFive.SDK.Plugins.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - NFive.SDK.Plugins - $version$ - $title$ - NFive - NFive - false - LGPL-3.0-only - https://github.com/NFive/SDK.Plugins - $description$ - $copyright$ - nfive fivem gtav - - - diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs deleted file mode 100644 index f872642..0000000 --- a/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("NFive Plugins SDK")] -[assembly: AssemblyDescription("NFive plugin SDK for plugin parsing and loading")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("NFive")] -[assembly: AssemblyProduct("NFive SDK")] -[assembly: AssemblyCopyright("Copyright © NFive 2018-2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: Guid("6e4afd28-ee33-446c-b4c4-a700fd0d7ccf")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/README.md b/README.md index 3bac8cf..86798b1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # NFive Plugins SDK [![License](https://img.shields.io/github/license/NFive/SDK.Plugins.svg)](LICENSE) -[![Build Status](https://img.shields.io/appveyor/ci/NFive/sdk-plugins.svg)](https://ci.appveyor.com/project/NFive/sdk-plugins) +[![Build Status](https://img.shields.io/github/actions/workflow/status/NFive/SDK.Plugins/ci.yml)](https://github.com/NFive/SDK.Plugins/actions/workflows/ci.yml) [![NuGet Version](https://img.shields.io/nuget/v/NFive/SDK.Plugins.svg)](https://www.nuget.org/packages/NFive.SDK.Plugins) [![Release Version](https://img.shields.io/github/release/NFive/SDK.Plugins/all.svg)](https://github.com/NFive/SDK.Plugins/releases) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 219ff53..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: 0.1.0.{build} - -image: Visual Studio 2019 -configuration: Release -platform: Any CPU -clone_depth: 1 - -branches: - only: - - master - -cache: -- packages -> packages.config - -test: off - -assembly_info: - patch: true - file: Properties\AssemblyInfo.cs - assembly_version: "{version}" - assembly_file_version: "{version}" - assembly_informational_version: "{version}" - -before_build: -- nuget update -self -- nuget restore - -build: - project: NFive.SDK.Plugins.sln - verbosity: minimal - publish_nuget: true diff --git a/icon.png b/icon.png new file mode 100644 index 0000000..1d2da72 Binary files /dev/null and b/icon.png differ diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 046928f..0000000 --- a/nuget.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/packages.config b/packages.config deleted file mode 100644 index fe4cc02..0000000 --- a/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file