From a4e19c4db666da8e3e3c9305f64bfeb4fb368a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Thu, 1 Nov 2018 22:47:48 +0000
Subject: [PATCH] Build updates.

---
 Build/Targets/InternalPackages.targets             |  1 +
 Directory.Build.props                              | 14 +++++++-------
 .../Cosmos.VS.ProjectSystem.csproj                 |  5 +----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Build/Targets/InternalPackages.targets b/Build/Targets/InternalPackages.targets
index 1fb0857a3..62e0c7bb6 100644
--- a/Build/Targets/InternalPackages.targets
+++ b/Build/Targets/InternalPackages.targets
@@ -18,6 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <XSharpPackage Include="VSPropertyPages" ProjectPath="source\VSPropertyPages\VSPropertyPages.csproj" />
         <XSharpPackage Include="XSharp" ProjectPath="source\XSharp\XSharp.csproj" />
         <XSharpPackage Include="XSharp.Assembler" ProjectPath="source\XSharp.Assembler\XSharp.Assembler.csproj" />
     </ItemGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
index 6d558a125..1b4c3d5cb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,21 +2,21 @@
 
     <PropertyGroup>
         <LangVersion>Latest</LangVersion>
-		<NoWarn>CA1051;CA1707;CA1711;CA1801;$(NoWarn)</NoWarn>
+        <NoWarn>CA1051;CA1707;CA1711;CA1801;$(NoWarn)</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup>
         <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
-		<CommonRepoRoot>$(RepoRoot)..\Common\</CommonRepoRoot>
+        <CommonRepoRoot>$(RepoRoot)..\Common\</CommonRepoRoot>
         <IL2CPURepoRoot>$(RepoRoot)..\IL2CPU\</IL2CPURepoRoot>
         <XSharpRepoRoot>$(RepoRoot)..\XSharp\</XSharpRepoRoot>
     </PropertyGroup>
 
-	<PropertyGroup>
-		<CommonVersion>0.1.0-build5</CommonVersion>
-		<IL2CPUVersion>0.1.0-build328</IL2CPUVersion>
-		<XSharpVersion>0.1.0-build521</XSharpVersion>
-	</PropertyGroup>
+    <PropertyGroup>
+        <CommonVersion>0.1.0-build5</CommonVersion>
+        <IL2CPUVersion>0.1.0-build328</IL2CPUVersion>
+        <XSharpVersion>0.1.0-build534</XSharpVersion>
+    </PropertyGroup>
 
     <Import Project="build\Targets\Import.props" />
 
diff --git a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj
index 0fcbcefac..642af86e5 100644
--- a/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj
+++ b/source/Cosmos.VS.ProjectSystem/Cosmos.VS.ProjectSystem.csproj
@@ -67,10 +67,7 @@
         <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.7.27703" />
         <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61031" />
         <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="$(XSharpRepoRoot)source\VSPropertyPages\VSPropertyPages.csproj" />
+        <PackageReference Include="VSPropertyPages" />
     </ItemGroup>
 
     <Target Name="IncludeMissingAssemblies" AfterTargets="GetVsixSourceItems" BeforeTargets="RemoveVSSDKAssemblies">