From 91abc3ea33827cfedc1351f53fe633c5608d483a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 14 Dec 2016 21:37:18 -0800 Subject: [PATCH] Fix for VersionSuffix ending up in package version twice --- build/build-quality.txt | 1 - build/shade/BuildEnv.shade | 25 +------------------------ template/build/common.props | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 build/build-quality.txt diff --git a/build/build-quality.txt b/build/build-quality.txt deleted file mode 100644 index bdafe4a..0000000 --- a/build/build-quality.txt +++ /dev/null @@ -1 +0,0 @@ -preview1 \ No newline at end of file diff --git a/build/shade/BuildEnv.shade b/build/shade/BuildEnv.shade index 4d63707..9962fc8 100644 --- a/build/shade/BuildEnv.shade +++ b/build/shade/BuildEnv.shade @@ -25,29 +25,6 @@ functions 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 { get @@ -58,7 +35,7 @@ functions return "t" + CreateSecondBasedTimeStamp(); } - return !string.IsNullOrEmpty(BuildQuality) ? BuildQuality + "-" + buildNumber : buildNumber; + return buildNumber; } } diff --git a/template/build/common.props b/template/build/common.props index aa4b2fc..6e92975 100644 --- a/template/build/common.props +++ b/template/build/common.props @@ -6,7 +6,7 @@ BeforeTargets="Build" Condition="!Exists('$(MSBuildThisFileDirectory)..\.build\common.props')"> + Text="Project has not been initialized. Run 'build initialize' in the solution directory." /> \ No newline at end of file