projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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 e2e9d54a65427f0e25551b7b7e31986853118932..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;
@@
-100,4
+99,3
@@
namespace Microsoft.Build.Tasks {
}
}
-#endif
\ No newline at end of file