Skip to content
Permalink
Browse files

fix: use netstandard 2.0 compatible version of splat (#1579)

  • Loading branch information...
ghuntley committed Apr 30, 2018
1 parent 17ca554 commit 12fc3e39eb027ff5c415a2076f67bf8dfad10213
Showing with 59 additions and 75 deletions.
  1. +1 −1 CONTRIBUTING.md
  2. +2 −2 build.cake
  3. +1 −1 src/Directory.build.props
  4. +6 −8 src/Directory.build.targets
  5. +1 −1 src/EventBuilder/EventBuilder.csproj
  6. +1 −1 src/EventBuilder/Platforms/WPF.cs
  7. +2 −2 src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
  8. +2 −1 src/ReactiveUI.Blend/FollowObservableStateBehavior.cs
  9. 0 src/ReactiveUI.Blend/Platforms/{net45 → net461}/ObservableTrigger.cs
  10. 0 src/ReactiveUI.Blend/Platforms/{uap10.0 → uap10.0.16299}/Behavior.cs
  11. 0 src/ReactiveUI.Blend/Platforms/{uap10.0 → uap10.0.16299}/ObservableTriggerBehavior.cs
  12. +7 −7 src/ReactiveUI.Blend/ReactiveUI.Blend.csproj
  13. +1 −1 src/ReactiveUI.Events.WPF/ReactiveUI.Events.WPF.csproj
  14. +2 −5 src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj
  15. +6 −6 src/ReactiveUI.Events/ReactiveUI.Events.csproj
  16. +1 −1 src/ReactiveUI.Testing/ReactiveUI.Testing.csproj
  17. +1 −1 src/ReactiveUI.Tests/API/ApiApprovalTests.Blend.approved.txt
  18. +3 −3 src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.approved.txt
  19. +1 −1 src/ReactiveUI.Tests/API/ApiApprovalTests.Testing.approved.txt
  20. +1 −2 src/ReactiveUI.Tests/API/ApiApprovalTests.Winforms.approved.txt
  21. +2 −2 src/ReactiveUI.Tests/ReactiveUI.Tests.csproj
  22. +0 −10 src/ReactiveUI.Winforms/Properties/AssemblyInfo.cs
  23. +1 −1 src/ReactiveUI.Winforms/ReactiveUI.Winforms.csproj
  24. +1 −1 src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj
  25. +2 −3 src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj
  26. 0 src/ReactiveUI/Platforms/{net45 → net461}/ComponentModelTypeConverter.cs
  27. 0 src/ReactiveUI/Platforms/{net45 → net461}/PlatformRegistrations.cs
  28. 0 src/ReactiveUI/Platforms/{netcoreapp1.0 → netcoreapp2.0}/PlatformRegistrations.cs
  29. 0 src/ReactiveUI/Platforms/{netstandard1.1 → netstandard2.0}/PlatformRegistrations.cs
  30. 0 src/ReactiveUI/Platforms/{uap10.0 → uap10.0.16299}/DependencyObjectObservableForProperty.cs
  31. 0 src/ReactiveUI/Platforms/{uap10.0 → uap10.0.16299}/PlatformRegistrations.cs
  32. 0 src/ReactiveUI/Platforms/{uap10.0 → uap10.0.16299}/TransitioningContentControl.Empty.cs
  33. 0 src/ReactiveUI/Platforms/{uap10.0 → uap10.0.16299}/WinRTAppDataDriver.cs
  34. 0 src/ReactiveUI/Platforms/{uap10.0 → uap10.0.16299}/WinRTAutoSuspendApplication.cs
  35. +14 −14 src/ReactiveUI/ReactiveUI.csproj
@@ -147,7 +147,7 @@ from the main (upstream) repository:
- .NET desktop development workload
- Mobile development with .NET workload
- .NET Core cross-platform development
- Windows 10 SDK 10.0.14393 (individual component)
- Windows 10 SDK 10.0.16299 (individual component)
- PowerShell
- Android SDK Platform 26 (install through Visual Studio)

@@ -127,8 +127,8 @@ Task("GenerateEvents")
.IsDependentOn("BuildEventBuilder")
.Does (() =>
{
var eventBuilder = "./src/EventBuilder/bin/Release/net452/EventBuilder.exe";
var workingDirectory = "./src/EventBuilder/bin/Release/Net452";
var eventBuilder = "./src/EventBuilder/bin/Release/net461/EventBuilder.exe";
var workingDirectory = "./src/EventBuilder/bin/Release/Net461";
var referenceAssembliesPath = VSWhereLatest().CombineWithFilePath("./Common7/IDE/ReferenceAssemblies/Microsoft/Framework");

Information(referenceAssembliesPath.ToString());
@@ -6,7 +6,7 @@
<PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
<Authors>.NET Foundation and Contributors</Authors>
<Owners>xpaulbettsx;ghuntley</Owners>
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;ios;mac;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;xamarin.mac;wpf;net;net45;uwp;tizen</PackageTags>
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;ios;mac;forms;monodroid;monotouch;xamarin.android;xamarin.ios;xamarin.forms;xamarin.mac;wpf;net;netstandard;net461;uwp;tizen</PackageTags>
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>

<NoWarn>$(NoWarn);1591;1701;1702;1705</NoWarn>
@@ -1,14 +1,12 @@
<Project>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>$(DefineConstants);PORTABLE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<DefineConstants>$(DefineConstants);NET_45;XAML</DefineConstants>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
<DefineConstants>$(DefineConstants);NET_461;XAML</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS_UWP</DefineConstants>
<TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.iOS10'">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA</DefineConstants>
@@ -19,10 +17,10 @@
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid80'">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0.0'">
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.8" />
</ItemGroup>
</Project>
@@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net452</TargetFramework>
<TargetFramework>net461</TargetFramework>
<AssemblyName>EventBuilder</AssemblyName>
<RootNamespace>EventBuilder</RootNamespace>
</PropertyGroup>
@@ -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");
@@ -16,7 +16,7 @@
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="26.1.0.1" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Reactive" Version="[3.1.1,4)" />
<PackageReference Include="Splat" Version="2.0.0" />
<PackageReference Include="Splat" Version="4.0.0" />
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>

@@ -26,4 +26,4 @@

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />

</Project>
</Project>
@@ -5,6 +5,7 @@
using System;
using System.Reactive.Linq;


#if NETFX_CORE
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
@@ -88,4 +89,4 @@ protected static void onStateObservableChanged(DependencyObject sender, Dependen
});
}
}
}
}
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net45;uap10.0</TargetFrameworks>
<TargetFrameworks>net461;uap10.0.16299</TargetFrameworks>
<AssemblyName>ReactiveUI.Blend</AssemblyName>
<RootNamespace>ReactiveUI.Blend</RootNamespace>
<Description>Blend behaviors for ReactiveUI</Description>
@@ -12,11 +12,11 @@
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />
<PackageReference Include="System.Reactive" Version="[3.1.1,4)" />
<PackageReference Include="Splat" Version="2.0.0" />
<PackageReference Include="Splat" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Compile Include="Platforms\net45\**\*.cs" />
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Compile Include="Platforms\net461\**\*.cs" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
@@ -25,8 +25,8 @@
<PackageReference Include="Expression.Blend.Sdk" Version="1.0.2" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
<Compile Include="Platforms\uap10.0\**\*.cs" />
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">
<Compile Include="Platforms\uap10.0.16299\**\*.cs" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="1.1.0" />
</ItemGroup>

@@ -35,4 +35,4 @@
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
</Project>
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45</TargetFrameworks>
<TargetFrameworks>net461</TargetFrameworks>
<AssemblyName>ReactiveUI.Events.WPF</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>
@@ -1,9 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard1.3</TargetFrameworks>
<PackageTargetFallback Condition="'$(TargetFramework)' == 'netstandard1.3'">
$(PackageTargetFallback);portable-win+net45+wp8+win81+wpa8
</PackageTargetFallback>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<AssemblyName>ReactiveUI.Events.XamForms</AssemblyName>
<RootNamespace>ReactiveUI.Events</RootNamespace>
<Description>Provides Observable-based events API for Xamarin Forms UI controls/eventhandlers. The contents of this package is automatically generated, please target pull-requests to the code generator.</Description>
@@ -18,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="2.5.0.91635" />
<PackageReference Include="Xamarin.Forms" Version="2.5.1.444934" />
<Compile Include="Events_XAMFORMS.cs" />
</ItemGroup>

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>uap10.0;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid80</TargetFrameworks>
<TargetFrameworks>uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid80</TargetFrameworks>
<AssemblyName>ReactiveUI.Events</AssemblyName>
<RootNamespace>ReactiveUI.Events</RootNamespace>
<Description>Provides Observable-based events API for common UI controls/eventhandlers. The contents of this package is automatically generated, please target pull-requests to the code generator.</Description>
@@ -14,14 +14,14 @@
<PackageReference Include="System.Reactive" Version="[3.1.1,4)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">
<Compile Include="Events_UWP.cs" Condition="Exists('Events_UWP.cs')" />
<SDKReference Include="WindowsDesktop, Version=10.0.14393.0">
<SDKReference Include="WindowsDesktop, Version=10.0.16299.0">
<Name>Windows Desktop Extensions for the UWP</Name>
</SDKReference>
<SDKReference Include="WindowsMobile, Version=10.0.14393.0">
<Name>Windows Mobile Extensions for the UWP</Name>
</SDKReference>
<SDKReference Include="WindowsMobile, Version=10.0.16299.0">
<Name>Windows Mobile Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'Xamarin.iOS10' ">
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.1;net45;uap10.0;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid80</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid80</TargetFrameworks>
<AssemblyName>ReactiveUI.Testing</AssemblyName>
<RootNamespace>ReactiveUI.Testing</RootNamespace>
<Description>A library to aid in writing unit tests for ReactiveUI projects</Description>
@@ -1,4 +1,4 @@
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")]
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName=".NET Framework 4.6.1")]
namespace ReactiveUI.Blend
{
public class FollowObservableStateBehavior : System.Windows.Interactivity.Behavior<System.Windows.FrameworkElement>
@@ -3,7 +3,7 @@
[assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("ReactiveUI.Winforms")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("ReactiveUI.Wpf")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("ReactiveUI.XamForms")]
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")]
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName=".NET Framework 4.6.1")]
namespace ReactiveUI
{
public class static AutoPersistHelper
@@ -599,8 +599,8 @@ namespace ReactiveUI
public virtual void Move(int oldIndex, int newIndex) { }
protected void MoveItem(int oldIndex, int newIndex) { }
protected virtual void publishResetNotification() { }
protected virtual void raiseCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs args) { }
protected virtual void raiseCollectionChanging(System.Collections.Specialized.NotifyCollectionChangedEventArgs args) { }
protected virtual void raiseCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { }
protected virtual void raiseCollectionChanging(System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { }
public virtual bool Remove(T item) { }
public virtual void RemoveAll(System.Collections.Generic.IEnumerable<T> items) { }
public virtual void RemoveAt(int index) { }
@@ -1,4 +1,4 @@
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")]
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName=".NET Framework 4.6.1")]
namespace ReactiveUI.Testing
{
public class static TestUtils
@@ -1,5 +1,4 @@
[assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("ReactiveUI.Tests_Net45")]
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")]
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6.1", FrameworkDisplayName=".NET Framework 4.6.1")]
namespace ReactiveUI.Winforms
{
public class ActivationForViewFetcher : ReactiveUI.IActivationForViewFetcher, Splat.IEnableLogger
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net452</TargetFramework>
<TargetFrameworks>net461</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

@@ -42,7 +42,7 @@
<None Include="Platforms\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Compile Include="Platforms\Winforms\**\*.cs" />
<Compile Include="Platforms\Xaml\**\*.cs" />
</ItemGroup>

This file was deleted.

Oops, something went wrong.
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net45</TargetFrameworks>
<TargetFrameworks>net461</TargetFrameworks>
<AssemblyName>ReactiveUI.Winforms</AssemblyName>
<RootNamespace>ReactiveUI.Winforms</RootNamespace>
<Description>Windows Forms specific extensions to ReactiveUI</Description>
@@ -6,7 +6,7 @@
<Import Project="obj\*.props" Condition=" '$(MSBuildProjectExtension)' == '.tmp_proj'" />

<PropertyGroup>
<TargetFramework>net45</TargetFramework>
<TargetFramework>net461</TargetFramework>
<Description>WPF specific extensions to ReactiveUI</Description>
<PackageId>ReactiveUI.WPF</PackageId>
</PropertyGroup>
@@ -1,14 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.3</TargetFrameworks>
<PackageTargetFallback>$(PackageTargetFallback);portable-win+net45+wp8+win81+wpa8</PackageTargetFallback>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<Description>Xamarin Forms specific extensions to ReactiveUI</Description>
<PackageId>ReactiveUI.XamForms</PackageId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="2.5.0.91635" />
<PackageReference Include="Xamarin.Forms" Version="2.5.1.444934" />
</ItemGroup>

<ItemGroup>
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard1.1;net45;uap10.0;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid80;netcoreapp1.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;uap10.0.16299;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid80;netcoreapp2.0</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>
@@ -11,28 +11,28 @@
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />
<PackageReference Include="System.Reactive" Version="[3.1.1,4)" />
<PackageReference Include="Splat" Version="2.0.0" />
<PackageReference Include="Splat" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
<Compile Include="Platforms\netstandard1.1\**\*.cs" />
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<Compile Include="Platforms\netstandard2.0\**\*.cs" />
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Compile Include="Platforms\net45\**\*.cs" />
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<Compile Include="Platforms\net461\**\*.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'!='netstandard1.1'">
<Compile Include="Platforms\shared\**\*.cs" />
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<Compile Include="Platforms\shared\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">
<Compile Include="Platforms\windows-common\**\*.cs" />
<Compile Include="Platforms\uap10.0\**\*.cs" />
<Compile Include="Platforms\uap10.0.16299\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'Xamarin.iOS10' ">
@@ -55,9 +55,9 @@
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<Compile Include="Platforms\netcoreapp1.0\**\*.cs" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<Compile Include="Platforms\netcoreapp2.0\**\*.cs" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
@@ -70,4 +70,4 @@
</ItemGroup>

<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>
</Project>

0 comments on commit 12fc3e3

Please sign in to comment.
You can’t perform that action at this time.