diff options
| author | Jb Evain <jb@evain.net> | 2019-01-27 07:11:32 +0300 |
|---|---|---|
| committer | Jb Evain <jb@evain.net> | 2019-02-12 01:38:44 +0300 |
| commit | c005b7d92a700e711fb835b6140597196fb1fc89 (patch) | |
| tree | a77c2348b6db2716f1e575c5d3349ea35c6be74a /rocks | |
| parent | 71b08cb673452d972f1f7374bc79463db7e6e388 (diff) | |
Move to SDK style projects
Diffstat (limited to 'rocks')
| -rw-r--r-- | rocks/Mono.Cecil.Rocks.csproj | 22 | ||||
| -rw-r--r-- | rocks/Test/Mono.Cecil.Rocks.Tests.csproj | 13 | ||||
| -rw-r--r-- | rocks/Test/Mono.Cecil.Tests/SecurityDeclarationRocksTests.cs | 4 |
3 files changed, 14 insertions, 25 deletions
diff --git a/rocks/Mono.Cecil.Rocks.csproj b/rocks/Mono.Cecil.Rocks.csproj index 045606b..3d66047 100644 --- a/rocks/Mono.Cecil.Rocks.csproj +++ b/rocks/Mono.Cecil.Rocks.csproj @@ -1,23 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current"> <PropertyGroup> - <ProjectGuid>{FBC6DD59-D09D-499C-B03C-99C1C78FF2AC}</ProjectGuid> - <RootNamespace>Mono.Cecil.Rocks</RootNamespace> - <AssemblyName>Mono.Cecil.Rocks</AssemblyName> + <TargetFrameworks>netstandard2.0;net40</TargetFrameworks> + <DefineConstants>$(DefineConstants);INSIDE_ROCKS</DefineConstants> </PropertyGroup> <ItemGroup> - <Compile Include="..\ProjectInfo.cs" /> - <Compile Include="Mono.Cecil.Rocks\*.cs" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\Mono.Cecil.csproj"> - <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project> <Name>Mono.Cecil</Name> </ProjectReference> </ItemGroup> - <Import Project="..\Mono.Cecil.props" /> - <Import Project="$(MSBuildCSharpTargets)" Condition=" ! $(NetStandard) " /> - <PropertyGroup> - <DefineConstants>$(DefineConstants);INSIDE_ROCKS</DefineConstants> - </PropertyGroup> + <ItemGroup> + <Compile Include="..\ProjectInfo.cs" /> + <Compile Include="Mono.Cecil.Rocks\*.cs" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/rocks/Test/Mono.Cecil.Rocks.Tests.csproj b/rocks/Test/Mono.Cecil.Rocks.Tests.csproj index 7c1946c..5bab176 100644 --- a/rocks/Test/Mono.Cecil.Rocks.Tests.csproj +++ b/rocks/Test/Mono.Cecil.Rocks.Tests.csproj @@ -1,22 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current"> <Import Project="..\..\Mono.Cecil.Tests.props" /> <PropertyGroup> - <ProjectGuid>{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}</ProjectGuid> - <RootNamespace>Mono.Cecil.Rocks.Tests</RootNamespace> - <AssemblyName>Mono.Cecil.Rocks.Tests</AssemblyName> + <TargetFrameworks>netcoreapp2.1;net40</TargetFrameworks> </PropertyGroup> <ItemGroup> <ProjectReference Include="..\..\Mono.Cecil.csproj"> - <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project> <Name>Mono.Cecil</Name> </ProjectReference> <ProjectReference Include="..\..\Test\Mono.Cecil.Tests.csproj"> - <Project>{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}</Project> <Name>Mono.Cecil.Tests</Name> </ProjectReference> <ProjectReference Include="..\Mono.Cecil.Rocks.csproj"> - <Project>{FBC6DD59-D09D-499C-B03C-99C1C78FF2AC}</Project> <Name>Mono.Cecil.Rocks</Name> </ProjectReference> </ItemGroup> @@ -26,5 +20,4 @@ <ItemGroup> <None Include="Resources\**\*" /> </ItemGroup> - <Import Project="$(MSBuildCSharpTargets)" Condition="!$(NetStandard)" /> -</Project>
\ No newline at end of file +</Project> diff --git a/rocks/Test/Mono.Cecil.Tests/SecurityDeclarationRocksTests.cs b/rocks/Test/Mono.Cecil.Tests/SecurityDeclarationRocksTests.cs index 0c2c125..948b5df 100644 --- a/rocks/Test/Mono.Cecil.Tests/SecurityDeclarationRocksTests.cs +++ b/rocks/Test/Mono.Cecil.Tests/SecurityDeclarationRocksTests.cs @@ -1,3 +1,5 @@ +#if !NET_CORE + using System.Security.Permissions; using NUnit.Framework; @@ -60,3 +62,5 @@ namespace Mono.Cecil.Tests { } } } + +#endif |