Merge pull request #1401 from fquiroz01/patch-1

[mono.git] / mcs / class / Microsoft.Build.Framework / Microsoft.Build.Framework-tests-net_3_5.csproj

diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_3_5.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_3_5.csproj
index de19487cde63de84f6d9254789545e6e8a97a803..396b12807d2b727dd44ff39897544af03a567ca8 100644 (file)
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_3_5.csproj
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-tests-net_3_5.csproj
@@ -5,14 +5,16 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
     <ProductVersion>9.0.30729</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>\r
+    <ProjectGuid>{3816DD7B-7954-4002-BFFD-4E059FBD5B36}</ProjectGuid>\r
     <OutputType>Library</OutputType>\r
     <NoWarn>1699</NoWarn>\r
-    <OutputPath>.\</OutputPath>\r
-    <NoStdLib>true</NoStdLib>\r
+    <OutputPath>bin\Debug\Microsoft.Build.Framework-tests-net_3_5</OutputPath>\r
+    <NoStdLib>True</NoStdLib>\r
+    <NoConfig>False</NoConfig>\r
     \r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace></RootNamespace>\r
+    <RootNamespace>\r
+    </RootNamespace>\r
     <AssemblyName>Microsoft.Build.Framework_test_net_3_5</AssemblyName>\r
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
@@ -25,7 +27,6 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../../class/lib/net_3_5,./../../class/lib/net_2_0</AdditionalLibPaths>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r
@@ -34,28 +35,32 @@
     <DefineConstants>NET_1_1;NET_2_0;NET_3_5</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../../class/lib/net_3_5,./../../class/lib/net_2_0</AdditionalLibPaths>\r
+  </PropertyGroup>\r
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
+  is a problem to compile the Mono mscorlib.dll -->\r
+  <PropertyGroup>\r
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
   </PropertyGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
-   <Compile Include="Test\Microsoft.Build.Framework\BuildErrorEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\BuildEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\BuildFinishedEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\BuildMessageEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\BuildStartedEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\BuildWarningEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectFinishedEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectStartedEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\LoggerExceptionTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\ProjectFinishedEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\ProjectStartedEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\TargetFinishedEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\TargetStartedEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\TaskCommandLineEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\TaskFinishedEventArgsTest.cs" />
-   <Compile Include="Test\Microsoft.Build.Framework\TaskStartedEventArgsTest.cs" />
-\r
-  </ItemGroup>\r
+    <Compile Include="Test\Microsoft.Build.Framework\BuildErrorEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\BuildEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\BuildEventContextTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\BuildFinishedEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\BuildMessageEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\BuildStartedEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\BuildWarningEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectFinishedEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\ExternalProjectStartedEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\LoggerExceptionTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\ProjectFinishedEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\ProjectStartedEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\TargetFinishedEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\TargetStartedEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\TaskCommandLineEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\TaskFinishedEventArgsTest.cs" />\r
+    <Compile Include="Test\Microsoft.Build.Framework\TaskStartedEventArgsTest.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
@@ -64,23 +69,29 @@
   </Target>\r
   -->\r
   <PropertyGroup>\r
-    <PreBuildEvent></PreBuildEvent>\r
+    <PreBuildEvent>\r
+\r
+    </PreBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-        <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_3_5/Microsoft.Build.Framework.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_3_5/Microsoft.Build.Framework.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework" />
-\r
+    <Reference Include="..\lib\net_3_5\nunit.framework.dll" />\r
+    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">\r
+      <Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>\r
+      <Name>corlib\corlib-net_2_0</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5.csproj">\r
+      <Project>{88FC8C2C-9157-41EB-A47C-981B2205ED7E}</Project>\r
+      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_3_5</Name>\r
+    </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
-  \r
 </Project>\r