Merge remote-tracking branch 'upstream/master'

SUPPORT.md

@@ -1,2 +0,0 @@
-### Common Issues
-- When installing the Dev Kit, if .NET Framework 4.6.2 isn't being found, try installing it from: https://www.microsoft.com/en-us/download/details.aspx?id=53321

install-VS2017.bat

@@ -1,18 +1,14 @@
 @echo off
 cls
 
-echo Check for installed .NET Framework 4.7.1
+set DOTNET_VERSION=4.7.1
 
-FOR /F "tokens=2*" %%A IN ('REG.EXE QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" /V "Release" 2^>NUL ^| FIND "REG_DWORD"') DO SET Ver=%%B
+echo Check for installed .NET Framework %DOTNET_VERSION%
-IF "%Ver%"=="" (
-  echo .NET Framework 4.7.1 or 4.5 or above 4.5 is not installed. Please download from https://www.microsoft.com/net/download/visual-studio-sdks
-  pause
-  goto:eof
-)
-SET "NET471_CREATORS=0x709fc"
 
-if NOT "%NET471_CREATORS%"=="%Ver%" (
+reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\SKUs\.NETFramework,Version=v%DOTNET_VERSION%" /ve >nul 2>&1
-  echo .NET Framework 4.7.1 is required.
+
+if %ERRORLEVEL% neq 0 (
+  echo .NET Framework %DOTNET_VERSION% is not installed. Please download it from https://www.microsoft.com/net/download/visual-studio-sdks
   pause
   goto:eof
 )

source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPage.cs

@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using Microsoft.VisualStudio.ProjectSystem;
 
 using VSPropertyPages;
@@ -6,17 +7,17 @@ using VSPropertyPages;
 namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
 {
     [Guid(PageGuid)]
-    internal class OldCosmosPropertyPage : PropertyPage
+    internal class OldCosmosPropertyPage : PropertyPageBase
     {
         public const string PageGuid = "8624b37e-183d-416c-a635-99ebc3bcffe6";
 
         public override string PageName => "Cosmos";
 
-        public override IPropertyPageUI CreatePropertyPageUI() => new OldCosmosPropertyPageControl();
+        public override IPropertyPageUI CreatePropertyPageUI() =>
+            new OldCosmosPropertyPageControl(
+                new OldCosmosPropertyPageViewModel((OldPropertyManager)PropertyManager, ProjectThreadingService));
 
-        public override PropertyPageViewModel CreatePropertyPageViewModel(
+        public override IPropertyManager CreatePropertyManager(
-            UnconfiguredProject unconfiguredProject,
+            IReadOnlyCollection<ConfiguredProject> configuredProjects) => new OldPropertyManager(UnconfiguredProject);
-            IProjectThreadingService projectThreadingService) => new OldCosmosPropertyPageViewModel(
-                new OldPropertyManager(unconfiguredProject), projectThreadingService);
     }
 }

source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPageControl.cs

@@ -12,7 +12,6 @@ using VSPropertyPages;
 using Cosmos.Build.Common;
 
 using DebugMode = Cosmos.Build.Common.DebugMode;
-using System.Threading.Tasks;
 
 namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
 {
@@ -26,10 +25,7 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
 
             public bool IsPreset;
 
-            public override string ToString()
+            public override string ToString() => Name;
-            {
-                return Name;
-            }
         }
 
         private OldCosmosPropertyPageViewModel mViewModel;
@@ -52,14 +48,11 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
 
         protected bool FreezeEvents;
 
-        public OldCosmosPropertyPageControl()
+        public OldCosmosPropertyPageControl(OldCosmosPropertyPageViewModel aViewModel)
         {
             InitializeComponent();
-        }
 
-        public override Task SetViewModelAsync(PropertyPageViewModel propertyPageViewModel)
+            mViewModel = aViewModel;
-        {
-            mViewModel = (OldCosmosPropertyPageViewModel)propertyPageViewModel;
 
             #region Profile
 
@@ -308,11 +301,10 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
                     mViewModel.BuildProperties.StartBochsDebugGui = x;
                 }
             };
+
             #endregion
 
             FillProperties();
-
-            return Task.CompletedTask;
         }
 
         protected void RemoveTab(TabPage aTab)

source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldPropertyManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.ProjectSystem;
 
@@ -23,6 +24,7 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
 
         public event EventHandler<ProjectPropertyChangedEventArgs> PropertyChanged;
         public event EventHandler<ProjectPropertyChangingEventArgs> PropertyChanging;
+        public event EventHandler ConfigurationsChanged;
 
         public OldPropertyManager(UnconfiguredProject unconfiguredProject)
         {
@@ -135,5 +137,7 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
                 return project.GetPropertyValue(propertyName);
             }
         }
+
+        public Task UpdateConfigurationsAsync(IReadOnlyCollection<ConfiguredProject> configuredProjects) => Task.CompletedTask;
     }
 }