Merge pull request #819 from brendanzagaeski/patch-1

[mono.git] / mcs / class / Microsoft.Build.Utilities / Microsoft.Build.Utilities / TargetDotNetFrameworkVersion.cs

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
index 11d96256e109a8cf061238497716a0fc3ad33b87..04940d5e8badbdce51fbf6219c40685962021d7d 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
@@ -1,10 +1,12 @@
 //
 // TargetDotNetFrameworkVersion.cs: Represents framework version.
 //
-// Author:
+// Authors:
 //   Marek Sieradzki (marek.sieradzki@gmail.com)
+//   Marek Safar (marek.safar@gmail.com)
 //
 // (C) 2005 Marek Sieradzki
+// Copyright 2011 Xamarin Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -25,16 +27,39 @@
 // 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
-
 namespace Microsoft.Build.Utilities
 {
-       public enum TargetDotNetFrameworkVersion
+       // If changing something here then update
+       // ToolLocationHelper.GetPathToDotNetFramework also
+       #if MICROSOFT_BUILD_DLL
+       internal
+       #else
+       public
+       #endif
+       enum TargetDotNetFrameworkVersion
        {
                Version11,
                Version20,
-               VersionLatest = Version20
+               Version30,
+               Version35,
+#if NET_4_0
+               Version40,
+#endif
+#if NET_4_5
+               Version45,
+#endif
+#if XBUILD_12
+               Version451,
+#endif
+
+#if XBUILD_12
+               VersionLatest = Version451
+#elif NET_4_5
+               VersionLatest = Version45
+#elif NET_4_0
+               VersionLatest = Version40
+#else
+               VersionLatest = Version35
+#endif
        }
 }
-
-#endif
\ No newline at end of file