Merge branch 'rel/2.0.0' into dev

This commit is contained in:
Pranav K 2017-07-11 21:04:38 -07:00
commit cd5d4fbdaf
1 changed files with 8 additions and 3 deletions

View File

@ -40,12 +40,17 @@
<PropertyGroup> <PropertyGroup>
<ModuleVersion>@(ExecOutput)</ModuleVersion> <ModuleVersion>@(ExecOutput)</ModuleVersion>
<ModuleVersion Condition="'$(VersionSuffix)' != ''">$(ModuleVersion)-$(VersionSuffix)</ModuleVersion> <ModuleVersion Condition="'$(VersionSuffix)' != ''">$(ModuleVersion)-$(VersionSuffix)</ModuleVersion>
<IsGitRepository Condition="EXISTS('$(MSBuildThisFileDirectory)..\..\.git\HEAD')">true</IsGitRepository>
<IsGitRepository Condition="'$(IsGitRepository)'==''">false</IsGitRepository>
</PropertyGroup> </PropertyGroup>
<Exec Command="npm version $(ModuleVersion)" WorkingDirectory="$(MSBuildThisFileDirectory).." Condition="'$(VersionSuffix)' != ''" /> <Exec Command="npm version $(ModuleVersion)" WorkingDirectory="$(MSBuildThisFileDirectory).." Condition="'$(VersionSuffix)' != ''" />
<Exec Command="npm pack" WorkingDirectory="$(MSBuildThisFileDirectory).." /> <Exec Command="npm pack" WorkingDirectory="$(MSBuildThisFileDirectory).." />
<Exec Command="git checkout HEAD -- $(MSBuildThisFileDirectory)../package.json" Condition="'$(VersionSuffix)' != ''" /> <Exec
<Exec Command="git checkout HEAD -- $(MSBuildThisFileDirectory)../package-lock.json" Condition="'$(VersionSuffix)' != ''" /> Command="git checkout HEAD -- $(MSBuildThisFileDirectory)../package.json"
Condition="$(IsGitRepository) AND '$(VersionSuffix)' != ''" />
<Exec
Command="git checkout HEAD -- $(MSBuildThisFileDirectory)../package-lock.json"
Condition="$(IsGitRepository) AND '$(VersionSuffix)' != ''" />
<ItemGroup> <ItemGroup>
<TSClient Include="$(MSBuildThisFileDirectory)../signalr-client*.tgz" /> <TSClient Include="$(MSBuildThisFileDirectory)../signalr-client*.tgz" />
</ItemGroup> </ItemGroup>