Skip to content

Commit

Permalink
Compiler fixes.
Browse files Browse the repository at this point in the history
Created project.json files for projects that need it.
  • Loading branch information
jp2masa committed Jan 11, 2017
1 parent fc9a412 commit c2d422e
Show file tree
Hide file tree
Showing 77 changed files with 919 additions and 438 deletions.
62 changes: 62 additions & 0 deletions Cosmos.sln
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetCore", "NetCore", "{4561
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Debug.Net462", "source\Cosmos.Debug.Net462\Cosmos.Debug.Net462.csproj", "{A0C60E14-7520-48CC-B624-8EB1D798E1A6}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cosmos.IL2CPU.Plugs", "source\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.xproj", "{9778FAA1-B346-4471-97CD-F5AA78A5E82C}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cosmos.Core", "source\Cosmos.Core\Cosmos.Core.xproj", "{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cosmos.HAL", "source\Cosmos.HAL\Cosmos.HAL.xproj", "{DE4F000A-B65C-4395-B066-891B7423E9EC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetCore", "NetCore", "{11FA9AFD-306B-4B00-B3C9-C78F4708F1A5}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cosmos.Build.Common", "source\Cosmos.Build.Common\Cosmos.Build.Common.xproj", "{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1365,6 +1375,54 @@ Global
{A0C60E14-7520-48CC-B624-8EB1D798E1A6}.Release|x64.Build.0 = Release|Any CPU
{A0C60E14-7520-48CC-B624-8EB1D798E1A6}.Release|x86.ActiveCfg = Release|Any CPU
{A0C60E14-7520-48CC-B624-8EB1D798E1A6}.Release|x86.Build.0 = Release|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Debug|x64.ActiveCfg = Debug|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Debug|x64.Build.0 = Debug|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Debug|x86.ActiveCfg = Debug|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Debug|x86.Build.0 = Debug|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Release|Any CPU.Build.0 = Release|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Release|x64.ActiveCfg = Release|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Release|x64.Build.0 = Release|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Release|x86.ActiveCfg = Release|Any CPU
{9778FAA1-B346-4471-97CD-F5AA78A5E82C}.Release|x86.Build.0 = Release|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug|x64.ActiveCfg = Debug|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug|x64.Build.0 = Debug|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug|x86.ActiveCfg = Debug|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug|x86.Build.0 = Debug|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release|Any CPU.Build.0 = Release|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release|x64.ActiveCfg = Release|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release|x64.Build.0 = Release|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release|x86.ActiveCfg = Release|Any CPU
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release|x86.Build.0 = Release|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug|x64.ActiveCfg = Debug|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug|x64.Build.0 = Debug|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug|x86.ActiveCfg = Debug|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug|x86.Build.0 = Debug|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release|Any CPU.Build.0 = Release|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release|x64.ActiveCfg = Release|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release|x64.Build.0 = Release|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release|x86.ActiveCfg = Release|Any CPU
{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release|x86.Build.0 = Release|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Debug|x64.ActiveCfg = Debug|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Debug|x64.Build.0 = Debug|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Debug|x86.ActiveCfg = Debug|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Debug|x86.Build.0 = Debug|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Release|Any CPU.Build.0 = Release|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Release|x64.ActiveCfg = Release|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Release|x64.Build.0 = Release|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Release|x86.ActiveCfg = Release|Any CPU
{4496A1C9-EFDA-475C-A1ED-832B83C00F2C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1496,5 +1554,9 @@ Global
{3C515676-8565-4A19-98E7-266F83D579A8} = {45619442-64FC-4AEB-A5F1-4537842F6504}
{45619442-64FC-4AEB-A5F1-4537842F6504} = {056A94C1-6C75-4730-B62A-675779CD07FB}
{A0C60E14-7520-48CC-B624-8EB1D798E1A6} = {FF5BAFDE-AE9D-438D-935A-86B33EE0A758}
{9778FAA1-B346-4471-97CD-F5AA78A5E82C} = {D77D3D2E-B3CE-4106-A294-D32CCB104F4B}
{B45F760C-6D3D-48E1-9E2C-97CECC6A7061} = {ECC73F75-35C8-409C-8E00-1736E23FC9AE}
{DE4F000A-B65C-4395-B066-891B7423E9EC} = {11FA9AFD-306B-4B00-B3C9-C78F4708F1A5}
{11FA9AFD-306B-4B00-B3C9-C78F4708F1A5} = {22583FFE-B418-447E-ACE4-615950C5F373}
EndGlobalSection
EndGlobal
14 changes: 5 additions & 9 deletions Demos/Guess/project.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
{
"runtimes": {
"win10-x86": {},
"win10-x64": {}
},
{
"supports": {},
"dependencies": {
"Microsoft.NETCore.App": "1.0.3"
"Microsoft.NETCore.Portable.Compatibility": "1.0.2",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
"netcoreapp1.0": {
"imports": "portable-net452"
}
"netstandard1.5": {}
}
}
Binary file not shown.
49 changes: 41 additions & 8 deletions Tools/Cosmos.NetCore.TestApp/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,54 @@ public class Program
{
public static void Main(string[] args)
{
var xType = Type.GetType("System.Object");
//var xType = Type.GetType("System.Object");

var ctx = DependencyContext.Default;
//var ctx = DependencyContext.Default;

Console.WriteLine("--- Native libraries ---");
foreach (var r in ctx.GetDefaultNativeAssets())
//Console.WriteLine("--- Native libraries ---");
//foreach (var r in ctx.GetDefaultNativeAssets())
//{
// Console.WriteLine($" {r}");


//}
//Console.WriteLine();


//Console.ReadKey();

var xArgs = new string[]
{
Console.WriteLine($" {r}");
"DebugEnabled:False",
"StackCorruptionDetectionEnabled:False",
"StackCorruptionDetectionLevel:",
"DebugMode:Source",
"TraceAssemblies:Cosmos",
"DebugCom:1",
"UseNAsm:True",
@"OutputFilename:path\to\GuessKernel.asm",
"EnableLogging:True",
"EmitDebugSymbols:True",
"IgnoreDebugStubAttribute:False",
@"References:path\to\GuessKernel.dll",
@"References:path\to\Cosmos.Core.Plugs.dll",
@"References:path\to\Cosmos.Debug.Kernel.Plugs.dll",
@"References:path\to\Cosmos.System.Plugs.dll"
};

global::IL2CPU.Program.Run(xArgs, LogMessage, LogError);

}
Console.WriteLine();
Console.ReadLine();
}

public static void LogMessage(string aMessage)
{
Console.WriteLine("Message: " + aMessage);
}

Console.ReadKey();
public static void LogError(string aError)
{
Console.WriteLine("Error: " + aError);
}
}
}
7 changes: 6 additions & 1 deletion Tools/Cosmos.NetCore.TestApp/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@

"frameworks": {
"netcoreapp1.0": {
"imports": "dnxcore50"
"imports": "dnxcore50",
"dependencies": {
"IL2CPU": {
"target": "project"
}
}
}
}
}
5 changes: 2 additions & 3 deletions source/Cosmos.Assembler/project.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"supports": {},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"System.Threading.Thread": "4.3.0",
"NETStandard.Library": "1.6.0"
"NETStandard.Library": "1.6.1",
"System.Threading.Thread": "4.3.0"
},
"frameworks": {
"netstandard1.5": {}
Expand Down
19 changes: 19 additions & 0 deletions source/Cosmos.Build.Common/Cosmos.Build.Common.xproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>4496a1c9-efda-475c-a1ed-832b83c00f2c</ProjectGuid>
<RootNamespace>Cosmos.Build.Common</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
6 changes: 3 additions & 3 deletions source/Cosmos.Build.Common/project.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"supports": {},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"Microsoft.Win32.Registry": "4.3.0",
"Microsoft.NETCore.Portable.Compatibility": "1.0.2",
"NETStandard.Library": "1.6.1",
"System.ComponentModel.Primitives": "4.3.0",
"System.Diagnostics.Process": "4.3.0",
"NETStandard.Library": "1.6.0"
"Microsoft.Win32.Registry": "4.3.0"
},
"frameworks": {
"netstandard1.5": {}
Expand Down
2 changes: 1 addition & 1 deletion source/Cosmos.Common/Cosmos.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<Link>Cosmos.snk</Link>
</None>
<None Include=".editorconfig" />
<None Include="project.json" />
<None Include="Cosmos.Common.project.json" />
<!-- A reference to the entire .NET Framework is automatically included -->
</ItemGroup>
<ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions source/Cosmos.Common/Cosmos.Common.project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"supports": {},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.2",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
"netstandard1.5": {}
}
}
9 changes: 7 additions & 2 deletions source/Cosmos.Common/project.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"supports": {},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.2",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.5": {
"dependencies": {
"Cosmos.Debug.Kernel": {
"target": "project"
}
}
}
}
}
5 changes: 4 additions & 1 deletion source/Cosmos.Core.Common/Cosmos.Core.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@
<None Include="..\..\Cosmos.snk">
<Link>Cosmos.snk</Link>
</None>
<None Include="project.json" />
<Content Include="Cosmos.Core.Common.project.json" />
<Content Include="project - Copy.lock.json">
<DependentUpon>Cosmos.Core.Common.project.json</DependentUpon>
</Content>
<!-- A reference to the entire .NET Framework is automatically included -->
</ItemGroup>
<ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions source/Cosmos.Core.Common/Cosmos.Core.Common.project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"supports": {},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.2",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
"netstandard1.5": {}
}
}
15 changes: 13 additions & 2 deletions source/Cosmos.Core.Common/project.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
{
"supports": {},
"buildOptions": {
"allowUnsafe": true
},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.2",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.5": {
"dependencies": {
"Cosmos.Common": {
"target": "project"
},
"Cosmos.IL2CPU.Plugs": {
"target": "project"
}
}
}
}
}
2 changes: 1 addition & 1 deletion source/Cosmos.Core/Cosmos.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<Link>Cosmos.snk</Link>
</None>
<None Include=".editorconfig" />
<None Include="project.json" />
<None Include="Cosmos.Core.project.json" />
<!-- A reference to the entire .NET Framework is automatically included -->
</ItemGroup>
<ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions source/Cosmos.Core/Cosmos.Core.project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"supports": {},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.2",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
"netstandard1.5": {}
}
}
19 changes: 19 additions & 0 deletions source/Cosmos.Core/Cosmos.Core.xproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b45f760c-6d3d-48e1-9e2c-97cecc6a7061</ProjectGuid>
<RootNamespace>Cosmos.Core</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
4 changes: 2 additions & 2 deletions source/Cosmos.Core/IOGroup/ATA.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ internal ATA(bool aSecondary)
{
if (aSecondary)
{
Debugger.DoSend("Creating Secondary ATA IOGroup");
Global.mDebugger.Send("Creating Secondary ATA IOGroup");
}
else
{
Debugger.DoSend("Creating Primary ATA IOGroup");
Global.mDebugger.Send("Creating Primary ATA IOGroup");
}

var xBAR0 = GetBAR0(aSecondary);
Expand Down
21 changes: 19 additions & 2 deletions source/Cosmos.Core/project.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
{
"supports": {},
"buildOptions": {
"allowUnsafe": true
},
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.2",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
"netstandard1.5": {}
"netstandard1.5": {
"dependencies": {
"Cosmos.Common": {
"target": "project"
},
"Cosmos.Core.Common": {
"target": "project"
},
"Cosmos.Debug.Kernel": {
"target": "project"
},
"Cosmos.IL2CPU.Plugs": {
"target": "project"
}
}
}
}
}
Loading

0 comments on commit c2d422e

Please sign in to comment.