Skip to content
Permalink
Browse files

[Launcher] Few fixes so that launcher properly separate

  • Loading branch information
xen2 committed Dec 10, 2018
1 parent a47f7f2 commit 2bd13008907d550bcf2a294c301e09719ed201e6
@@ -612,7 +612,7 @@ public void PurgeCache()

public string GetRealPath(NugetLocalPackage package)
{
if (IsDevRedirectPackage(package))
if (IsDevRedirectPackage(package) && package.Version < new PackageVersion(3, 1, 0, 0))
{
var realPath = File.ReadAllText(GetRedirectFile(package));
if (!Directory.Exists(realPath))
@@ -630,7 +630,9 @@ public string GetRedirectFile(NugetLocalPackage package)

public bool IsDevRedirectPackage(NugetLocalPackage package)
{
return File.Exists(GetRedirectFile(package));
return package.Version < new PackageVersion(3, 1, 0, 0)
? File.Exists(GetRedirectFile(package))
: (package.Version.SpecialVersion?.StartsWith("dev") ?? false);
}

public bool IsDevRedirectPackage(NugetServerPackage package)
@@ -231,9 +231,7 @@ public async Task RetrieveLocalXenkoVersions()
{
try
{
var realPath = File.ReadAllText(store.GetRedirectFile(package));
if (!Directory.Exists(realPath))
throw new DirectoryNotFoundException();
var realPath = store.GetRealPath(package);
var version = new XenkoDevVersionViewModel(this, store, package, realPath, true);
Dispatcher.Invoke(() => xenkoVersions.Add(version));
}
@@ -32,7 +32,7 @@ internal XenkoDevVersionViewModel(LauncherViewModel launcher, NugetStore store,
public override string Name => "Local " + path.MakeRelative(path.GetParent());

/// <inheritdoc/>
public override string DisplayName => localPackage != null ? $"{localPackage.Id} {localPackage.Version} (local)" : base.DisplayName;
public override string DisplayName => localPackage != null ? $"{localPackage.Version} (local)" : base.DisplayName;

/// <inheritdoc/>
public override string FullName => localPackage?.Version.ToString() ?? path.MakeRelative(path.GetParent());
@@ -28,7 +28,7 @@
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>

<!-- Assembly version for the launcher, used to generate the appropriate nuget package -->
<InformationalVersion>3.0.1</InformationalVersion>
<InformationalVersion>3.0.2</InformationalVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -2,7 +2,7 @@
<package>
<metadata>
<id>Xenko.Launcher</id>
<version>3.0.1</version>
<version>3.0.2</version>
<authors>Xenko</authors>
<owners>Xenko</owners>
<licenseUrl>http://xenko.com/license.txt</licenseUrl>

0 comments on commit 2bd1300

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