From cbd1625410a5fffad883684215ae179300c36e33 Mon Sep 17 00:00:00 2001 From: Kazuki Ota Date: Wed, 3 Apr 2019 11:27:20 +0900 Subject: [PATCH 1/7] update libraries --- ReactiveProperty.sln | 36 ++---------- .../Sample.ViewModels.csproj | 2 +- Sample/UWP.TodoMVVM/UWP.TodoMVVM.csproj | 6 +- Sample/UWP/UWP.csproj | 6 +- Sample/WPF/Properties/Resources.Designer.cs | 26 ++++----- Sample/WPF/Properties/Settings.Designer.cs | 10 ++-- Sample/WPF/WPF.csproj | 4 +- Sample/WPF/app.config | 6 +- Sample/XamarinAndroid/XamarinAndroid.csproj | 6 +- .../ReactiveProperty.NETStandard.csproj | 3 +- .../ReactiveProperty.Platform.Android.csproj | 3 +- .../packages.config | 57 ------------------- .../ReactiveProperty.Platform.UWP.csproj | 6 +- .../ReactiveProperty.Platform.iOS.csproj | 2 +- .../ReactiveProperty.Tests.csproj | 6 +- 15 files changed, 44 insertions(+), 135 deletions(-) delete mode 100644 Source/ReactiveProperty.Platform.Android/packages.config diff --git a/ReactiveProperty.sln b/ReactiveProperty.sln index 9133978e..8cb21c52 100644 --- 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}" @@ -199,31 +197,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 @@ -443,7 +416,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} @@ -456,9 +428,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 diff --git a/Sample/Sample.ViewModels/Sample.ViewModels.csproj b/Sample/Sample.ViewModels/Sample.ViewModels.csproj index 2122f28d..a188d23c 100644 --- a/Sample/Sample.ViewModels/Sample.ViewModels.csproj +++ b/Sample/Sample.ViewModels/Sample.ViewModels.csproj @@ -6,7 +6,7 @@ - + diff --git a/Sample/UWP.TodoMVVM/UWP.TodoMVVM.csproj b/Sample/UWP.TodoMVVM/UWP.TodoMVVM.csproj index c89db22c..eddf4d7b 100644 --- a/Sample/UWP.TodoMVVM/UWP.TodoMVVM.csproj +++ b/Sample/UWP.TodoMVVM/UWP.TodoMVVM.csproj @@ -11,7 +11,7 @@ UWP.TodoMVVM ja-JP UAP - 10.0.17134.0 + 10.0.17763.0 10.0.16299.0 14 true @@ -141,7 +141,7 @@ - 6.1.9 + 6.2.8 2.0.0 @@ -153,7 +153,7 @@ 6.3.0 - 4.1.2 + 4.1.3 diff --git a/Sample/UWP/UWP.csproj b/Sample/UWP/UWP.csproj index be2e1efa..429d2589 100644 --- a/Sample/UWP/UWP.csproj +++ b/Sample/UWP/UWP.csproj @@ -11,7 +11,7 @@ UWP ja-JP UAP - 10.0.17134.0 + 10.0.17763.0 10.0.16299.0 14 true @@ -138,13 +138,13 @@ - 6.1.9 + 6.2.8 2.0.0 - 4.1.2 + 4.1.3 diff --git a/Sample/WPF/Properties/Resources.Designer.cs b/Sample/WPF/Properties/Resources.Designer.cs index f971ce49..40758167 100644 --- a/Sample/WPF/Properties/Resources.Designer.cs +++ b/Sample/WPF/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// このコードはツールによって生成されました。 -// ランタイム バージョン:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 -// コードが再生成されるときに損失したりします。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace WPF.Properties { /// - /// ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // このクラスは StronglyTypedResourceBuilder クラスが ResGen - // または Visual Studio のようなツールを使用して自動生成されました。 - // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に - // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ internal Resources() { } /// - /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// 厳密に型指定されたこのリソース クラスを使用して、すべての検索リソースに対し、 - /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Sample/WPF/Properties/Settings.Designer.cs b/Sample/WPF/Properties/Settings.Designer.cs index a4f8bf0a..5c122a27 100644 --- a/Sample/WPF/Properties/Settings.Designer.cs +++ b/Sample/WPF/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// このコードはツールによって生成されました。 -// ランタイム バージョン:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 -// コードが再生成されるときに損失したりします。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace WPF.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/Sample/WPF/WPF.csproj b/Sample/WPF/WPF.csproj index 83da4dd6..267ebabd 100644 --- a/Sample/WPF/WPF.csproj +++ b/Sample/WPF/WPF.csproj @@ -10,7 +10,7 @@ Properties WPF WPF - v4.6.1 + v4.7.2 512 @@ -225,7 +225,7 @@ - 4.1.2 + 4.1.3 1.0.0 diff --git a/Sample/WPF/app.config b/Sample/WPF/app.config index 9868bb45..2a2d4499 100644 --- a/Sample/WPF/app.config +++ b/Sample/WPF/app.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Sample/XamarinAndroid/XamarinAndroid.csproj b/Sample/XamarinAndroid/XamarinAndroid.csproj index 9af0654d..3aa47f76 100644 --- a/Sample/XamarinAndroid/XamarinAndroid.csproj +++ b/Sample/XamarinAndroid/XamarinAndroid.csproj @@ -56,7 +56,7 @@ - + @@ -122,10 +122,6 @@ {157f0f88-34ac-4c49-971f-7027aac757ae} ReactiveProperty.NETStandard - - {abf4f434-e274-4980-b1d1-aadcf75685a0} - ReactiveProperty.Platform.Android - {4aa39c19-6571-4a9f-8722-2d7240d425d1} Sample.ViewModels diff --git a/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj b/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj index f914261f..4b576b74 100644 --- a/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj +++ b/Source/ReactiveProperty.NETStandard/ReactiveProperty.NETStandard.csproj @@ -26,8 +26,7 @@ - - + \ No newline at end of file diff --git a/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj b/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj index 503a714c..af4ee455 100644 --- a/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj +++ b/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj @@ -51,7 +51,7 @@ - + @@ -82,7 +82,6 @@ - diff --git a/Source/ReactiveProperty.Platform.Android/packages.config b/Source/ReactiveProperty.Platform.Android/packages.config deleted file mode 100644 index 69ac982f..00000000 --- a/Source/ReactiveProperty.Platform.Android/packages.config +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/ReactiveProperty.Platform.UWP/ReactiveProperty.Platform.UWP.csproj b/Source/ReactiveProperty.Platform.UWP/ReactiveProperty.Platform.UWP.csproj index df090081..31bab9ff 100644 --- a/Source/ReactiveProperty.Platform.UWP/ReactiveProperty.Platform.UWP.csproj +++ b/Source/ReactiveProperty.Platform.UWP/ReactiveProperty.Platform.UWP.csproj @@ -11,7 +11,7 @@ ReactiveProperty.UWP ja-JP UAP - 10.0.17134.0 + 10.0.17763.0 10.0.16299.0 14 512 @@ -138,13 +138,13 @@ - 6.1.9 + 6.2.8 2.0.0 - 4.1.2 + 4.1.3 diff --git a/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj b/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj index 136d05bf..68e68ee7 100644 --- a/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj +++ b/Source/ReactiveProperty.Platform.iOS/ReactiveProperty.Platform.iOS.csproj @@ -48,7 +48,7 @@ - + diff --git a/Test/ReactiveProperty.Tests/ReactiveProperty.Tests.csproj b/Test/ReactiveProperty.Tests/ReactiveProperty.Tests.csproj index d4e86cfe..26b27c40 100644 --- a/Test/ReactiveProperty.Tests/ReactiveProperty.Tests.csproj +++ b/Test/ReactiveProperty.Tests/ReactiveProperty.Tests.csproj @@ -1,18 +1,18 @@  - net462 + net472 ReactiveProperty.Tests ReactiveProperty.Tests true true - + - + From b2f4ffbb104dc573370a7701e32646eecd387bf5 Mon Sep 17 00:00:00 2001 From: Kazuki Ota Date: Wed, 3 Apr 2019 11:35:36 +0900 Subject: [PATCH 2/7] Update the Android project to PackageReference --- ReactiveProperty.sln | 40 +- .../Properties/AssemblyInfo.cs | 4 +- .../ReactiveProperty.Platform.Android.csproj | 71 +- .../Resources/AboutResources.txt | 24 +- .../Resources/Resource.Designer.cs | 5056 ++++++++++++++++- .../Resources/Values/Strings.xml | 5 +- 6 files changed, 5103 insertions(+), 97 deletions(-) diff --git a/ReactiveProperty.sln b/ReactiveProperty.sln index 8cb21c52..239d700d 100644 --- a/ReactiveProperty.sln +++ b/ReactiveProperty.sln @@ -100,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 @@ -221,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 @@ -251,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 @@ -284,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 @@ -408,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 @@ -426,11 +455,12 @@ 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 - SolutionGuid = {5AC43AC2-86FE-46EF-B243-5C8E75EAB89B} - BuildVersion_UseGlobalSettings = True BuildVersion_AssemblyInfoFilename = Source\NET40\Properties\CommonAssemblyInfo.cs + BuildVersion_UseGlobalSettings = True + SolutionGuid = {5AC43AC2-86FE-46EF-B243-5C8E75EAB89B} EndGlobalSection GlobalSection(TestCaseManagementSettings) = postSolution CategoryFile = ReactiveProperty.vsmdi diff --git a/Source/ReactiveProperty.Platform.Android/Properties/AssemblyInfo.cs b/Source/ReactiveProperty.Platform.Android/Properties/AssemblyInfo.cs index 4cb5beeb..f8f28b25 100644 --- a/Source/ReactiveProperty.Platform.Android/Properties/AssemblyInfo.cs +++ b/Source/ReactiveProperty.Platform.Android/Properties/AssemblyInfo.cs @@ -26,5 +26,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.2.*")] -[assembly: AssemblyFileVersion("5.2.0.0")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj b/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj index af4ee455..cfb5eba4 100644 --- a/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj +++ b/Source/ReactiveProperty.Platform.Android/ReactiveProperty.Platform.Android.csproj @@ -5,24 +5,22 @@ AnyCPU 8.0.30703 2.0 - {ABF4F434-E274-4980-B1D1-AADCF75685A0} + {BF2E72F9-149B-4687-ABCD-7B949430FFDE} {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {9ef11e43-1701-4396-8835-8392d57abb70} Library Properties - Reactive.Bindings - ReactiveProperty.Android + ReactiveProperty.Android + Reactive.Bindings 512 - Resources\Resource.Designer.cs + Resources\Resource.designer.cs Off - True - ..\..\ - true - v9.0 - True + false + v8.1 true - full + portable false bin\Debug\ DEBUG;TRACE @@ -36,39 +34,14 @@ TRACE prompt 4 - ..\..\Binary\MonoAndroid\ReactiveProperty.Android.XML + ..\..\Binary\MonoAndroid\ReactiveProperty.Android.xml - - bin\Documentation\ - TRACE - ..\..\Binary\MonoAndroid\ReactiveProperty.Android.XML - true - pdbonly - AnyCPU - Off - prompt - MinimumRecommendedRules.ruleset - - - - - - - - $(UserProfile)\.nuget\packages\system.threading.tasks.extensions\4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - + - - - - ..\..\packages\System.Reactive.4.1.2\lib\netstandard2.0\System.Reactive.dll - @@ -78,14 +51,20 @@ - + - + + + + + + + @@ -94,20 +73,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - -