Skip to content

Commit

Permalink
Updated dependency library version to System.Reactive 4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
runceel committed Jun 3, 2018
1 parent c66f224 commit a3d59da
Show file tree
Hide file tree
Showing 39 changed files with 230 additions and 503 deletions.
101 changes: 34 additions & 67 deletions BuildTools/ReactiveProperty.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,121 +2,88 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>ReactiveProperty</id>
<version>4.2.2</version>
<version>5.0.0</version>
<title>ReactiveProperty</title>
<authors>neuecc xin9le okazuki</authors>
<owners>neuecc xin9le okazuki</owners>
<licenseUrl>https://github.com/runceel/ReactiveProperty/blob/master/LICENSE.txt</licenseUrl>
<projectUrl>https://github.com/runceel/ReactiveProperty</projectUrl>
<iconUrl>http://neue.cc/ReactivePropertyIcon_100x100.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>ReactiveProperty is MVVM and Asynchronous Extensions for Reactive Extensions(System.Reactive). Target is .NET 4.6, UWP ,Xamarin(Android, iOS, Forms) and .NET Standard 1.3.</description>
<description>ReactiveProperty is MVVM and Asynchronous Extensions for Reactive Extensions(System.Reactive). Target platform is .NET Standard 2.0.</description>
<summary />
<language>en-US</language>
<tags>rx mvvm async rx-main reactive</tags>
<dependencies>
<group targetFramework="net46">
<dependency id="System.Reactive" version="3.1.1" />
</group>
<group targetFramework="uap10.0">
<dependency id="System.Reactive" version="3.1.1" />
<dependency id="Microsoft.Xaml.Behaviors.Uwp.Managed" version="2.0.0" />
</group>
<group targetFramework="MonoAndroid">
<dependency id="System.Reactive" version="3.1.1" />
</group>
<group targetFramework="MonoTouch">
<dependency id="System.Reactive" version="3.1.1" />
</group>
<group targetFramework="Xamarin.Mac20">
<dependency id="System.Reactive" version="3.1.1" />
</group>
<group targetFramework="portable-net46+uap+MonoTouch+MonoAndroid">
<dependency id="System.Reactive" version="3.1.1" />
</group>
<group targetFramework="netstandard1.3">
<dependency id="System.Reactive" version="3.1.1" />
<dependency id="System.Collections" version="4.3.0" />
<dependency id="System.ComponentModel.Annotations" version="4.5.0" />
<dependency id="System.ObjectModel" version="4.3.0" />
<dependency id="System.Reactive" version="4.0.0" />
<dependency id="System.Reflection" version="4.3.0" />
<dependency id="System.Reflection.Extensions" version="4.3.0" />
<dependency id="System.Runtime" version="4.3.0" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Collections" version="4.3.0" />
<dependency id="System.ComponentModel.Annotations" version="4.5.0" />
<dependency id="System.ObjectModel" version="4.3.0" />
<dependency id="System.Reactive" version="4.0.0" />
<dependency id="System.Reflection" version="4.3.0" />
<dependency id="System.Reflection.Extensions" version="4.3.0" />
<dependency id="System.ComponentModel.Annotations" version="4.4.0" />
<dependency id="System.Runtime" version="4.3.0" />
</group>
</dependencies>
<frameworkAssemblies>
<!-- net46 -->
<frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.6" />
<frameworkAssembly assemblyName="PresentationCore" targetFramework=".NETFramework4.6" />
<frameworkAssembly assemblyName="WindowsBase" targetFramework=".NETFramework4.6" />
<frameworkAssembly assemblyName="PresentationFramework" targetFramework=".NETFramework4.6" />
<frameworkAssembly assemblyName="System.Xaml" targetFramework=".NETFramework4.6" />
<frameworkAssembly assemblyName="System.Core" targetFramework=".NETFramework4.6" />
<frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations" targetFramework=".NETFramework4.6" />
<!-- xamarin -->
<frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations" targetFramework="MonoAndroid" />
<frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations" targetFramework="MonoTouch" />
<frameworkAssembly assemblyName="System.ComponentModel.DataAnnotations" targetFramework="Xamarin.Mac20" />
</frameworkAssemblies>
</metadata>
<files>
<file src="..\Snippet\**.snippet" target="Snippet\" />
<file src="..\LICENSE.txt" target="\" />

<!-- platform -->
<!-- WPF NET46 -->
<file src="..\Binary\NET46\ReactiveProperty.NET46.dll" target="lib\net46" />
<file src="..\Binary\NET46\ReactiveProperty.NET46.XML" target="lib\net46" />
<file src="..\Binary\NET46\ReactiveProperty.NET46.pdb" target="lib\net46" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.dll" target="lib\net46" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.xml" target="lib\net46" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.pdb" target="lib\net46" />
<file src="..\Binary\NET46\ReactiveProperty.NET46.dll" target="lib\net461" />
<file src="..\Binary\NET46\ReactiveProperty.NET46.XML" target="lib\net461" />
<file src="..\Binary\NET46\ReactiveProperty.NET46.pdb" target="lib\net461" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.dll" target="lib\net461" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.xml" target="lib\net461" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.pdb" target="lib\net461" />

<!-- UWP -->
<file src="..\Binary\UWP\ReactiveProperty.UWP.dll" target="lib\uap10.0" />
<file src="..\Binary\UWP\ReactiveProperty.UWP.XML" target="lib\uap10.0" />
<file src="..\Binary\UWP\ReactiveProperty.UWP.pdb" target="lib\uap10.0" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.dll" target="lib\uap10.0" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.xml" target="lib\uap10.0" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.pdb" target="lib\uap10.0" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.dll" target="lib\uap10.0" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.xml" target="lib\uap10.0" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.pdb" target="lib\uap10.0" />

<!-- Mono.Android -->
<file src="..\Binary\netstandard1.3\ReactiveProperty.dll" target="lib\MonoAndroid" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.xml" target="lib\MonoAndroid" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.pdb" target="lib\MonoAndroid" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.dll" target="lib\MonoAndroid" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.xml" target="lib\MonoAndroid" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.pdb" target="lib\MonoAndroid" />
<file src="..\Binary\MonoAndroid\ReactiveProperty.Android.dll" target="lib\MonoAndroid" />
<file src="..\Binary\MonoAndroid\ReactiveProperty.Android.XML" target="lib\MonoAndroid" />
<file src="..\Binary\MonoAndroid\ReactiveProperty.Android.pdb" target="lib\MonoAndroid" />

<!-- Mono.Touch -->
<file src="..\Binary\netstandard1.3\ReactiveProperty.dll" target="lib\MonoTouch" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.xml" target="lib\MonoTouch" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.pdb" target="lib\MonoTouch" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.dll" target="lib\MonoTouch" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.xml" target="lib\MonoTouch" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.pdb" target="lib\MonoTouch" />
<file src="..\Binary\MonoTouch\ReactiveProperty.iOS.dll" target="lib\MonoTouch" />
<file src="..\Binary\MonoTouch\ReactiveProperty.iOS.XML" target="lib\MonoTouch" />
<file src="..\Binary\MonoTouch\ReactiveProperty.iOS.pdb" target="lib\MonoTouch" />

<!-- Xamarin.iOS10 -->
<file src="..\Binary\netstandard1.3\ReactiveProperty.dll" target="lib\Xamarin.iOS10" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.xml" target="lib\Xamarin.iOS10" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.pdb" target="lib\Xamarin.iOS10" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.dll" target="lib\Xamarin.iOS10" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.xml" target="lib\Xamarin.iOS10" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.pdb" target="lib\Xamarin.iOS10" />
<file src="..\Binary\MonoTouch\ReactiveProperty.iOS.dll" target="lib\Xamarin.iOS10" />
<file src="..\Binary\MonoTouch\ReactiveProperty.iOS.XML" target="lib\Xamarin.iOS10" />
<file src="..\Binary\MonoTouch\ReactiveProperty.iOS.pdb" target="lib\Xamarin.iOS10" />

<!-- Xamarin.Mac Unified -->
<file src="..\Binary\netstandard1.3\ReactiveProperty.dll" target="lib\Xamarin.Mac20" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.xml" target="lib\Xamarin.Mac20" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.pdb" target="lib\Xamarin.Mac20" />

<!-- PCL -->
<file src="..\Binary\netstandard1.3\ReactiveProperty.dll" target="lib\portable-net46+uap+MonoTouch+MonoAndroid" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.xml" target="lib\portable-net46+uap+MonoTouch+MonoAndroid" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.pdb" target="lib\portable-net46+uap+MonoTouch+MonoAndroid" />

<!-- .net standard -->
<file src="..\Binary\netstandard1.3\ReactiveProperty.dll" target="lib\netstandard1.3" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.xml" target="lib\netstandard1.3" />
<file src="..\Binary\netstandard1.3\ReactiveProperty.pdb" target="lib\netstandard1.3" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.dll" target="lib\netstandard2.0" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.xml" target="lib\netstandard2.0" />
<file src="..\Binary\netstandard2.0\ReactiveProperty.pdb" target="lib\netstandard2.0" />
</files>
</package>
19 changes: 10 additions & 9 deletions ReactiveProperty.sln
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,16 @@ Global
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Debug|x64.ActiveCfg = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Debug|x86.ActiveCfg = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Debug|x86.Build.0 = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|ARM.ActiveCfg = Documentation|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|ARM.Build.0 = Documentation|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|Any CPU.Build.0 = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|ARM.ActiveCfg = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|ARM.Build.0 = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|Mixed Platforms.ActiveCfg = Release|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|Mixed Platforms.Build.0 = Release|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|x64.ActiveCfg = Documentation|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|x64.Build.0 = Documentation|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|x86.ActiveCfg = Documentation|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|x86.Build.0 = Documentation|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|x64.ActiveCfg = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|x64.Build.0 = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|x86.ActiveCfg = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Documentation|x86.Build.0 = Debug|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Release|Any CPU.Build.0 = Release|Any CPU
{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Release|ARM.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -453,9 +454,9 @@ Global
{157F0F88-34AC-4C49-971F-7027AAC757AE} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
BuildVersion_AssemblyInfoFilename = Source\NET40\Properties\CommonAssemblyInfo.cs
BuildVersion_UseGlobalSettings = True
SolutionGuid = {5AC43AC2-86FE-46EF-B243-5C8E75EAB89B}
BuildVersion_UseGlobalSettings = True
BuildVersion_AssemblyInfoFilename = Source\NET40\Properties\CommonAssemblyInfo.cs
EndGlobalSection
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = ReactiveProperty.vsmdi
Expand Down
30 changes: 0 additions & 30 deletions Sample/Sample.ViewModels/Properties/AssemblyInfo.cs

This file was deleted.

83 changes: 12 additions & 71 deletions Sample/Sample.ViewModels/Sample.ViewModels.csproj
Original file line number Diff line number Diff line change
@@ -1,79 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<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')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4AA39C19-6571-4A9F-8722-2D7240D425D1}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Sample.ViewModels</RootNamespace>
<AssemblyName>Sample.ViewModels</AssemblyName>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<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\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Documentation|AnyCPU'">
<OutputPath>bin\Documentation\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="AsyncReactiveCommandViewModel.cs" />
<Compile Include="EventToReactiveCommandViewModel.cs" />
<Compile Include="FilteredReadOnlyObservableCollectionBasicsViewModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="AsynchronousViewModel.cs" />
<Compile Include="EventToReactivePropertyViewModel.cs" />
<Compile Include="ReactivePropertyBasicsViewModel.cs" />
<Compile Include="SynchronizeObjectViewModel.cs" />
<Compile Include="ValidationViewModel.cs" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="app.config" />
<None Include="project.json" />
<ProjectReference Include="..\..\Source\ReactiveProperty.NETStandard\ReactiveProperty.NETStandard.csproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Source\ReactiveProperty.NETStandard\ReactiveProperty.NETStandard.csproj">
<Project>{157f0f88-34ac-4c49-971f-7027aac757ae}</Project>
<Name>ReactiveProperty.NETStandard</Name>
</ProjectReference>
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<!--<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />-->
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
18 changes: 0 additions & 18 deletions Sample/Sample.ViewModels/Sample.ViewModels.nuget.targets

This file was deleted.

10 changes: 0 additions & 10 deletions Sample/Sample.ViewModels/project.json

This file was deleted.

0 comments on commit a3d59da

Please sign in to comment.