Skip to content

Commit

Permalink
026 migrate compiler to netstandard2.0 and dnlib to 3.1.0 (#581)
Browse files Browse the repository at this point in the history
* Migrate Compiler to .NET Standart2.0

* 026 Migrate Compiler to .NET Standard 2.0 and dnlib to 3.1.0
  • Loading branch information
arakis authored and tgiphil committed Jan 30, 2019
1 parent 7a7fd73 commit 5c9b4c1
Show file tree
Hide file tree
Showing 51 changed files with 262 additions and 1,102 deletions.
21 changes: 21 additions & 0 deletions Source/MOSA.sln
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.Kernel.ESP32", "Mosa.K
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DeviceSystem", "DeviceSystem", "{88676490-5035-4424-812B-22FC1A70555E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{AFAB2795-9E00-4798-ACE9-54170BFD9192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mosa.Compiler.Plugin.Dwarf", "Mosa.Compiler.Plugin.Dwarf\Mosa.Compiler.Plugin.Dwarf.csproj", "{F8264668-E0CE-46C1-9AA8-B710D564264D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -232,6 +236,7 @@ Global
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
Description = MOSA Project
Description|Any CPU = Description|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B69C2F31-5161-47BB-9FD3-2F2F2BCBF659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -906,6 +911,20 @@ Global
{5C002A6C-9FF8-40C2-88AD-539642B31E65}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5C002A6C-9FF8-40C2-88AD-539642B31E65}.Release|x86.ActiveCfg = Release|Any CPU
{5C002A6C-9FF8-40C2-88AD-539642B31E65}.Release|x86.Build.0 = Release|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Debug|x86.ActiveCfg = Debug|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Debug|x86.Build.0 = Debug|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Release|Any CPU.Build.0 = Release|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Release|x86.ActiveCfg = Release|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Release|x86.Build.0 = Release|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Description|Any CPU.ActiveCfg = Debug|Any CPU
{F8264668-E0CE-46C1-9AA8-B710D564264D}.Description|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -972,6 +991,8 @@ Global
{599D1C00-7C78-4211-A958-1285C4CB77C9} = {3C5A2C4B-FD05-42B3-B6C6-C366DF978A62}
{889162C2-B68B-4A89-B66F-7779BABD927F} = {57A405DF-CCB3-4C9E-A88D-478E35042A84}
{5C002A6C-9FF8-40C2-88AD-539642B31E65} = {FF773BDF-A20C-4A5F-BFF9-F422C2AFF3CE}
{AFAB2795-9E00-4798-ACE9-54170BFD9192} = {DDBC7F79-A2A1-4D92-9AE7-ADDC838F1E5E}
{F8264668-E0CE-46C1-9AA8-B710D564264D} = {AFAB2795-9E00-4798-ACE9-54170BFD9192}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C22A5C94-6B05-4B1B-845A-A2EA7615E093}
Expand Down
1 change: 0 additions & 1 deletion Source/Mosa.ClassLib/Mosa.ClassLib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<OutputType>Library</OutputType>
<AppDesignerFolder>
Expand Down
84 changes: 7 additions & 77 deletions Source/Mosa.Compiler.Common/Mosa.Compiler.Common.csproj
Original file line number Diff line number Diff line change
@@ -1,78 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0B1011A6-8FCD-4F9E-BBB8-8DB86E23D2E8}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mosa.Compiler.Common</RootNamespace>
<AssemblyName>Mosa.Compiler.Common</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Compile Include="EndianAwareBinaryWriterExtensions.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="IncludeFile.cs" />
<Compile Include="KeyedList.cs" />
<Compile Include="Alignment.cs" />
<Compile Include="Exceptions\InvalidMetadataException.cs" />
<Compile Include="Bits.cs" />
<Compile Include="BitArrayExtension.cs" />
<Compile Include="Exceptions\AssemblyLoadException.cs" />
<Compile Include="HasSetExtension.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SortedSetExtension.cs" />
<Compile Include="Exceptions\NotImplementCompilerException.cs" />
<Compile Include="Exceptions\CompilerException.cs" />
<Compile Include="SimplePriorityQueue.cs" />
<Compile Include="Endianness .cs" />
<Compile Include="ListExtension.cs" />
<Compile Include="EndianAwareBinaryWriter.cs" />
<Compile Include="EndianAwareBinaryReader.cs" />
<Compile Include="Endian.cs" />
<Compile Include="SparseBitArray.cs" />
<Compile Include="StreamExtension.cs" />
<Compile Include="UniqueStackThreadSafe.cs" />
<Compile Include="UniqueQueueThreadSafe.cs" />
<Compile Include="UniqueQueue.cs" />
<Compile Include="StringExtension.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<OutputType>Library</OutputType>
<AppDesignerFolder>
Expand Down
202 changes: 0 additions & 202 deletions Source/Mosa.Compiler.Framework/CIL/IRInstructions.cs

This file was deleted.

0 comments on commit 5c9b4c1

Please sign in to comment.