Merge pull request #104 from runceel/release/5.4

Release v5 4
runceel · Apr 3, 2019 · d6edd8a · d6edd8a
2 parents 74a3450 + fd05410
commit d6edd8a
Show file tree

Hide file tree

Showing 20 changed files with 5,141 additions and 226 deletions.
diff --git a/BuildTools/ReactiveProperty.nuspec b/BuildTools/ReactiveProperty.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>ReactiveProperty</id>
-    <version>5.3.2</version>
+    <version>5.4.0</version>
     <title>ReactiveProperty</title>
     <authors>neuecc xin9le okazuki</authors>
     <owners>neuecc xin9le okazuki</owners>
@@ -18,11 +18,11 @@
       <group targetFramework="uap10.0">
         <dependency id="Microsoft.Xaml.Behaviors.Uwp.Managed" version="2.0.0" />
         <dependency id="System.ComponentModel.Annotations" version="4.5.0" />
-        <dependency id="System.Reactive" version="4.1.2" />
+        <dependency id="System.Reactive" version="4.1.3" />
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="System.ComponentModel.Annotations" version="4.5.0" />
-        <dependency id="System.Reactive" version="4.1.2" />
+        <dependency id="System.Reactive" version="4.1.3" />
       </group>
     </dependencies>
     <frameworkAssemblies>

diff --git a/ReactiveProperty.sln b/ReactiveProperty.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{592AA479-AD7F-476B-AEF8-2B0268EA3BD8}"
 EndProject
@@ -54,8 +54,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{97EC2E
 		Images\xf-howtouserp-createproject.png = Images\xf-howtouserp-createproject.png
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveProperty.Platform.Android", "Source\ReactiveProperty.Platform.Android\ReactiveProperty.Platform.Android.csproj", "{ABF4F434-E274-4980-B1D1-AADCF75685A0}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamarinAndroid", "Sample\XamarinAndroid\XamarinAndroid.csproj", "{73FB08B3-EBF3-4384-A1FB-4442BD999477}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "csharp5", "csharp5", "{B087D3DF-7BED-4296-8A2F-CCE3324CC45B}"
@@ -102,6 +100,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ReactiveProperty.Platform.S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveProperty.NETStandard", "Source\ReactiveProperty.NETStandard\ReactiveProperty.NETStandard.csproj", "{157F0F88-34AC-4C49-971F-7027AAC757AE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveProperty.Platform.Android", "Source\ReactiveProperty.Platform.Android\ReactiveProperty.Platform.Android.csproj", "{BF2E72F9-149B-4687-ABCD-7B949430FFDE}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Source\ReactiveProperty.Platform.Shared\ReactiveProperty.Platform.Shared.projitems*{523e5506-24df-44ca-83cc-6aa02454f150}*SharedItemsImports = 13
@@ -199,31 +199,6 @@ Global
 		{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Release|x64.ActiveCfg = Release|Any CPU
 		{4AA39C19-6571-4A9F-8722-2D7240D425D1}.Release|x86.ActiveCfg = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Debug|x86.Build.0 = Debug|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Documentation|ARM.ActiveCfg = Documentation|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Documentation|ARM.Build.0 = Documentation|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Documentation|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Documentation|Mixed Platforms.Build.0 = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Documentation|x64.ActiveCfg = Documentation|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Documentation|x64.Build.0 = Documentation|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Documentation|x86.ActiveCfg = Documentation|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Documentation|x86.Build.0 = Documentation|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Release|ARM.ActiveCfg = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Release|x64.ActiveCfg = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Release|x86.ActiveCfg = Release|Any CPU
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0}.Release|x86.Build.0 = Release|Any CPU
 		{73FB08B3-EBF3-4384-A1FB-4442BD999477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73FB08B3-EBF3-4384-A1FB-4442BD999477}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{73FB08B3-EBF3-4384-A1FB-4442BD999477}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -248,7 +223,6 @@ Global
 		{73FB08B3-EBF3-4384-A1FB-4442BD999477}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{73FB08B3-EBF3-4384-A1FB-4442BD999477}.Release|ARM.ActiveCfg = Release|Any CPU
 		{73FB08B3-EBF3-4384-A1FB-4442BD999477}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{73FB08B3-EBF3-4384-A1FB-4442BD999477}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
 		{73FB08B3-EBF3-4384-A1FB-4442BD999477}.Release|x64.ActiveCfg = Release|Any CPU
 		{73FB08B3-EBF3-4384-A1FB-4442BD999477}.Release|x86.ActiveCfg = Release|Any CPU
 		{1A284C37-BA3F-4B28-B800-7C3137E3365E}.Debug|Any CPU.ActiveCfg = Debug|x86
@@ -278,7 +252,6 @@ Global
 		{1A284C37-BA3F-4B28-B800-7C3137E3365E}.Release|ARM.Build.0 = Release|ARM
 		{1A284C37-BA3F-4B28-B800-7C3137E3365E}.Release|ARM.Deploy.0 = Release|ARM
 		{1A284C37-BA3F-4B28-B800-7C3137E3365E}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{1A284C37-BA3F-4B28-B800-7C3137E3365E}.Release|Mixed Platforms.Deploy.0 = Release|x86
 		{1A284C37-BA3F-4B28-B800-7C3137E3365E}.Release|x64.ActiveCfg = Release|x64
 		{1A284C37-BA3F-4B28-B800-7C3137E3365E}.Release|x64.Build.0 = Release|x64
 		{1A284C37-BA3F-4B28-B800-7C3137E3365E}.Release|x64.Deploy.0 = Release|x64
@@ -311,7 +284,6 @@ Global
 		{40AE1FF3-8B25-4659-8B0A-7886113E4246}.Release|ARM.Build.0 = Release|ARM
 		{40AE1FF3-8B25-4659-8B0A-7886113E4246}.Release|ARM.Deploy.0 = Release|ARM
 		{40AE1FF3-8B25-4659-8B0A-7886113E4246}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{40AE1FF3-8B25-4659-8B0A-7886113E4246}.Release|Mixed Platforms.Deploy.0 = Release|x86
 		{40AE1FF3-8B25-4659-8B0A-7886113E4246}.Release|x64.ActiveCfg = Release|x64
 		{40AE1FF3-8B25-4659-8B0A-7886113E4246}.Release|x64.Build.0 = Release|x64
 		{40AE1FF3-8B25-4659-8B0A-7886113E4246}.Release|x64.Deploy.0 = Release|x64
@@ -435,6 +407,36 @@ Global
 		{157F0F88-34AC-4C49-971F-7027AAC757AE}.Release|x64.Build.0 = Release|Any CPU
 		{157F0F88-34AC-4C49-971F-7027AAC757AE}.Release|x86.ActiveCfg = Release|Any CPU
 		{157F0F88-34AC-4C49-971F-7027AAC757AE}.Release|x86.Build.0 = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|x64.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Debug|x86.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|Any CPU.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|ARM.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|ARM.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|x64.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|x64.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|x86.ActiveCfg = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Documentation|x86.Build.0 = Debug|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|ARM.Build.0 = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|x64.ActiveCfg = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|x64.Build.0 = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -443,7 +445,6 @@ Global
 		{5894EB9D-270B-41E4-B57A-4F3A48062D20} = {6356D836-36AA-4CD9-8EB2-BF037115D329}
 		{9B3C2CF3-0AFD-4FB8-BAB1-2B7931C2AF18} = {6B13388E-F781-4F55-AF8B-2E991EA59DB8}
 		{4AA39C19-6571-4A9F-8722-2D7240D425D1} = {6356D836-36AA-4CD9-8EB2-BF037115D329}
-		{ABF4F434-E274-4980-B1D1-AADCF75685A0} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
 		{73FB08B3-EBF3-4384-A1FB-4442BD999477} = {6356D836-36AA-4CD9-8EB2-BF037115D329}
 		{B087D3DF-7BED-4296-8A2F-CCE3324CC45B} = {9F7EFC36-593F-4521-B678-41B00A6642B1}
 		{66249041-95E4-4DAE-AC93-3475EBE60AF0} = {9F7EFC36-593F-4521-B678-41B00A6642B1}
@@ -454,6 +455,7 @@ Global
 		{A54AE997-6255-4000-A4CE-3F8D6D8F0026} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
 		{523E5506-24DF-44CA-83CC-6AA02454F150} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
 		{157F0F88-34AC-4C49-971F-7027AAC757AE} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
+		{BF2E72F9-149B-4687-ABCD-7B949430FFDE} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		BuildVersion_AssemblyInfoFilename = Source\NET40\Properties\CommonAssemblyInfo.cs

diff --git a/Sample/Sample.ViewModels/Sample.ViewModels.csproj b/Sample/Sample.ViewModels/Sample.ViewModels.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="System.Reactive" Version="4.1.2" />
+    <PackageReference Include="System.Reactive" Version="4.1.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Sample/UWP.TodoMVVM/UWP.TodoMVVM.csproj b/Sample/UWP.TodoMVVM/UWP.TodoMVVM.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>UWP.TodoMVVM</AssemblyName>
     <DefaultLanguage>ja-JP</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
@@ -141,7 +141,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.1.9</Version>
+      <Version>6.2.8</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
       <Version>2.0.0</Version>
@@ -153,7 +153,7 @@
       <Version>6.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive">
-      <Version>4.1.2</Version>
+      <Version>4.1.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Sample/UWP/UWP.csproj b/Sample/UWP/UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>UWP</AssemblyName>
     <DefaultLanguage>ja-JP</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
@@ -138,13 +138,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.1.9</Version>
+      <Version>6.2.8</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
       <Version>2.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.Reactive">
-      <Version>4.1.2</Version>
+      <Version>4.1.3</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

diff --git a/Sample/WPF/Properties/Resources.Designer.cs b/Sample/WPF/Properties/Resources.Designer.cs
diff --git a/Sample/WPF/Properties/Settings.Designer.cs b/Sample/WPF/Properties/Settings.Designer.cs
diff --git a/Sample/WPF/WPF.csproj b/Sample/WPF/WPF.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WPF</RootNamespace>
     <AssemblyName>WPF</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -225,7 +225,7 @@
     </PackageReference>
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
     <PackageReference Include="System.Reactive">
-      <Version>4.1.2</Version>
+      <Version>4.1.3</Version>
     </PackageReference>
     <PackageReference Include="Unofficial.Blend.Interactivity">
       <Version>1.0.0</Version>

diff --git a/Sample/WPF/app.config b/Sample/WPF/app.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
-</configuration>
+</configuration>