Author: msierad
Date: 2006-12-11 08:54:08 -0500 (Mon, 11 Dec 2006)
New Revision: 69323

Modified:
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Test.csproj
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RemoveDir.cs
Log:
2006-12-11  Marek Sieradzki  <[EMAIL PROTECTED]>

        * RemoveDir.cs (Execute): Don't remove recursively.
        * CreateProperty.cs: Use the same field for both properties.



Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog       
2006-12-11 13:48:39 UTC (rev 69322)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog       
2006-12-11 13:54:08 UTC (rev 69323)
@@ -1,3 +1,8 @@
+2006-12-11  Marek Sieradzki  <[EMAIL PROTECTED]>
+
+       * RemoveDir.cs (Execute): Don't remove recursively.
+       * CreateProperty.cs: Use the same field for both properties.
+
 2006-12-08  Marek Sieradzki  <[EMAIL PROTECTED]>
 
        * ManagedCompiler.cs, Csc.cs: Moved some code from

Modified: 
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs
===================================================================
--- 
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs   
    2006-12-11 13:48:39 UTC (rev 69322)
+++ 
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/CreateProperty.cs   
    2006-12-11 13:54:08 UTC (rev 69323)
@@ -34,7 +34,6 @@
        public class CreateProperty : TaskExtension {
        
                string[] value;
-               string[] valueSetByTask;
        
                public CreateProperty ()
                {
@@ -42,8 +41,6 @@
 
                public override bool Execute ()
                {
-                       valueSetByTask = value;
-               
                        return true;
                }
 
@@ -53,10 +50,10 @@
                        set { [EMAIL PROTECTED] = value; }
                }
 
-               // FIXME: is this value after evaluation?
+               [MonoTODO]
                [Output]
                public string[] ValueSetByTask {
-                       get { return valueSetByTask; }
+                       get { return @value; }
                }
        }
 }

Modified: 
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RemoveDir.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RemoveDir.cs    
2006-12-11 13:48:39 UTC (rev 69322)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RemoveDir.cs    
2006-12-11 13:54:08 UTC (rev 69323)
@@ -49,7 +49,7 @@
                        
                        foreach (ITaskItem directory in directories) {
                                try {
-                                       Directory.Delete (directory.GetMetadata 
("FullPath"), true);
+                                       Directory.Delete (directory.GetMetadata 
("FullPath"));
                                        temporaryRemovedDirectories.Add 
(directory);
                                }
                                catch (DirectoryNotFoundException ex) {
@@ -102,4 +102,4 @@
        }
 }
 
-#endif
\ No newline at end of file
+#endif

Modified: 
trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Test.csproj
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Test.csproj     
2006-12-11 13:48:39 UTC (rev 69322)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Test.csproj     
2006-12-11 13:54:08 UTC (rev 69323)
@@ -1,65 +1,76 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Build.Tasks.Test</RootNamespace>
-    <AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' 
">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>./</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <OutputType>Library</OutputType>
-    <AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 
'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>./bin/Release/</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <OutputType>Library</OutputType>
-    <AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
-    <DebugSymbols>True</DebugSymbols>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{01D4DF2C-F88B-43F1-B935-25CC0EE900C7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Build.Tasks.Test</RootNamespace>
+    <AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' 
">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
+    <OutputPath>./</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 
'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>True</Optimize>
+    <OutputPath>./bin/Release/</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Microsoft.Build.Tasks.Test</AssemblyName>
+    <DebugSymbols>True</DebugSymbols>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.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>
-  -->
-  <ItemGroup>
-    <Compile Include="Test\Microsoft.Build.Tasks\Consts.cs" />
-    <Compile Include="Test\Microsoft.Build.Tasks\ErrorTest.cs" />
-    <Compile Include="Test\Microsoft.Build.Tasks\MessageTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Tasks" />
-    <Reference Include="Microsoft.Build.Utilities" />
-    <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, 
PublicKeyToken=96d09a1eb7f44a77" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
+  -->
+  <ItemGroup>
+    <Compile Include="Test\Microsoft.Build.Tasks\ALTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\Consts.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\CreateItemTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\CreatePropertyTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\CscTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\ErrorTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkPathTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\GetFrameworkSdkPathTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\MakeDirTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\ManagedCompilerTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\MessageTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\RemoveDirTest.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\TestEngine.cs" />
+    <Compile Include="Test\Microsoft.Build.Tasks\WarningTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Build.Engine" />
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build.Tasks" />
+    <Reference Include="Microsoft.Build.Utilities" />
+    <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, 
PublicKeyToken=96d09a1eb7f44a77" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to