From 37623dc78db07e172207d16e318cc3ff57afcb22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Thu, 22 Feb 2018 20:10:48 +0000 Subject: [PATCH 1/3] VS property pages. --- .../VS/PropertyPages/OldCosmosPropertyPage.cs | 15 ++++++++------- .../OldCosmosPropertyPageControl.cs | 16 ++++------------ .../VS/PropertyPages/OldPropertyManager.cs | 4 ++++ 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPage.cs b/source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPage.cs index 422cba6b0..93ca613f7 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPage.cs +++ b/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( - UnconfiguredProject unconfiguredProject, - IProjectThreadingService projectThreadingService) => new OldCosmosPropertyPageViewModel( - new OldPropertyManager(unconfiguredProject), projectThreadingService); + public override IPropertyManager CreatePropertyManager( + IReadOnlyCollection configuredProjects) => new OldPropertyManager(UnconfiguredProject); } } diff --git a/source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPageControl.cs b/source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPageControl.cs index 75b96021e..ca090899e 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPageControl.cs +++ b/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() - { - return Name; - } + public override string ToString() => 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 = (OldCosmosPropertyPageViewModel)propertyPageViewModel; + mViewModel = aViewModel; #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) diff --git a/source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldPropertyManager.cs b/source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldPropertyManager.cs index cb0ddc2c8..bd42aa0d6 100644 --- a/source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldPropertyManager.cs +++ b/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 PropertyChanged; public event EventHandler 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 configuredProjects) => Task.CompletedTask; } } From 66554bd34b47959b4418f5c2b4b9caef99e4c1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Sat, 24 Feb 2018 01:05:03 +0000 Subject: [PATCH 2/3] Removed SUPPORT.md. --- SUPPORT.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 SUPPORT.md diff --git a/SUPPORT.md b/SUPPORT.md deleted file mode 100644 index ffee7a719..000000000 --- a/SUPPORT.md +++ /dev/null @@ -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 From ba59a99cae10087ec4a9e1862e21af2ec964288c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Sat, 24 Feb 2018 01:06:53 +0000 Subject: [PATCH 3/3] Fixed .NET Framework check. --- install-VS2017.bat | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/install-VS2017.bat b/install-VS2017.bat index 2eef95385..2c0733b90 100644 --- a/install-VS2017.bat +++ b/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 -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" +echo Check for installed .NET Framework %DOTNET_VERSION% -if NOT "%NET471_CREATORS%"=="%Ver%" ( - echo .NET Framework 4.7.1 is required. +reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\SKUs\.NETFramework,Version=v%DOTNET_VERSION%" /ve >nul 2>&1 + +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 )