Fix for VersionSuffix ending up in package version twice

This commit is contained in:
Nate McMaster 2016-12-14 21:37:18 -08:00
Родитель 60ae6269c4
Коммит 91abc3ea33
3 изменённых файлов: 2 добавлений и 26 удалений

Просмотреть файл

@ -1 +0,0 @@
preview1

Просмотреть файл

@ -25,29 +25,6 @@ functions
return seconds.ToString("x").PadLeft(9, (char)'0'); return seconds.ToString("x").PadLeft(9, (char)'0');
} }
private bool _buildQualitySet;
private string _buildQuality;
string BuildQuality
{
get
{
if (!_buildQualitySet)
{
var buildQualityFilePath = Path.Combine(KoreBuildFolderPath, "build-quality.txt");
_buildQuality = File.ReadAllText(buildQualityFilePath);
_buildQualitySet = true;
}
return _buildQuality;
}
set
{
_buildQuality = value;
_buildQualitySet = true;
}
}
string BuildNumber string BuildNumber
{ {
get get
@ -58,7 +35,7 @@ functions
return "t" + CreateSecondBasedTimeStamp(); return "t" + CreateSecondBasedTimeStamp();
} }
return !string.IsNullOrEmpty(BuildQuality) ? BuildQuality + "-" + buildNumber : buildNumber; return buildNumber;
} }
} }

Просмотреть файл

@ -6,7 +6,7 @@
BeforeTargets="Build" BeforeTargets="Build"
Condition="!Exists('$(MSBuildThisFileDirectory)..\.build\common.props')"> Condition="!Exists('$(MSBuildThisFileDirectory)..\.build\common.props')">
<Error File="$(MSBuildProjectFile)" <Error File="$(MSBuildProjectFile)"
Text="Project has not been initialized. Run 'build initialize' in the solution directory '$(MSBuildThisFileDirectory)'" /> Text="Project has not been initialized. Run 'build initialize' in the solution directory." />
</Target> </Target>
</Project> </Project>