bumped from net45 to net452

reactiveui · Aug 4, 2017 · fa5ba4a · fa5ba4a
1 parent fea42cd
commit fa5ba4a
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 18 deletions.
diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -6,7 +6,7 @@
     <PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
     <Authors>ReactiveUI contributors</Authors>
     <Owners>xpaulbettsx;flagbug;ghuntley;haacked;kent.boogaart;mteper;moswald;niik;onovotny;rdavisau;shiftkey</Owners>
-    <PackageTags>mvvm;reactiveui;Rx;Reactive Extensions;Observable;LINQ;Events;xamarin;android;ios;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;wpf;winforms;uwp;winrt;net45;netcore;wp;wpdev;windowsphone;windowsstore</PackageTags>
+    <PackageTags>mvvm;reactiveui;Rx;Reactive Extensions;Observable;LINQ;Events;xamarin;android;ios;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;wpf;winforms;uwp;winrt;net452;netcore;wp;wpdev;windowsphone;windowsstore</PackageTags>
     <PackageReleaseNotes>https://github.com/reactiveui/reactiveui/releases</PackageReleaseNotes>
 
     <NoWarn>$(NoWarn);1591</NoWarn>

diff --git a/src/Directory.build.targets b/src/Directory.build.targets
@@ -2,8 +2,8 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
     <DefineConstants>$(DefineConstants);PORTABLE</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
-    <DefineConstants>$(DefineConstants);NET_45;XAML</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net452'">
+    <DefineConstants>$(DefineConstants);NET_452;XAML</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
     <DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS_UWP</DefineConstants>

diff --git a/src/EventBuilder/Platforms/WPF.cs b/src/EventBuilder/Platforms/WPF.cs
@@ -11,7 +11,7 @@ public class WPF : BasePlatform
         public WPF()
         {
             if (PlatformHelper.IsRunningOnMono()) {
-                throw new NotSupportedException("Building events for NET45 on Mac is not implemented.");
+                throw new NotSupportedException("Building events for WPF 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");

diff --git a/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj b/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net452;uap10.0</TargetFrameworks>
     <AssemblyName>ReactiveUI.Blend</AssemblyName>
     <RootNamespace>ReactiveUI.Blend</RootNamespace>
     <Description>Blend behaviors for ReactiveUI</Description>
@@ -15,8 +15,8 @@
     <PackageReference Include="Splat" Version="2.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Compile Include="Platforms\net45\**\*.cs" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Compile Include="Platforms\net452\**\*.cs" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />

diff --git a/src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj b/src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net452</TargetFrameworks>
     <AssemblyName>ReactiveUI.Events</AssemblyName>
     <RootNamespace>ReactiveUI.Events</RootNamespace>
     <Description>Provides Observable-based events API for WPF UI controls/eventhandlers. The contents of this package is automatically generated, please target pull-requests to the code generator.</Description>

diff --git a/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj b/src/ReactiveUI.Testing/ReactiveUI.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;uap10.0;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid70</TargetFrameworks>
+    <TargetFrameworks>net452;uap10.0;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid70</TargetFrameworks>
     <AssemblyName>ReactiveUI.Testing</AssemblyName>
     <RootNamespace>ReactiveUI.Testing</RootNamespace>
     <Description>A library to aid in writing unit tests for ReactiveUI projects</Description>

diff --git a/src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj b/src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net452</TargetFrameworks>
     <AssemblyName>ReactiveUI.Winforms</AssemblyName>
     <RootNamespace>ReactiveUI.Winforms</RootNamespace>
     <Description>Windows Forms specific extensions to ReactiveUI</Description>

diff --git a/src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj b/src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net452</TargetFramework>
     <DefineConstants>$(DefineConstants);WPF</DefineConstants>
     <Description>WPF specific extensions to ReactiveUI</Description>
     <PackageId>reactiveui-wpf</PackageId>

diff --git a/src/ReactiveUI/Legacy/ReactiveCommand.cs b/src/ReactiveUI/Legacy/ReactiveCommand.cs
@@ -320,7 +320,7 @@ public static ReactiveCommand<object> 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<T> : IReactiveCommand<T>, IReactiveCommand
     {
-#if NET_45
+#if NET_452
         public event EventHandler CanExecuteChanged;
 
         protected virtual void raiseCanExecuteChanged(EventArgs args)

diff --git a/...orms/net45/ComponentModelTypeConverter.cs → ...rms/net452/ComponentModelTypeConverter.cs b/...orms/net45/ComponentModelTypeConverter.cs → ...rms/net452/ComponentModelTypeConverter.cs
diff --git a/.../Platforms/net45/PlatformRegistrations.cs → ...Platforms/net452/PlatformRegistrations.cs b/.../Platforms/net45/PlatformRegistrations.cs → ...Platforms/net452/PlatformRegistrations.cs
diff --git a/src/ReactiveUI/ReactiveList.cs b/src/ReactiveUI/ReactiveList.cs
@@ -27,7 +27,7 @@ namespace ReactiveUI
     [DebuggerTypeProxy(typeof(CollectionDebugView<>))]
     public class ReactiveList<T> : IReactiveList<T>, IReadOnlyReactiveList<T>, IList
     {
-#if NET_45
+#if NET_452
         public event NotifyCollectionChangedEventHandler CollectionChanging;
 
         protected virtual void raiseCollectionChanging(NotifyCollectionChangedEventArgs args)

diff --git a/src/ReactiveUI/ReactiveObject.cs b/src/ReactiveUI/ReactiveObject.cs
@@ -28,7 +28,7 @@ namespace ReactiveUI
     [DataContract]
     public class ReactiveObject : IReactiveNotifyPropertyChanged<IReactiveObject>, IHandleObservableErrors, IReactiveObject
     {
-#if NET_45        
+#if NET_452        
         public event PropertyChangingEventHandler PropertyChanging;
 
         void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)

diff --git a/src/ReactiveUI/ReactiveUI.csproj b/src/ReactiveUI/ReactiveUI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.1;net45;uap10.0;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid70</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;net452;uap10.0;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid70</TargetFrameworks>
     <AssemblyName>ReactiveUI</AssemblyName>
     <RootNamespace>ReactiveUI</RootNamespace>
     <Description>A MVVM framework that integrates with the Reactive Extensions for .NET to create elegant, testable User Interfaces that run on any mobile or desktop platform. Supports Xamarin.iOS, Xamarin.Android, Xamarin.Mac, Xamarin Forms, WPF, Windows Forms, Windows Phone 8.1, Windows Store and Universal Windows Platform (UWP).</Description>
@@ -22,8 +22,8 @@
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-    <Compile Include="Platforms\net45\**\*.cs" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+    <Compile Include="Platforms\net452\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'!='netstandard1.1'">

diff --git a/src/ReactiveUI/WeakEventManager.cs b/src/ReactiveUI/WeakEventManager.cs
@@ -17,7 +17,7 @@
 
 namespace ReactiveUI
 {
-#if !NET_45
+#if !NET_452
     internal class CanExecuteChangedEventManager : WeakEventManager<ICommand, EventHandler, EventArgs>
     {
     }