Fixed build targets.

Dark-Tater · May 8, 2018 · 9409bd0 · 9409bd0
1 parent 3be8b12
commit 9409bd0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 33 deletions.
diff --git a/build/Targets/Workarounds.props b/build/Targets/Workarounds.props
@@ -1,8 +1,6 @@
 <Project>
 
-    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.props" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj'" />
-
-    <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.tmp_proj'">
+    <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.tmp_proj' OR $(MSBuildProjectName.EndsWith('wpftmp'))">
         <LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
     </PropertyGroup>
 

diff --git a/build/Targets/Workarounds.targets b/build/Targets/Workarounds.targets
@@ -7,6 +7,4 @@
         </PropertyGroup>
     </Target>
 
-    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.targets" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj'" />
-
 </Project>
diff --git a/source/VSPropertyPages.Sample/VSPropertyPages.Sample.csproj b/source/VSPropertyPages.Sample/VSPropertyPages.Sample.csproj
@@ -2,7 +2,7 @@
 
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
-    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.props" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj'" />
+    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.props" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj' OR $(MSBuildProjectName.EndsWith('wpftmp'))" />
 
     <PropertyGroup>
         <TargetFramework>net471</TargetFramework>
@@ -29,23 +29,9 @@
         </EmbeddedResource>
     </ItemGroup>
 
-    <!--
-        WPF Workarounds
-    -->
-
-    <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.tmp_proj'">
-        <LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
-    </PropertyGroup>
-
     <ItemGroup>
-        <Page Include="PropertyPages\**\*.xaml">
-            <SubType>Designer</SubType>
-            <Generator>MSBuild:Compile</Generator>
-        </Page>
-        <Compile Update="PropertyPages\**\*.xaml.cs">
-            <SubType>Code</SubType>
-            <DependentUpon>%(Filename)</DependentUpon>
-        </Compile>
+        <Page Include="PropertyPages\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+        <Compile Update="PropertyPages\**\*.xaml.cs" DependentUpon="%(Filename)" />
     </ItemGroup>
 
     <Target Name="WorkaroundForXAMLIntellisenseBuildIssue" AfterTargets="_CheckCompileDesignTimePrerequisite">
@@ -93,6 +79,6 @@
     <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
     <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets') AND '$(MSBuildProjectExtension)' != '.tmp_proj'" />
 
-    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.targets" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj'" />
+    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.targets" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj' OR $(MSBuildProjectName.EndsWith('wpftmp'))" />
 
 </Project>
diff --git a/source/XSharp.ProjectSystem/XSharp.ProjectSystem.csproj b/source/XSharp.ProjectSystem/XSharp.ProjectSystem.csproj
@@ -1,7 +1,7 @@
 <Project>
 
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.props" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj'" />
+    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.props" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj' OR $(MSBuildProjectName.EndsWith('wpftmp'))" />
 
     <PropertyGroup>
         <TargetFramework>net471</TargetFramework>
@@ -41,14 +41,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Page Include="ProjectSystem\**\*.xaml">
-            <SubType>Designer</SubType>
-            <Generator>MSBuild:Compile</Generator>
-        </Page>
-        <Compile Update="ProjectSystem\**\*.xaml.cs">
-            <SubType>Code</SubType>
-            <DependentUpon>%(Filename)</DependentUpon>
-        </Compile>
+        <Page Include="ProjectSystem\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+        <Compile Update="ProjectSystem\**\*.xaml.cs" DependentUpon="%(Filename)" />
     </ItemGroup>
 
     <ItemGroup>
@@ -90,6 +84,6 @@
     </Target>
 
     <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.targets" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj'" />
+    <Import Project="$(BaseIntermediateOutputPath)*.nuget.g.targets" Condition="'$(MSBuildProjectExtension)' == '.tmp_proj' OR $(MSBuildProjectName.EndsWith('wpftmp'))" />
 
 </Project>