Merge branch 'master' into mono4-continuations_fix

[mono.git] / mcs / class / Microsoft.Build.Tasks / Microsoft.Build.Tasks / RegisterAssembly.cs

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
index 238af3dc2cf24e99e0e875b4ac380e4dc3c8a59e..1a00322d7b83bef6301ffa4947bb0a98ea3656a8 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/RegisterAssembly.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if NET_2_0
 
 using System;
 using System.Reflection;
@@ -36,8 +35,8 @@ namespace Microsoft.Build.Tasks {
        public class RegisterAssembly : AppDomainIsolatedTaskExtension, ITypeLibExporterNotifySink {
        
                ITaskItem[]     assemblies;
+               ITaskItem       assemblyListFile;
                bool            createCodeBase;
-               ITaskItem       stateFile;
                ITaskItem[]     typeLibFiles;
        
                public RegisterAssembly ()
@@ -46,7 +45,7 @@ namespace Microsoft.Build.Tasks {
 
                public override bool Execute ()
                {
-                       return true;
+                       throw new NotImplementedException ();
                }
 
                public void ReportEvent (ExporterEventKind kind, int code,
@@ -70,24 +69,25 @@ namespace Microsoft.Build.Tasks {
                        }
                }
 
-               public bool CreateCodeBase  {
+               public ITaskItem AssemblyListFile {
                        get {
-                               return createCodeBase;
+                               return assemblyListFile;
                        }
                        set {
-                               createCodeBase = value;
+                               assemblyListFile = value;
                        }
                }
 
-               public ITaskItem StateFile {
+               public bool CreateCodeBase  {
                        get {
-                               return stateFile;
+                               return createCodeBase;
                        }
                        set {
-                               stateFile = value;
+                               createCodeBase = value;
                        }
                }
 
+               [Output]
                public ITaskItem[] TypeLibFiles {
                        get {
                                return typeLibFiles;
@@ -99,4 +99,3 @@ namespace Microsoft.Build.Tasks {
        }
 }
 
-#endif
\ No newline at end of file