Unity-Technologies
/
Git-for-Unity
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

yamato: fix package numbering system for branch builds

This commit is contained in:
Andreia Gaita 2020-09-16 14:34:41 +02:00
Родитель 4a92f44b35
Коммит b5f5863ba7
1 изменённых файлов: 8 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
common/packaging.targets
Просмотреть файл

@ -57,8 +57,10 @@
<PropertyGroup>
<NeedsSuffix Condition="'$(PublicRelease)' != 'true' and '$(NpmVersionSuffix)' != '' and !$(NuGetPackageVersion.Contains('$(NpmVersionSuffix)'))">true</NeedsSuffix>
<NpmVersion Condition=" '$(NeedsSuffix)' != 'true' ">$(NuGetPackageVersion)</NpmVersion>
<NpmVersion Condition=" '$(NeedsSuffix)' == 'true'">$(BuildVersionSimple)$(NpmVersionSuffix)-g$(GitCommitIdShort)</NpmVersion>
<NeedsCustomVersion Condition="'$(PublicRelease)' != 'true' and '$(YAMATO_JOB_ID)' != ''">true</NeedsCustomVersion>
<NpmVersion Condition=" '$(NeedsCustomVersion)' == 'true' ">$(BuildVersionSimple)$(NpmVersionSuffix)$(FileVersion.Substring($(FileVersion.LastIndexOf('.'))))</NpmVersion>
<NpmVersion Condition=" '$(NeedsCustomVersion)' != 'true' and '$(NeedsSuffix)' != 'true' ">$(NuGetPackageVersion)</NpmVersion>
<NpmVersion Condition=" '$(NeedsCustomVersion)' != 'true' and '$(NeedsSuffix)' == 'true' ">$(BuildVersionSimple)$(NpmVersionSuffix)-g$(GitCommitIdShort)</NpmVersion>
</PropertyGroup>
<FileUpdate
@ -162,8 +164,10 @@
<PropertyGroup>
<NeedsSuffix Condition="'$(PublicRelease)' != 'true' and '$(NpmVersionSuffix)' != '' and !$(NuGetPackageVersion.Contains('$(NpmVersionSuffix)'))">true</NeedsSuffix>
<NpmVersion Condition=" '$(NeedsSuffix)' != 'true' ">$(NuGetPackageVersion)</NpmVersion>
<NpmVersion Condition=" '$(NeedsSuffix)' == 'true'">$(BuildVersionSimple)$(NpmVersionSuffix)-g$(GitCommitIdShort)</NpmVersion>
<NeedsCustomVersion Condition="'$(PublicRelease)' != 'true' and '$(YAMATO_JOB_ID)' != ''">true</NeedsCustomVersion>
<NpmVersion Condition=" '$(NeedsCustomVersion)' == 'true' ">$(BuildVersionSimple)$(NpmVersionSuffix)$(FileVersion.Substring($(FileVersion.LastIndexOf('.'))))</NpmVersion>
<NpmVersion Condition=" '$(NeedsCustomVersion)' != 'true' and '$(NeedsSuffix)' != 'true' ">$(NuGetPackageVersion)</NpmVersion>
<NpmVersion Condition=" '$(NeedsCustomVersion)' != 'true' and '$(NeedsSuffix)' == 'true' ">$(BuildVersionSimple)$(NpmVersionSuffix)-g$(GitCommitIdShort)</NpmVersion>
</PropertyGroup>
<FileUpdate