Package updates.

Project file cleanup.
CosmosOS · Oct 28, 2018 · cafcb35 · cafcb35
1 parent 8bc79ca
commit cafcb35
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/build/Targets/Import.targets b/build/Targets/Import.targets
@@ -11,6 +11,8 @@
     <!-- .NET Framework targets: reference assemblies -->
     <Import Project="NETFramework.targets" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
 
+	<Import Project="References.targets" />
+
     <!-- Project types -->
     <Import Project="MSBuildExtension.targets" Condition="'$(IsMSBuildExtensionProject)' == 'True'" />
     <Import Project="Tests.targets" Condition="'$(IsTestProject)' == 'True'" />

diff --git a/build/Targets/References.targets b/build/Targets/References.targets
@@ -0,0 +1,14 @@
+<Project>
+
+    <ItemGroup Condition="'$(IncludeWpfReferences)' == 'True'">
+        <Reference Include="PresentationCore" />
+        <Reference Include="PresentationFramework" />
+        <Reference Include="System.Xaml" />
+        <Reference Include="WindowsBase" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(IncludeWindowsFormsReferences)' == 'True'">
+        <Reference Include="System.Windows.Forms" />
+    </ItemGroup>
+
+</Project>
diff --git a/build/Targets/Versions.props b/build/Targets/Versions.props
@@ -5,7 +5,7 @@
         <MicrosoftBuildVersion>15.8.166</MicrosoftBuildVersion>
         <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesVersion>
         <MicrosoftVisualStudioProjectSystemVersion>15.8.243</MicrosoftVisualStudioProjectSystemVersion>
-        <MicrosoftVisualStudioSdkEmbedInteropTypesVersion>15.0.21</MicrosoftVisualStudioSdkEmbedInteropTypesVersion>
+        <MicrosoftVisualStudioSdkEmbedInteropTypesVersion>15.0.27</MicrosoftVisualStudioSdkEmbedInteropTypesVersion>
         <MicrosoftVisualStudioThreadingAnalyzersVersion>15.8.145</MicrosoftVisualStudioThreadingAnalyzersVersion>
         <MicrosoftVSSDKBuildToolsVersion>15.8.3252</MicrosoftVSSDKBuildToolsVersion>
     </PropertyGroup>

diff --git a/source/XSharp.ProjectSystem/XSharp.ProjectSystem.csproj b/source/XSharp.ProjectSystem/XSharp.ProjectSystem.csproj
@@ -7,6 +7,8 @@
         <TargetFramework>net471</TargetFramework>
         <RootNamespace>XSharp.ProjectSystem</RootNamespace>
         <IsVsixProject>True</IsVsixProject>
+        <IncludeWpfReferences>True</IncludeWpfReferences>
+        <IncludeWindowsFormsReferences>True</IncludeWindowsFormsReferences>
     </PropertyGroup>
 
     <ItemGroup>
@@ -16,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Content Include="BuildSystem\**" InstallRoot="MSBuild" VSIXSubPath="XSharp\%(RecursiveDir)" />
+        <Content Include="BuildSystem\**" IncludeInVSIX="True" InstallRoot="MSBuild" VSIXSubPath="XSharp\%(RecursiveDir)" />
     </ItemGroup>
 
     <ItemGroup>
@@ -46,12 +48,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Reference Include="PresentationCore" />
-        <Reference Include="PresentationFramework" />
         <Reference Include="System.Management" />
-        <Reference Include="System.Xaml" />
-        <Reference Include="System.Windows.Forms" />
-        <Reference Include="WindowsBase" />
     </ItemGroup>
 
     <ItemGroup>