diff options
| author | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2012-11-15 04:36:03 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2012-11-15 04:36:03 +0400 |
| commit | aeab08a478358f9d089c9d9772e909b98e3450ca (patch) | |
| tree | 8d3d0a1aa5fbf9ca64b455a35dce8608530f6cec /mcs/class/System.Reactive.Windows.Forms | |
| parent | 762da3308781cdce3aac8b496a0ce0d9cdb4f88b (diff) | |
fix install-local and simplify signing in rx assemblies.
Diffstat (limited to 'mcs/class/System.Reactive.Windows.Forms')
4 files changed, 3 insertions, 7 deletions
diff --git a/mcs/class/System.Reactive.Windows.Forms/Assembly/MonoAssemblyInfo.cs b/mcs/class/System.Reactive.Windows.Forms/Assembly/MonoAssemblyInfo.cs deleted file mode 100644 index 8b39d5b9eb0..00000000000 --- a/mcs/class/System.Reactive.Windows.Forms/Assembly/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/Makefile b/mcs/class/System.Reactive.Windows.Forms/Makefile index 8fdb3694506..c2e8fc415cf 100644 --- a/mcs/class/System.Reactive.Windows.Forms/Makefile +++ b/mcs/class/System.Reactive.Windows.Forms/Makefile @@ -29,9 +29,9 @@ VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.System.Reactive.Windows.Forms.dll NO_INSTALL = yes +NO_SIGN_ASSEMBLY = yes endif -NO_SIGN_ASSEMBLY = yes NO_TEST = yes include ../../build/library.make 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 758515d106c..ab1f8f9ad79 100644 --- 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,4 +1,3 @@ -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 6a4024bc0bf..a53ee7b7f9c 100644 --- a/mcs/class/System.Reactive.Windows.Forms/more_build_args +++ b/mcs/class/System.Reactive.Windows.Forms/more_build_args @@ -1 +1,3 @@ -d:SIGNED +-delaysign +-keyfile:../reactive.pub |