Skip to content
Permalink
Browse files

[Build] Remove the -beta02 version suffix

  • Loading branch information
xen2 committed Sep 24, 2019
1 parent 48692b4 commit 8787a1959ff4dcd1ca9219615463a6dba7b14e56
@@ -405,7 +405,7 @@ private static void CopyAssetPacks(SessionTemplateGeneratorParameters parameters
{
var logger = parameters.Logger;

var presentationPackageFile = PackageStore.Instance.GetPackageFileName("Xenko.Samples.Templates", new PackageVersionRange(new PackageVersion(XenkoVersion.NuGetVersionSuffix != string.Empty ? "3.1.0.1-beta02" : "3.1.0.1")));
var presentationPackageFile = PackageStore.Instance.GetPackageFileName("Xenko.Samples.Templates", new PackageVersionRange(new PackageVersion("3.1.0.1")));
var assetPackagesDir = UDirectory.Combine(presentationPackageFile.GetFullDirectory(), @"Templates\Samples\Templates\Packs");
var assetPacks = parameters.TryGetTag(AssetsKey);
if (assetPacks == null)
@@ -88,7 +88,7 @@ public static void LoadDefaultTemplates()
{
// Load templates
// Currently hardcoded, this will need to change with plugin system
foreach (var packageInfo in new[] { new { Name = "Xenko.Assets.Presentation", Version = XenkoVersion.NuGetVersion }, new { Name = "Xenko.SpriteStudio.Offline", Version = XenkoVersion.NuGetVersion }, new { Name = "Xenko.Samples.Templates", Version = XenkoVersion.NuGetVersionSuffix != string.Empty ? "3.1.0.1-beta02" : "3.1.0.1" } })
foreach (var packageInfo in new[] { new { Name = "Xenko.Assets.Presentation", Version = XenkoVersion.NuGetVersion }, new { Name = "Xenko.SpriteStudio.Offline", Version = XenkoVersion.NuGetVersion }, new { Name = "Xenko.Samples.Templates", Version = "3.1.0.1" } })
{
var logger = new LoggerResult();
var packageFile = PackageStore.Instance.GetPackageFileName(packageInfo.Name, new PackageVersionRange(new PackageVersion(packageInfo.Version)));
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\targets\Xenko.PreSettings.targets" />

<PropertyGroup>
@@ -8,7 +8,7 @@
<!-- Note: we version this package manually because most of the time the samples are big and don't need to be updated.
PLEASE UPDATE XenkoDefaultAssetsPlugin.LoadDefaultTemplates() accordingly! -->
<PackageVersion>3.1.0.1</PackageVersion>
<PackageVersion Condition="'$(XenkoOfficialBuild)' != 'true'">$(PackageVersion)-beta02</PackageVersion>
<PackageVersion Condition="'$(XenkoOfficialBuild)' != 'true'">$(PackageVersion)</PackageVersion>
</PropertyGroup>

<Import Project="$(XenkoPostSettingsTargets)" />
@@ -49,7 +49,7 @@ internal class XenkoVersion
/// - -betaXX: development version (XX should corespond to development asset versioning)
/// - -betaXX-YYYY: beta release (YYYY is the git height since current version has been bumped)
/// </summary>
public const string NuGetVersionSuffix = "-beta02";
public const string NuGetVersionSuffix = "";

/// <summary>
/// The build metadata, usually +g[git_hash] during package. Automatically set by Xenko.GitVersioning.GenerateVersionFile.

0 comments on commit 8787a19

Please sign in to comment.
You can’t perform that action at this time.