dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-19 04:18:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Quajak 2018-02-24 15:26:33 +01:00
commit 88c50eceb7
5 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SUPPORT.md
View file

@ -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

16
install-VS2017.bat
View file

@ -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
)

15
source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPage.cs
View file

@ -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<ConfiguredProject> configuredProjects) => new OldPropertyManager(UnconfiguredProject);
}
}

16
source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPageControl.cs
View file

@ -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)

4
source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldPropertyManager.cs
View file

@ -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;
}
}