[VSPackage] Fix Xenko version detection to work not only with nuget p…

…ackages but also solution projects, so that it works with Xenko solution itself.
manio143 · Sep 12, 2019 · 964ef5e · 964ef5e
1 parent 2e35915
commit 964ef5e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/sources/assets/Xenko.Core.Assets/PackageSessionHelper.Solution.cs b/sources/assets/Xenko.Core.Assets/PackageSessionHelper.Solution.cs
@@ -81,7 +81,7 @@ public static async Task<PackageVersion> GetPackageVersion(string fullPath)
                             var projectAssets = format.Read(projectAssetsJsonPath);
                             foreach (var library in projectAssets.Libraries)
                             {
-                                if (library.Type == "package" && library.Name == "Xenko.Engine")
+                                if ((library.Type == "package" || library.Type == "project") && library.Name == "Xenko.Engine")
                                 {
                                     return new PackageVersion((string)library.Version.ToString());
                                 }

diff --git a/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.nuspec b/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Xenko.VisualStudio.Package</id>
-    <version>3.0.6</version>
+    <version>3.0.7</version>
     <authors>Xenko</authors>
     <owners>Xenko</owners>
     <licenseUrl>https://github.com/xenko3d/xenko/blob/master/LICENSE.md</licenseUrl>

diff --git a/sources/tools/Xenko.VisualStudio.Package/source.extension.vsixmanifest b/sources/tools/Xenko.VisualStudio.Package/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="b0b8feb1-7b83-43fc-9fc0-70065ddb80a1" Version="3.0.6" Language="en-US" Publisher="Xenko" />
+    <Identity Id="b0b8feb1-7b83-43fc-9fc0-70065ddb80a1" Version="3.0.7" Language="en-US" Publisher="Xenko" />
     <DisplayName>Xenko</DisplayName>
     <Description>Xenko VisualStudio Package</Description>
     <Icon>Logo.ico</Icon>