From 28dec4ae6a40b28fa6e4549a51f74d4d008a87e0 Mon Sep 17 00:00:00 2001 From: MysticBoy Date: Sun, 3 Nov 2019 02:56:39 +0800 Subject: [PATCH] modify about version --- GitVersion.yml | 73 +++++++++++++++++-- .../IoTSharp.Extensions.AspNetCore.csproj | 13 ++++ .../IoTSharp.Extensions.csproj | 12 +++ IoTSharp.sln | 1 - appveyor.yml | 29 ++++---- 5 files changed, 103 insertions(+), 25 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 5c01de1b..7fbdddde 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,8 +1,65 @@ -assembly-versioning-scheme: MajorMinorPatchTag -assembly-file-versioning-scheme: MajorMinorPatchTag -mode: ContinuousDeployment -next-version: 1.0 -patch-version-bump-message: '\+semver:\s?(fix|patch)' -branches: {} -ignore: - sha: [] +branches: + master: + regex: master + mode: ContinuousDelivery + tag: '' + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + tracks-release-branches: false + is-release-branch: false + release: + regex: releases?[/-] + mode: ContinuousDelivery + tag: beta + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + tracks-release-branches: false + is-release-branch: true + feature: + regex: features?[/-] + mode: ContinuousDelivery + tag: useBranchName + increment: Inherit + prevent-increment-of-merged-branch-version: false + track-merge-target: false + tracks-release-branches: false + is-release-branch: false + pull-request: + regex: (pull|pull\-requests|pr)[/-] + mode: ContinuousDelivery + tag: PullRequest + increment: Inherit + prevent-increment-of-merged-branch-version: false + tag-number-pattern: '[/-](?\d+)[-/]' + track-merge-target: false + tracks-release-branches: false + is-release-branch: false + hotfix: + regex: hotfix(es)?[/-] + mode: ContinuousDelivery + tag: beta + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: false + tracks-release-branches: false + is-release-branch: false + support: + regex: support[/-] + mode: ContinuousDelivery + tag: '' + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + tracks-release-branches: false + is-release-branch: false + develop: + regex: dev(elop)?(ment)?$ + mode: ContinuousDeployment + tag: unstable + increment: Minor + prevent-increment-of-merged-branch-version: false + track-merge-target: true + tracks-release-branches: true + is-release-branch: false \ No newline at end of file diff --git a/IoTSharp.Extensions.AspNetCore/IoTSharp.Extensions.AspNetCore.csproj b/IoTSharp.Extensions.AspNetCore/IoTSharp.Extensions.AspNetCore.csproj index accf9445..e08ba391 100644 --- a/IoTSharp.Extensions.AspNetCore/IoTSharp.Extensions.AspNetCore.csproj +++ b/IoTSharp.Extensions.AspNetCore/IoTSharp.Extensions.AspNetCore.csproj @@ -3,6 +3,13 @@ netcoreapp3.0 true + https://raw.githubusercontent.com/IoTSharp/IoTSharp/master/docs/images/64x64.png + LICENSE.txt + MaiKeBing + IoTSharp + IoTSharp + https://github.com/IoTSharp/IoTSharp + https://github.com/IoTSharp/IoTSharp @@ -16,4 +23,10 @@ + + + True + + + diff --git a/IoTSharp.Extensions/IoTSharp.Extensions.csproj b/IoTSharp.Extensions/IoTSharp.Extensions.csproj index a64c78c9..dbc8f846 100644 --- a/IoTSharp.Extensions/IoTSharp.Extensions.csproj +++ b/IoTSharp.Extensions/IoTSharp.Extensions.csproj @@ -7,6 +7,11 @@ https://github.com/IoTSharp/IoTSharp Endian;Json;XML IoTSharp + https://raw.githubusercontent.com/IoTSharp/IoTSharp/master/docs/images/64x64.png + LICENSE.txt + IoTSharp + IoTSharp + MaiKeBing @@ -18,4 +23,11 @@ + + + True + + + + diff --git a/IoTSharp.sln b/IoTSharp.sln index 6157253e..ba66b6d6 100644 --- a/IoTSharp.sln +++ b/IoTSharp.sln @@ -6,7 +6,6 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D5C97089-F896-436D-8E99-27B2E43BC65F}" ProjectSection(SolutionItems) = preProject appveyor.yml = appveyor.yml - GitVersion.yml = GitVersion.yml LICENSE = LICENSE README.md = README.md roadmap.md = roadmap.md diff --git a/appveyor.yml b/appveyor.yml index 455ede30..9386cda9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.{build} +version: 0.1.{build} image: Visual Studio 2019 init: - ps: Install-Product node $env:nodejs_version @@ -12,6 +12,7 @@ dotnet_csproj: patch: true file: '**\*.csproj' version: '{version}' + version_prefix: '{version}' package_version: '{version}' assembly_version: '{version}' file_version: '{version}' @@ -23,20 +24,16 @@ install: git submodule sync --recursive git submodule update --init --recursive - - dotnet tool install --global dotnet-zip - - dotnet tool install --global dotnet-tarball - - dotnet tool install --global dotnet-rpm - - dotnet tool install --global dotnet-deb build_script: -- cmd: "dotnet msbuild IoTSharp/IoTSharp.csproj /t:CreateDeb /p:TargetFramework=netcoreapp3.0 /p:RuntimeIdentifier=ubuntu.16.04-x64 \n /p:Configuration=Release \ndotnet msbuild IoTSharp/IoTSharp.csproj /t:CreateRpm \n /p:TargetFramework=netcoreapp3.0 /p:RuntimeIdentifier=rhel.7-x64 \n /p:Configuration=Release\ndotnet msbuild IoTSharp/IoTSharp.csproj /t:CreateZip \n /p:TargetFramework=netcoreapp3.0 /p:RuntimeIdentifier=win7-x64 \n /p:Configuration=Release" +- cmd: >- + dotnet publish -c Release ./IoTSharp/IoTSharp.csproj + + dotnet publish -c Release ./IoTSharp.Edge.ModBus/IoTSharp.Edge.ModBus.csproj artifacts: -- path: IoTSharp\bin\Release\netcoreapp3.0\ubuntu.16.04-x64\*.deb - name: IoTSharp.ubuntu -- path: IoTSharp\bin\Release\netcoreapp3.0\rhel.7-x64\*.rpm - name: IoTSharp.centos -- path: IoTSharp\bin\Release\netcoreapp3.0\win7-x64\*.zip - name: IoTSharp.win \ No newline at end of file +- path: IoTSharp\bin\Release\netcoreapp3.0\publish\ + name: IoTSharp +- path: IoTSharp.Extensions\bin\Release\*.nupkg + name: IoTSharp.Extensions +- path: IoTSharp.Edge.ModBus\bin\Release\netcoreapp3.0\publish\ + name: IoTSharp.Edge.ModBus +deploy: off \ No newline at end of file -- GitLab