1 files changed, 7 insertions, 12 deletions
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj
index 82a5e3c1..855f0ef5 100644
--- a/src/ext/Bal/test/examples/examples.proj
+++ b/src/ext/Bal/test/examples/examples.proj
@@ -2,8 +2,7 @@
 <!-- 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. -->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+<Project Sdk="Microsoft.Build.Traversal">
-  <Import Project="..\..\Directory.Build.props" />
  <PropertyGroup>
    <EarliestCoreMBAProjectPath>EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>
@@ -28,14 +27,12 @@
      <SkipFDDx86>true</SkipFDDx86>
      <SkipSCD>true</SkipSCD>
    </CoreMBAProject>
-    
    <FullMBAProject Include="$(FullFramework2MBAProjectPath)" />
    <FullMBAProject Include="$(FullFramework4MBAProjectPath)" />
-    
-    <ExampleBundleProject Include="**\*.wixproj" />
  </ItemGroup>
-  <Target Name="PublishCoreExamples">
+  <Target Name="PublishCoreExamples" BeforeTargets="Build">
    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd-x86" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
          Condition="'%(CoreMBAProject.SkipFDDx86)'==''" />
    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
@@ -46,9 +43,7 @@
          Condition="'%(CoreMBAProject.TrimMode)'!=''" />
  </Target>
-  <Target Name="Build" DependsOnTargets="PublishCoreExamples">
+  <ItemGroup>
-    <MSBuild Projects="%(ExampleBundleProject.Identity)" />
+    <ProjectReference Include="**\*.wixproj" />
-  </Target>
+  </ItemGroup>
-  
+</Project>
-  <Import Project="..\..\..\..\Directory.Build.targets" />
-</Project>
-\ No newline at end of file

diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj index 82a5e3c1..855f0ef5 100644 --- a/src/ext/Bal/test/examples/examples.proj +++ b/src/ext/Bal/test/examples/examples.proj
@@ -2,8 +2,7 @@
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		4
5	<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	5	<Project Sdk="Microsoft.Build.Traversal">
6	<Import Project="..\..\Directory.Build.props" />
7		6
8	<PropertyGroup>	7	<PropertyGroup>
9	<EarliestCoreMBAProjectPath>EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>	8	<EarliestCoreMBAProjectPath>EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>
@@ -28,14 +27,12 @@
28	<SkipFDDx86>true</SkipFDDx86>	27	<SkipFDDx86>true</SkipFDDx86>
29	<SkipSCD>true</SkipSCD>	28	<SkipSCD>true</SkipSCD>
30	</CoreMBAProject>	29	</CoreMBAProject>
31		30
32	<FullMBAProject Include="$(FullFramework2MBAProjectPath)" />	31	<FullMBAProject Include="$(FullFramework2MBAProjectPath)" />
33	<FullMBAProject Include="$(FullFramework4MBAProjectPath)" />	32	<FullMBAProject Include="$(FullFramework4MBAProjectPath)" />
34
35	<ExampleBundleProject Include="*\.wixproj" />
36	</ItemGroup>	33	</ItemGroup>
37		34
38	<Target Name="PublishCoreExamples">	35	<Target Name="PublishCoreExamples" BeforeTargets="Build">
39	<Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd-x86" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'	36	<Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd-x86" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
40	Condition="'%(CoreMBAProject.SkipFDDx86)'==''" />	37	Condition="'%(CoreMBAProject.SkipFDDx86)'==''" />
41	<Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'	38	<Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
@@ -46,9 +43,7 @@
46	Condition="'%(CoreMBAProject.TrimMode)'!=''" />	43	Condition="'%(CoreMBAProject.TrimMode)'!=''" />
47	</Target>	44	</Target>
48		45
49	<Target Name="Build" DependsOnTargets="PublishCoreExamples">	46	<ItemGroup>
50	<MSBuild Projects="%(ExampleBundleProject.Identity)" />	47	<ProjectReference Include="*\.wixproj" />
51	</Target>	48	</ItemGroup>
52		49	</Project>
53	<Import Project="..\..\..\..\Directory.Build.targets" />
54	</Project> \ No newline at end of file