refactoring props (#1510)

* refactoring props * remove AddXmlLanguage from Test projects
microsoft · Dec 19, 2019 · e821aab · e821aab
1 parent 77c4bca
commit e821aab
Show file tree

Hide file tree

Showing 38 changed files with 25 additions and 110 deletions.
diff --git a/.targets/AddXmlLanguage.targets b/.targets/AddXmlLanguage.targets
@@ -24,7 +24,7 @@
                     }
                     else
                     {
-                      Log.LogError("InjectXmlLanguage: Assembly XML Doc file not found in bin folder.");
+                        Log.LogError("InjectXmlLanguage: Assembly XML Doc file not found in bin folder.");
                     }
             ]]></Code>
         </Task>

diff --git a/BASE/Common.targets b/BASE/Common.targets
@@ -2,6 +2,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Project="Signing.targets" />
-  <Import Project="$(TargetsRoot)\AddXmlLanguage.targets" />
 
 </Project>
diff --git a/...crosoft.ApplicationInsights/Product.props → BASE/Product.props b/...crosoft.ApplicationInsights/Product.props → BASE/Product.props
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props"/>
+  <Import Project="$(SourceRoot)\Common.props"/>
+
+  <Import Project="$(TargetsRoot)\AddXmlLanguage.targets" />
+
   <PropertyGroup>
     <!--Removing the SRC folder from the output directory-->
     <CorePath>$(RelativeOutputPathBase.Substring(4))</CorePath>	
     <OutputPath>$(BinRoot)\$(Configuration)\$(CorePath)</OutputPath>
     <OutputPath>$([System.IO.Path]::GetFullPath( $(OutputPath) ))\</OutputPath>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <RootNamespace>Microsoft.ApplicationInsights</RootNamespace>
-    <AssemblyName>$(RootNamespace)</AssemblyName>
-  </PropertyGroup>
 </Project>
diff --git a/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj b/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj
@@ -1,8 +1,10 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
+  <Import Project="$(SourceRoot)\Product.props" />
   <Import Project="$(PropsRoot)\_Nupkg.props" />
 
   <PropertyGroup>
+    <RootNamespace>Microsoft.ApplicationInsights</RootNamespace>
+    <AssemblyName>Microsoft.ApplicationInsights</AssemblyName>
     <TargetFrameworks>net45;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard1.3;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
@@ -88,5 +90,5 @@
 
   <Import Project="..\Common\Common\Common.projitems" Label="Shared" />
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
+  <Import Project="$(SourceRoot)\Common.targets" />
 </Project>
diff --git a/BASE/src/ServerTelemetryChannel/Product.props b/BASE/src/ServerTelemetryChannel/Product.props
diff --git a/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj b/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj
@@ -1,8 +1,10 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Product.props'))\Product.props" />
+  <Import Project="$(SourceRoot)\Product.props" />
   <Import Project="$(PropsRoot)\_Nupkg.props" />
 
   <PropertyGroup>
+    <RootNamespace>Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel</RootNamespace>
+    <AssemblyName>Microsoft.AI.ServerTelemetryChannel</AssemblyName>
     <TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard1.3;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
@@ -112,6 +114,6 @@
   </ItemGroup>
 
   <Import Project="..\Common\Common\Common.projitems" Label="Shared" />
-  
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
+
+  <Import Project="$(SourceRoot)\Common.targets" />
 </Project>
diff --git a/LOGGING/Common.targets b/LOGGING/Common.targets
@@ -2,6 +2,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Project="Signing.targets" />
-  <Import Project="$(TargetsRoot)\AddXmlLanguage.targets" />
 
 </Project>
diff --git a/LOGGING/src/Product.props b/LOGGING/src/Product.props
@@ -3,6 +3,8 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\Common.props"/>
 
   <Import Project="$(PropsRoot)\_Nupkg.props" />
+
+  <Import Project="$(TargetsRoot)\AddXmlLanguage.targets" />
 
   <PropertyGroup>
     <!--Removing the SRC folder from the output directory-->

diff --git a/WEB/Common.targets b/WEB/Common.targets
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj
@@ -92,5 +92,4 @@
 
   <Import Project="..\Shared\DependencyCollector.Shared.projitems" Label="Shared" />
   <Import Project="..\..\Common\Common.projitems" Label="Shared" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Src/DependencyCollector/Net45.Tests/DependencyCollector.Net45.Tests.csproj b/WEB/Src/DependencyCollector/Net45.Tests/DependencyCollector.Net45.Tests.csproj
@@ -102,5 +102,4 @@
   <Import Project="..\..\TestFramework\Shared\TestFramework.Shared.projitems" Label="Shared" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj b/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollector.csproj
@@ -57,6 +57,5 @@
   </ItemGroup>
 
   <Import Project="..\..\..\Src\Common\Common.projitems" Label="Shared" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 
 </Project>
diff --git a/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/HostingStartup.Net45.Tests.csproj b/WEB/Src/HostingStartup/HostingStartup.Net45.Tests/HostingStartup.Net45.Tests.csproj
@@ -95,5 +95,4 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj b/WEB/Src/HostingStartup/HostingStartup/HostingStartup.csproj
@@ -76,5 +76,4 @@
   </ItemGroup>
 
   <Import Project="..\..\Common\Common.projitems" Label="Shared" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Perf.Net45.Tests.csproj b/WEB/Src/PerformanceCollector/Perf.Net45.Tests/Perf.Net45.Tests.csproj
@@ -92,6 +92,5 @@
   <Import Project="..\Perf.Shared.Tests\Perf.Shared.Tests.projitems" Label="Shared" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
   <Import Project="..\..\TestFramework\Shared\TestFramework.Shared.projitems" Label="Shared" />
 </Project>
diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj b/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj
@@ -94,5 +94,4 @@
   <Import Project="..\Perf.Shared.NetStandard16.Stubs\Perf.Shared.NetStandard16.Stubs.projitems" Label="Shared" Condition="'$(TargetFramework)' == 'netstandard1.6'" />
   <Import Project="..\Perf.Shared.NetStandard20\Perf.Shared.NetStandard20.projitems" Label="Shared" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Src/PerformanceCollector/Xdt.Tests/Xdt.Tests.csproj b/WEB/Src/PerformanceCollector/Xdt.Tests/Xdt.Tests.csproj
@@ -93,5 +93,4 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Src/Product.props b/WEB/Src/Product.props
@@ -3,14 +3,7 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)\..', 'Common.props'))\Common.props" />
   <Import Project="$(PropsRoot)\_Nupkg.props" />
-
-  <!--
-      Example of how to do logs:
-      Conditions are supported.
-    
-    <Target Name="BuildLogs_HelloWorld" AfterTargets="CopyFilesToOutputDirectory" >
-        <Message Text="Hello World!" Importance="high" />
-    </Target>
-    -->
+
+  <Import Project="$(TargetsRoot)\AddXmlLanguage.targets" />
 
 </Project>
diff --git a/WEB/Src/Web/Web.Net45.Tests/Web.Net45.Tests.csproj b/WEB/Src/Web/Web.Net45.Tests/Web.Net45.Tests.csproj
@@ -153,6 +153,5 @@
   <Import Project="..\Web.Shared.Net.Tests\Web.Shared.Net.Tests.projitems" Label="Shared" />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
   <Import Project="..\..\TestFramework\Shared\TestFramework.Shared.projitems" Label="Shared" />
 </Project>
diff --git a/WEB/Src/Web/Web/Web.csproj b/WEB/Src/Web/Web/Web.csproj
@@ -77,5 +77,4 @@
 
   <Import Project="..\Web.Shared.Net\Web.Shared.Net.projitems" Label="Shared" />
   <Import Project="..\..\Common\Common.projitems" Label="Shared" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Src/WindowsServer/WindowsServer.Net45.Tests/WindowsServer.Net45.Tests.csproj b/WEB/Src/WindowsServer/WindowsServer.Net45.Tests/WindowsServer.Net45.Tests.csproj
@@ -114,7 +114,6 @@
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
   <Import Project="..\..\TestFramework\Shared\TestFramework.Shared.projitems" Label="Shared" />
   <Import Project="..\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.projitems" Label="Shared" />
 </Project>
diff --git a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj
@@ -90,5 +90,4 @@
 
   <Import Project="..\WindowsServer.Shared\WindowsServer.Shared.projitems" Label="Shared" />
   <Import Project="..\..\Common\Common.projitems" Label="Shared" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj b/WEB/Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
   <PropertyGroup>
     <Company>Microsoft</Company>
-    <Copyright>Copyright © Microsoft. All Rights Reserved.</Copyright>
+    <Copyright>Copyright © Microsoft. All Rights Reserved.</Copyright>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
@@ -88,5 +88,4 @@
       <Link>StackFrame.bond</Link>
     </BondCodegen>
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Test/E2ETests/IngestionService/IngestionService.csproj b/WEB/Test/E2ETests/IngestionService/IngestionService.csproj
@@ -144,11 +144,5 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
diff --git a/WEB/Test/E2ETests/TestApps/Net452/E2ETestApp/E2ETestApp.csproj b/WEB/Test/E2ETests/TestApps/Net452/E2ETestApp/E2ETestApp.csproj
@@ -361,11 +361,5 @@
     </PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\..\..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('..\..\..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
diff --git a/WEB/Test/E2ETests/TestApps/Net452/E2ETestWebApi/E2ETestWebApi.csproj b/WEB/Test/E2ETests/TestApps/Net452/E2ETestWebApi/E2ETestWebApi.csproj
@@ -335,10 +335,5 @@
     <Error Condition="!Exists('..\..\..\..\..\..\..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\..\..\..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
   </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target> -->
+
 </Project>
diff --git a/WEB/Test/PerformanceCollector/FunctionalTests/FunctionalTests.csproj b/WEB/Test/PerformanceCollector/FunctionalTests/FunctionalTests.csproj
@@ -234,5 +234,4 @@
     <Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets'))" />
   </Target>
   <Import Project="..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Test/PerformanceCollector/FunctionalTests/TestApps/TestApp45/TestApp45.csproj b/WEB/Test/PerformanceCollector/FunctionalTests/TestApps/TestApp45/TestApp45.csproj
@@ -192,7 +192,6 @@
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\Test.Common.Sdk.Net45.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
   <PropertyGroup Condition="$(BuildingInsideVisualStudio)!=''">
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <PostBuildEvent>

diff --git a/WEB/Test/Web/FunctionalTests/FunctionalTests/Functional.csproj b/WEB/Test/Web/FunctionalTests/FunctionalTests/Functional.csproj
@@ -207,12 +207,5 @@
     <Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets'))" />
   </Target>
   <Import Project="..\..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('..\..\..\..\..\..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
diff --git a/WEB/Test/Web/FunctionalTests/StressTest/StressTest.csproj b/WEB/Test/Web/FunctionalTests/StressTest/StressTest.csproj
@@ -53,12 +53,5 @@
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
diff --git a/WEB/Test/Web/FunctionalTests/TestApps/AspNetDiagnostics/AspNetDiagnostics.csproj b/WEB/Test/Web/FunctionalTests/TestApps/AspNetDiagnostics/AspNetDiagnostics.csproj
@@ -415,5 +415,4 @@
     </PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\FunctionalTests\Test.Common.Sdk.Net45.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Test/Web/FunctionalTests/TestApps/Aspx45/Aspx45.csproj b/WEB/Test/Web/FunctionalTests/TestApps/Aspx45/Aspx45.csproj
@@ -405,12 +405,5 @@
       copy "$(TargetDir)" "$(ProjectDir)bin"
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
diff --git a/WEB/Test/Web/FunctionalTests/TestApps/ConsoleAppFW45/ConsoleAppFW45.csproj b/WEB/Test/Web/FunctionalTests/TestApps/ConsoleAppFW45/ConsoleAppFW45.csproj
@@ -104,5 +104,4 @@
       copy "$(TargetDir)" "$(ProjectDir)bin"
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Test/Web/FunctionalTests/TestApps/Mvc4_MediumTrust/Mvc4_MediumTrust.csproj b/WEB/Test/Web/FunctionalTests/TestApps/Mvc4_MediumTrust/Mvc4_MediumTrust.csproj
@@ -414,5 +414,4 @@
       copy "$(TargetDir)" "$(ProjectDir)bin"
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Test/Web/FunctionalTests/TestApps/Wa45Aspx/Wa45Aspx.csproj b/WEB/Test/Web/FunctionalTests/TestApps/Wa45Aspx/Wa45Aspx.csproj
@@ -227,5 +227,4 @@
       copy "$(TargetDir)" "$(ProjectDir)bin"
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Test/Web/FunctionalTests/TestApps/Wcf45Tests/Wcf45Tests.csproj b/WEB/Test/Web/FunctionalTests/TestApps/Wcf45Tests/Wcf45Tests.csproj
@@ -158,5 +158,4 @@
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\FunctionalTests\Test.Common.Sdk.Net45.targets" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Test/Web/FunctionalTests/TestApps/WebAppFW45/WebAppFW45.csproj b/WEB/Test/Web/FunctionalTests/TestApps/WebAppFW45/WebAppFW45.csproj
@@ -214,5 +214,4 @@
       copy "$(TargetDir)" "$(ProjectDir)bin"
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>
diff --git a/WEB/Test/Web/FunctionalTests/TestApps/WebAppFW45Sampled/WebAppFW45Sampled.csproj b/WEB/Test/Web/FunctionalTests/TestApps/WebAppFW45Sampled/WebAppFW45Sampled.csproj
@@ -185,5 +185,4 @@
       copy "$(TargetDir)" "$(ProjectDir)bin"
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />
 </Project>