Skip to content

Commit

Permalink
housekeeping: Release 10.0 (reactiveui#2102)
Browse files Browse the repository at this point in the history
  • Loading branch information
glennawatson authored Sep 4, 2019
1 parent 5359fd8 commit f396c32
Show file tree
Hide file tree
Showing 145 changed files with 2,802 additions and 5,236 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ src/ReactiveUI/Platforms/apple-common/* @reactiveui/ios-team @reactiveui/mac-
src/ReactiveUI/Platforms/ios/* @reactiveui/ios-team
src/ReactiveUI/Platforms/mac/* @reactiveui/mac-team
src/ReactiveUI/Platforms/net461/* @reactiveui/wpf-team @reactiveui/winforms-team
src/ReactiveUI/Platforms/netcoreapp2.0/* @reactiveui/dotnetcore-team @reactiveui/webassembly-team
src/ReactiveUI/Platforms/uap/* @reactiveui/uwp-team
src/ReactiveUI/Platforms/netcoreapp/* @reactiveui/dotnetcore-team @reactiveui/webassembly-team
src/ReactiveUI/Platforms/uap10/* @reactiveui/uwp-team
src/ReactiveUI/Platforms/tizen/* @reactiveui/tizen-team
src/ReactiveUI/Platforms/tvos/* @reactiveui/tvos-team
src/ReactiveUI/Platforms/windows-common/* @reactiveui/wpf-team @reactiveui/winforms-team @reactiveui/uwp-team
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ from the main (upstream) repository:
## Coding
### Developer Environment
- Visual Studio 2017 (with latest patches/updates), with the following workloads/components
- Visual Studio 2019 (with latest patches/updates), with the following workloads/components
- Windows Universal Platform Development workload
- .NET desktop development workload
- Mobile development with .NET workload
- .NET Core cross-platform development
- Windows 10 SDK 10.0.16299 (individual component)
- Windows 10 SDK 10.0.17763.0 (individual component)
- PowerShell
- Android SDK Platform 26 (install through Visual Studio)
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -407,4 +407,3 @@ This is how we use the donations:
[Become a backer](https://opencollective.com/reactiveui#backer) and get your image on our README on Github with a link to your site.

<a href="https://opencollective.com/reactiveui#backer"><img src="https://opencollective.com/reactiveui/backer.svg?width=890&avatarHeight=50&button=false"></a>

2 changes: 1 addition & 1 deletion integrationtests/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
</ItemGroup>
<Import Project="..\directory.build.props" />
<Import Project="..\src\directory.build.props" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
</ItemGroup>

<ItemGroup>
Expand All @@ -29,7 +29,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Xunit.StaFact" Version="0.3.13" />
<PackageReference Include="Xunit.StaFact" Version="0.3.18" />
<PackageReference Include="FluentAssertions" Version="5.6.0" />
<PackageReference Include="ReactiveUI.Testing" Version="*" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<AssemblyName>IntegrationTests.UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<PackageReference Include="ReactiveUI.Events.WPF" Version="*" />
<PackageReference Include="ReactiveUI.WPF" Version="*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj" />
<ProjectReference Include="..\IntegrationTests.Shared\IntegrationTests.Shared.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<AssemblyName>IntegrationTests.XamarinForms.UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
<FileAlignment>512</FileAlignment>
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.build.props
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.0.25" PrivateAssets="all" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
</PropertyGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/ReactiveUI.AndroidSupport/ReactiveAppCompatActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class ReactiveAppCompatActivity : AppCompatActivity, IReactiveObject, IRe
{
private readonly Subject<Unit> _activated = new Subject<Unit>();
private readonly Subject<Unit> _deactivated = new Subject<Unit>();
private readonly Subject<Tuple<int, Result, Intent>> _activityResult = new Subject<Tuple<int, Result, Intent>>();
private readonly Subject<(int requestCode, Result result, Intent intent)> _activityResult = new Subject<(int requestCode, Result result, Intent intent)>();

/// <summary>
/// Initializes a new instance of the <see cref="ReactiveAppCompatActivity" /> class.
Expand Down Expand Up @@ -124,7 +124,7 @@ public event PropertyChangedEventHandler PropertyChanged
/// <value>
/// The activity result.
/// </value>
public IObservable<Tuple<int, Result, Intent>> ActivityResult => _activityResult.AsObservable();
public IObservable<(int requestCode, Result result, Intent intent)> ActivityResult => _activityResult.AsObservable();

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
Expand All @@ -150,13 +150,13 @@ public IDisposable SuppressChangeNotifications()
/// <param name="intent">The intent.</param>
/// <param name="requestCode">The request code.</param>
/// <returns>A task with the result and intent.</returns>
public Task<Tuple<Result, Intent>> StartActivityForResultAsync(Intent intent, int requestCode)
public Task<(Result result, Intent intent)> StartActivityForResultAsync(Intent intent, int requestCode)
{
// NB: It's important that we set up the subscription *before* we
// call ActivityForResult
var ret = ActivityResult
.Where(x => x.Item1 == requestCode)
.Select(x => Tuple.Create(x.Item2, x.Item3))
.Where(x => x.requestCode == requestCode)
.Select(x => (x.result, x.intent))
.FirstAsync()
.ToTask();

Expand All @@ -170,13 +170,13 @@ public Task<Tuple<Result, Intent>> StartActivityForResultAsync(Intent intent, in
/// <param name="type">The type.</param>
/// <param name="requestCode">The request code.</param>
/// <returns>A task with the result and intent.</returns>
public Task<Tuple<Result, Intent>> StartActivityForResultAsync(Type type, int requestCode)
public Task<(Result result, Intent intent)> StartActivityForResultAsync(Type type, int requestCode)
{
// NB: It's important that we set up the subscription *before* we
// call ActivityForResult
var ret = ActivityResult
.Where(x => x.Item1 == requestCode)
.Select(x => Tuple.Create(x.Item2, x.Item3))
.Where(x => x.requestCode == requestCode)
.Select(x => (x.result, x.intent))
.FirstAsync()
.ToTask();

Expand All @@ -202,7 +202,7 @@ protected override void OnResume()
protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
{
base.OnActivityResult(requestCode, resultCode, data);
_activityResult.OnNext(Tuple.Create(requestCode, resultCode, data));
_activityResult.OnNext((requestCode, resultCode, data));
}

/// <inheritdoc/>
Expand Down
18 changes: 9 additions & 9 deletions src/ReactiveUI.AndroidSupport/ReactiveFragmentActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class ReactiveFragmentActivity : FragmentActivity, IReactiveObject, IReac
{
private readonly Subject<Unit> _activated = new Subject<Unit>();
private readonly Subject<Unit> _deactivated = new Subject<Unit>();
private readonly Subject<Tuple<int, Result, Intent>> _activityResult = new Subject<Tuple<int, Result, Intent>>();
private readonly Subject<(int requestCode, Result result, Intent intent)> _activityResult = new Subject<(int requestCode, Result result, Intent intent)>();

/// <inheritdoc/>
public event PropertyChangingEventHandler PropertyChanging
Expand Down Expand Up @@ -112,7 +112,7 @@ public event PropertyChangedEventHandler PropertyChanged
/// <summary>
/// Gets the activity result.
/// </summary>
public IObservable<Tuple<int, Result, Intent>> ActivityResult => _activityResult.AsObservable();
public IObservable<(int requestCode, Result result, Intent intent)> ActivityResult => _activityResult.AsObservable();

/// <inheritdoc/>
void IReactiveObject.RaisePropertyChanging(PropertyChangingEventArgs args)
Expand All @@ -135,13 +135,13 @@ void IReactiveObject.RaisePropertyChanged(PropertyChangedEventArgs args)
/// <param name="intent">The intent.</param>
/// <param name="requestCode">The request code.</param>
/// <returns>A task with the result and intent.</returns>
public Task<Tuple<Result, Intent>> StartActivityForResultAsync(Intent intent, int requestCode)
public Task<(Result result, Intent intent)> StartActivityForResultAsync(Intent intent, int requestCode)
{
// NB: It's important that we set up the subscription *before* we
// call ActivityForResult
var ret = ActivityResult
.Where(x => x.Item1 == requestCode)
.Select(x => Tuple.Create(x.Item2, x.Item3))
.Where(x => x.requestCode == requestCode)
.Select(x => (x.result, x.intent))
.FirstAsync()
.ToTask();

Expand All @@ -155,13 +155,13 @@ public Task<Tuple<Result, Intent>> StartActivityForResultAsync(Intent intent, in
/// <param name="type">The type.</param>
/// <param name="requestCode">The request code.</param>
/// <returns>A task with the result and intent.</returns>
public Task<Tuple<Result, Intent>> StartActivityForResultAsync(Type type, int requestCode)
public Task<(Result result, Intent intent)> StartActivityForResultAsync(Type type, int requestCode)
{
// NB: It's important that we set up the subscription *before* we
// call ActivityForResult
var ret = ActivityResult
.Where(x => x.Item1 == requestCode)
.Select(x => Tuple.Create(x.Item2, x.Item3))
.Where(x => x.requestCode == requestCode)
.Select(x => (x.result, x.intent))
.FirstAsync()
.ToTask();

Expand All @@ -187,7 +187,7 @@ protected override void OnResume()
protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
{
base.OnActivityResult(requestCode, resultCode, data);
_activityResult.OnNext(Tuple.Create(requestCode, resultCode, data));
_activityResult.OnNext((requestCode, resultCode, data));
}

/// <inheritdoc/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public event PropertyChangedEventHandler PropertyChanged
/// <summary>
/// Gets an observable that signals that this ViewHolder has been selected.
///
/// The <see cref="TViewModel"/> is the ViewModel of this ViewHolder in the <see cref="RecyclerView"/>.
/// The <see cref="IObservable{TViewModel}"/> is the ViewModel of this ViewHolder in the <see cref="RecyclerView"/>.
/// </summary>
public IObservable<TViewModel> SelectedWithViewModel { get; }

Expand All @@ -119,7 +119,7 @@ public event PropertyChangedEventHandler PropertyChanged
/// <summary>
/// Gets an observable that signals that this ViewHolder has been long-clicked.
///
/// The <see cref="TViewModel"/> is the ViewModel of this ViewHolder in the <see cref="RecyclerView"/>.
/// The <see cref="IObservable{TViewModel}"/> is the ViewModel of this ViewHolder in the <see cref="RecyclerView"/>.
/// </summary>
public IObservable<TViewModel> LongClickedWithViewModel { get; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using System.Collections.Specialized;

namespace ReactiveUI
namespace ReactiveUI.Blazor
{
#if !NET_461
internal class CollectionChangedEventManager : WeakEventManager<INotifyCollectionChanged, NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>
/// <summary>
/// Returns the current orientation of the device on Windows.
/// </summary>
public class PlatformOperations : IPlatformOperations
{
/// <inheritdoc/>
public string GetOrientation()
{
return null;
}
}
#endif
}
27 changes: 27 additions & 0 deletions src/ReactiveUI.Blazor/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:50286/",
"sslPort": 0
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"ReactiveUI.Blazor": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://localhost:50291/"
}
}
}
Loading

0 comments on commit f396c32

Please sign in to comment.