diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /Prebuild/src/Core | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to '')
-rw-r--r-- | Prebuild/src/Core/Kernel.cs | 2 | ||||
-rw-r--r-- | Prebuild/src/Core/Nodes/ProjectNode.cs | 10 | ||||
-rw-r--r-- | Prebuild/src/Core/Targets/VS2010Target.cs | 278 |
3 files changed, 150 insertions, 140 deletions
diff --git a/Prebuild/src/Core/Kernel.cs b/Prebuild/src/Core/Kernel.cs index 67051d5..761962e 100644 --- a/Prebuild/src/Core/Kernel.cs +++ b/Prebuild/src/Core/Kernel.cs | |||
@@ -73,7 +73,7 @@ namespace Prebuild.Core | |||
73 | /// <summary> | 73 | /// <summary> |
74 | /// This must match the version of the schema that is embeeded | 74 | /// This must match the version of the schema that is embeeded |
75 | /// </summary> | 75 | /// </summary> |
76 | private const string m_SchemaVersion = "1.9"; | 76 | private const string m_SchemaVersion = "1.10"; |
77 | private const string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd"; | 77 | private const string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd"; |
78 | private const string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema; | 78 | private const string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema; |
79 | bool disposed; | 79 | bool disposed; |
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs index fb92b32..a822704 100644 --- a/Prebuild/src/Core/Nodes/ProjectNode.cs +++ b/Prebuild/src/Core/Nodes/ProjectNode.cs | |||
@@ -93,7 +93,15 @@ namespace Prebuild.Core.Nodes | |||
93 | /// .NET 4.0 | 93 | /// .NET 4.0 |
94 | /// </summary> | 94 | /// </summary> |
95 | v4_0, | 95 | v4_0, |
96 | } | 96 | /// <summary> |
97 | /// .NET 4.5 | ||
98 | /// </summary> | ||
99 | v4_5, | ||
100 | /// <summary> | ||
101 | /// .NET 4.5.1 | ||
102 | /// </summary> | ||
103 | v4_5_1 | ||
104 | } | ||
97 | /// <summary> | 105 | /// <summary> |
98 | /// The Node object representing /Prebuild/Solution/Project elements | 106 | /// The Node object representing /Prebuild/Solution/Project elements |
99 | /// </summary> | 107 | /// </summary> |
diff --git a/Prebuild/src/Core/Targets/VS2010Target.cs b/Prebuild/src/Core/Targets/VS2010Target.cs index ea9f736..e8aeab5 100644 --- a/Prebuild/src/Core/Targets/VS2010Target.cs +++ b/Prebuild/src/Core/Targets/VS2010Target.cs | |||
@@ -1,138 +1,140 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.IO; | 2 | using System.IO; |
3 | using System.Text; | 3 | using System.Text; |
4 | 4 | ||
5 | using Prebuild.Core.Attributes; | 5 | using Prebuild.Core.Attributes; |
6 | using Prebuild.Core.Interfaces; | 6 | using Prebuild.Core.Interfaces; |
7 | using Prebuild.Core.Nodes; | 7 | using Prebuild.Core.Nodes; |
8 | using Prebuild.Core.Utilities; | 8 | using Prebuild.Core.Utilities; |
9 | using System.CodeDom.Compiler; | 9 | using System.CodeDom.Compiler; |
10 | 10 | ||
11 | namespace Prebuild.Core.Targets | 11 | namespace Prebuild.Core.Targets |
12 | { | 12 | { |
13 | 13 | ||
14 | /// <summary> | 14 | /// <summary> |
15 | /// | 15 | /// |
16 | /// </summary> | 16 | /// </summary> |
17 | [Target("vs2010")] | 17 | [Target("vs2010")] |
18 | public class VS2010Target : VSGenericTarget | 18 | public class VS2010Target : VSGenericTarget |
19 | { | 19 | { |
20 | #region Fields | 20 | #region Fields |
21 | 21 | ||
22 | string solutionVersion = "11.00"; | 22 | string solutionVersion = "11.00"; |
23 | string productVersion = "9.0.30729"; | 23 | string productVersion = "9.0.30729"; |
24 | string schemaVersion = "2.0"; | 24 | string schemaVersion = "2.0"; |
25 | string versionName = "Visual Studio 2010"; | 25 | string versionName = "Visual Studio 2010"; |
26 | string name = "vs2010"; | 26 | string name = "vs2010"; |
27 | VSVersion version = VSVersion.VS10; | 27 | VSVersion version = VSVersion.VS10; |
28 | 28 | ||
29 | #endregion | 29 | #endregion |
30 | 30 | ||
31 | #region Properties | 31 | #region Properties |
32 | 32 | ||
33 | /// <summary> | 33 | /// <summary> |
34 | /// Gets or sets the solution version. | 34 | /// Gets or sets the solution version. |
35 | /// </summary> | 35 | /// </summary> |
36 | /// <value>The solution version.</value> | 36 | /// <value>The solution version.</value> |
37 | public override string SolutionVersion | 37 | public override string SolutionVersion |
38 | { | 38 | { |
39 | get | 39 | get |
40 | { | 40 | { |
41 | return solutionVersion; | 41 | return solutionVersion; |
42 | } | 42 | } |
43 | } | 43 | } |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Gets or sets the product version. | 46 | /// Gets or sets the product version. |
47 | /// </summary> | 47 | /// </summary> |
48 | /// <value>The product version.</value> | 48 | /// <value>The product version.</value> |
49 | public override string ProductVersion | 49 | public override string ProductVersion |
50 | { | 50 | { |
51 | get | 51 | get |
52 | { | 52 | { |
53 | return productVersion; | 53 | return productVersion; |
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
57 | /// <summary> | 57 | /// <summary> |
58 | /// Gets or sets the schema version. | 58 | /// Gets or sets the schema version. |
59 | /// </summary> | 59 | /// </summary> |
60 | /// <value>The schema version.</value> | 60 | /// <value>The schema version.</value> |
61 | public override string SchemaVersion | 61 | public override string SchemaVersion |
62 | { | 62 | { |
63 | get | 63 | get |
64 | { | 64 | { |
65 | return schemaVersion; | 65 | return schemaVersion; |
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | /// <summary> | 69 | /// <summary> |
70 | /// Gets or sets the name of the version. | 70 | /// Gets or sets the name of the version. |
71 | /// </summary> | 71 | /// </summary> |
72 | /// <value>The name of the version.</value> | 72 | /// <value>The name of the version.</value> |
73 | public override string VersionName | 73 | public override string VersionName |
74 | { | 74 | { |
75 | get | 75 | get |
76 | { | 76 | { |
77 | return versionName; | 77 | return versionName; |
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
81 | /// <summary> | 81 | /// <summary> |
82 | /// Gets or sets the version. | 82 | /// Gets or sets the version. |
83 | /// </summary> | 83 | /// </summary> |
84 | /// <value>The version.</value> | 84 | /// <value>The version.</value> |
85 | public override VSVersion Version | 85 | public override VSVersion Version |
86 | { | 86 | { |
87 | get | 87 | get |
88 | { | 88 | { |
89 | return version; | 89 | return version; |
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | /// <summary> | 93 | /// <summary> |
94 | /// Gets the name. | 94 | /// Gets the name. |
95 | /// </summary> | 95 | /// </summary> |
96 | /// <value>The name.</value> | 96 | /// <value>The name.</value> |
97 | public override string Name | 97 | public override string Name |
98 | { | 98 | { |
99 | get | 99 | get |
100 | { | 100 | { |
101 | return name; | 101 | return name; |
102 | } | 102 | } |
103 | } | 103 | } |
104 | 104 | ||
105 | protected override string GetToolsVersionXml(FrameworkVersion frameworkVersion) | 105 | protected override string GetToolsVersionXml(FrameworkVersion frameworkVersion) |
106 | { | 106 | { |
107 | switch (frameworkVersion) | 107 | switch (frameworkVersion) |
108 | { | 108 | { |
109 | case FrameworkVersion.v4_0: | 109 | case FrameworkVersion.v4_5_1: |
110 | case FrameworkVersion.v3_5: | 110 | case FrameworkVersion.v4_5: |
111 | return "ToolsVersion=\"4.0\""; | 111 | case FrameworkVersion.v4_0: |
112 | case FrameworkVersion.v3_0: | 112 | case FrameworkVersion.v3_5: |
113 | return "ToolsVersion=\"3.0\""; | 113 | return "ToolsVersion=\"4.0\""; |
114 | default: | 114 | case FrameworkVersion.v3_0: |
115 | return "ToolsVersion=\"2.0\""; | 115 | return "ToolsVersion=\"3.0\""; |
116 | } | 116 | default: |
117 | } | 117 | return "ToolsVersion=\"2.0\""; |
118 | 118 | } | |
119 | public override string SolutionTag | 119 | } |
120 | { | 120 | |
121 | get { return "# Visual Studio 2010"; } | 121 | public override string SolutionTag |
122 | } | 122 | { |
123 | 123 | get { return "# Visual Studio 2010"; } | |
124 | #endregion | 124 | } |
125 | 125 | ||
126 | #region Constructors | 126 | #endregion |
127 | 127 | ||
128 | /// <summary> | 128 | #region Constructors |
129 | /// Initializes a new instance of the <see cref="VS2005Target"/> class. | 129 | |
130 | /// </summary> | 130 | /// <summary> |
131 | public VS2010Target() | 131 | /// Initializes a new instance of the <see cref="VS2005Target"/> class. |
132 | : base() | 132 | /// </summary> |
133 | { | 133 | public VS2010Target() |
134 | } | 134 | : base() |
135 | 135 | { | |
136 | #endregion | 136 | } |
137 | } | 137 | |
138 | } | 138 | #endregion |
139 | } | ||
140 | } | ||