Skip to content

Commit 84dbf0e

Browse files
glennawatsonglennawatson
authored
houskeeeping: Update preview 10.0.1 with contents from master. (#2028)
1 parent 25fcf7f commit 84dbf0e

24 files changed

+727
-80
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,9 @@ The following have been core team members in the past.
349349
<p>London, United Kingdom</p>
350350
</td>
351351
<td align="center" valign="top">
352-
<img width="100" height="100" src="https://github.com/paulcbetts.png?s=150">
352+
<img width="100" height="100" src="https://github.com/anaisbetts.png?s=150">
353353
<br>
354-
<a href="https://github.com/paulcbetts">Paul Betts</a>
354+
<a href="https://github.com/anaisbetts">Anaïs Betts</a>
355355
<p>San Francisco, USA</p>
356356
</td>
357357
<td align="center" valign="top">

‎directory.build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PackageLicenseExpression>MIT</PackageLicenseExpression>
66
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
77
<PackageIconUrl>https://github.com/reactiveui/styleguide/blob/master/logo/main.png?raw=true</PackageIconUrl>
8-
<Owners>xpaulbettsx;ghuntley</Owners>
8+
<Owners>xanaisbettsx;ghuntley</Owners>
99
<Product>ReactiveUI ($(TargetFramework))</Product>
1010
<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;xamarin.tvos;wpf;net;netstandard;net461;uwp;tizen</PackageTags>
1111
<PackageReleaseNotes>https://github.com/reactiveui/ReactiveUI/releases</PackageReleaseNotes>

‎integrationtests/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
55
<PackageIconUrl>https://i.imgur.com/7WDbqSy.png</PackageIconUrl>
66
<Authors>.NET Foundation and Contributors</Authors>
7-
<Owners>xpaulbettsx;ghuntley</Owners>
7+
<Owners>xanaisbettsx;ghuntley</Owners>
88
<Product>ReactiveUI Integration Tests ($(TargetFramework))</Product>
99
<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;xamarin.tvos;wpf;net;netstandard;net461;uwp;tizen</PackageTags>
1010
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>

‎samples/testing/ReactiveUI.Samples.Testing.SimpleViewModels/src/ReactiveUI.Samples.Testing.SimpleViewModels.Tests/ReactiveUI.Samples.Testing.SimpleViewModelsUnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.0.0" />
6+
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.5" />
77
<PackageReference Include="ReactiveUI.Testing" Version="9.11.3" />
88
<PackageReference Include="xunit" Version="2.4.1" />
99
</ItemGroup>

‎src/Directory.build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<Owners>xpaulbettsx;ghuntley</Owners>
3+
<Owners>xanaisbettsx;ghuntley</Owners>
44
<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;xamarin.tvos;wpf;net;netstandard;net461;uwp;tizen</PackageTags>
55
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -27,11 +27,11 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup Condition="$(IsTestProject)">
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
3131
<PackageReference Include="xunit" Version="2.4.1" />
3232
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
3333
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
34-
<PackageReference Include="Xunit.StaFact" Version="0.3.13" />
34+
<PackageReference Include="Xunit.StaFact" Version="0.3.18" />
3535
<PackageReference Include="Shouldly" Version="3.0.2" />
3636
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0-preview.102" />
3737
<PackageReference Include="PublicApiGenerator" Version="8.1.0" />
@@ -58,7 +58,7 @@
5858
</ItemGroup>
5959

6060
<ItemGroup>
61-
<PackageReference Include="stylecop.analyzers" Version="1.1.1-rc.114" PrivateAssets="all" />
61+
<PackageReference Include="stylecop.analyzers" Version="1.1.118" PrivateAssets="all" />
6262
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3" PrivateAssets="all" />
6363
<PackageReference Include="Roslynator.Analyzers" Version="2.1.0-rc" PrivateAssets="All" />
6464
<PackageReference Condition="'$(OS)' == 'Windows_NT'" Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.2" PrivateAssets="all" />

‎src/EventBuilder/EventBuilder.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="CommandLineParser" Version="2.4.3" />
21+
<PackageReference Include="CommandLineParser" Version="2.5.0" />
2222
<PackageReference Include="Mono.Cecil" Version="0.10.3" />
2323
<PackageReference Include="Polly" Version="7.1.0" />
2424
<PackageReference Include="Serilog" Version="2.8.0" />

‎src/ReactiveUI.Blend/ReactiveUI.Blend.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
2727
<Compile Include="Platforms\uap\**\*.cs" />
28-
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.0" />
28+
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

‎src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Fody" Version="4.2.1" PrivateAssets="None" />
18-
<PackageReference Include="FodyPackaging" Version="4.2.1" PrivateAssets="All" />
17+
<PackageReference Include="Fody" Version="5.0.5" PrivateAssets="None" />
18+
<PackageReference Include="FodyPackaging" Version="5.0.5" PrivateAssets="All" />
1919
<PackageReference Include="System.Reactive" Version="4.2.0-preview.102" />
2020
</ItemGroup>
2121

‎src/ReactiveUI.Fody/ReactiveUI.Fody.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="FodyHelpers" Version="4.2.1" />
10+
<PackageReference Include="FodyHelpers" Version="5.0.6" />
1111
</ItemGroup>
1212
</Project>

‎src/ReactiveUI.Mac.sln‎

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
33
VisualStudioVersion = 15.0.26730.15
44
MinimumVisualStudioVersion = 10.0.40219.1
@@ -28,6 +28,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Fody.Helpers", "
2828
EndProject
2929
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Fody.Tests", "ReactiveUI.Fody.Tests\ReactiveUI.Fody.Tests.csproj", "{404B0F3F-7343-4E54-A863-F27B99FE788B}"
3030
EndProject
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Testing.Tests", "ReactiveUI.Testing.Tests\ReactiveUI.Testing.Tests.csproj", "{6591097A-342A-4EA0-AFF6-D2B3207F3E09}"
32+
EndProject
3133
Global
3234
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3335
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -468,6 +470,62 @@ Global
468470
{404B0F3F-7343-4E54-A863-F27B99FE788B}.Release|x64.Build.0 = Release|Any CPU
469471
{404B0F3F-7343-4E54-A863-F27B99FE788B}.Release|x86.ActiveCfg = Release|Any CPU
470472
{404B0F3F-7343-4E54-A863-F27B99FE788B}.Release|x86.Build.0 = Release|Any CPU
473+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
474+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
475+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
476+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
477+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
478+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
479+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
480+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
481+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|Mixed Platforms.ActiveCfg = Debug|Any CPU
482+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|Mixed Platforms.Build.0 = Debug|Any CPU
483+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
484+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
485+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
486+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
487+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
488+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|Any CPU.Build.0 = Debug|Any CPU
489+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|ARM.ActiveCfg = Debug|Any CPU
490+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|ARM.Build.0 = Debug|Any CPU
491+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
492+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|iPhone.Build.0 = Debug|Any CPU
493+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
494+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
495+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|Mixed Platforms.ActiveCfg = Debug|Any CPU
496+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|Mixed Platforms.Build.0 = Debug|Any CPU
497+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|x64.ActiveCfg = Debug|Any CPU
498+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|x64.Build.0 = Debug|Any CPU
499+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|x86.ActiveCfg = Debug|Any CPU
500+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.AppStore|x86.Build.0 = Debug|Any CPU
501+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
502+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|Any CPU.Build.0 = Debug|Any CPU
503+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|ARM.ActiveCfg = Debug|Any CPU
504+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|ARM.Build.0 = Debug|Any CPU
505+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|iPhone.ActiveCfg = Debug|Any CPU
506+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|iPhone.Build.0 = Debug|Any CPU
507+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
508+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
509+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
510+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
511+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|x64.ActiveCfg = Debug|Any CPU
512+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|x64.Build.0 = Debug|Any CPU
513+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|x86.ActiveCfg = Debug|Any CPU
514+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Debug|x86.Build.0 = Debug|Any CPU
515+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|Any CPU.ActiveCfg = Release|Any CPU
516+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|Any CPU.Build.0 = Release|Any CPU
517+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|ARM.ActiveCfg = Release|Any CPU
518+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|ARM.Build.0 = Release|Any CPU
519+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|iPhone.ActiveCfg = Release|Any CPU
520+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|iPhone.Build.0 = Release|Any CPU
521+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
522+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
523+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
524+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|Mixed Platforms.Build.0 = Release|Any CPU
525+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|x64.ActiveCfg = Release|Any CPU
526+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|x64.Build.0 = Release|Any CPU
527+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|x86.ActiveCfg = Release|Any CPU
528+
{6591097A-342A-4EA0-AFF6-D2B3207F3E09}.Release|x86.Build.0 = Release|Any CPU
471529
EndGlobalSection
472530
GlobalSection(SolutionProperties) = preSolution
473531
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)