Add unit test for AggregateException.GetBaseException that works on .net but is broke...

[mono.git] / mcs / tools / xbuild / xbuild / 3.5 / Microsoft.Common.targets

diff --git a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
index 6a2c6efe85dced063d88c5c0d0a5f862d9cee795..6d91c7767391a9247e248cdaf98feed82b266b05 100644 (file)
--- a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
@@ -1,6 +1,9 @@
 <Project DefaultTargets="Build" InitialTargets="_ValidateEssentialProperties" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+       <Import Project="$(MSBuildProjectFullPath).user" Condition="Exists('$(MSBuildProjectFullPath).user')"/>
+       
        <PropertyGroup>
+               <OutputType Condition="'$(OutputType)' == ''">Exe</OutputType>
                <TargetExt Condition="'$(OutputType)' == 'Winexe'">.exe</TargetExt>
                <TargetExt Condition="'$(OutputType)' == 'Exe'">.exe</TargetExt>
                <TargetExt Condition="'$(OutputType)' == 'Library'">.dll</TargetExt>
@@ -12,7 +15,7 @@
        </PropertyGroup>
 
        <PropertyGroup>
-               <AssemblyName Condition="'$(AssemblyName)' == ''">$(RootNamespace)</AssemblyName>
+               <AssemblyName Condition="'$(AssemblyName)' == ''">$(MSBuildProjectName)</AssemblyName>
                <OutputPath Condition="'$(OutputPath)' != '' and !HasTrailingSlash('$(OutputPath)')">$(OutputPath)\</OutputPath> 
                <OutputPath Condition=" '$(Platform)'=='' and '$(Configuration)'=='' and '$(OutputPath)'=='' ">bin\Debug\</OutputPath>
                <WarningLevel Condition="'$(WarningLevel)' == ''" >2</WarningLevel>
@@ -139,7 +142,9 @@
                </AllowedReferenceAssemblyFileExtensions>
 
                <AllowedReferenceRelatedFileExtensions Condition=" '$(AllowedReferenceRelatedFileExtensions)' == '' ">
-                       .mdb
+                       .exe.mdb;
+                       .dll.mdb;
+                       .xml
                </AllowedReferenceRelatedFileExtensions>
 
                <AssemblySearchPaths Condition="'$(AssemblySearchPaths)' == ''">