Skip to content

refactor: retargeted from net45 to net46 as it is EOL #1184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 29, 2016
Merged

refactor: retargeted from net45 to net46 as it is EOL #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a248c6c
refactor: retargeted from net45 to net46 as it is EOL
ghuntley Oct 29, 2016
132cb12
Merge branch 'rxui7-master' into net46
ghuntley Oct 29, 2016
b7f92e8
fixed build script
ghuntley Oct 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Action<string, string> 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<string>(releaseNotes.Notes),

Symbols = true,
Expand Down Expand Up @@ -201,7 +201,7 @@ Task("GenerateEvents")
generate("mac");
generate("xamforms");

generate("net45");
generate("net46");

generate("wpa81");
generate("uwp");
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions packages/repositories.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,28 @@
<repository path="..\Playground-Wpa81\Playground-Wpa81.Windows\packages.config" />
<repository path="..\Playground-Wpa81\Playground-Wpa81.WindowsPhone\packages.config" />
<repository path="..\ReactiveUI.AndroidSupport\packages.config" />
<repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_Net45.config" />
<repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_Net46.config" />
<repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_WinRT.config" />
<repository path="..\ReactiveUI.Blend\packages.ReactiveUI.Blend_WP8.config" />
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_Android_XS.config" />
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_Net45.config" />
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_Net46.config" />
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WinRT.config" />
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WinRT80.config" />
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WP8.config" />
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WP81.config" />
<repository path="..\ReactiveUI.Events\packages.ReactiveUI.Events_WPA81.config" />
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Android.config" />
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Mac.config" />
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Net45.config" />
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_Net46.config" />
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_WinRT.config" />
<repository path="..\ReactiveUI.Testing\packages.ReactiveUI.Testing_WP8.config" />
<repository path="..\ReactiveUI.Tests\packages.ReactiveUI.Tests_Android.config" />
<repository path="..\ReactiveUI.Tests\packages.ReactiveUI.Tests_Net45.config" />
<repository path="..\ReactiveUI.Tests\packages.ReactiveUI.Tests_Net46.config" />
<repository path="..\ReactiveUI.Winforms\packages.config" />
<repository path="..\ReactiveUI.XamForms\packages.config" />
<repository path="..\ReactiveUI\packages.ReactiveUI.config" />
<repository path="..\ReactiveUI\packages.ReactiveUI_Android.config" />
<repository path="..\ReactiveUI\packages.ReactiveUI_Net45.config" />
<repository path="..\ReactiveUI\packages.ReactiveUI_Net46.config" />
<repository path="..\ReactiveUI\packages.ReactiveUI_UAP.config" />
<repository path="..\ReactiveUI\packages.ReactiveUI_WinRT.config" />
<repository path="..\ReactiveUI\packages.ReactiveUI_WinRT80.config" />
Expand Down
2 changes: 1 addition & 1 deletion src/EventBuilder/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
</startup>
<appSettings>
<add key="serilog:minimum-level" value="Verbose"/>
Expand Down
4 changes: 2 additions & 2 deletions src/EventBuilder/CommandLineOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public enum AutoPlatform
Android,
iOS,
Mac,
NET45,
NET46,
XamForms,
UWP,
WP81,
Expand All @@ -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; }

Expand Down
6 changes: 3 additions & 3 deletions src/EventBuilder/EventBuilder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>EventBuilder</RootNamespace>
<AssemblyName>EventBuilder</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -113,7 +113,7 @@
<Compile Include="Platforms\iOS.cs" />
<Compile Include="Platforms\IPlatform.cs" />
<Compile Include="Platforms\Mac.cs" />
<Compile Include="Platforms\Net45.cs" />
<Compile Include="Platforms\Net46.cs" />
<Compile Include="Platforms\UWP.cs" />
<Compile Include="Platforms\WP81.cs" />
<Compile Include="Platforms\WPA81.cs" />
Expand Down
14 changes: 7 additions & 7 deletions src/EventBuilder/Platforms/Net45.cs → src/EventBuilder/Platforms/Net46.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

}

Expand Down
4 changes: 2 additions & 2 deletions src/EventBuilder/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions src/PerfConsoleRunner/PerfConsoleRunner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PerfConsoleRunner</RootNamespace>
<AssemblyName>PerfConsoleRunner</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -59,13 +59,13 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI.Blend\ReactiveUI.Blend_Net45.csproj">
<ProjectReference Include="..\ReactiveUI.Blend\ReactiveUI.Blend_Net46.csproj">
<Project>{7866b5b1-5457-43a2-976a-e784eb10f2da}</Project>
<Name>ReactiveUI.Blend_Net45</Name>
<Name>ReactiveUI.Blend_Net46</Name>
</ProjectReference>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Net45.csproj">
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Net46.csproj">
<Project>{1ce2d235-8072-4649-ba5a-cfb1af8776e0}</Project>
<Name>ReactiveUI_Net45</Name>
<Name>ReactiveUI_Net46</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/PerfConsoleRunner/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI-Blend.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<!-- Windows Universal -->
<file src="bin/Release/UAP10.0/ReactiveUI.Blend_UWP.dll" target="lib/UAP10/ReactiveUI.Blend_UWP.dll" />
<!-- .NET 4.5 -->
<file src="bin/Release/Net45/ReactiveUI.Blend.dll" target="lib/Net45/ReactiveUI.Blend.dll" />
<file src="bin/Release/Net46/ReactiveUI.Blend.dll" target="lib/Net46/ReactiveUI.Blend.dll" />
<!-- Source -->
<file src="*.cs" target="src" />
</files>
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI-Core.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@
<!-- iOS Unified API -->
<file src="bin/Release/Xamarin.iOS10/ReactiveUI.dll" target="lib/Xamarin.iOS10/ReactiveUI.dll" />
<!-- Xamarin Mac Unified API -->
<file src="bin/Release/Xamarin.Mac20/ReactiveUI.dll" target="lib/Xamarin.Mac20/ReactiveUI.dll" />
<file src="bin/Release/Xamarin.Mac20/ReactiveUI.dll" target="lib/Xamarin.Mac20/ReactiveUI.dll" />
<!-- Windows Store 8.1 -->
<file src="bin/Release/Portable-Win81+Wpa81/ReactiveUI.dll" target="lib/Portable-Win81+Wpa81/ReactiveUI.dll" />
<!-- Windows Universal -->
<file src="bin/Release/UAP10.0/ReactiveUI.dll" target="lib/UAP10/ReactiveUI.dll" />
<!-- .NET 4.5 -->
<file src="bin/Release/Net45/ReactiveUI.dll" target="lib/Net45/ReactiveUI.dll" />
<file src="bin/Release/Net46/ReactiveUI.dll" target="lib/Net46/ReactiveUI.dll" />
<!-- Portable PCL -->
<file src="bin/Release/portable-net45+netcore45+wpa81+win8+wp8+UAP10+MonoAndroid403+MonoTouch10+Xamarin.iOS10/ReactiveUI.dll" target="lib/portable-net45+netcore45+wpa81+win8+wp8+UAP10+MonoAndroid403+MonoTouch10+Xamarin.iOS10/ReactiveUI.dll" />
<!-- Source -->
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI-Events.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- Windows Universal -->
<file src="bin/Release/UAP10.0/ReactiveUI.Events.dll" target="lib/UAP10/ReactiveUI.Events.dll" />
<!-- .NET 4.5 -->
<file src="bin/Release/Net45/ReactiveUI.Events.dll" target="lib/Net45/ReactiveUI.Events.dll" />
<file src="bin/Release/Net46/ReactiveUI.Events.dll" target="lib/Net46/ReactiveUI.Events.dll" />
<!-- Source -->
<file src="*.cs" target="src" />
</files>
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI-Testing.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
<!-- iOS Unified API -->
<file src="bin/Release/Xamarin.iOS10/ReactiveUI.Testing.dll" target="lib/Xamarin.iOS10/ReactiveUI.Testing.dll" />
<!-- Xamarin Mac Unified API -->
<file src="bin/Release/Xamarin.Mac20/ReactiveUI.Testing.dll" target="lib/Xamarin.Mac20/ReactiveUI.Testing.dll" />
<file src="bin/Release/Xamarin.Mac20/ReactiveUI.Testing.dll" target="lib/Xamarin.Mac20/ReactiveUI.Testing.dll" />
<!-- Windows Store 8.1 -->
<file src="bin/Release/Portable-Win81+WPA81/ReactiveUI.Testing.dll" target="lib/Portable-Win81+WPA81/ReactiveUI.Testing.dll" />
<!-- Windows Universal -->
<file src="bin/Release/UAP10.0/ReactiveUI.Testing.dll" target="lib/UAP10/ReactiveUI.Testing.dll" />
<!-- .NET 4.5 -->
<file src="bin/Release/Net45/ReactiveUI.Testing.dll" target="lib/Net45/ReactiveUI.Testing.dll" />
<file src="bin/Release/Net46/ReactiveUI.Testing.dll" target="lib/Net46/ReactiveUI.Testing.dll" />
<!-- Source -->
<file src="*.cs" target="src" />
</files>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI-Winforms.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</metadata>
<files>
<!-- .NET 4.5 -->
<file src="bin/Release/Net45/ReactiveUI.Winforms.dll" target="lib/Net45/ReactiveUI.Winforms.dll" />
<file src="bin/Release/Net46/ReactiveUI.Winforms.dll" target="lib/Net46/ReactiveUI.Winforms.dll" />
<!-- Source -->
<file src="*.cs" target="src" />
</files>
Expand Down
24 changes: 12 additions & 12 deletions ...iveUI.Blend/ReactiveUI.Blend_Net45.csproj → ...iveUI.Blend/ReactiveUI.Blend_Net46.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReactiveUI.Blend</RootNamespace>
<AssemblyName>ReactiveUI.Blend</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
Expand All @@ -29,21 +29,21 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\Net45\</OutputPath>
<IntermediateOutputPath>obj\Debug\Net45</IntermediateOutputPath>
<DefineConstants>DEBUG;TRACE;NET_45</DefineConstants>
<OutputPath>bin\Debug\Net46\</OutputPath>
<IntermediateOutputPath>obj\Debug\Net46</IntermediateOutputPath>
<DefineConstants>DEBUG;TRACE;NET_46</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\Net45\</OutputPath>
<IntermediateOutputPath>obj\Release\Net45</IntermediateOutputPath>
<DefineConstants>TRACE;NET_45</DefineConstants>
<OutputPath>bin\Release\Net46\</OutputPath>
<IntermediateOutputPath>obj\Release\Net46</IntermediateOutputPath>
<DefineConstants>TRACE;NET_46</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Net45\ReactiveUI.Blend.xml</DocumentationFile>
<DocumentationFile>bin\Release\Net46\ReactiveUI.Blend.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
Expand Down Expand Up @@ -91,12 +91,12 @@
<Compile Include="ObservableTrigger.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.ReactiveUI.Blend_Net45.config" />
<None Include="packages.ReactiveUI.Blend_Net46.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Net45.csproj">
<ProjectReference Include="..\ReactiveUI\ReactiveUI_Net46.csproj">
<Project>{1ce2d235-8072-4649-ba5a-cfb1af8776e0}</Project>
<Name>ReactiveUI_Net45</Name>
<Name>ReactiveUI_Net46</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
0 ...nd/packages.ReactiveUI.Blend_Net45.config → ...nd/packages.ReactiveUI.Blend_Net46.config
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...eUI.Events/ReactiveUI.Events_Net45.csproj → ...eUI.Events/ReactiveUI.Events_Net46.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReactiveUI.Events</RootNamespace>
<AssemblyName>ReactiveUI.Events</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
Expand All @@ -20,17 +20,17 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\Net45\</OutputPath>
<IntermediateOutputPath>obj\Debug\Net45</IntermediateOutputPath>
<OutputPath>bin\Debug\Net46\</OutputPath>
<IntermediateOutputPath>obj\Debug\Net46</IntermediateOutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\Net45\</OutputPath>
<IntermediateOutputPath>obj\Release\Net45</IntermediateOutputPath>
<OutputPath>bin\Release\Net46\</OutputPath>
<IntermediateOutputPath>obj\Release\Net46</IntermediateOutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand Down Expand Up @@ -78,15 +78,15 @@
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs" />
<Compile Include="Events_NET45.cs" />
<Compile Include="Events_NET46.cs" />
<Compile Include="SingleAwaitSubject.cs" />
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<None Include="packages.ReactiveUI.Events_Net45.config">
<None Include="packages.ReactiveUI.Events_Net46.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...tiveUI.Events/ReactiveUI.Events_Net45.sln → ...tiveUI.Events/ReactiveUI.Events_Net46.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...s/packages.ReactiveUI.Events_Net45.config → ...s/packages.ReactiveUI.Events_Net46.config
View file
Open in desktop
File renamed without changes.
Loading