Another dist build fix for rx integration, move *.cs file to safe-ish path.

diff --git a/mcs/class/Mono.Reactive.Testing/Assembly/MonoAssemblyInfo.cs b/mcs/class/Mono.Reactive.Testing/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/Mono.Reactive.Testing/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing.dll.sources b/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing.dll.sources
index 964a9c5f05187618dfd17fb00960885774d2e494..3225de3b997c145301865e3c90de85083be5eae4 100644 (file)
--- a/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing.dll.sources
+++ b/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/ColdObservable.cs
 ../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/GlobalSuppressions.cs
 ../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/HotObservable.cs

diff --git a/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing_test.dll.sources b/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing_test.dll.sources
index 8971bf1a05503abd0524df85f6ae2841b66d5dd5..03a55234f8a98eaa924b14a1c1ff995d02917ac6 100644 (file)
--- a/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing_test.dll.sources
+++ b/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing_test.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../../external/rx/Rx.NET/Tests.System.Reactive/App.cs
 ../../../../external/rx/Rx.NET/Tests.System.Reactive/DispatcherHelpers.cs
 ../../../../external/rx/Rx.NET/Tests.System.Reactive/Semaphore.cs

diff --git a/mcs/class/Mono.Reactive.Testing/MonoAssemblyInfo.cs b/mcs/class/Mono.Reactive.Testing/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/Mono.Reactive.Testing/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/Mono.Reactive.Testing/more_build_args b/mcs/class/Mono.Reactive.Testing/more_build_args
index ca28f4c84a6aa62abfb5372443804d97596e118e..6a4024bc0bfe856f551bb5893f57184a8b2011b7 100644 (file)
--- a/mcs/class/Mono.Reactive.Testing/more_build_args
+++ b/mcs/class/Mono.Reactive.Testing/more_build_args
@@ -1,2 +1 @@
 -d:SIGNED
-MonoAssemblyInfo.cs

diff --git a/mcs/class/System.Reactive.Core/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Core/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.Core/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.Core/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Core/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.Core/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.Core/System.Reactive.Core.dll.sources b/mcs/class/System.Reactive.Core/System.Reactive.Core.dll.sources
index 257e51ff394541e70040e397217ead66a2dcb0d7..6e995958e16e327f4ea60984a2655d7dc924d1ff 100644 (file)
--- a/mcs/class/System.Reactive.Core/System.Reactive.Core.dll.sources
+++ b/mcs/class/System.Reactive.Core/System.Reactive.Core.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Core/GlobalSuppressions.cs
 ../../../external/rx/Rx.NET/System.Reactive.Core/InternalsVisibleTo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Core/NamespaceDocs.cs

diff --git a/mcs/class/System.Reactive.Core/more_build_args b/mcs/class/System.Reactive.Core/more_build_args
index cb80d8da7808cdb8b4e7d10de43d288ae25d3243..2d0bbe0471b983de300612b2fc2eb12eace216ed 100644 (file)
--- a/mcs/class/System.Reactive.Core/more_build_args
+++ b/mcs/class/System.Reactive.Core/more_build_args
@@ -1,3 +1,2 @@
 -d:SIGNED
-MonoAssemblyInfo.cs
 -resource:Strings_Core.resources,System.Reactive.Strings_Core.resources

diff --git a/mcs/class/System.Reactive.Debugger/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Debugger/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.Debugger/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.Debugger/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Debugger/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.Debugger/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.dll.sources b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.dll.sources
index 711f341c3e1556348184b7b45356762108126397..aab4e3d41135b40a66235f1c5d94a96aedf5893a 100644 (file)
--- a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.dll.sources
+++ b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.dll.sources
@@ -1,2 +1,3 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Debugger/Properties/AssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Debugger/Reactive/Linq/QueryDebugger.cs

diff --git a/mcs/class/System.Reactive.Debugger/more_build_args b/mcs/class/System.Reactive.Debugger/more_build_args
index ca28f4c84a6aa62abfb5372443804d97596e118e..6a4024bc0bfe856f551bb5893f57184a8b2011b7 100644 (file)
--- a/mcs/class/System.Reactive.Debugger/more_build_args
+++ b/mcs/class/System.Reactive.Debugger/more_build_args
@@ -1,2 +1 @@
 -d:SIGNED
-MonoAssemblyInfo.cs

diff --git a/mcs/class/System.Reactive.Experimental/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Experimental/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.Experimental/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.Experimental/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Experimental/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.Experimental/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.dll.sources b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.dll.sources
index 014a9c93f42ffa79a457edb81ded22fb9139759a..e39b5593fea78ae64304900855fca774e6c48240 100644 (file)
--- a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.dll.sources
+++ b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Experimental/ExperimentalAttribute.cs
 ../../../external/rx/Rx.NET/System.Reactive.Experimental/InternalsVisibleTo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Experimental/Properties/AssemblyInfo.cs

diff --git a/mcs/class/System.Reactive.Experimental/more_build_args b/mcs/class/System.Reactive.Experimental/more_build_args
index ca28f4c84a6aa62abfb5372443804d97596e118e..6a4024bc0bfe856f551bb5893f57184a8b2011b7 100644 (file)
--- a/mcs/class/System.Reactive.Experimental/more_build_args
+++ b/mcs/class/System.Reactive.Experimental/more_build_args
@@ -1,2 +1 @@
 -d:SIGNED
-MonoAssemblyInfo.cs

diff --git a/mcs/class/System.Reactive.Interfaces/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Interfaces/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.Interfaces/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.Interfaces/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Interfaces/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.Interfaces/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.dll.sources b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.dll.sources
index 2ce2955ed3be7194e1e625742b4603e3570796cb..45adc9c85a6e213c9cf140d6de9177a391a68c8d 100644 (file)
--- a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.dll.sources
+++ b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Interfaces/AssemblyFileVersionAttribute.cs
 ../../../external/rx/Rx.NET/System.Reactive.Interfaces/DateTimeOffset.cs
 ../../../external/rx/Rx.NET/System.Reactive.Interfaces/GlobalSuppressions.cs

diff --git a/mcs/class/System.Reactive.Interfaces/more_build_args b/mcs/class/System.Reactive.Interfaces/more_build_args
index ca28f4c84a6aa62abfb5372443804d97596e118e..6a4024bc0bfe856f551bb5893f57184a8b2011b7 100644 (file)
--- a/mcs/class/System.Reactive.Interfaces/more_build_args
+++ b/mcs/class/System.Reactive.Interfaces/more_build_args
@@ -1,2 +1 @@
 -d:SIGNED
-MonoAssemblyInfo.cs

diff --git a/mcs/class/System.Reactive.Linq/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Linq/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.Linq/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.Linq/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Linq/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.Linq/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.Linq/System.Reactive.Linq.dll.sources b/mcs/class/System.Reactive.Linq/System.Reactive.Linq.dll.sources
index 896357503b0fb5598b1d103594fdddfe916bf865..407f558badaae65498bb79f1668e15702d9eb50e 100644 (file)
--- a/mcs/class/System.Reactive.Linq/System.Reactive.Linq.dll.sources
+++ b/mcs/class/System.Reactive.Linq/System.Reactive.Linq.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Linq/GlobalSuppressions.cs
 ../../../external/rx/Rx.NET/System.Reactive.Linq/NamespaceDocs.cs
 ../../../external/rx/Rx.NET/System.Reactive.Linq/Reactive/Concurrency/VirtualTimeScheduler.Extensions.cs

diff --git a/mcs/class/System.Reactive.Linq/more_build_args b/mcs/class/System.Reactive.Linq/more_build_args
index 3cf0db46252ebe8fedb51e58e5410080831ad3c7..86aaeede87c94e9205f6e9666904027d41a9c8d2 100644 (file)
--- a/mcs/class/System.Reactive.Linq/more_build_args
+++ b/mcs/class/System.Reactive.Linq/more_build_args
@@ -1,3 +1,2 @@
 -d:SIGNED
-MonoAssemblyInfo.cs
 -resource:Strings_Linq.resources,System.Reactive.Strings_Linq.resources

diff --git a/mcs/class/System.Reactive.PlatformServices/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.PlatformServices/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.PlatformServices/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.PlatformServices/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.PlatformServices/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.PlatformServices/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.dll.sources b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.dll.sources
index 9950bee597da3ec8fb588abc7971883ad1c2cf16..47ffa6f8e915cb0d04444b158156cea5d0cc6c8a 100644 (file)
--- a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.dll.sources
+++ b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.PlatformServices/GlobalSuppressions.cs
 ../../../external/rx/Rx.NET/System.Reactive.PlatformServices/Properties/AssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.PlatformServices/Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.Windows.cs

diff --git a/mcs/class/System.Reactive.PlatformServices/more_build_args b/mcs/class/System.Reactive.PlatformServices/more_build_args
index 449b9a8011459328dcd9c0ce8b39ea75bbd0bb41..af58f79030a8dde89dddc86c0fcbf8c92e96795b 100644 (file)
--- a/mcs/class/System.Reactive.PlatformServices/more_build_args
+++ b/mcs/class/System.Reactive.PlatformServices/more_build_args
@@ -1,3 +1,2 @@
 -d:SIGNED
-MonoAssemblyInfo.cs
 -resource:Strings_PlatformServices.resources,System.Reactive.Strings_PlatformServices.resources

diff --git a/mcs/class/System.Reactive.Providers/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Providers/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.Providers/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.Providers/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Providers/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.Providers/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers.dll.sources b/mcs/class/System.Reactive.Providers/System.Reactive.Providers.dll.sources
index 13780f9bd374502ace7ed352f37f8a2b535feb4d..d64ae1747aba266c72e1e6f41150bb3b4e8ebc21 100644 (file)
--- a/mcs/class/System.Reactive.Providers/System.Reactive.Providers.dll.sources
+++ b/mcs/class/System.Reactive.Providers/System.Reactive.Providers.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Providers/GlobalSuppressions.cs
 ../../../external/rx/Rx.NET/System.Reactive.Providers/Properties/AssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Providers/Reactive/Internal/Constants.cs

diff --git a/mcs/class/System.Reactive.Providers/more_build_args b/mcs/class/System.Reactive.Providers/more_build_args
index 0eb7b9d4b51ee197031ee67bf33de6fb9424b876..45869de172ca3364158dba4581c42bad5aed9f8f 100644 (file)
--- a/mcs/class/System.Reactive.Providers/more_build_args
+++ b/mcs/class/System.Reactive.Providers/more_build_args
@@ -1,3 +1,2 @@
 -d:SIGNED
-MonoAssemblyInfo.cs
 -resource:Strings_Providers.resources,System.Reactive.Strings_Providers.resources

diff --git a/mcs/class/System.Reactive.Runtime.Remoting/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Runtime.Remoting/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.Runtime.Remoting/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.Runtime.Remoting/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Runtime.Remoting/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.Runtime.Remoting/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.dll.sources b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.dll.sources
index ee06dc6b3365549a09a67b6457589de10c5c71d4..70b581cd2e0eebf6dfc68006518fe51d91e90d13 100644 (file)
--- a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.dll.sources
+++ b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Runtime.Remoting/GlobalSuppressions.cs
 ../../../external/rx/Rx.NET/System.Reactive.Runtime.Remoting/Properties/AssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Runtime.Remoting/Reactive/Linq/Observable.Remoting.cs

diff --git a/mcs/class/System.Reactive.Runtime.Remoting/more_build_args b/mcs/class/System.Reactive.Runtime.Remoting/more_build_args
index ca28f4c84a6aa62abfb5372443804d97596e118e..6a4024bc0bfe856f551bb5893f57184a8b2011b7 100644 (file)
--- a/mcs/class/System.Reactive.Runtime.Remoting/more_build_args
+++ b/mcs/class/System.Reactive.Runtime.Remoting/more_build_args
@@ -1,2 +1 @@
 -d:SIGNED
-MonoAssemblyInfo.cs

diff --git a/mcs/class/System.Reactive.Windows.Forms/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Windows.Forms/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.Windows.Forms/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.Windows.Forms/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Windows.Forms/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.Windows.Forms/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.dll.sources b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.dll.sources
index ab1f8f9ad794ec60d1531c20140d646b144df627..758515d106c7c7572f4a1fcabcfe76374198211d 100644 (file)
--- a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.dll.sources
+++ b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Windows.Forms/GlobalSuppressions.cs
 ../../../external/rx/Rx.NET/System.Reactive.Windows.Forms/Reactive/Linq/ControlObservable.cs
 ../../../external/rx/Rx.NET/System.Reactive.Windows.Forms/Reactive/Concurrency/ControlScheduler.cs

diff --git a/mcs/class/System.Reactive.Windows.Forms/more_build_args b/mcs/class/System.Reactive.Windows.Forms/more_build_args
index ca28f4c84a6aa62abfb5372443804d97596e118e..6a4024bc0bfe856f551bb5893f57184a8b2011b7 100644 (file)
--- a/mcs/class/System.Reactive.Windows.Forms/more_build_args
+++ b/mcs/class/System.Reactive.Windows.Forms/more_build_args
@@ -1,2 +1 @@
 -d:SIGNED
-MonoAssemblyInfo.cs

diff --git a/mcs/class/System.Reactive.Windows.Threading/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Windows.Threading/Assembly/MonoAssemblyInfo.cs
new file mode 100644 (file)
index 0000000..8b39d5b
--- /dev/null
+++ b/mcs/class/System.Reactive.Windows.Threading/Assembly/MonoAssemblyInfo.cs
@@ -0,0 +1,5 @@
+
+using System.Reflection;
+[assembly: AssemblyDelaySign (true)]
+[assembly:AssemblyKeyFile ("../reactive.pub")]
+

diff --git a/mcs/class/System.Reactive.Windows.Threading/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Windows.Threading/MonoAssemblyInfo.cs
deleted file mode 100644 (file)
index 8b39d5b..0000000
--- a/mcs/class/System.Reactive.Windows.Threading/MonoAssemblyInfo.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-
-using System.Reflection;
-[assembly: AssemblyDelaySign (true)]
-[assembly:AssemblyKeyFile ("../reactive.pub")]
-

diff --git a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.dll.sources b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.dll.sources
index 7b287a882338270be5b4590b72671ea8d716e90c..768caf60e0a5e2d5ddb06da3b380785649380670 100644 (file)
--- a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.dll.sources
+++ b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.dll.sources
@@ -1,3 +1,4 @@
+Assembly/MonoAssemblyInfo.cs
 ../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/GlobalSuppressions.cs
 ../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/Reactive/Concurrency/CoreDispatcherScheduler.cs
 ../../../external/rx/Rx.NET/System.Reactive.Windows.Threading/Reactive/Internal/Constants.cs

diff --git a/mcs/class/System.Reactive.Windows.Threading/more_build_args b/mcs/class/System.Reactive.Windows.Threading/more_build_args
index b2b0b012c97578c0ff791c729ba12b5fbf3e4f8b..13a53c447e218fc26d46c90ccad331453e780030 100644 (file)
--- a/mcs/class/System.Reactive.Windows.Threading/more_build_args
+++ b/mcs/class/System.Reactive.Windows.Threading/more_build_args
@@ -1,3 +1,2 @@
 -d:SIGNED
-MonoAssemblyInfo.cs
 -resource:Strings_WindowsThreading.resources,System.Reactive.Strings_WindowsThreading.resources

diff --git a/mcs/class/build-rx-dll-sources.sh b/mcs/class/build-rx-dll-sources.sh
index 6d8506348aa6309d84a8b892f44b67126ceea84f..1780aa3b93c96cb21ebbc40cd640d23d5d99c39c 100644 (file)
--- a/mcs/class/build-rx-dll-sources.sh
+++ b/mcs/class/build-rx-dll-sources.sh
@@ -50,6 +50,7 @@ foreach (var ass in asses) {
        var doc = XDocument.Load (csproj);
        var rootNS = doc.XPathSelectElement ("//*[local-name()='RootNamespace']").Value;
        using (var tw = File.CreateText (sources)) {
+               tw.WriteLine ("Assembly/MonoAssemblyInfo.cs");
                foreach (var path in doc.XPathSelectElements ("//*[local-name()='Compile']")
                        .Select (el => el.Attribute ("Include").Value)
                        .Select (s => s.Replace ("\\", "/")))
@@ -57,7 +58,7 @@ foreach (var ass in asses) {
                                tw.WriteLine (Path.Combine (pathPrefix, basePath, ass, path));
        }
 
-       var monoAssInfo = Path.Combine (Path.GetDirectoryName (sources), "MonoAssemblyInfo.cs");
+       var monoAssInfo = Path.Combine (Path.GetDirectoryName (sources), "Assembly", "MonoAssemblyInfo.cs");
        using (var tw = File.CreateText (monoAssInfo))
                tw.WriteLine (@"
 using System.Reflection;
@@ -68,7 +69,6 @@ using System.Reflection;
        var argsPath = Path.Combine (Path.GetDirectoryName (sources), "more_build_args");
        using (var tw = File.CreateText (argsPath)) {
                tw.WriteLine ("-d:SIGNED");
-               tw.WriteLine ("MonoAssemblyInfo.cs");
 
                foreach (var path in doc.XPathSelectElements ("//*[local-name()='EmbeddedResource']")) {
                        var res = path.Attribute ("Include").Value;