Skip to content

Commit 7973f86

Browse files
jbevainjbevain
committed
Port to .NET SDK style projects
1 parent e3372fb commit 7973f86

15 files changed

+46
-347
lines changed

‎Directory.Build.props

3.01 KB
Binary file not shown.

‎Mono.Linq.Expressions.csproj

+8-103
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{0C001D50-4176-45AE-BDC8-BA626508B0CC}</ProjectGuid>
9-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
10-
<OutputType>Library</OutputType>
11-
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>Mono.Linq.Expressions</RootNamespace>
13-
<AssemblyName>Mono.Linq.Expressions</AssemblyName>
14-
<TargetFrameworkProfile>Profile92</TargetFrameworkProfile>
15-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16-
<FileAlignment>512</FileAlignment>
17-
<SignAssembly>true</SignAssembly>
18-
<AssemblyOriginatorKeyFile>mono.snk</AssemblyOriginatorKeyFile>
19-
<FileUpgradeFlags>
20-
</FileUpgradeFlags>
21-
<UpgradeBackupLocation>
22-
</UpgradeBackupLocation>
23-
<OldToolsVersion>3.5</OldToolsVersion>
24-
<PublishUrl>publish\</PublishUrl>
25-
<Install>true</Install>
26-
<InstallFrom>Disk</InstallFrom>
27-
<UpdateEnabled>false</UpdateEnabled>
28-
<UpdateMode>Foreground</UpdateMode>
29-
<UpdateInterval>7</UpdateInterval>
30-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
31-
<UpdatePeriodically>false</UpdatePeriodically>
32-
<UpdateRequired>false</UpdateRequired>
33-
<MapFileExtensions>true</MapFileExtensions>
34-
<ApplicationRevision>0</ApplicationRevision>
35-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
36-
<IsWebBootstrapper>false</IsWebBootstrapper>
37-
<UseApplicationTrust>false</UseApplicationTrust>
38-
<BootstrapperEnabled>true</BootstrapperEnabled>
3+
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
394
</PropertyGroup>
40-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
41-
<DebugSymbols>true</DebugSymbols>
42-
<DebugType>full</DebugType>
43-
<Optimize>false</Optimize>
44-
<OutputPath>bin\Debug\</OutputPath>
45-
<DefineConstants>DEBUG;TRACE</DefineConstants>
46-
<ErrorReport>prompt</ErrorReport>
47-
<WarningLevel>4</WarningLevel>
48-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
49-
</PropertyGroup>
50-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
51-
<Optimize>true</Optimize>
52-
<OutputPath>bin\Release\</OutputPath>
53-
<DefineConstants>TRACE</DefineConstants>
54-
<ErrorReport>prompt</ErrorReport>
55-
<WarningLevel>4</WarningLevel>
56-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
57-
</PropertyGroup>
58-
<ItemGroup>
59-
<Reference Include="System" />
60-
<Reference Include="System.Core">
61-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
62-
</Reference>
63-
</ItemGroup>
64-
<ItemGroup>
65-
<Compile Include="Mono.Linq.Expressions\CombineExtensions.cs" />
66-
<Compile Include="Mono.Linq.Expressions\DoWhileExpression.cs" />
67-
<Compile Include="Mono.Linq.Expressions\FluentExtensions.cs" />
68-
<Compile Include="Mono.Linq.Expressions\UsingExpression.cs" />
69-
<Compile Include="Mono.Linq.Expressions\WhileExpression.cs" />
70-
<Compile Include="Mono.Linq.Expressions\CustomExpressionVisitor.cs" />
71-
<Compile Include="Mono.Linq.Expressions\CustomExpression.cs" />
72-
<Compile Include="Mono.Linq.Expressions\ForEachExpression.cs" />
73-
<Compile Include="Mono.Linq.Expressions\ForExpression.cs" />
74-
<Compile Include="Mono.Linq.Expressions\PredicateBuilder.cs" />
75-
<Compile Include="Mono.Linq.Expressions\ExpressionExtensions.cs" />
76-
<Compile Include="Mono.Linq.Expressions\CSharp.cs" />
77-
<Compile Include="Mono.Linq.Expressions\CSharpWriter.cs" />
78-
<Compile Include="Mono.Linq.Expressions\ExpressionWriter.cs" />
79-
<Compile Include="Mono.Linq.Expressions\IExpressionWriter.cs" />
80-
<Compile Include="Mono.Linq.Expressions\DelegateConverter.cs" />
81-
<Compile Include="Mono.Linq.Expressions\IFormatter.cs" />
82-
<Compile Include="Mono.Linq.Expressions\TextFormatter.cs" />
83-
<Compile Include="Properties\AssemblyInfo.cs" />
84-
</ItemGroup>
85-
<ItemGroup>
86-
<None Include="mono.snk" />
87-
</ItemGroup>
5+
886
<ItemGroup>
89-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
90-
<Visible>False</Visible>
91-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
92-
<Install>false</Install>
93-
</BootstrapperPackage>
94-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
95-
<Visible>False</Visible>
96-
<ProductName>.NET Framework 3.5 SP1</ProductName>
97-
<Install>true</Install>
98-
</BootstrapperPackage>
99-
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
100-
<Visible>False</Visible>
101-
<ProductName>Windows Installer 3.1</ProductName>
102-
<Install>true</Install>
103-
</BootstrapperPackage>
7+
<Compile Include="Mono.Linq.Expressions\*.cs" />
8+
<Compile Include="Properties\*.cs.cs" />
1049
</ItemGroup>
10+
10511
<ItemGroup>
10612
<Content Include="nodes.txt" />
10713
</ItemGroup>
108-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
109-
<Import Project="$(MSBuildThisFileDirectory)Mono.Linq.Expressions.targets" />
110-
</Project>
14+
15+
</Project>

‎Mono.Linq.Expressions.nunit

-6
This file was deleted.

‎Mono.Linq.Expressions.nuspec

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Mono.Linq.Expressions</id>
5-
<version>1.2.0.0</version>
5+
<version>2.0.0.0</version>
66
<title>Mono.Linq.Expressions</title>
77
<authors>Jb Evain</authors>
88
<owners>Jb Evain</owners>
@@ -12,8 +12,15 @@
1212
<description>Complement for System.Linq.Expressions, including a C# writer, useful custom Expression nodes and extension methods.</description>
1313
<language>en-US</language>
1414
<tags>linq expression-tree expressions writer system.linq.expression predicatebuilder fluent</tags>
15+
<dependencies>
16+
<group targetFramework=".NETFramework4.0" />
17+
<group targetFramework=".NETStandard2.0" />
18+
</dependencies>
1519
</metadata>
1620
<files>
17-
<file src="bin\Release\*.dll" target="lib" />
21+
<file src="bin\Release\net40\Mono.Linq.Expressions.dll" target="lib/net40" />
22+
<file src="bin\Release\net40\Mono.Linq.Expressions.pdb" target="lib/net40" />
23+
<file src="bin\Release\netstandard2.0\Mono.Linq.Expressions.dll" target="lib/netstandard2.0" />
24+
<file src="bin\Release\netstandard2.0\Mono.Linq.Expressions.pdb" target="lib/netstandard2.0" />
1825
</files>
1926
</package>

‎Mono.Linq.Expressions.targets

-11
This file was deleted.

‎Mono.Linq.Expressions/CombineExtensions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace Mono.Linq.Expressions {
3535

3636
public static class CombineExtensions {
3737

38-
public static Expression<T> Combine<[DelegateConstraint] T> (this Expression<T> self, Func<Expression, Expression> combinator) where T : class
38+
public static Expression<T> Combine<T> (this Expression<T> self, Func<Expression, Expression> combinator) where T : Delegate
3939
{
4040
if (self == null)
4141
throw new ArgumentNullException ("self");
@@ -47,7 +47,7 @@ public static Expression<T> Combine<[DelegateConstraint] T> (this Expression<T>
4747
return Expression.Lambda<T> (combinator (RewriteBody (self, parameters)), parameters);
4848
}
4949

50-
public static Expression<T> Combine<[DelegateConstraint] T> (this Expression<T> self, Expression<T> expression, Func<Expression, Expression, Expression> combinator) where T : class
50+
public static Expression<T> Combine<T> (this Expression<T> self, Expression<T> expression, Func<Expression, Expression, Expression> combinator) where T : Delegate
5151
{
5252
if (self == null)
5353
throw new ArgumentNullException ("self");

‎Mono.Linq.Expressions/DelegateConverter.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,12 @@
2929
using System;
3030
using System.Linq.Expressions;
3131

32-
[AttributeUsage (AttributeTargets.GenericParameter)]
33-
class DelegateConstraintAttribute : Attribute {
34-
}
35-
3632
namespace Mono.Linq.Expressions {
3733

3834
public static class DelegateConverter {
3935

40-
public static Expression<TDelegate> ToExpression<[DelegateConstraint] TDelegate> (this TDelegate @delegate)
41-
where TDelegate : class
36+
public static Expression<TDelegate> ToExpression<TDelegate> (this TDelegate @delegate)
37+
where TDelegate : Delegate
4238
{
4339
throw new NotImplementedException ();
4440
}

‎Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@
4343

4444
[assembly: Guid ("7c6dad55-cc59-424e-bf21-95ba4234eb65")]
4545

46-
[assembly: AssemblyVersion ("1.2.0.0")]
47-
[assembly: AssemblyFileVersion ("1.2.0.0")]
46+
[assembly: AssemblyVersion ("2.0.0.0")]
47+
[assembly: AssemblyFileVersion ("2.0.0.0")]

‎Test/Mono.Linq.Expressions.Tests.csproj

+15-59
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{4F200EA1-EFDA-48BF-BAAA-FFD9DE9BCD8F}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Mono.Linq.Expressions.Tests</RootNamespace>
12-
<AssemblyName>Mono.Linq.Expressions.Tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
3+
<TargetFrameworks>netcoreapp2.1;net40</TargetFrameworks>
4+
<IsTestProject>true</IsTestProject>
325
</PropertyGroup>
336
<ItemGroup>
34-
<Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
35-
<SpecificVersion>False</SpecificVersion>
36-
<HintPath>..\..\..\Program Files (x86)\NUnit 2.4.8\lib\nunit.framework.dll</HintPath>
37-
</Reference>
38-
<Reference Include="System" />
39-
<Reference Include="System.Core" />
40-
<Reference Include="Microsoft.CSharp" />
7+
<PackageReference Include="NUnit">
8+
<Version>3.11.0</Version>
9+
</PackageReference>
10+
<PackageReference Include="Microsoft.NET.Test.Sdk">
11+
<Version>15.9.0</Version>
12+
</PackageReference>
13+
<PackageReference Include="NUnit3TestAdapter">
14+
<Version>3.12.0</Version>
15+
</PackageReference>
4116
</ItemGroup>
4217
<ItemGroup>
43-
<Compile Include="Mono.Linq.Expressions\BaseExpressionTest.cs" />
44-
<Compile Include="Mono.Linq.Expressions\DoWhileExpressionTest.cs" />
45-
<Compile Include="Mono.Linq.Expressions\UsingExpressionTest.cs" />
46-
<Compile Include="Mono.Linq.Expressions\WhileExpressionTest.cs" />
47-
<Compile Include="Mono.Linq.Expressions\ForEachExpressionTest.cs" />
48-
<Compile Include="Mono.Linq.Expressions\ForExpressionTest.cs" />
49-
<Compile Include="Mono.Linq.Expressions\PredicateBuilderTest.cs" />
50-
<Compile Include="Mono.Linq.Expressions\CSharpWriterTest.cs" />
51-
<Compile Include="Properties\AssemblyInfo.cs">
52-
<SubType>
53-
</SubType>
54-
</Compile>
18+
<Compile Include="Mono.Linq.Expressions\*.cs" />
19+
<Compile Include="Properties\*.cs" />
5520
</ItemGroup>
5621
<ItemGroup>
5722
<ProjectReference Include="..\Mono.Linq.Expressions.csproj">
58-
<Project>{0C001D50-4176-45AE-BDC8-BA626508B0CC}</Project>
5923
<Name>Mono.Linq.Expressions</Name>
6024
</ProjectReference>
6125
</ItemGroup>
62-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
63-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
64-
Other similar extension points exist, see Microsoft.Common.targets.
65-
<Target Name="BeforeBuild">
66-
</Target>
67-
<Target Name="AfterBuild">
68-
</Target>
69-
-->
70-
</Project>
26+
</Project>

‎Test/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242

4343
[assembly: Guid ("7c6dad55-cc59-424e-bf21-95ba4234eb65")]
4444

45-
[assembly: AssemblyVersion ("1.0.0.0")]
46-
[assembly: AssemblyFileVersion ("1.0.0.0")]
45+
[assembly: AssemblyVersion ("2.0.0.0")]
46+
[assembly: AssemblyFileVersion ("2.0.0.0")]

‎dbg/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion ("1.0.0.0")]
36-
[assembly: AssemblyFileVersion ("1.0.0.0")]
35+
[assembly: AssemblyVersion ("2.0.0.0")]
36+
[assembly: AssemblyFileVersion ("2.0.0.0")]

‎dbg/dbg.csproj

+4-47
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,16 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{A1939E56-E2B2-44CF-8B29-347E7EE459E0}</ProjectGuid>
9-
<OutputType>Exe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>dbg</RootNamespace>
12-
<AssemblyName>dbg</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15-
<FileAlignment>512</FileAlignment>
3+
<TargetFramework>net40</TargetFramework>
164
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
18-
<PlatformTarget>x86</PlatformTarget>
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
28-
<PlatformTarget>x86</PlatformTarget>
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="Microsoft.CSharp" />
40-
</ItemGroup>
5+
416
<ItemGroup>
427
<Compile Include="Program.cs" />
438
<Compile Include="Properties\AssemblyInfo.cs" />
449
</ItemGroup>
10+
4511
<ItemGroup>
4612
<ProjectReference Include="..\Mono.Linq.Expressions.csproj">
47-
<Project>{0C001D50-4176-45AE-BDC8-BA626508B0CC}</Project>
4813
<Name>Mono.Linq.Expressions</Name>
4914
</ProjectReference>
5015
</ItemGroup>
51-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
52-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
53-
Other similar extension points exist, see Microsoft.Common.targets.
54-
<Target Name="BeforeBuild">
55-
</Target>
56-
<Target Name="AfterBuild">
57-
</Target>
58-
-->
5916
</Project>

‎tools/Mono.Cecil.dll

-300 KB
Binary file not shown.

0 commit comments

Comments
 (0)