diff --git a/build.cake b/build.cake index faedaa8dd8..80e4cb85f2 100644 --- a/build.cake +++ b/build.cake @@ -94,7 +94,7 @@ Action Package = (nuspec, basePath) => RequireLicenseAcceptance = false, Version = semVersion, - Tags = new [] {"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"}, + Tags = new [] {"mvvm", "reactiveui", "Rx", "Reactive Extensions", "Observable", "LINQ", "Events", "xamarin", "android", "ios", "forms", "monodroid", "monotouch", "xamarin.android", "xamarin.ios", "xamarin.forms", "wpf", "winforms", "uwp", "winrt", "net46", "netcore", "wp", "wpdev", "windowsphone", "windowsstore"}, ReleaseNotes = new List(releaseNotes.Notes), Symbols = true, @@ -201,7 +201,7 @@ Task("GenerateEvents") generate("mac"); generate("xamforms"); - generate("net45"); + generate("net46"); generate("wpa81"); generate("uwp"); @@ -235,7 +235,7 @@ Task("BuildEvents") build("ReactiveUI.Events_MAC.sln"); build("ReactiveUI.Events_XamForms.sln"); - build("ReactiveUI.Events_NET45.sln"); + build("ReactiveUI.Events_NET46.sln"); build("ReactiveUI.Events_WPA81.sln"); build("ReactiveUI.Events_UWP.sln"); @@ -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/Net46/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..78b08cb396 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, @@ -24,7 +24,7 @@ public class CommandLineOptions [Option('p', "platform", Required = true, HelpText = - "Platform to automatically generate. Possible options include: NONE, ANDROID, IOS, NET45, MAC, UWP, WP81, WPA81, XAMFORMS" + "Platform to automatically generate. Possible options include: NONE, ANDROID, IOS, NET46, MAC, UWP, WP81, WPA81, XAMFORMS" )] public AutoPlatform Platform { get; set; } 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..c3c91ccef8 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 NET46 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..621cb63eb2 100644 --- a/src/PerfConsoleRunner/PerfConsoleRunner.csproj +++ b/src/PerfConsoleRunner/PerfConsoleRunner.csproj @@ -10,7 +10,7 @@ Properties PerfConsoleRunner PerfConsoleRunner - v4.5 + v4.6 512 @@ -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..1b30b217aa 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\Net46\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..7c6b08412b 100644 --- a/src/ReactiveUI-Core.nuspec +++ b/src/ReactiveUI-Core.nuspec @@ -61,13 +61,13 @@ - + - + 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..ca9f79cdc9 100644 --- a/src/ReactiveUI-Testing.nuspec +++ b/src/ReactiveUI-Testing.nuspec @@ -39,13 +39,13 @@ - + - + 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 86% rename from src/ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj rename to src/ReactiveUI.Blend/ReactiveUI.Blend_Net46.csproj index 5399922f98..5452b06190 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 @@ -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 @@ -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 92% rename from src/ReactiveUI.Events/ReactiveUI.Events_Net45.csproj rename to src/ReactiveUI.Events/ReactiveUI.Events_Net46.csproj index a034e4274f..cd3dc7bdd3 100644 --- a/src/ReactiveUI.Events/ReactiveUI.Events_Net45.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 @@ - + @@ -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 89% rename from src/ReactiveUI.Testing/ReactiveUI.Testing_Net45.csproj rename to src/ReactiveUI.Testing/ReactiveUI.Testing_Net46.csproj index b56cac74aa..e9172f3a03 100644 --- a/src/ReactiveUI.Testing/ReactiveUI.Testing_Net45.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 @@ -96,13 +96,13 @@ - + {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 + ReactiveUI_Net46 - +