dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-27 22:12:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/CosmosOS/master'

Browse source
This commit is contained in:
GeomTech 2017-10-31 21:57:23 +01:00
commit 9f7cc7243a
12 changed files with 81 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.github/issue_template.md vendored Normal file
View file

@ -0,0 +1,13 @@
#### Area of Cosmos - What area of Cosmos are we dealing with?
#### Expected Behaviour - What do you want to happen?
#### Actual behaviour - What unexpectedly happens?
#### Reproduction - How did you get this error to appear?
#### Version information - Were you using the Userkit or Devkit? And what userkit version or devkit commit?

1
CONTRIBUTING.md
View file

@ -2,6 +2,7 @@ CosmosOS is a volunteer effort. We encourage you to pitch in. Join the team!
- Before you begin work, make sure to clear it with the project owners. It will save a lot of time down the road.
- Fork the project over to your account, do not request repository access.
- Please be sure to check out the FAQ to see if any questions you have are already answered. [FAQ on GoCosmos.org](https://www.gocosmos.org/faq/)
- Please don't "bump" your issue(s). If you've filed it, we have seen it.
- Please be sure to install the [EditorConfig](https://visualstudiogallery.msdn.microsoft.com/c8bccfe2-650c-4b42-bc5c-845e21f96328). This ensures your pull requests meet the required formatting and conventions. [See here](https://github.com/CosmosOS/Cosmos/wiki/FAQ#what-is-this-editorconfig-file-and-how-do-i-use-it) for more info.

10
README.md
View file

@ -4,3 +4,13 @@ For instructions on how to install and use Cosmos, please visit [www.goCosmos.or
Build status for master branch:
[![Build status](https://ci.appveyor.com/api/projects/status/kust7g5dlnykhkaf/branch/master?svg=true)](https://ci.appveyor.com/project/CosmosOS/cosmos/branch/master)
# Urgent Notice
## Updated Sep 29, 2017
The hosting service which hosts our website has a technical issue which has taken our website offline. We are urgently working to resolve this issue.
## Hurricane Harvey
The issue is being impacted by lasting impacts to a center in Houston affected by Harvey and the impacts of moving resources out of the affected location.

1
SUPPORT.md
View file

@ -6,3 +6,4 @@
<DesignTimeBuild>True</DesignTimeBuild>
<ProjectAssetsFile>NULL</ProjectAssetsFile>
```
^This issue is fixed in Userkit 20170928 https://github.com/CosmosOS/Cosmos/releases/tag/Userkit_20170928

57
source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
View file

@ -1,35 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Content Include="Cosmos.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" Version="15.3.409" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.3.409" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="2.0.0" />
<PackageReference Include="System.Data.Common" Version="4.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
<ProjectReference Include="..\..\..\IL2CPU\source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj" />
</ItemGroup>
<Target Name="ExcludeSystemDataCommon" AfterTargets="ImplicitlyExpandNETStandardFacades">
<ItemGroup>
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(Filename)' == 'System.Data.Common'" />
<Content Include="Cosmos.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Target>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" Version="15.3.409" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.3.409" />
<PackageReference Include="System.Data.Common" Version="4.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj" />
<ProjectReference Include="..\..\..\IL2CPU\source\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj" />
</ItemGroup>
<Target Name="ExcludeSystemDataCommon" AfterTargets="ImplicitlyExpandNETStandardFacades">
<ItemGroup>
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(Filename)' == 'System.Data.Common'" />
</ItemGroup>
</Target>
<Target Name="ExcludeESqlite3FromPublishDir" AfterTargets="Publish">
<Delete Files="$(PublishDir)e_sqlite3.dll" Condition="Exists('$(PublishDir)e_sqlite3.dll')" />
</Target>
</Project>

21
source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs
View file

@ -379,6 +379,27 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl
private void DbgCmdNullReferenceOccurred(uint lastEIPAddress)
{
if (mDebugInfo.TryGetValue(BuildPropertyNames.DebugModeString, out var xDebugMode))
{
if (xDebugMode == "Source")
{
try
{
var xMethod = mDebugInfoDb.GetMethod(lastEIPAddress);
var xLabel = mDebugInfoDb.GetLabels(lastEIPAddress)[0];
var xMethodIlOp = mDebugInfoDb.TryGetFirstMethodIlOpByLabelName(xLabel.Remove(xLabel.LastIndexOf('.'))).IlOffset;
var xSequencePoints = mDebugInfoDb.GetSequencePoints(mDebugInfoDb.GetAssemblyFileById(xMethod.AssemblyFileID).Pathname, xMethod.MethodToken);
var xLine = xSequencePoints.Where(q => q.Offset <= xMethodIlOp).Last().LineStart;
AD7Util.MessageBox($"NullReferenceException occurred in '{xMethod.LabelCall}'{Environment.NewLine}Document: {mDebugInfoDb.GetDocumentById(xMethod.DocumentID)}{Environment.NewLine}Line: {xLine}{Environment.NewLine}Address: 0x{lastEIPAddress.ToString("X8")}");
return;
}
catch (InvalidOperationException)
{
}
}
}
AD7Util.MessageBox(String.Format("NullReferenceException occurred at address 0x{0:X8}! Halting now.", lastEIPAddress));
}

1
source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/Cosmos.vstemplate
View file

@ -7,6 +7,7 @@
<CreateNewFolder>true</CreateNewFolder>
<DefaultName>Cosmos</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
</TemplateData>
<TemplateContent>
<Project File="CosmosProject.Cosmos" ReplaceParameters="true">

1
source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (CSharp)/CSharpProj.vstemplate
View file

@ -8,6 +8,7 @@
<DefaultName>CSharpKernel</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<CreateInPlace>true</CreateInPlace>
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
</TemplateData>
<TemplateContent>
<Project File="CSharpProject.csproj" ReplaceParameters="true">

1
source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosKernel (VB)/VBProj.vstemplate
View file

@ -8,6 +8,7 @@
<DefaultName>VBKernel</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<CreateInPlace>true</CreateInPlace>
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
</TemplateData>
<TemplateContent>
<Project File="VBProjKernel.vbproj" ReplaceParameters="true">

1
source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (CSharp)/CSharpProj.vstemplate
View file

@ -8,6 +8,7 @@
<DefaultName>CosmosKernel</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<CreateInPlace>true</CreateInPlace>
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
</TemplateData>
<TemplateContent>
<Project File="CSharpProject.csproj" ReplaceParameters="true">

1
source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (FSharp)/FSharpProj.vstemplate
View file

@ -8,6 +8,7 @@
<DefaultName>CosmosKernel</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<CreateInPlace>true</CreateInPlace>
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
</TemplateData>
<TemplateContent>
<Project File="FSharpProject.fsproj" ReplaceParameters="true">

1
source/Cosmos.VS.ProjectSystem/ProjectTemplates/CosmosProject (VB)/VBProj.vstemplate
View file

@ -8,6 +8,7 @@
<DefaultName>CosmosKernel</DefaultName>
<ProvideDefaultName>true</ProvideDefaultName>
<CreateInPlace>true</CreateInPlace>
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
</TemplateData>
<TemplateContent>
<Project File="VBProjKernel.vbproj" ReplaceParameters="true">