From 689781f24e481083318c65bb3110ae465e093b14 Mon Sep 17 00:00:00 2001
From: Dariusz Komosinski <darek.komosinski@gmail.com>
Date: Sat, 20 Jul 2019 16:59:13 +0200
Subject: [PATCH] Make ViewModelBase and ViewLocator internal.

---
 samples/ControlCatalog/ViewModels/MainWindowViewModel.cs   | 3 +--
 src/Avalonia.Diagnostics/ViewLocator.cs                    | 2 +-
 src/Avalonia.Diagnostics/ViewModels/ViewModelBase.cs       | 7 +++++--
 .../Views/{TreePage.xaml.cs => TreePageView.xaml.cs}       | 0
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename src/Avalonia.Diagnostics/Views/{TreePage.xaml.cs => TreePageView.xaml.cs} (100%)

diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 28cb84dad0..adf0345a70 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -1,11 +1,10 @@
 using System.Reactive;
 using Avalonia.Controls.Notifications;
-using Avalonia.Diagnostics.ViewModels;
 using ReactiveUI;
 
 namespace ControlCatalog.ViewModels
 {
-    class MainWindowViewModel : ViewModelBase
+    class MainWindowViewModel : ReactiveObject
     {
         private IManagedNotificationManager _notificationManager;
 
diff --git a/src/Avalonia.Diagnostics/ViewLocator.cs b/src/Avalonia.Diagnostics/ViewLocator.cs
index cda511909a..a66703301d 100644
--- a/src/Avalonia.Diagnostics/ViewLocator.cs
+++ b/src/Avalonia.Diagnostics/ViewLocator.cs
@@ -7,7 +7,7 @@ using Avalonia.Controls.Templates;
 
 namespace Avalonia.Diagnostics
 {
-    public class ViewLocator<TViewModel> : IDataTemplate
+    internal class ViewLocator<TViewModel> : IDataTemplate
     {
         public bool SupportsRecycling => false;
 
diff --git a/src/Avalonia.Diagnostics/ViewModels/ViewModelBase.cs b/src/Avalonia.Diagnostics/ViewModels/ViewModelBase.cs
index 00660754c0..a6ff4dd853 100644
--- a/src/Avalonia.Diagnostics/ViewModels/ViewModelBase.cs
+++ b/src/Avalonia.Diagnostics/ViewModels/ViewModelBase.cs
@@ -1,11 +1,14 @@
-using System.Collections.Generic;
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
-    public class ViewModelBase : INotifyPropertyChanged
+    internal class ViewModelBase : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
diff --git a/src/Avalonia.Diagnostics/Views/TreePage.xaml.cs b/src/Avalonia.Diagnostics/Views/TreePageView.xaml.cs
similarity index 100%
rename from src/Avalonia.Diagnostics/Views/TreePage.xaml.cs
rename to src/Avalonia.Diagnostics/Views/TreePageView.xaml.cs