Skip to content

Commit 03a2ac6

Browse files
authored
housekeeping: Update the directory.build.props (#2082)
1 parent 22ed350 commit 03a2ac6

File tree

4 files changed

+111
-115
lines changed

4 files changed

+111
-115
lines changed

directory.build.props

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Directory.build.props

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,38 @@
11
<Project>
22
<PropertyGroup>
3-
<Owners>xanaisbettsx;ghuntley</Owners>
4-
<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>
5-
<PackageReleaseNotes>https://reactiveui.net/blog/</PackageReleaseNotes>
63
<GenerateDocumentationFile>true</GenerateDocumentationFile>
74
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000</NoWarn>
85
<Platform>AnyCPU</Platform>
96
<IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
107
<DebugType>embedded</DebugType>
8+
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)analyzers.ruleset</CodeAnalysisRuleSet>
9+
10+
<Authors>.NET Foundation and Contributors</Authors>
11+
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
12+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
13+
<PackageProjectUrl>https://reactiveui.net</PackageProjectUrl>
14+
<PackageIconUrl>https://github.com/reactiveui/styleguide/blob/master/logo/main.png?raw=true</PackageIconUrl>
15+
<PackageDescription>A MVVM framework that integrates with the Reactive Extensions for .NET to create elegant, testable User Interfaces that run on any mobile or desktop platform. Supports Xamarin.iOS, Xamarin.Android, Xamarin.Mac, Xamarin Forms, Xamarin.TVOS, Tizen, WPF, Windows Forms, Windows Store and Universal Windows Platform (UWP).</PackageDescription>
16+
<Owners>xanaisbettsx;ghuntley</Owners>
17+
<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>
18+
<PackageReleaseNotes>https://github.com/reactiveui/ReactiveUI/releases</PackageReleaseNotes>
19+
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
20+
<RepositoryType>git</RepositoryType>
21+
22+
<!-- disable sourcelink on mono, to workaround https://github.com/dotnet/sourcelink/issues/155 -->
23+
<EnableSourceLink Condition=" '$(OS)' != 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">false</EnableSourceLink>
24+
<EnableSourceControlManagerQueries>$(EnableSourceLink)</EnableSourceControlManagerQueries>
1125
<!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
1226
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1327
<!-- Embed source files that are not tracked by the source control manager in the PDB -->
1428
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1529
<!-- Include PDB in the built .nupkg -->
1630
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
17-
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)analyzers.ruleset</CodeAnalysisRuleSet>
31+
</PropertyGroup>
1832

19-
<!-- disable sourcelink on mono, to workaround https://github.com/dotnet/sourcelink/issues/155 -->
20-
<EnableSourceLink Condition=" '$(OS)' != 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">false</EnableSourceLink>
21-
<EnableSourceControlManagerQueries>$(EnableSourceLink)</EnableSourceControlManagerQueries>
33+
<!-- MonoAndroid doesn't seem to want to allow debugging for maintainers -->
34+
<PropertyGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
35+
<DebugType>Full</DebugType>
2236
</PropertyGroup>
2337

2438
<PropertyGroup Condition="$(IsTestProject)">
@@ -27,22 +41,22 @@
2741
</PropertyGroup>
2842

2943
<ItemGroup Condition="$(IsTestProject)">
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
44+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
3145
<PackageReference Include="xunit" Version="2.4.1" />
3246
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
3347
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
3448
<PackageReference Include="Xunit.StaFact" Version="0.3.18" />
35-
<PackageReference Include="Shouldly" Version="3.0.2" />
49+
<PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
3650
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.5" />
37-
<PackageReference Include="PublicApiGenerator" Version="8.1.0" />
51+
<PackageReference Include="PublicApiGenerator" Version="9.0.0" />
3852
</ItemGroup>
3953

4054
<ItemGroup Condition="$(IsTestProject)">
4155
<Compile Include="$(MSBuildThisFileDirectory)ApiGeneratorGlobalSuppressions.cs" />
4256
</ItemGroup>
4357

4458
<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false'">
45-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
59+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19270-01" PrivateAssets="All" />
4660
</ItemGroup>
4761

4862
<PropertyGroup>
@@ -54,18 +68,16 @@
5468
</ItemGroup>
5569

5670
<ItemGroup>
57-
<PackageReference Include="Nerdbank.GitVersioning" Version="2.3.38" PrivateAssets="all" />
71+
<PackageReference Include="Nerdbank.GitVersioning" Version="2.3.183" PrivateAssets="all" />
5872
</ItemGroup>
5973

6074
<ItemGroup>
6175
<PackageReference Include="stylecop.analyzers" Version="1.1.118" PrivateAssets="all" />
6276
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3" PrivateAssets="all" />
6377
<PackageReference Include="Roslynator.Analyzers" Version="2.1.0-rc" PrivateAssets="All" />
64-
<PackageReference Condition="'$(OS)' == 'Windows_NT'" Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.2" PrivateAssets="all" />
78+
<PackageReference Condition="'$(OS)' == 'Windows_NT'" Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.3" PrivateAssets="all" />
6579
</ItemGroup>
6680
<ItemGroup>
6781
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
6882
</ItemGroup>
69-
70-
<Import Project="..\Directory.build.props" />
7183
</Project>

src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net461.approved.txt

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -186,35 +186,19 @@ namespace ReactiveUI
186186
void RegisterScheduler<T>(System.Reactive.Concurrency.IScheduler scheduler, string contract = null);
187187
void SendMessage<T>(T message, string contract = null);
188188
}
189-
public interface INotifyCollectionChanging
190-
{
191-
public event System.Collections.Specialized.NotifyCollectionChangedEventHandler CollectionChanging;
192-
}
193-
public interface INotifyPropertyChanging
194-
{
195-
public event ReactiveUI.PropertyChangingEventHandler PropertyChanging;
196-
}
197189
public class INPCObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger
198190
{
199191
public INPCObservableForProperty() { }
200192
public int GetAffinityForObject(System.Type type, string propertyName, bool beforeChanged) { }
201193
public System.IObservable<ReactiveUI.IObservedChange<object, object>> GetNotificationForProperty(object sender, System.Linq.Expressions.Expression expression, string propertyName, bool beforeChanged, bool suppressWarnings = False) { }
202194
}
203-
public class Interaction<TInput, TOutput>
195+
public interface INotifyCollectionChanging
204196
{
205-
public Interaction(System.Reactive.Concurrency.IScheduler handlerScheduler = null) { }
206-
protected System.Func<, >[] GetHandlers() { }
207-
public virtual System.IObservable<TOutput> Handle(TInput input) { }
208-
public System.IDisposable RegisterHandler(System.Action<ReactiveUI.InteractionContext<TInput, TOutput>> handler) { }
209-
public System.IDisposable RegisterHandler(System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.Threading.Tasks.Task> handler) { }
210-
public System.IDisposable RegisterHandler<TDontCare>(System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.IObservable<TDontCare>> handler) { }
197+
public event System.Collections.Specialized.NotifyCollectionChangedEventHandler CollectionChanging;
211198
}
212-
public sealed class InteractionContext<TInput, TOutput>
199+
public interface INotifyPropertyChanging
213200
{
214-
public TInput Input { get; }
215-
public bool IsHandled { get; }
216-
public TOutput GetOutput() { }
217-
public void SetOutput(TOutput output) { }
201+
public event ReactiveUI.PropertyChangingEventHandler PropertyChanging;
218202
}
219203
public interface IObservedChange<out TSender, out TValue>
220204
{
@@ -248,6 +232,12 @@ namespace ReactiveUI
248232
{
249233
bool ExecuteHook(object source, object target, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction);
250234
}
235+
public class IROObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger
236+
{
237+
public IROObservableForProperty() { }
238+
public int GetAffinityForObject(System.Type type, string propertyName, bool beforeChanged = False) { }
239+
public System.IObservable<ReactiveUI.IObservedChange<object, object>> GetNotificationForProperty(object sender, System.Linq.Expressions.Expression expression, string propertyName, bool beforeChanged = False, bool suppressWarnings = False) { }
240+
}
251241
public interface IReactiveBinding<out TView, out TViewModel, out TValue> : System.IDisposable
252242
where out TView : ReactiveUI.IViewFor
253243
where out TViewModel : class
@@ -289,12 +279,6 @@ namespace ReactiveUI
289279
string PropertyName { get; }
290280
TSender Sender { get; }
291281
}
292-
public class IROObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger
293-
{
294-
public IROObservableForProperty() { }
295-
public int GetAffinityForObject(System.Type type, string propertyName, bool beforeChanged = False) { }
296-
public System.IObservable<ReactiveUI.IObservedChange<object, object>> GetNotificationForProperty(object sender, System.Linq.Expressions.Expression expression, string propertyName, bool beforeChanged = False, bool suppressWarnings = False) { }
297-
}
298282
public interface IRoutableViewModel : ReactiveUI.INotifyPropertyChanging, ReactiveUI.IReactiveObject, Splat.IEnableLogger, System.ComponentModel.INotifyPropertyChanged
299283
{
300284
ReactiveUI.IScreen HostScreen { get; }
@@ -343,6 +327,22 @@ namespace ReactiveUI
343327
ReactiveUI.IViewFor ResolveView<T>(T viewModel, string contract = null)
344328
where T : class;
345329
}
330+
public sealed class InteractionContext<TInput, TOutput>
331+
{
332+
public TInput Input { get; }
333+
public bool IsHandled { get; }
334+
public TOutput GetOutput() { }
335+
public void SetOutput(TOutput output) { }
336+
}
337+
public class Interaction<TInput, TOutput>
338+
{
339+
public Interaction(System.Reactive.Concurrency.IScheduler handlerScheduler = null) { }
340+
protected System.Func<, >[] GetHandlers() { }
341+
public virtual System.IObservable<TOutput> Handle(TInput input) { }
342+
public System.IDisposable RegisterHandler(System.Action<ReactiveUI.InteractionContext<TInput, TOutput>> handler) { }
343+
public System.IDisposable RegisterHandler(System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.Threading.Tasks.Task> handler) { }
344+
public System.IDisposable RegisterHandler<TDontCare>(System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.IObservable<TDontCare>> handler) { }
345+
}
346346
public class MessageBus : ReactiveUI.IMessageBus, Splat.IEnableLogger
347347
{
348348
public MessageBus() { }
@@ -410,17 +410,17 @@ namespace ReactiveUI
410410
public static System.Collections.Generic.IComparer<T> OrderByDescending<TValue>(System.Func<T, TValue> selector) { }
411411
public static System.Collections.Generic.IComparer<T> OrderByDescending<TValue>(System.Func<T, TValue> selector, System.Collections.Generic.IComparer<TValue> comparer) { }
412412
}
413-
public class PlatformRegistrations
414-
{
415-
public PlatformRegistrations() { }
416-
public void Register(System.Action<System.Func<object>, System.Type> registerFunction) { }
417-
}
418413
public class POCOObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger
419414
{
420415
public POCOObservableForProperty() { }
421416
public int GetAffinityForObject(System.Type type, string propertyName, bool beforeChanged = False) { }
422417
public System.IObservable<ReactiveUI.IObservedChange<object, object>> GetNotificationForProperty(object sender, System.Linq.Expressions.Expression expression, string propertyName, bool beforeChanged = False, bool suppressWarnings = False) { }
423418
}
419+
public class PlatformRegistrations
420+
{
421+
public PlatformRegistrations() { }
422+
public void Register(System.Action<System.Func<object>, System.Type> registerFunction) { }
423+
}
424424
public class PropertyBinderImplementation : ReactiveUI.IPropertyBinderImplementation, Splat.IEnableLogger
425425
{
426426
public PropertyBinderImplementation() { }
@@ -486,16 +486,6 @@ namespace ReactiveUI
486486
public static ReactiveUI.ReactiveCommand<TParam, System.Reactive.Unit> CreateFromTask<TParam>(System.Func<TParam, System.Threading.Tasks.Task> execute, System.IObservable<bool> canExecute = null, System.Reactive.Concurrency.IScheduler outputScheduler = null) { }
487487
public static ReactiveUI.ReactiveCommand<TParam, System.Reactive.Unit> CreateFromTask<TParam>(System.Func<TParam, System.Threading.CancellationToken, System.Threading.Tasks.Task> execute, System.IObservable<bool> canExecute = null, System.Reactive.Concurrency.IScheduler outputScheduler = null) { }
488488
}
489-
public class ReactiveCommand<TParam, TResult> : ReactiveUI.ReactiveCommandBase<TParam, TResult>
490-
{
491-
protected internal ReactiveCommand(System.Func<TParam, System.IObservable<TResult>> execute, System.IObservable<bool> canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { }
492-
public override System.IObservable<bool> CanExecute { get; }
493-
public override System.IObservable<bool> IsExecuting { get; }
494-
public override System.IObservable<System.Exception> ThrownExceptions { get; }
495-
protected override void Dispose(bool disposing) { }
496-
public override System.IObservable<TResult> Execute(TParam parameter = null) { }
497-
public override System.IDisposable Subscribe(System.IObserver<TResult> observer) { }
498-
}
499489
public abstract class ReactiveCommandBase<TParam, TResult> : ReactiveUI.IHandleObservableErrors, ReactiveUI.IReactiveCommand, System.IDisposable, System.IObservable<TResult>, System.Windows.Input.ICommand
500490
{
501491
protected ReactiveCommandBase() { }
@@ -520,6 +510,16 @@ namespace ReactiveUI
520510
public static System.IDisposable InvokeCommand<T, TResult, TTarget>(this System.IObservable<T> @this, TTarget target, System.Linq.Expressions.Expression<System.Func<TTarget, ReactiveUI.ReactiveCommandBase<T, TResult>>> commandProperty)
521511
where TTarget : class { }
522512
}
513+
public class ReactiveCommand<TParam, TResult> : ReactiveUI.ReactiveCommandBase<TParam, TResult>
514+
{
515+
protected internal ReactiveCommand(System.Func<TParam, System.IObservable<TResult>> execute, System.IObservable<bool> canExecute, System.Reactive.Concurrency.IScheduler outputScheduler) { }
516+
public override System.IObservable<bool> CanExecute { get; }
517+
public override System.IObservable<bool> IsExecuting { get; }
518+
public override System.IObservable<System.Exception> ThrownExceptions { get; }
519+
protected override void Dispose(bool disposing) { }
520+
public override System.IObservable<TResult> Execute(TParam parameter = null) { }
521+
public override System.IDisposable Subscribe(System.IObserver<TResult> observer) { }
522+
}
523523
public class static ReactiveNotifyPropertyChangedMixin
524524
{
525525
public static System.IObservable<ReactiveUI.IObservedChange<TSender, TValue>> ObservableForProperty<TSender, TValue>(this TSender @this, System.Linq.Expressions.Expression<System.Func<TSender, TValue>> property, bool beforeChange = False, bool skipInitial = True) { }
@@ -908,8 +908,8 @@ namespace ReactiveUI.Legacy
908908
public System.IObservable<T> BeforeItemsAdded { get; }
909909
public System.IObservable<ReactiveUI.Legacy.IMoveInfo<T>> BeforeItemsMoved { get; }
910910
public System.IObservable<T> BeforeItemsRemoved { get; }
911-
public System.IObservable<System.Collections.Specialized.NotifyCollectionChangedEventArgs> Changed { get; }
912911
public bool ChangeTrackingEnabled { get; set; }
912+
public System.IObservable<System.Collections.Specialized.NotifyCollectionChangedEventArgs> Changed { get; }
913913
public System.IObservable<System.Collections.Specialized.NotifyCollectionChangedEventArgs> Changing { get; }
914914
public int Count { get; }
915915
public System.IObservable<int> CountChanged { get; }

0 commit comments

Comments
 (0)