瀏覽代碼

take out ThisAssembly from SR.cs, conflicts with the one in Sys.Data.

Atsushi Eno 11 年之前
父節點
當前提交
510710e423

+ 0 - 5
mcs/build/common/SR.cs

@@ -19,11 +19,6 @@ static class AssemblyRef
 	public const string SystemWindowsForms = Consts.AssemblySystem_Windows_Forms;
 }
 
-static class ThisAssembly
-{
-	public const string Version = Consts.FxVersion;
-}
-
 static partial class SR
 {
 	internal static string GetString(string name, params object[] args)

+ 5 - 0
mcs/class/System.XML/ReferenceSources/ThisAssembly.cs

@@ -0,0 +1,5 @@
+static class ThisAssembly
+{
+        public const string Version = Consts.FxVersion;
+}
+

+ 3 - 2
mcs/class/System.XML/System.Xml.dll.sources

@@ -7,9 +7,10 @@ Assembly/AssemblyInfo.cs
 Dummy.cs
 System.Xml.Res.cs
 System.Xml.Utils.Res.cs
-ReferenceSources/Wsdl.cs
-ReferenceSources/TypeScope.cs
 ReferenceSources/SpecifiedAccessor.cs
+ReferenceSources/ThisAssembly.cs
+ReferenceSources/TypeScope.cs
+ReferenceSources/Wsdl.cs
 ../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/Assembly.cs
 ../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs
 ../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs

+ 1 - 0
mcs/class/System.XML/mobile_System.Xml.dll.sources

@@ -6,6 +6,7 @@ Assembly/AssemblyInfo.cs
 Dummy.cs
 System.Xml.Res.cs
 System.Xml.Utils.Res.cs
+ReferenceSources/ThisAssembly.cs
 ReferenceSources/TypeScope.cs
 ReferenceSources/Wsdl.cs
 ../../../external/referencesource/System.Data.SqlXml/System/Xml/Xsl/Assembly.cs