Skip to content

Commit

Permalink
Merge pull request #9 from Amartel1986/netstandard
Browse files Browse the repository at this point in the history
Attempt to add .NET Standard 2.0 support.
  • Loading branch information
AndrewKostousov authored Dec 31, 2017
2 parents 1a6f8a2 + 218c632 commit 34912c2
Show file tree
Hide file tree
Showing 16 changed files with 416 additions and 500 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ obj
*.suo
_ReSharper.*
Assemblies/GrEmit.*
.vs
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

75 changes: 26 additions & 49 deletions GrEmit/AsmToBytes/AsmToBytes.csproj
Original file line number Diff line number Diff line change
@@ -1,56 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8775F533-B177-443E-AEBC-D03719C8AE1D}</ProjectGuid>
<TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
<Authors>SKB Kontur.</Authors>
<Company>SKB Kontur</Company>
<Description>GrEmit is a library containing different helpers for generating code using Reflection.Emit with the main one being GroboIL - a smart wrapper over ILGenerator.</Description>
<Copyright>Copyright � SKB Kontur 2017.</Copyright>
<PackageProjectUrl>https://github.com/skbkontur/gremit</PackageProjectUrl>
<RepositoryUrl>https://github.com/skbkontur/gremit</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>.NET</PackageTags>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<Version>1.0.0</Version>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<ApplicationIcon />
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>GrEmit.AsmToBytes</RootNamespace>
<AssemblyName>AsmToBytes</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="EntryPoint.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.0" />
</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>
</Project>
36 changes: 0 additions & 36 deletions GrEmit/AsmToBytes/Properties/AssemblyInfo.cs

This file was deleted.

29 changes: 16 additions & 13 deletions GrEmit/GrEmit.sln
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2002
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GrEmit", "GrEmit\GrEmit.csproj", "{049F27EE-942B-4F5F-BFA8-BD199538E3A8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsmToBytes", "AsmToBytes\AsmToBytes.csproj", "{09C1BA4E-CF80-48F8-BA58-07C1F15EC12E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{FA3769F0-39AD-4413-BA0E-B45A116EA957}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GrEmit", "GrEmit\GrEmit.csproj", "{9D33C46B-7413-4568-B37E-F03CB2F49D37}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsmToBytes", "AsmToBytes\AsmToBytes.csproj", "{8775F533-B177-443E-AEBC-D03719C8AE1D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{FA3769F0-39AD-4413-BA0E-B45A116EA957}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{049F27EE-942B-4F5F-BFA8-BD199538E3A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{049F27EE-942B-4F5F-BFA8-BD199538E3A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{049F27EE-942B-4F5F-BFA8-BD199538E3A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{049F27EE-942B-4F5F-BFA8-BD199538E3A8}.Release|Any CPU.Build.0 = Release|Any CPU
{09C1BA4E-CF80-48F8-BA58-07C1F15EC12E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{09C1BA4E-CF80-48F8-BA58-07C1F15EC12E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{09C1BA4E-CF80-48F8-BA58-07C1F15EC12E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{09C1BA4E-CF80-48F8-BA58-07C1F15EC12E}.Release|Any CPU.Build.0 = Release|Any CPU
{9D33C46B-7413-4568-B37E-F03CB2F49D37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D33C46B-7413-4568-B37E-F03CB2F49D37}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D33C46B-7413-4568-B37E-F03CB2F49D37}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D33C46B-7413-4568-B37E-F03CB2F49D37}.Release|Any CPU.Build.0 = Release|Any CPU
{FA3769F0-39AD-4413-BA0E-B45A116EA957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FA3769F0-39AD-4413-BA0E-B45A116EA957}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA3769F0-39AD-4413-BA0E-B45A116EA957}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FA3769F0-39AD-4413-BA0E-B45A116EA957}.Release|Any CPU.Build.0 = Release|Any CPU
{8775F533-B177-443E-AEBC-D03719C8AE1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8775F533-B177-443E-AEBC-D03719C8AE1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8775F533-B177-443E-AEBC-D03719C8AE1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8775F533-B177-443E-AEBC-D03719C8AE1D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9C5B0E2F-D2A9-4326-84A0-30A7D0FFE32C}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 34912c2

Please sign in to comment.