Skip to content

Commit fac10b8

Browse files
ghuntleyghuntley
authored
revert: mintarget is no longer 460 as 452 is still supported (#1195)
This reverts commit 9738872.
1 parent 6550e96 commit fac10b8

33 files changed

Lines changed: 115 additions & 116 deletions

‎build.cake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Action<string, string> Package = (nuspec, basePath) =>
8383
RequireLicenseAcceptance = false,
8484

8585
Version = nugetVersion,
86-
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"},
86+
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"},
8787
ReleaseNotes = new [] { string.Format("{0}/releases", githubUrl) },
8888

8989
Symbols = false,
@@ -190,7 +190,7 @@ Task("GenerateEvents")
190190
generate("mac");
191191
generate("xamforms");
192192

193-
generate("net46");
193+
generate("net45");
194194

195195
generate("wpa81");
196196
generate("uwp");
@@ -224,7 +224,7 @@ Task("BuildEvents")
224224
build("ReactiveUI.Events_MAC.sln");
225225
build("ReactiveUI.Events_XamForms.sln");
226226

227-
build("ReactiveUI.Events_NET46.sln");
227+
build("ReactiveUI.Events_NET45.sln");
228228

229229
build("ReactiveUI.Events_WPA81.sln");
230230
build("ReactiveUI.Events_UWP.sln");
@@ -309,7 +309,7 @@ Task("RunUnitTests")
309309
.IsDependentOn("BuildReactiveUI")
310310
.Does(() =>
311311
{
312-
XUnit2("./src/ReactiveUI.Tests/bin/Release/Net46/ReactiveUI.Tests_Net46.dll", new XUnit2Settings {
312+
XUnit2("./src/ReactiveUI.Tests/bin/Release/Net45/ReactiveUI.Tests_Net45.dll", new XUnit2Settings {
313313
OutputDirectory = artifactDirectory,
314314
XmlReportV1 = true,
315315
NoAppDomain = true
@@ -447,4 +447,4 @@ Task("Default")
447447
// EXECUTION
448448
//////////////////////////////////////////////////////////////////////
449449

450-
RunTarget(target);
450+
RunTarget(target);

‎packages/repositories.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,28 @@
3333
<repository path="..\Playground-Wpa81\Playground-Wpa81.Windows\packages.config" />
3434
<repository path="..\Playground-Wpa81\Playground-Wpa81.WindowsPhone\packages.config" />
3535
<repository path="..\ReactiveUI.AndroidSupport\packages.config" />
36-
<repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_Net46.config" />
36+
<repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_Net45.config" />
3737
<repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_WinRT.config" />
3838
<repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_WP8.config" />
3939
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_Android_XS.config" />
40-
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_Net46.config" />
40+
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_Net45.config" />
4141
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WinRT.config" />
4242
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WinRT80.config" />
4343
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WP8.config" />
4444
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WP81.config" />
4545
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WPA81.config" />
4646
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Android.config" />
4747
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Mac.config" />
48-
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Net46.config" />
48+
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Net45.config" />
4949
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_WinRT.config" />
5050
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_WP8.config" />
5151
<repository path="..\ReactiveUI.Tests\packages.ReactiveUI.Tests_Android.config" />
52-
<repository path="..\ReactiveUI.Tests\packages.ReactiveUI.Tests_Net46.config" />
52+
<repository path="..\ReactiveUI.Tests\packages.ReactiveUI.Tests_Net45.config" />
5353
<repository path="..\ReactiveUI.Winforms\packages.config" />
5454
<repository path="..\ReactiveUI.XamForms\packages.config" />
5555
<repository path="..\ReactiveUI\packages.ReactiveUI.config" />
5656
<repository path="..\ReactiveUI\packages.ReactiveUI_Android.config" />
57-
<repository path="..\ReactiveUI\packages.ReactiveUI_Net46.config" />
57+
<repository path="..\ReactiveUI\packages.ReactiveUI_Net45.config" />
5858
<repository path="..\ReactiveUI\packages.ReactiveUI_UAP.config" />
5959
<repository path="..\ReactiveUI\packages.ReactiveUI_WinRT.config" />
6060
<repository path="..\ReactiveUI\packages.ReactiveUI_WinRT80.config" />

‎src/EventBuilder/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
55
</startup>
66
<appSettings>
77
<add key="serilog:minimum-level" value="Verbose"/>

‎src/EventBuilder/CommandLineOptions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public enum AutoPlatform
1010
Android,
1111
iOS,
1212
Mac,
13-
NET46,
13+
NET45,
1414
XamForms,
1515
UWP,
1616
WP81,
@@ -24,7 +24,7 @@ public class CommandLineOptions
2424

2525
[Option('p', "platform", Required = true,
2626
HelpText =
27-
"Platform to automatically generate. Possible options include: NONE, ANDROID, IOS, NET46, MAC, UWP, WP81, WPA81, XAMFORMS"
27+
"Platform to automatically generate. Possible options include: NONE, ANDROID, IOS, NET45, MAC, UWP, WP81, WPA81, XAMFORMS"
2828
)]
2929
public AutoPlatform Platform { get; set; }
3030

‎src/EventBuilder/EventBuilder.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>EventBuilder</RootNamespace>
1111
<AssemblyName>EventBuilder</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1515
<TargetFrameworkProfile />
@@ -113,7 +113,7 @@
113113
<Compile Include="Platforms\iOS.cs" />
114114
<Compile Include="Platforms\IPlatform.cs" />
115115
<Compile Include="Platforms\Mac.cs" />
116-
<Compile Include="Platforms\Net46.cs" />
116+
<Compile Include="Platforms\Net45.cs" />
117117
<Compile Include="Platforms\UWP.cs" />
118118
<Compile Include="Platforms\WP81.cs" />
119119
<Compile Include="Platforms\WPA81.cs" />

src/EventBuilder/Platforms/Net46.cs renamed to src/EventBuilder/Platforms/Net45.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88
namespace EventBuilder.Platforms
99
{
10-
public class Net46 : BasePlatform
10+
public class Net45 : BasePlatform
1111
{
12-
public Net46()
12+
public Net45()
1313
{
1414
if (PlatformHelper.IsRunningOnMono())
1515
{
16-
throw new NotSupportedException("Building events for NET46 on Mac is not implemented.");
16+
throw new NotSupportedException("Building events for NET45 on Mac is not implemented yet.");
1717
}
1818
else
1919
{
20-
Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6\WindowsBase.dll");
21-
Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6\PresentationCore.dll");
22-
Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6\PresentationFramework.dll");
20+
Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\WindowsBase.dll");
21+
Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\PresentationCore.dll");
22+
Assemblies.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\PresentationFramework.dll");
2323

24-
CecilSearchDirectories.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6");
24+
CecilSearchDirectories.Add(@"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5");
2525

2626
}
2727

‎src/EventBuilder/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ private static void Main(string[] args)
9292
platform = new Mac();
9393
break;
9494

95-
case AutoPlatform.NET46:
96-
platform = new Net46();
95+
case AutoPlatform.NET45:
96+
platform = new Net45();
9797
break;
9898

9999
case AutoPlatform.XamForms:

‎src/PerfConsoleRunner/PerfConsoleRunner.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>PerfConsoleRunner</RootNamespace>
1212
<AssemblyName>PerfConsoleRunner</AssemblyName>
13-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<TargetFrameworkProfile>
1515
</TargetFrameworkProfile>
1616
<FileAlignment>512</FileAlignment>
@@ -59,13 +59,13 @@
5959
<Compile Include="Properties\AssemblyInfo.cs" />
6060
</ItemGroup>
6161
<ItemGroup>
62-
<ProjectReference Include="..\ReactiveUI.Blend\ReactiveUI.Blend_Net46.csproj">
62+
<ProjectReference Include="..\ReactiveUI.Blend\ReactiveUI.Blend_Net45.csproj">
6363
<Project>{7866b5b1-5457-43a2-976a-e784eb10f2da}</Project>
64-
<Name>ReactiveUI.Blend_Net46</Name>
64+
<Name>ReactiveUI.Blend_Net45</Name>
6565
</ProjectReference>
66-
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Net46.csproj">
66+
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Net45.csproj">
6767
<Project>{1ce2d235-8072-4649-ba5a-cfb1af8776e0}</Project>
68-
<Name>ReactiveUI_Net46</Name>
68+
<Name>ReactiveUI_Net45</Name>
6969
</ProjectReference>
7070
</ItemGroup>
7171
<ItemGroup>

‎src/PerfConsoleRunner/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static int Main(string[] args)
2121
var relDir = "Release";
2222
#endif
2323

24-
var testAssembly = Path.Combine(solutionDir, @"ReactiveUI.Tests\bin\Debug\Net46\ReactiveUI.Tests_Net46.dll")
24+
var testAssembly = Path.Combine(solutionDir, @"ReactiveUI.Tests\bin\Debug\Net45\ReactiveUI.Tests_Net45.dll")
2525
.Replace("Debug", relDir);
2626

2727
Xunit.ConsoleClient.Program.Main(new[] { testAssembly });

‎src/ReactiveUI-Blend.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<!-- Windows Universal -->
3939
<file src="bin/Release/UAP10.0/ReactiveUI.Blend_UWP.dll" target="lib/UAP10/ReactiveUI.Blend_UWP.dll" />
4040
<!-- .NET 4.5 -->
41-
<file src="bin/Release/Net46/ReactiveUI.Blend.dll" target="lib/Net46/ReactiveUI.Blend.dll" />
41+
<file src="bin/Release/Net45/ReactiveUI.Blend.dll" target="lib/Net45/ReactiveUI.Blend.dll" />
4242
<!-- Source -->
4343
<file src="*.cs" target="src" />
4444
</files>

0 commit comments

Comments
 (0)