projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge pull request #1718 from madewokherd/sgenthreadcleanup
[mono.git]
/
mcs
/
class
/
Microsoft.Build.Tasks
/
Microsoft.Build.Tasks.Deployment.Bootstrapper
/
BuildSettings.cs
diff --git
a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Deployment.Bootstrapper/BuildSettings.cs
b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Deployment.Bootstrapper/BuildSettings.cs
index 8a1e4eaadc4b6c5d0eee83755eb62a8afff0033b..98084019ed37457e8e09e1368fb5c75547e7a814 100644
(file)
--- a/
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Deployment.Bootstrapper/BuildSettings.cs
+++ b/
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.Deployment.Bootstrapper/BuildSettings.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.Runtime.InteropServices;
@@
-116,4
+115,3
@@
namespace Microsoft.Build.Tasks.Deployment.Bootstrapper {
}
}
-#endif