diff options
author | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-03-05 18:57:39 +0400 |
---|---|---|
committer | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-03-05 18:57:39 +0400 |
commit | cd6dc32e0b936645bf2f89e1bf61c6ae04c3258a (patch) | |
tree | 0109b408dd2150c4fbb38cd8d11b2197866df07b | |
parent | 7950d8b97d905f7cc752ce4640444af8b06db0d7 (diff) |
Add Assembly version attributes to hopefully fix bug #10002.
12 files changed, 15 insertions, 4 deletions
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 b9f10f90f54..1c1d60c8ac2 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ColdObservable.cs ../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/GlobalSuppressions.cs ../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/HotObservable.cs 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 2201460e0a6..e660c87394f 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Core/GlobalSuppressions.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Core/InternalsVisibleTo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Core/NamespaceDocs.cs 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 8e1e215b46d..129a9de718e 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Debugger/Properties/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Debugger/Reactive/Linq/QueryDebugger.cs 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 00bb33cd65d..13b0c79baea 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/ExperimentalAttribute.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/InternalsVisibleTo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/Properties/AssemblyInfo.cs 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 24e3207137a..13033bf16da 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/AssemblyFileVersionAttribute.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/DateTimeOffset.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/GlobalSuppressions.cs 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 7e1f8a7abae..5fb950da166 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Linq/GlobalSuppressions.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Linq/NamespaceDocs.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Concurrency/VirtualTimeScheduler.Extensions.cs 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 cd3b82b114a..ac8b888079e 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/GlobalSuppressions.cs ../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Properties/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.Windows.cs 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 6e7b91e0340..e4d5b1316e4 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Providers/GlobalSuppressions.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Properties/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/Internal/Constants.cs 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 08d770ac1a3..004b67c4f09 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/GlobalSuppressions.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/Properties/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/Reactive/Linq/Observable.Remoting.cs 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 b1f69a27bb0..57fd7081d85 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,3 +1,4 @@ +Assembly/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Forms/GlobalSuppressions.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Forms/Reactive/Linq/ControlObservable.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Forms/Reactive/Concurrency/ControlScheduler.cs 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 b526b72ba3c..37d244b5745 100644 --- 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/AssemblyInfo.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/GlobalSuppressions.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Concurrency/CoreDispatcherScheduler.cs ../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Internal/Constants.cs diff --git a/mcs/class/build-rx-dll-sources.sh b/mcs/class/build-rx-dll-sources.sh index 0697463e391..999738f5ffe 100644 --- a/mcs/class/build-rx-dll-sources.sh +++ b/mcs/class/build-rx-dll-sources.sh @@ -82,8 +82,8 @@ foreach (var ass in asses) { if (!Directory.Exists (assdir)) Directory.CreateDirectory (assdir); using (var tw = File.CreateText (assinfo)) { - tw.WriteLine ("// Due to InternalsVisibleTo issue we don't add versions so far..."); - tw.WriteLine ("// [assembly:System.Reflection.AssemblyVersion (\"0.0.0.0\")]"); + tw.WriteLine ("[assembly:System.Reflection.AssemblyVersion (\"2.1.30214.0\")]"); + tw.WriteLine ("[assembly:System.Reflection.AssemblyFileVersion (\"2.1.30214.0\")]"); } } @@ -104,8 +104,8 @@ foreach (var ass in asses) { Console.WriteLine ("Writing " + sources + " ..."); using (var tw = File.CreateText (sources)) { - //if (monoass != "Tests.System.Reactive") - // tw.WriteLine ("Assembly/AssemblyInfo.cs"); + if (monoass != "Tests.System.Reactive") + tw.WriteLine ("Assembly/AssemblyInfo.cs"); foreach (var path in doc.XPathSelectElements ("//*[local-name()='Compile']") .Select (el => el.Attribute ("Include").Value) .Select (s => s.Replace ("\\", "/"))) { |