mirror of
https://github.com/danbulant/Cosmos
synced 2026-06-05 07:42:45 +00:00
Merge remote-tracking branch 'refs/remotes/CosmosOS/master'
This commit is contained in:
commit
9f7cc7243a
12 changed files with 81 additions and 28 deletions
13
.github/issue_template.md
vendored
Normal file
13
.github/issue_template.md
vendored
Normal 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?
|
||||||
|
|
@ -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.
|
- 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.
|
- 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 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.
|
- 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
10
README.md
|
|
@ -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 for master branch:
|
||||||
[](https://ci.appveyor.com/project/CosmosOS/cosmos/branch/master)
|
[](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.
|
||||||
|
|
|
||||||
|
|
@ -6,3 +6,4 @@
|
||||||
<DesignTimeBuild>True</DesignTimeBuild>
|
<DesignTimeBuild>True</DesignTimeBuild>
|
||||||
<ProjectAssetsFile>NULL</ProjectAssetsFile>
|
<ProjectAssetsFile>NULL</ProjectAssetsFile>
|
||||||
```
|
```
|
||||||
|
^This issue is fixed in Userkit 20170928 https://github.com/CosmosOS/Cosmos/releases/tag/Userkit_20170928
|
||||||
|
|
|
||||||
|
|
@ -1,35 +1,36 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net462</TargetFramework>
|
<TargetFramework>net462</TargetFramework>
|
||||||
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
|
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
|
||||||
<SignAssembly>True</SignAssembly>
|
<SignAssembly>True</SignAssembly>
|
||||||
<AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
|
<AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
|
||||||
</PropertyGroup>
|
</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>
|
<ItemGroup>
|
||||||
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(Filename)' == 'System.Data.Common'" />
|
<Content Include="Cosmos.targets">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
</ItemGroup>
|
</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>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -379,6 +379,27 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl
|
||||||
|
|
||||||
private void DbgCmdNullReferenceOccurred(uint lastEIPAddress)
|
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));
|
AD7Util.MessageBox(String.Format("NullReferenceException occurred at address 0x{0:X8}! Halting now.", lastEIPAddress));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
<CreateNewFolder>true</CreateNewFolder>
|
<CreateNewFolder>true</CreateNewFolder>
|
||||||
<DefaultName>Cosmos</DefaultName>
|
<DefaultName>Cosmos</DefaultName>
|
||||||
<ProvideDefaultName>true</ProvideDefaultName>
|
<ProvideDefaultName>true</ProvideDefaultName>
|
||||||
|
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
|
||||||
</TemplateData>
|
</TemplateData>
|
||||||
<TemplateContent>
|
<TemplateContent>
|
||||||
<Project File="CosmosProject.Cosmos" ReplaceParameters="true">
|
<Project File="CosmosProject.Cosmos" ReplaceParameters="true">
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@
|
||||||
<DefaultName>CSharpKernel</DefaultName>
|
<DefaultName>CSharpKernel</DefaultName>
|
||||||
<ProvideDefaultName>true</ProvideDefaultName>
|
<ProvideDefaultName>true</ProvideDefaultName>
|
||||||
<CreateInPlace>true</CreateInPlace>
|
<CreateInPlace>true</CreateInPlace>
|
||||||
|
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
|
||||||
</TemplateData>
|
</TemplateData>
|
||||||
<TemplateContent>
|
<TemplateContent>
|
||||||
<Project File="CSharpProject.csproj" ReplaceParameters="true">
|
<Project File="CSharpProject.csproj" ReplaceParameters="true">
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@
|
||||||
<DefaultName>VBKernel</DefaultName>
|
<DefaultName>VBKernel</DefaultName>
|
||||||
<ProvideDefaultName>true</ProvideDefaultName>
|
<ProvideDefaultName>true</ProvideDefaultName>
|
||||||
<CreateInPlace>true</CreateInPlace>
|
<CreateInPlace>true</CreateInPlace>
|
||||||
|
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
|
||||||
</TemplateData>
|
</TemplateData>
|
||||||
<TemplateContent>
|
<TemplateContent>
|
||||||
<Project File="VBProjKernel.vbproj" ReplaceParameters="true">
|
<Project File="VBProjKernel.vbproj" ReplaceParameters="true">
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@
|
||||||
<DefaultName>CosmosKernel</DefaultName>
|
<DefaultName>CosmosKernel</DefaultName>
|
||||||
<ProvideDefaultName>true</ProvideDefaultName>
|
<ProvideDefaultName>true</ProvideDefaultName>
|
||||||
<CreateInPlace>true</CreateInPlace>
|
<CreateInPlace>true</CreateInPlace>
|
||||||
|
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
|
||||||
</TemplateData>
|
</TemplateData>
|
||||||
<TemplateContent>
|
<TemplateContent>
|
||||||
<Project File="CSharpProject.csproj" ReplaceParameters="true">
|
<Project File="CSharpProject.csproj" ReplaceParameters="true">
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@
|
||||||
<DefaultName>CosmosKernel</DefaultName>
|
<DefaultName>CosmosKernel</DefaultName>
|
||||||
<ProvideDefaultName>true</ProvideDefaultName>
|
<ProvideDefaultName>true</ProvideDefaultName>
|
||||||
<CreateInPlace>true</CreateInPlace>
|
<CreateInPlace>true</CreateInPlace>
|
||||||
|
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
|
||||||
</TemplateData>
|
</TemplateData>
|
||||||
<TemplateContent>
|
<TemplateContent>
|
||||||
<Project File="FSharpProject.fsproj" ReplaceParameters="true">
|
<Project File="FSharpProject.fsproj" ReplaceParameters="true">
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@
|
||||||
<DefaultName>CosmosKernel</DefaultName>
|
<DefaultName>CosmosKernel</DefaultName>
|
||||||
<ProvideDefaultName>true</ProvideDefaultName>
|
<ProvideDefaultName>true</ProvideDefaultName>
|
||||||
<CreateInPlace>true</CreateInPlace>
|
<CreateInPlace>true</CreateInPlace>
|
||||||
|
<PromptForSaveOnCreation>true</PromptForSaveOnCreation>
|
||||||
</TemplateData>
|
</TemplateData>
|
||||||
<TemplateContent>
|
<TemplateContent>
|
||||||
<Project File="VBProjKernel.vbproj" ReplaceParameters="true">
|
<Project File="VBProjKernel.vbproj" ReplaceParameters="true">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue