From a248c6c3f5c561f2ae5f0ac5378890b5587f2138 Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Sat, 29 Oct 2016 18:35:02 +1100 Subject: [PATCH 1/2] refactor: retargeted from net45 to net46 as it is EOL --- build.cake | 2 +- packages/repositories.config | 10 ++++---- src/EventBuilder/App.config | 2 +- src/EventBuilder/CommandLineOptions.cs | 2 +- src/EventBuilder/EventBuilder.csproj | 6 ++--- .../Platforms/{Net45.cs => Net46.cs} | 14 +++++------ src/EventBuilder/Program.cs | 4 ++-- .../PerfConsoleRunner.csproj | 8 +++---- src/PerfConsoleRunner/Program.cs | 2 +- src/ReactiveUI-Blend.nuspec | 2 +- src/ReactiveUI-Core.nuspec | 2 +- src/ReactiveUI-Events.nuspec | 2 +- src/ReactiveUI-Testing.nuspec | 2 +- src/ReactiveUI-Winforms.nuspec | 2 +- ...5.csproj => ReactiveUI.Blend_Net46.csproj} | 10 ++++---- ...=> packages.ReactiveUI.Blend_Net46.config} | 0 ....csproj => ReactiveUI.Events_Net46.csproj} | 2 +- ..._Net45.sln => ReactiveUI.Events_Net46.sln} | 2 +- ...> packages.ReactiveUI.Events_Net46.config} | 0 ...csproj => ReactiveUI.Testing_Net46.csproj} | 6 ++--- ... packages.ReactiveUI.Testing_Net46.config} | 0 ...5.csproj => ReactiveUI.Tests_Net46.csproj} | 24 +++++++++---------- ...=> packages.ReactiveUI.Tests_Net46.config} | 0 .../Properties/AssemblyInfo.cs | 2 +- ...sproj => ReactiveUI.Winforms_Net46.csproj} | 8 +++---- src/ReactiveUI.sln | 10 ++++---- src/ReactiveUI/Properties/AssemblyInfo.cs | 2 +- ...I_Net45.csproj => ReactiveUI_Net46.csproj} | 7 +++--- ...onfig => packages.ReactiveUI_Net46.config} | 0 29 files changed, 67 insertions(+), 66 deletions(-) rename src/EventBuilder/Platforms/{Net45.cs => Net46.cs} (65%) rename src/ReactiveUI.Blend/{ReactiveUI.Blend_Net45.csproj => ReactiveUI.Blend_Net46.csproj} (93%) rename src/ReactiveUI.Blend/{packages.ReactiveUI.Blend_Net45.config => packages.ReactiveUI.Blend_Net46.config} (100%) rename src/ReactiveUI.Events/{ReactiveUI.Events_Net45.csproj => ReactiveUI.Events_Net46.csproj} (98%) rename src/ReactiveUI.Events/{ReactiveUI.Events_Net45.sln => ReactiveUI.Events_Net46.sln} (93%) rename src/ReactiveUI.Events/{packages.ReactiveUI.Events_Net45.config => packages.ReactiveUI.Events_Net46.config} (100%) rename src/ReactiveUI.Testing/{ReactiveUI.Testing_Net45.csproj => ReactiveUI.Testing_Net46.csproj} (97%) rename src/ReactiveUI.Testing/{packages.ReactiveUI.Testing_Net45.config => packages.ReactiveUI.Testing_Net46.config} (100%) rename src/ReactiveUI.Tests/{ReactiveUI.Tests_Net45.csproj => ReactiveUI.Tests_Net46.csproj} (94%) rename src/ReactiveUI.Tests/{packages.ReactiveUI.Tests_Net45.config => packages.ReactiveUI.Tests_Net46.config} (100%) rename src/ReactiveUI.Winforms/{ReactiveUI.Winforms_Net45.csproj => ReactiveUI.Winforms_Net46.csproj} (96%) rename src/ReactiveUI/{ReactiveUI_Net45.csproj => ReactiveUI_Net46.csproj} (97%) rename src/ReactiveUI/{packages.ReactiveUI_Net45.config => packages.ReactiveUI_Net46.config} (100%) diff --git a/build.cake b/build.cake index faedaa8dd8..ae2f3db954 100644 --- a/build.cake +++ b/build.cake @@ -320,7 +320,7 @@ Task("RunUnitTests") .IsDependentOn("BuildReactiveUI") .Does(() => { - XUnit2("./src/ReactiveUI.Tests/bin/Release/Net45/ReactiveUI.Tests_Net45.dll", new XUnit2Settings { + XUnit2("./src/ReactiveUI.Tests/bin/Release/Net45/ReactiveUI.Tests_Net46.dll", new XUnit2Settings { OutputDirectory = artifactDirectory, XmlReportV1 = true, NoAppDomain = true diff --git a/packages/repositories.config b/packages/repositories.config index bf1beb5fc6..688378d3f9 100644 --- a/packages/repositories.config +++ b/packages/repositories.config @@ -33,11 +33,11 @@ - + - + @@ -45,16 +45,16 @@ - + - + - + diff --git a/src/EventBuilder/App.config b/src/EventBuilder/App.config index 71a44c90c7..ed590d737a 100644 --- a/src/EventBuilder/App.config +++ b/src/EventBuilder/App.config @@ -1,7 +1,7 @@ - + diff --git a/src/EventBuilder/CommandLineOptions.cs b/src/EventBuilder/CommandLineOptions.cs index bd50898368..46dc6f7c8d 100644 --- a/src/EventBuilder/CommandLineOptions.cs +++ b/src/EventBuilder/CommandLineOptions.cs @@ -10,7 +10,7 @@ public enum AutoPlatform Android, iOS, Mac, - NET45, + NET46, XamForms, UWP, WP81, diff --git a/src/EventBuilder/EventBuilder.csproj b/src/EventBuilder/EventBuilder.csproj index 3703b2514f..5bca74cd9f 100644 --- a/src/EventBuilder/EventBuilder.csproj +++ b/src/EventBuilder/EventBuilder.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties EventBuilder EventBuilder - v4.5 + v4.6 512 true @@ -113,7 +113,7 @@ - + diff --git a/src/EventBuilder/Platforms/Net45.cs b/src/EventBuilder/Platforms/Net46.cs similarity index 65% rename from src/EventBuilder/Platforms/Net45.cs rename to src/EventBuilder/Platforms/Net46.cs index 5135e094bd..8d47390157 100644 --- a/src/EventBuilder/Platforms/Net45.cs +++ b/src/EventBuilder/Platforms/Net46.cs @@ -7,21 +7,21 @@ namespace EventBuilder.Platforms { - public class Net45 : BasePlatform + public class Net46 : BasePlatform { - public Net45() + public Net46() { if (PlatformHelper.IsRunningOnMono()) { - throw new NotSupportedException("Building events for NET45 on Mac is not implemented yet."); + throw new NotSupportedException("Building events for NET45 on Mac is not implemented."); } else { - Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\WindowsBase.dll"); - Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\PresentationCore.dll"); - Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\PresentationFramework.dll"); + Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6\WindowsBase.dll"); + Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6\PresentationCore.dll"); + Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6\PresentationFramework.dll"); - CecilSearchDirectories.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5"); + CecilSearchDirectories.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6"); } diff --git a/src/EventBuilder/Program.cs b/src/EventBuilder/Program.cs index 35d86616dd..13900f9e41 100644 --- a/src/EventBuilder/Program.cs +++ b/src/EventBuilder/Program.cs @@ -92,8 +92,8 @@ private static void Main(string[] args) platform = new Mac(); break; - case AutoPlatform.NET45: - platform = new Net45(); + case AutoPlatform.NET46: + platform = new Net46(); break; case AutoPlatform.XamForms: diff --git a/src/PerfConsoleRunner/PerfConsoleRunner.csproj b/src/PerfConsoleRunner/PerfConsoleRunner.csproj index 0925ec0214..af3464929a 100644 --- a/src/PerfConsoleRunner/PerfConsoleRunner.csproj +++ b/src/PerfConsoleRunner/PerfConsoleRunner.csproj @@ -59,13 +59,13 @@ - + {7866b5b1-5457-43a2-976a-e784eb10f2da} - ReactiveUI.Blend_Net45 + ReactiveUI.Blend_Net46 - + {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 + ReactiveUI_Net46 diff --git a/src/PerfConsoleRunner/Program.cs b/src/PerfConsoleRunner/Program.cs index 0ec4fe6f50..da26df53d7 100644 --- a/src/PerfConsoleRunner/Program.cs +++ b/src/PerfConsoleRunner/Program.cs @@ -21,7 +21,7 @@ public static int Main(string[] args) var relDir = "Release"; #endif - var testAssembly = Path.Combine(solutionDir, @"ReactiveUI.Tests\bin\Debug\Net45\ReactiveUI.Tests_Net45.dll") + var testAssembly = Path.Combine(solutionDir, @"ReactiveUI.Tests\bin\Debug\Net45\ReactiveUI.Tests_Net46.dll") .Replace("Debug", relDir); Xunit.ConsoleClient.Program.Main(new[] { testAssembly }); diff --git a/src/ReactiveUI-Blend.nuspec b/src/ReactiveUI-Blend.nuspec index 283006ee58..c7932f6ba8 100644 --- a/src/ReactiveUI-Blend.nuspec +++ b/src/ReactiveUI-Blend.nuspec @@ -38,7 +38,7 @@ - + diff --git a/src/ReactiveUI-Core.nuspec b/src/ReactiveUI-Core.nuspec index 1a2c46c7ed..8576171427 100644 --- a/src/ReactiveUI-Core.nuspec +++ b/src/ReactiveUI-Core.nuspec @@ -67,7 +67,7 @@ - + diff --git a/src/ReactiveUI-Events.nuspec b/src/ReactiveUI-Events.nuspec index e82f3e3770..a8a1e248e5 100644 --- a/src/ReactiveUI-Events.nuspec +++ b/src/ReactiveUI-Events.nuspec @@ -30,7 +30,7 @@ - + diff --git a/src/ReactiveUI-Testing.nuspec b/src/ReactiveUI-Testing.nuspec index ddc13b0105..69a57a71d9 100644 --- a/src/ReactiveUI-Testing.nuspec +++ b/src/ReactiveUI-Testing.nuspec @@ -45,7 +45,7 @@ - + diff --git a/src/ReactiveUI-Winforms.nuspec b/src/ReactiveUI-Winforms.nuspec index 3434e789f1..cb81d138b0 100644 --- a/src/ReactiveUI-Winforms.nuspec +++ b/src/ReactiveUI-Winforms.nuspec @@ -11,7 +11,7 @@ - + diff --git a/src/ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj b/src/ReactiveUI.Blend/ReactiveUI.Blend_Net46.csproj similarity index 93% rename from src/ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj rename to src/ReactiveUI.Blend/ReactiveUI.Blend_Net46.csproj index 5399922f98..9f0a498b25 100644 --- a/src/ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj +++ b/src/ReactiveUI.Blend/ReactiveUI.Blend_Net46.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ReactiveUI.Blend ReactiveUI.Blend - v4.5 + v4.6 512 @@ -91,12 +91,12 @@ - + - + {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 + ReactiveUI_Net46 diff --git a/src/ReactiveUI.Blend/packages.ReactiveUI.Blend_Net45.config b/src/ReactiveUI.Blend/packages.ReactiveUI.Blend_Net46.config similarity index 100% rename from src/ReactiveUI.Blend/packages.ReactiveUI.Blend_Net45.config rename to src/ReactiveUI.Blend/packages.ReactiveUI.Blend_Net46.config diff --git a/src/ReactiveUI.Events/ReactiveUI.Events_Net45.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_Net46.csproj similarity index 98% rename from src/ReactiveUI.Events/ReactiveUI.Events_Net45.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_Net46.csproj index a034e4274f..c84a261e7a 100644 --- a/src/ReactiveUI.Events/ReactiveUI.Events_Net45.csproj +++ b/src/ReactiveUI.Events/ReactiveUI.Events_Net46.csproj @@ -86,7 +86,7 @@ - + Designer diff --git a/src/ReactiveUI.Events/ReactiveUI.Events_Net45.sln b/src/ReactiveUI.Events/ReactiveUI.Events_Net46.sln similarity index 93% rename from src/ReactiveUI.Events/ReactiveUI.Events_Net45.sln rename to src/ReactiveUI.Events/ReactiveUI.Events_Net46.sln index 8713234be6..9ef8c28993 100644 --- a/src/ReactiveUI.Events/ReactiveUI.Events_Net45.sln +++ b/src/ReactiveUI.Events/ReactiveUI.Events_Net46.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Events_Net45", "ReactiveUI.Events_Net45.csproj", "{600998C4-54DD-4755-BFA8-6F44544D8E2E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Events_Net46", "ReactiveUI.Events_Net46.csproj", "{600998C4-54DD-4755-BFA8-6F44544D8E2E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/ReactiveUI.Events/packages.ReactiveUI.Events_Net45.config b/src/ReactiveUI.Events/packages.ReactiveUI.Events_Net46.config similarity index 100% rename from src/ReactiveUI.Events/packages.ReactiveUI.Events_Net45.config rename to src/ReactiveUI.Events/packages.ReactiveUI.Events_Net46.config diff --git a/src/ReactiveUI.Testing/ReactiveUI.Testing_Net45.csproj b/src/ReactiveUI.Testing/ReactiveUI.Testing_Net46.csproj similarity index 97% rename from src/ReactiveUI.Testing/ReactiveUI.Testing_Net45.csproj rename to src/ReactiveUI.Testing/ReactiveUI.Testing_Net46.csproj index b56cac74aa..9411aef955 100644 --- a/src/ReactiveUI.Testing/ReactiveUI.Testing_Net45.csproj +++ b/src/ReactiveUI.Testing/ReactiveUI.Testing_Net46.csproj @@ -96,13 +96,13 @@ - + {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 + ReactiveUI_Net46 - + - + diff --git a/src/ReactiveUI-Testing.nuspec b/src/ReactiveUI-Testing.nuspec index 69a57a71d9..ca9f79cdc9 100644 --- a/src/ReactiveUI-Testing.nuspec +++ b/src/ReactiveUI-Testing.nuspec @@ -39,7 +39,7 @@ - + diff --git a/src/ReactiveUI.Blend/ReactiveUI.Blend_Net46.csproj b/src/ReactiveUI.Blend/ReactiveUI.Blend_Net46.csproj index 9f0a498b25..5452b06190 100644 --- a/src/ReactiveUI.Blend/ReactiveUI.Blend_Net46.csproj +++ b/src/ReactiveUI.Blend/ReactiveUI.Blend_Net46.csproj @@ -29,21 +29,21 @@ true full false - bin\Debug\Net45\ - obj\Debug\Net45 - DEBUG;TRACE;NET_45 + bin\Debug\Net46\ + obj\Debug\Net46 + DEBUG;TRACE;NET_46 prompt 4 pdbonly true - bin\Release\Net45\ - obj\Release\Net45 - TRACE;NET_45 + bin\Release\Net46\ + obj\Release\Net46 + TRACE;NET_46 prompt 4 - bin\Release\Net45\ReactiveUI.Blend.xml + bin\Release\Net46\ReactiveUI.Blend.xml diff --git a/src/ReactiveUI.Events/ReactiveUI.Events_Net46.csproj b/src/ReactiveUI.Events/ReactiveUI.Events_Net46.csproj index c84a261e7a..cd3dc7bdd3 100644 --- a/src/ReactiveUI.Events/ReactiveUI.Events_Net46.csproj +++ b/src/ReactiveUI.Events/ReactiveUI.Events_Net46.csproj @@ -9,7 +9,7 @@ Properties ReactiveUI.Events ReactiveUI.Events - v4.5 + v4.6 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -20,8 +20,8 @@ true full false - bin\Debug\Net45\ - obj\Debug\Net45 + bin\Debug\Net46\ + obj\Debug\Net46 DEBUG;TRACE prompt 4 @@ -29,8 +29,8 @@ pdbonly true - bin\Release\Net45\ - obj\Release\Net45 + bin\Release\Net46\ + obj\Release\Net46 TRACE prompt 4 @@ -78,7 +78,7 @@ - + diff --git a/src/ReactiveUI.Testing/ReactiveUI.Testing_Net46.csproj b/src/ReactiveUI.Testing/ReactiveUI.Testing_Net46.csproj index 9411aef955..e9172f3a03 100644 --- a/src/ReactiveUI.Testing/ReactiveUI.Testing_Net46.csproj +++ b/src/ReactiveUI.Testing/ReactiveUI.Testing_Net46.csproj @@ -10,7 +10,7 @@ Properties ReactiveUI.Testing ReactiveUI.Testing - v4.5 + v4.6 512 @@ -27,9 +27,9 @@ true full false - bin\Debug\Net45\ - obj\Debug\Net45 - DEBUG;TRACE;NET_45 + bin\Debug\Net46\ + obj\Debug\Net46 + DEBUG;TRACE;NET_46 prompt 4 ExtendedCorrectnessRules.ruleset @@ -38,12 +38,12 @@ pdbonly true - bin\Release\Net45\ - obj\Release\Net45 - TRACE;NET_45 + bin\Release\Net46\ + obj\Release\Net46 + TRACE;NET_46 prompt 4 - bin\Release\Net45\ReactiveUI.Testing.xml + bin\Release\Net46\ReactiveUI.Testing.xml 1591, 1573, 1711, 1587, 1570, 1572 diff --git a/src/ReactiveUI.Tests/ReactiveUI.Tests_Net46.csproj b/src/ReactiveUI.Tests/ReactiveUI.Tests_Net46.csproj index ff2cc22d69..53c5368a21 100644 --- a/src/ReactiveUI.Tests/ReactiveUI.Tests_Net46.csproj +++ b/src/ReactiveUI.Tests/ReactiveUI.Tests_Net46.csproj @@ -25,8 +25,8 @@ true full false - bin\Debug\Net45 - obj\Debug\Net45 + bin\Debug\Net46 + obj\Debug\Net46 DEBUG;TRACE prompt 4 @@ -35,8 +35,8 @@ pdbonly true - bin\Release\Net45 - obj\Release\Net45 + bin\Release\Net46 + obj\Release\Net46 TRACE prompt 4 diff --git a/src/ReactiveUI.Winforms/ReactiveUI.Winforms_Net46.csproj b/src/ReactiveUI.Winforms/ReactiveUI.Winforms_Net46.csproj index 80162ba590..8fbacfe393 100644 --- a/src/ReactiveUI.Winforms/ReactiveUI.Winforms_Net46.csproj +++ b/src/ReactiveUI.Winforms/ReactiveUI.Winforms_Net46.csproj @@ -10,7 +10,7 @@ Properties ReactiveUI ReactiveUI.Winforms - v4.5 + v4.6 512 @@ -29,7 +29,7 @@ true full false - bin\Debug\Net45\ + bin\Debug\Net46\ obj\Debug\WinForms_Net46 TRACE;DEBUG;WINFORMS prompt @@ -40,12 +40,12 @@ pdbonly true - bin\Release\Net45\ + bin\Release\Net46\ obj\Release\Winforms_Net46\ TRACE;WINFORMS prompt 4 - bin\Release\Net45\ReactiveUI.Winforms.xml + bin\Release\Net46\ReactiveUI.Winforms.xml 1591, 1573, 1711, 1587, 1570, 1572 diff --git a/src/ReactiveUI/Legacy/ReactiveCommand.cs b/src/ReactiveUI/Legacy/ReactiveCommand.cs index bf39b07586..fe251f54a3 100755 --- a/src/ReactiveUI/Legacy/ReactiveCommand.cs +++ b/src/ReactiveUI/Legacy/ReactiveCommand.cs @@ -318,7 +318,7 @@ public static ReactiveCommand CreateCombined(params IReactiveCommand[] c [Obsolete("This type is obsolete and will be removed in a future version of ReactiveUI. Please switch to using ReactiveUI.ReactiveCommand instead.")] public class ReactiveCommand : IReactiveCommand, IReactiveCommand { -#if NET_45 +#if NET_46 public event EventHandler CanExecuteChanged; protected virtual void raiseCanExecuteChanged(EventArgs args) diff --git a/src/ReactiveUI/Properties/AssemblyInfo.cs b/src/ReactiveUI/Properties/AssemblyInfo.cs index 320f96d6b0..0a6867f8b4 100644 --- a/src/ReactiveUI/Properties/AssemblyInfo.cs +++ b/src/ReactiveUI/Properties/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; using System.Windows; -#if NET_45 +#if NET_46 [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, diff --git a/src/ReactiveUI/ReactiveList.cs b/src/ReactiveUI/ReactiveList.cs index 225935136a..aa7c8f9745 100644 --- a/src/ReactiveUI/ReactiveList.cs +++ b/src/ReactiveUI/ReactiveList.cs @@ -23,7 +23,7 @@ namespace ReactiveUI [DebuggerTypeProxy(typeof(CollectionDebugView<>))] public class ReactiveList : IReactiveList, IReadOnlyReactiveList, IList { -#if NET_45 +#if NET_46 public event NotifyCollectionChangedEventHandler CollectionChanging; protected virtual void raiseCollectionChanging(NotifyCollectionChangedEventArgs args) diff --git a/src/ReactiveUI/ReactiveObject.cs b/src/ReactiveUI/ReactiveObject.cs index 291d923403..2131a37ff3 100644 --- a/src/ReactiveUI/ReactiveObject.cs +++ b/src/ReactiveUI/ReactiveObject.cs @@ -24,7 +24,7 @@ namespace ReactiveUI [DataContract] public class ReactiveObject : IReactiveNotifyPropertyChanged, IHandleObservableErrors, IReactiveObject { -#if NET_45 +#if NET_46 public event PropertyChangingEventHandler PropertyChanging; void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args) diff --git a/src/ReactiveUI/ReactiveUI_Net46.csproj b/src/ReactiveUI/ReactiveUI_Net46.csproj index f8a300d705..c1c1866797 100644 --- a/src/ReactiveUI/ReactiveUI_Net46.csproj +++ b/src/ReactiveUI/ReactiveUI_Net46.csproj @@ -22,9 +22,9 @@ true full false - bin\Debug\Net45\ - obj\Debug\Net45 - TRACE;DEBUG;NET_45; XAML + bin\Debug\Net46\ + obj\Debug\Net46 + TRACE;DEBUG;NET_46; XAML prompt 4 ExtendedCorrectnessRules.ruleset @@ -33,12 +33,12 @@ pdbonly true - bin\Release\Net45\ - bin\Release\Net45 - TRACE;NET_45; XAML + bin\Release\Net46\ + bin\Release\Net46 + TRACE;NET_46; XAML prompt 4 - bin\Release\Net45\ReactiveUI.xml + bin\Release\Net46\ReactiveUI.xml 1591, 1573, 1711, 1587, 1570, 1572 diff --git a/src/ReactiveUI/WeakEventManager.cs b/src/ReactiveUI/WeakEventManager.cs index ebe2c81d1b..28ab8af001 100644 --- a/src/ReactiveUI/WeakEventManager.cs +++ b/src/ReactiveUI/WeakEventManager.cs @@ -13,7 +13,7 @@ namespace ReactiveUI { -#if !NET_45 +#if !NET_46 internal class CanExecuteChangedEventManager : WeakEventManager { }