Add property that can disable the private MSBuild task invocation

This allows Nerdbank.GitVersioning to (once again) work under quickbuild.

src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs

@@ -39,6 +39,25 @@ protected override void ApplyGlobalProperties(IDictionary<string, string> global
  => globalProperties["NBGV_GitEngine"] = "Managed";
 }
 
+[Trait("Engine", "Managed")]
+[Collection("Build")] // msbuild sets current directory in the process, so we can't have it be concurrent with other build tests.
+public class BuildIntegrationInProjectManagedTests : BuildIntegrationTests
+{
+ public BuildIntegrationInProjectManagedTests(ITestOutputHelper logger)
+ : base(logger)
+ {
+ }
+
+ protected override GitContext CreateGitContext(string path, string committish = null)
+ => GitContext.Create(path, committish, writable: false);
+
+ protected override void ApplyGlobalProperties(IDictionary<string, string> globalProperties)
+ {
+ globalProperties["NBGV_GitEngine"] = "Managed";
+ globalProperties["NBGV_CacheMode"] = "None";
+ }
+}
+
 [Trait("Engine", "LibGit2")]
 [Collection("Build")] // msbuild sets current directory in the process, so we can't have it be concurrent with other build tests.
 public class BuildIntegrationLibGit2Tests : BuildIntegrationTests
@@ -57,6 +76,7 @@ protected override void ApplyGlobalProperties(IDictionary<string, string> global
 
 public abstract class BuildIntegrationTests : RepoTestBase, IClassFixture<MSBuildFixture>
 {
+ private const string GitVersioningPropsFileName = "NerdBank.GitVersioning.props";
  private const string GitVersioningTargetsFileName = "NerdBank.GitVersioning.targets";
  private const string UnitTestCloudBuildPrefix = "UnitTest: ";
  private static readonly string[] ToxicEnvironmentVariablePrefixes = new string[]
@@ -1175,6 +1195,7 @@ private ProjectRootElement CreateNativeProjectRootElement(string projectDirector
  {
  var pre = ProjectRootElement.Create(reader, this.projectCollection);
  pre.FullPath = Path.Combine(projectDirectory, projectName);
+ pre.InsertAfterChild(pre.CreateImportElement(Path.Combine(this.RepoPath, GitVersioningPropsFileName)), null);
  pre.AddImport(Path.Combine(this.RepoPath, GitVersioningTargetsFileName));
  return pre;
  }
@@ -1186,6 +1207,7 @@ private ProjectRootElement CreateProjectRootElement(string projectDirectory, str
  {
  var pre = ProjectRootElement.Create(reader, this.projectCollection);
  pre.FullPath = Path.Combine(projectDirectory, projectName);
+ pre.InsertAfterChild(pre.CreateImportElement(Path.Combine(this.RepoPath, GitVersioningPropsFileName)), null);
  pre.AddImport(Path.Combine(this.RepoPath, GitVersioningTargetsFileName));
  return pre;
  }

src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj

@@ -12,7 +12,7 @@
  <Compile Include="..\Shared\**\*.cs" LinkBase="Shared" />
  </ItemGroup>
  <ItemGroup>
- <EmbeddedResource Include="..\Nerdbank.GitVersioning.Tasks\build\*.targets">
+ <EmbeddedResource Include="..\Nerdbank.GitVersioning.Tasks\build\*.targets;..\Nerdbank.GitVersioning.Tasks\build\*.props">
  <Visible>false</Visible>
  <Link>Targets\%(FileName)%(Extension)</Link>
  </EmbeddedResource>

src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec

@@ -48,9 +48,13 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj
  <file src="$BaseOutputPath$netcoreapp3.1\System.Text.Json.dll" target="build\MSBuildCore\System.Text.Json.dll" />
  <file src="$BaseOutputPath$netcoreapp3.1\Validation.dll" target="build\MSBuildCore\Validation.dll" />
 
- <file src="build\Nerdbank.GitVersioning.targets" target="build\Nerdbank.GitVersioning$LKGSuffix$.targets" />
+ <file src="build\InProjectVersionComputation.targets" target="build\InProjectVersionComputation.targets" />
+ <file src="build\MSBuildTargetCaching.targets" target="build\MSBuildTargetCaching.targets" />
  <file src="build\Nerdbank.GitVersioning.Common.targets" target="build\Nerdbank.GitVersioning.Common.targets" />
  <file src="build\Nerdbank.GitVersioning.Inner.targets" target="build\Nerdbank.GitVersioning.Inner.targets" />
+ <file src="build\Nerdbank.GitVersioning.Inner.Empty.targets" target="build\Nerdbank.GitVersioning.Inner.Empty.targets" />
+ <file src="build\Nerdbank.GitVersioning.props" target="build\Nerdbank.GitVersioning$LKGSuffix$.props" />
+ <file src="build\Nerdbank.GitVersioning.targets" target="build\Nerdbank.GitVersioning$LKGSuffix$.targets" />
  <file src="buildCrossTargeting\Nerdbank.GitVersioning.targets" target="buildCrossTargeting\Nerdbank.GitVersioning$LKGSuffix$.targets" />
  <file src="readme.txt" target="readme.txt" />
  </files>

src/Nerdbank.GitVersioning.Tasks/build/InProjectVersionComputation.targets

@@ -0,0 +1,20 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="Nerdbank.GitVersioning.Inner.targets"/>
+
+ <Target Name="SetPropertiesForInvokeGetBuildVersionTask">
+ <!-- Set properties required for InvokeGetBuildVersionTask here, because
+ CallTarget invoked targets do not see properties set by the calling target. -->
+ <PropertyGroup>
+ <BuildMetadata>@(BuildMetadata, ',')</BuildMetadata>
+ </PropertyGroup>
+ </Target>
+
+ <Target Name="InvokeGetBuildVersionTask" DependsOnTargets="SetPropertiesForInvokeGetBuildVersionTask">
+ <CallTarget Targets="GetBuildVersion_Properties">
+ <Output TaskParameter="TargetOutputs" ItemName="NBGV_PropertyItems" />
+ </CallTarget>
+ <CallTarget Targets="GetBuildVersion_CloudBuildVersionVars">
+ <Output TaskParameter="TargetOutputs" ItemName="CloudBuildVersionVars" />
+ </CallTarget>
+ </Target>
+</Project>

src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets

@@ -0,0 +1,60 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <NBGV_InnerGlobalProperties Condition=" '$(GitRepoRoot)' != '' ">$(NBGV_InnerGlobalProperties)GitRepoRoot=$(GitRepoRoot);</NBGV_InnerGlobalProperties>
+ <NBGV_InnerGlobalProperties Condition=" '$(PublicRelease)' != '' ">$(NBGV_InnerGlobalProperties)PublicRelease=$(PublicRelease);</NBGV_InnerGlobalProperties>
+ <NBGV_InnerGlobalProperties Condition=" '$(_NBGV_BuildingRef)' != '' ">$(NBGV_InnerGlobalProperties)_NBGV_BuildingRef=$(_NBGV_BuildingRef);</NBGV_InnerGlobalProperties>
+ <NBGV_InnerGlobalProperties Condition=" '$(ProjectPathRelativeToGitRepoRoot)' != '' ">$(NBGV_InnerGlobalProperties)ProjectPathRelativeToGitRepoRoot=$(ProjectPathRelativeToGitRepoRoot);</NBGV_InnerGlobalProperties>
+ <NBGV_InnerGlobalProperties Condition=" '$(GitVersionBaseDirectory)' != '' ">$(NBGV_InnerGlobalProperties)GitVersionBaseDirectory=$(GitVersionBaseDirectory);</NBGV_InnerGlobalProperties>
+ <NBGV_InnerGlobalProperties Condition=" '$(OverrideBuildNumberOffset)' != '' ">$(NBGV_InnerGlobalProperties)OverrideBuildNumberOffset=$(OverrideBuildNumberOffset);</NBGV_InnerGlobalProperties>
+ <NBGV_InnerGlobalProperties Condition=" '$(NBGV_CacheMode)' != '' ">$(NBGV_InnerGlobalProperties)NBGV_CacheMode=$(NBGV_CacheMode);</NBGV_InnerGlobalProperties>
+ </PropertyGroup>
+
+ <!-- Compile a list of global properties that may vary when a project builds but that would never influence the result of the GetBuildVersion task. -->
+ <ItemGroup>
+ <NBGV_GlobalPropertiesToRemove Include="TargetFramework" />
+ <NBGV_GlobalPropertiesToRemove Include="RuntimeIdentifier" />
+ <NBGV_GlobalPropertiesToRemove Include="Configuration" />
+ <NBGV_GlobalPropertiesToRemove Include="Platform" />
+
+ <_BuildMetadataSnapped Include="@(BuildMetadata)" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <!-- Declare a P2P so that "msbuild -graph -isolate" doesn't complain when we use the MSBuild task to invoke our inner shared project. -->
+ <ProjectReference Include="$(MSBuildThisFileDirectory)Nerdbank.GitVersioning.Inner.targets">
+ <Targets>GetBuildVersion_Properties;GetBuildVersion_CloudBuildVersionVars</Targets>
+ <Properties>$(NBGV_InnerGlobalProperties)BuildMetadata=@(BuildMetadata, ',');</Properties>
+ <GlobalPropertiesToRemove>@(NBGV_GlobalPropertiesToRemove)</GlobalPropertiesToRemove>
+
+ <!-- Do our very best to prevent Microsoft.Common.CurrentVersion.targets or IDEs from processing this P2P. It's only here for MSBuild's static graph. -->
+ <BuildReference>false</BuildReference>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+ <Visible>false</Visible>
+ <NBGV_InnerProject>true</NBGV_InnerProject>
+ </ProjectReference>
+ </ItemGroup>
+
+ <Target Name="InvokeGetBuildVersionTask">
+ <Error Text="BuildMetadata items changed after a copy was made. Add all BuildMetadata items before importing this file." Condition=" '@(BuildMetadata)' != '@(_BuildMetadataSnapped)' " />
+
+ <!-- Calculate version by invoking another "project" with global properties that will serve as a key
+ into an msbuild cache to ensure we only invoke the GetBuildVersion task as many times as will produce a unique value. -->
+ <MSBuild Projects="@(ProjectReference)"
+ Condition=" '%(ProjectReference.NBGV_InnerProject)' == 'true' "
+ Properties="%(ProjectReference.Properties)"
+ RemoveProperties="%(ProjectReference.GlobalPropertiesToRemove)"
+ Targets="GetBuildVersion_Properties">
+ <Output TaskParameter="TargetOutputs" ItemName="NBGV_PropertyItems" />
+ </MSBuild>
+
+ <!-- Also get other items. -->
+ <MSBuild Projects="@(ProjectReference)"
+ Condition=" '%(ProjectReference.NBGV_InnerProject)' == 'true' "
+ Properties="%(ProjectReference.Properties)"
+ RemoveProperties="%(ProjectReference.GlobalPropertiesToRemove)"
+ Targets="GetBuildVersion_CloudBuildVersionVars">
+ <Output TaskParameter="TargetOutputs" ItemName="CloudBuildVersionVars" />
+ </MSBuild>
+ </Target>
+</Project>

src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Common.targets

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
+ <_NBGV_Common_Targets_Imported>true</_NBGV_Common_Targets_Imported>
  <_NBGV_PlatformSuffix Condition=" '$(_NBGV_PlatformSuffix)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">MSBuildCore/</_NBGV_PlatformSuffix>
  <_NBGV_PlatformSuffix Condition=" '$(_NBGV_PlatformSuffix)' == '' ">MSBuildFull/</_NBGV_PlatformSuffix>
  <NerdbankGitVersioningTasksPath Condition=" '$(NerdbankGitVersioningTasksPath)' == '' ">$(MSBuildThisFileDirectory)$(_NBGV_PlatformSuffix)</NerdbankGitVersioningTasksPath>

src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.Empty.targets

@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <!-- These targets are called by MSBuild static graph because we declare a ProjectReference item to this file. -->
+ <Target Name="GetTargetFrameworks" />
+ <Target Name="GetNativeManifest" />
+ <Target Name="GetCopyToOutputDirectoryItems" />
+ <Target Name="GetTargetFrameworksWithPlatformForSingleTargetFramework" />
+
+</Project>

src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.targets

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
- <Import Project="Nerdbank.GitVersioning.Common.targets"/>
+ <Import Project="Nerdbank.GitVersioning.Common.targets" Condition=" '$(_NBGV_Common_Targets_Imported)' != 'true' "/>
 
  <UsingTask AssemblyFile="$(NerdbankGitVersioningTasksPath)Nerdbank.GitVersioning.Tasks.dll" TaskName="Nerdbank.GitVersioning.Tasks.GetBuildVersion"/>
 
@@ -18,7 +18,7 @@
  BuildingRef="$(_NBGV_BuildingRef)"
  BuildMetadata="$(BuildMetadata.Replace(',',';'))"
  DefaultPublicRelease="$(PublicRelease)"
- ProjectDirectory="$(ProjectDirectory)"
+ ProjectDirectory="$(GitVersionBaseDirectory)"
  GitRepoRoot="$(GitRepoRoot)"
  ProjectPathRelativeToGitRepoRoot="$(ProjectPathRelativeToGitRepoRoot)"
  OverrideBuildNumberOffset="$(OverrideBuildNumberOffset)"
@@ -42,11 +42,7 @@
  <Message Importance="low" Text="AssemblyInformationalVersion: $(AssemblyInformationalVersion)" />
  <Message Importance="low" Text="NuGetPackageVersion: $(NuGetPackageVersion)" />
  </Target>
-
- <!-- These targets are called by MSBuild static graph because we declare a ProjectReference item to this file. -->
- <Target Name="GetTargetFrameworks" />
- <Target Name="GetNativeManifest" />
- <Target Name="GetCopyToOutputDirectoryItems" />
- <Target Name="GetTargetFrameworksWithPlatformForSingleTargetFramework" />
+
+ <Import Project="Nerdbank.GitVersioning.Inner.Empty.targets" Condition=" '$(NBGV_CacheMode)' == 'MSBuildTargetCaching' " />
 
 </Project>

src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.props

@@ -0,0 +1,15 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <!-- Cache modes include:
+ MSBuildTargetCaching
+ This is the default.
+ Versions will be computed by an MSBuild target which can be shared across an entire build session via MSBuild target output caching.
+ None
+ Every project will compute its own version.
+
+ Note that the choice in caching should have no bearing on the result of the versions computed - only on build perf and which systems it can work with.
+ -->
+ <NBGV_CacheMode Condition=" '$(NBGV_CacheMode)' == '' and '$(QBuild)' == '1' ">None</NBGV_CacheMode>
+ <NBGV_CacheMode Condition=" '$(NBGV_CacheMode)' == '' ">MSBuildTargetCaching</NBGV_CacheMode>
+ </PropertyGroup>
+</Project>

src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets

@@ -25,7 +25,7 @@
  <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
  </PropertyGroup>
 
- <Import Project="Nerdbank.GitVersioning.Common.targets"/>
+ <Import Project="Nerdbank.GitVersioning.Common.targets" />
 
  <UsingTask AssemblyFile="$(NerdbankGitVersioningTasksPath)Nerdbank.GitVersioning.Tasks.dll" TaskName="Nerdbank.GitVersioning.Tasks.AssemblyVersionInfo"/>
  <UsingTask AssemblyFile="$(NerdbankGitVersioningTasksPath)Nerdbank.GitVersioning.Tasks.dll" TaskName="Nerdbank.GitVersioning.Tasks.NativeVersionInfo"/>
@@ -37,7 +37,7 @@
  <PropertyGroup>
  <!-- $(TargetExt) isn't set at evaluation time for us when built in wpftmp.csproj with manual imports -->
  <!-- Suppress assembly version info generation if not obviously compiling an assembly. -->
- <GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(TargetExt)' != '.dll' and '$(TargetExt)' != '.exe'">false</GenerateAssemblyVersionInfo>
+ <GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(TargetExt)' != '.dll' and '$(TargetExt)' != '.exe' ">false</GenerateAssemblyVersionInfo>
 
  <!-- Workaround the property stomping that msbuild does (see https://github.com/microsoft/msbuild/pull/4922) with manual imports. -->
  <PrepareForBuildDependsOn>
@@ -64,54 +64,9 @@
  <_NBGV_BuildingRef Condition=" '$(_NBGV_BuildingRef)' == '' ">$(_NBGV_BuildingBranch)</_NBGV_BuildingRef>
 
  <GitVersionBaseDirectory Condition=" '$(GitVersionBaseDirectory)' == '' ">$(MSBuildProjectDirectory)</GitVersionBaseDirectory>
- <NBGV_InnerGlobalProperties Condition=" '$(GitRepoRoot)' != '' ">$(NBGV_InnerGlobalProperties)GitRepoRoot=$(GitRepoRoot);</NBGV_InnerGlobalProperties>
- <NBGV_InnerGlobalProperties Condition=" '$(PublicRelease)' != '' ">$(NBGV_InnerGlobalProperties)PublicRelease=$(PublicRelease);</NBGV_InnerGlobalProperties>
- <NBGV_InnerGlobalProperties Condition=" '$(_NBGV_BuildingRef)' != '' ">$(NBGV_InnerGlobalProperties)_NBGV_BuildingRef=$(_NBGV_BuildingRef);</NBGV_InnerGlobalProperties>
- <NBGV_InnerGlobalProperties Condition=" '$(ProjectPathRelativeToGitRepoRoot)' != '' ">$(NBGV_InnerGlobalProperties)ProjectPathRelativeToGitRepoRoot=$(ProjectPathRelativeToGitRepoRoot);</NBGV_InnerGlobalProperties>
- <NBGV_InnerGlobalProperties Condition=" '$(GitVersionBaseDirectory)' != '' ">$(NBGV_InnerGlobalProperties)ProjectDirectory=$(GitVersionBaseDirectory);</NBGV_InnerGlobalProperties>
- <NBGV_InnerGlobalProperties Condition=" '$(OverrideBuildNumberOffset)' != '' ">$(NBGV_InnerGlobalProperties)OverrideBuildNumberOffset=$(OverrideBuildNumberOffset);</NBGV_InnerGlobalProperties>
- <NBGV_CoreTargets>$(MSBuildThisFileDirectory)Nerdbank.GitVersioning.Inner.targets</NBGV_CoreTargets>
  </PropertyGroup>
 
- <!-- Compile a list of global properties that may vary when a project builds but that would never influence the result of the GetBuildVersion task. -->
- <ItemGroup>
- <NBGV_GlobalPropertiesToRemove Include="TargetFramework" />
- <NBGV_GlobalPropertiesToRemove Include="RuntimeIdentifier" />
- <NBGV_GlobalPropertiesToRemove Include="Configuration" />
- <NBGV_GlobalPropertiesToRemove Include="Platform" />
-
- <_BuildMetadataSnapped Include="@(BuildMetadata)" />
- </ItemGroup>
-
- <ItemGroup>
- <!-- Declare a P2P so that "msbuild -graph -isolate" doesn't complain when we use the MSBuild task to invoke our inner shared project. -->
- <ProjectReference Include="$(NBGV_CoreTargets)">
- <Targets>GetBuildVersion_Properties;GetBuildVersion_CloudBuildVersionVars</Targets>
- <Properties>$(NBGV_InnerGlobalProperties)BuildMetadata=@(BuildMetadata, ',');</Properties>
- <GlobalPropertiesToRemove>@(NBGV_GlobalPropertiesToRemove)</GlobalPropertiesToRemove>
-
- <!-- Do our very best to prevent Microsoft.Common.CurrentVersion.targets or IDEs from processing this P2P. It's only here for MSBuild's static graph. -->
- <BuildReference>false</BuildReference>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
- <Visible>false</Visible>
- <NBGV_InnerProject>true</NBGV_InnerProject>
- </ProjectReference>
- </ItemGroup>
-
- <Target Name="GetBuildVersion" Returns="$(BuildVersion)">
- <Error Text="BuildMetadata items changed after a copy was made. Add all BuildMetadata items before importing this file." Condition=" '@(BuildMetadata)' != '@(_BuildMetadataSnapped)' " />
-
- <!-- Calculate version by invoking another "project" with global properties that will serve as a key 
- into an msbuild cache to ensure we only invoke the GetBuildVersion task as many times as will produce a unique value. -->
- <MSBuild Projects="@(ProjectReference)"
- Condition=" '%(ProjectReference.NBGV_InnerProject)' == 'true' "
- Properties="%(ProjectReference.Properties)"
- RemoveProperties="%(ProjectReference.GlobalPropertiesToRemove)"
- Targets="GetBuildVersion_Properties">
- <Output TaskParameter="TargetOutputs" ItemName="NBGV_PropertyItems" />
- </MSBuild>
-
+ <Target Name="GetBuildVersion" Returns="$(BuildVersion)" DependsOnTargets="InvokeGetBuildVersionTask">
  <!-- Convert each task item into a bona fide MSBuild property. -->
  <CreateProperty
  Value="%(NBGV_PropertyItems.Value)"
@@ -123,17 +78,11 @@
  <PropertyGroup>
  <CloudBuildNumber Condition=" '$(CloudBuildNumber)' == '' and %(NBGV_PropertyItems.Identity) == 'CloudBuildNumber' ">%(Value)</CloudBuildNumber>
  </PropertyGroup>
-
- <!-- Also get other items. -->
- <MSBuild Projects="@(ProjectReference)"
- Condition=" '%(ProjectReference.NBGV_InnerProject)' == 'true' "
- Properties="%(ProjectReference.Properties)"
- RemoveProperties="%(ProjectReference.GlobalPropertiesToRemove)"
- Targets="GetBuildVersion_CloudBuildVersionVars">
- <Output TaskParameter="TargetOutputs" ItemName="CloudBuildVersionVars" />
- </MSBuild>
  </Target>
 
+ <Import Project="InProjectVersionComputation.targets" Condition=" '$(NBGV_CacheMode)' != 'MSBuildTargetCaching' "/>
+ <Import Project="MSBuildTargetCaching.targets" Condition=" '$(NBGV_CacheMode)' == 'MSBuildTargetCaching' "/>
+
  <Target Name="SetCloudBuildVersionVars"
  DependsOnTargets="GetBuildVersion"
  AfterTargets="GetBuildVersion"

src/Nerdbank.GitVersioning.Tasks/buildCrossTargeting/Nerdbank.GitVersioning.props

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\build\$(MSBuildThisFileName)$(MSBuildThisFileExtension)" />
+</Project>