aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-12-10 13:47:55 -0800
committerRob Mensching <rob@firegiant.com>2021-12-28 14:18:52 -0800
commitf736593cd8cd7486132109e01df03921e5c24000 (patch)
tree4351e34b10f79621422c7bcd3ee4c114804f12cf
parent3ff422aee896a0964fa7b7f851fc440099f3a5f4 (diff)
downloadwix-f736593cd8cd7486132109e01df03921e5c24000.tar.gz
wix-f736593cd8cd7486132109e01df03921e5c24000.tar.bz2
wix-f736593cd8cd7486132109e01df03921e5c24000.zip
Reduce use of MSBuildAllProjects as per Microsoft guidance
-rw-r--r--src/internal/WixBuildTools.MsgGen/build/WixBuildTools.MsgGen.targets4
-rw-r--r--src/internal/WixBuildTools.XsdGen/build/WixBuildTools.XsdGen.targets6
2 files changed, 1 insertions, 9 deletions
diff --git a/src/internal/WixBuildTools.MsgGen/build/WixBuildTools.MsgGen.targets b/src/internal/WixBuildTools.MsgGen/build/WixBuildTools.MsgGen.targets
index dfa7bcbe..024d7479 100644
--- a/src/internal/WixBuildTools.MsgGen/build/WixBuildTools.MsgGen.targets
+++ b/src/internal/WixBuildTools.MsgGen/build/WixBuildTools.MsgGen.targets
@@ -2,10 +2,6 @@
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 3
4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5 <PropertyGroup>
6 <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
7 </PropertyGroup>
8
9 <ItemGroup> 5 <ItemGroup>
10 <!--Provide support for setting type (BuildAction) from VS--> 6 <!--Provide support for setting type (BuildAction) from VS-->
11 <AvailableItemName Include="MsgGenSource" /> 7 <AvailableItemName Include="MsgGenSource" />
diff --git a/src/internal/WixBuildTools.XsdGen/build/WixBuildTools.XsdGen.targets b/src/internal/WixBuildTools.XsdGen/build/WixBuildTools.XsdGen.targets
index ca1b89f6..8420eaca 100644
--- a/src/internal/WixBuildTools.XsdGen/build/WixBuildTools.XsdGen.targets
+++ b/src/internal/WixBuildTools.XsdGen/build/WixBuildTools.XsdGen.targets
@@ -2,10 +2,6 @@
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 3
4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5 <PropertyGroup>
6 <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
7 </PropertyGroup>
8
9 <ItemGroup> 5 <ItemGroup>
10 <!--Provide support for setting type (BuildAction) from VS--> 6 <!--Provide support for setting type (BuildAction) from VS-->
11 <AvailableItemName Include="XsdGenSource" /> 7 <AvailableItemName Include="XsdGenSource" />
@@ -42,7 +38,7 @@
42 BeforeTargets="PrepareResources" 38 BeforeTargets="PrepareResources"
43 DependsOnTargets="$(XsdGenDependsOn)" 39 DependsOnTargets="$(XsdGenDependsOn)"
44 Condition=" '@(XsdGenSource)' != '' " 40 Condition=" '@(XsdGenSource)' != '' "
45 Inputs="$(MSBuildAllProjects);@(XsdGenSource)" 41 Inputs="@(XsdGenSource)"
46 Outputs="$(IntermediateOutputPath)%(XsdGenSource.Filename).cs"> 42 Outputs="$(IntermediateOutputPath)%(XsdGenSource.Filename).cs">
47 43
48 <PropertyGroup> 44 <PropertyGroup>