Skip to content

Commit 4de5d4e

Browse files
author
maximv
committed
added src and internal packages and updated build scripts
1 parent 7d74cd0 commit 4de5d4e

13 files changed

+232
-186
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -253,3 +253,5 @@ paket-files/
253253

254254
BenchmarkDotNet.Artifacts/
255255
ApiKey.txt
256+
257+
FastExpressionCompiler.Internal/

‎.nuget/NuGet.exe

868 KB
Binary file not shown.

‎BuildScripts/MakeInternal.ps1

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
$inputFiles = @(
2-
".\src\FastExpressionCompiler.cs",
3-
".\src\Expression.cs"
2+
".\src\FastExpressionCompiler\FastExpressionCompiler.cs",
3+
".\src\FastExpressionCompiler.LightExpression\Expression.cs",
4+
".\src\FastExpressionCompiler.LightExpression\ExpressionVisitor.cs"
45
)
56
$outputFolder = ".\src\FastExpressionCompiler.Internal"
67

‎BuildScripts/NuGetPack.bat

+6-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ echo:
1111
if not exist %PACKAGEDIR% md %PACKAGEDIR%
1212

1313
echo:
14-
echo:DryIoc source and internal packages
14+
echo:Source and internal packages
1515
echo:===================================
16-
%NUGET% pack %NUSPECS%\DryIoc.nuspec -OutputDirectory %PACKAGEDIR% -NonInteractive
16+
%NUGET% pack %NUSPECS%\FastExpressionCompiler.src.nuspec -OutputDirectory %PACKAGEDIR% -NonInteractive
17+
%NUGET% pack %NUSPECS%\FastExpressionCompiler.LightExpression.src.nuspec -OutputDirectory %PACKAGEDIR% -NonInteractive
18+
1719
PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '.\BuildScripts\MakeInternal.ps1'";
18-
%NUGET% pack %NUSPECS%\DryIoc.Internal.nuspec -OutputDirectory %PACKAGEDIR% -NonInteractive
20+
%NUGET% pack %NUSPECS%\FastExpressionCompiler.Internal.src.nuspec -OutputDirectory %PACKAGEDIR% -NonInteractive
21+
%NUGET% pack %NUSPECS%\FastExpressionCompiler.LightExpression.Internal.src.nuspec -OutputDirectory %PACKAGEDIR% -NonInteractive
1922

2023

2124
REM if not "%1"=="-nopause" pause

‎BuildScripts/NuGetPublish.bat

+8-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@ set PACKAGES=..\.dist
44
set SOURCE=https://api.nuget.org/v3/index.json
55
set /p APIKEY=<"..\ApiKey.txt"
66

7-
dotnet nuget push "%PACKAGES%\DryIoc.dll.4.1.0-preview-03.nupkg" -k %APIKEY% -s %SOURCE%
8-
dotnet nuget push "%PACKAGES%\DryIoc.4.1.0-preview-03.nupkg" -k %APIKEY% -s %SOURCE%
9-
dotnet nuget push "%PACKAGES%\DryIoc.Internal.4.1.0-preview-03.nupkg" -k %APIKEY% -s %SOURCE%
7+
ser PKGVER=3.0.0-preview-01
8+
9+
dotnet nuget push "%PACKAGES%\FastExpressionCompiler.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
10+
dotnet nuget push "%PACKAGES%\FastExpressionCompiler.src\%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
11+
dotnet nuget push "%PACKAGES%\FastExpressionCompiler.Internal.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
12+
dotnet nuget push "%PACKAGES%\FastExpressionCompiler.LightExpression.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
13+
dotnet nuget push "%PACKAGES%\FastExpressionCompiler.LightExpression.src\%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
14+
dotnet nuget push "%PACKAGES%\FastExpressionCompiler.LightExpression.Internal.src.%PKGVER%.nupkg" -k %APIKEY% -s %SOURCE%
1015

1116
echo:
1217
echo:Publishing completed.

‎build.bat

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@ echo:
2727

2828
dotnet pack ".\src\FastExpressionCompiler" -c:Release -restore:False -p:DevMode=false
2929
dotnet pack ".\src\FastExpressionCompiler.LightExpression" -c:Release -restore:False -p:DevMode=false
30+
echo:
31+
echo:## Finished: DLL PACKAGING
3032

31-
echo:
32-
echo:## Finished: PACKAGING
33+
call BuildScripts\NugetPack.bat
34+
if %ERRORLEVEL% neq 0 goto :error
35+
echo:
36+
echo:## Finished: SOURCE PACKAGING
3337
echo:
3438
echo:## Finished: ALL ##
3539
echo:

‎nuspecs/FastExpressionCompiler.Internal.nuspec

-73
This file was deleted.

‎nuspecs/FastExpressionCompiler.Internal.src.nuspec

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata minClientVersion="3.3.0">
4+
<id>FastExpressionCompiler.Internal.src</id>
5+
<version>3.0.0-preview-01</version>
6+
<authors>Maksim Volkau</authors>
7+
<copyright>Copyright © 2013-2020 Maksim Volkau</copyright>
8+
<projectUrl>https://github.com/dadhi/FastExpressionCompiler</projectUrl>
9+
<license type="expression">MIT</license>
10+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11+
<description>FastExpressionCompiler is 10-40x times faster than Expression.Compile()</description>
12+
<tags>Performance;Expression;ExpressionTree;Compile;DynamicMethod;IL;ILEmit;DryIoc;ExpressionToCodeLib</tags>
13+
<releaseNotes><![CDATA[
14+
15+
## v3.0.0
16+
17+
Thanks to the contributors
18+
19+
]]></releaseNotes>
20+
<contentFiles>
21+
<files include="cs/**/*.*" buildAction="Compile" />
22+
</contentFiles>
23+
</metadata>
24+
<files>
25+
<file src="..\LICENSE" />
26+
<file src="..\FastExpressionCompiler.snk" />
27+
28+
<!--net45-->
29+
<file src="..\src\FastExpressionCompiler.Internal\FastExpressionCompiler.cs" target="content\net45\FastExpressionCompiler" />
30+
31+
<!-- .netstandard 1.0 -->
32+
<file src="..\src\FastExpressionCompiler.Internal\FastExpressionCompiler.cs" target="contentFiles\cs\netstandard1.0\FastExpressionCompiler" />
33+
34+
<!-- .netstandard 1.3 -->
35+
<file src="..\src\FastExpressionCompiler.Internal\FastExpressionCompiler.cs" target="contentFiles\cs\netstandard1.3\FastExpressionCompiler" />
36+
37+
<!-- .netstandard 2.0 -->
38+
<file src="..\src\FastExpressionCompiler.Internal\FastExpressionCompiler.cs" target="contentFiles\cs\netstandard2.0\FastExpressionCompiler" />
39+
40+
</files>
41+
</package>

‎nuspecs/FastExpressionCompiler.LightExpression.Internal.src.nuspec

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata minClientVersion="3.3.0">
4+
<id>FastExpressionCompiler.LightExpression.Internal.src</id>
5+
<version>3.0.0-preview-01</version>
6+
<authors>Maksim Volkau</authors>
7+
<copyright>Copyright © 2013-2020 Maksim Volkau</copyright>
8+
<projectUrl>https://github.com/dadhi/FastExpressionCompiler</projectUrl>
9+
<license type="expression">MIT</license>
10+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11+
<description>FastExpressionCompiler is 10-40x times faster than Expression.Compile()</description>
12+
<tags>Performance;Expression;ExpressionTree;Compile;DynamicMethod;IL;ILEmit;DryIoc;ExpressionToCodeLib</tags>
13+
<releaseNotes><![CDATA[
14+
15+
## v3.0.0
16+
17+
Thanks to the contributors
18+
19+
]]></releaseNotes>
20+
<contentFiles>
21+
<files include="cs/**/*.*" buildAction="Compile" />
22+
</contentFiles>
23+
</metadata>
24+
<files>
25+
<file src="..\LICENSE" />
26+
<file src="..\FastExpressionCompiler.snk" />
27+
28+
<!--net45-->
29+
<file src="..\src\FastExpressionCompiler.Internal\FastExpressionCompiler.cs" target="content\net45\FastExpressionCompiler.LightExpression" />
30+
<file src="..\src\FastExpressionCompiler.Internal\Expression.cs" target="content\net45\FastExpressionCompiler.LightExpression" />
31+
<file src="..\src\FastExpressionCompiler.Internal\ExpressionVisitor.cs" target="content\net45\FastExpressionCompiler.LightExpression" />
32+
33+
<!-- .netstandard 1.0 -->
34+
<file src="..\src\FastExpressionCompiler.Internal\FastExpressionCompiler.cs" target="contentFiles\cs\netstandard1.0\FastExpressionCompiler.LightExpression" />
35+
<file src="..\src\FastExpressionCompiler.Internal\Expression.cs" target="contentFiles\cs\netstandard1.0\FastExpressionCompiler.LightExpression" />
36+
<file src="..\src\FastExpressionCompiler.Internal\ExpressionVisitor.cs" target="contentFiles\cs\netstandard1.0\FastExpressionCompiler.LightExpression" />
37+
38+
<!-- .netstandard 1.3 -->
39+
<file src="..\src\FastExpressionCompiler.Internal\FastExpressionCompiler.cs" target="contentFiles\cs\netstandard1.3\FastExpressionCompiler.LightExpression" />
40+
<file src="..\src\FastExpressionCompiler.Internal\Expression.cs" target="contentFiles\cs\netstandard1.3\FastExpressionCompiler.LightExpression" />
41+
<file src="..\src\FastExpressionCompiler.Internal\ExpressionVisitor.cs" target="contentFiles\cs\netstandard1.3\FastExpressionCompiler.LightExpression" />
42+
43+
<!-- .netstandard 2.0 -->
44+
<file src="..\src\FastExpressionCompiler.Internal\FastExpressionCompiler.cs" target="contentFiles\cs\netstandard2.0\FastExpressionCompiler.LightExpression" />
45+
<file src="..\src\FastExpressionCompiler.Internal\Expression.cs" target="contentFiles\cs\netstandard2.0\FastExpressionCompiler.LightExpression" />
46+
<file src="..\src\FastExpressionCompiler.Internal\ExpressionVisitor.cs" target="contentFiles\cs\netstandard2.0\FastExpressionCompiler.LightExpression" />
47+
48+
</files>
49+
</package>

‎nuspecs/FastExpressionCompiler.LightExpression.src.nuspec

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata minClientVersion="3.3.0">
4+
<id>FastExpressionCompiler.LightExpression.src</id>
5+
<version>3.0.0-preview-01</version>
6+
<authors>Maksim Volkau</authors>
7+
<copyright>Copyright © 2013-2020 Maksim Volkau</copyright>
8+
<projectUrl>https://github.com/dadhi/FastExpressionCompiler</projectUrl>
9+
<license type="expression">MIT</license>
10+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11+
<description>FastExpressionCompiler is 10-40x times faster than Expression.Compile()</description>
12+
<tags>Performance;Expression;ExpressionTree;Compile;DynamicMethod;IL;ILEmit;DryIoc;ExpressionToCodeLib</tags>
13+
<releaseNotes><![CDATA[
14+
15+
## v3.0.0
16+
17+
Thanks to the contributors
18+
19+
]]></releaseNotes>
20+
<contentFiles>
21+
<files include="cs/**/*.*" buildAction="Compile" />
22+
</contentFiles>
23+
<dependencies>
24+
<group targetFramework="net45" />
25+
<group targetFramework="netstandard1.0">
26+
<dependency id="NETStandard.Library" version="1.6.1" />
27+
</group>
28+
<group targetFramework="netstandard1.3">
29+
<dependency id="NETStandard.Library" version="1.6.1" />
30+
<dependency id="System.Reflection.Emit.Lightweight" version="4.3.0" />
31+
</group>
32+
<group targetFramework="netstandard2.0">
33+
<dependency id="System.Reflection.Emit.Lightweight" version="4.3.0" />
34+
</group>
35+
</dependencies>
36+
</metadata>
37+
<files>
38+
<file src="..\LICENSE" />
39+
<file src="..\FastExpressionCompiler.snk" />
40+
41+
<!--net45-->
42+
<file src="..\src\FastExpressionCompiler\FastExpressionCompiler.cs" target="content\net45\FastExpressionCompiler.LightExpression" />
43+
<file src="..\src\FastExpressionCompiler.LightExpression\Expression.cs" target="content\net45\FastExpressionCompiler.LightExpression" />
44+
<file src="..\src\FastExpressionCompiler.LightExpression\ExpressionVisitor.cs" target="content\net45\FastExpressionCompiler.LightExpression" />
45+
46+
<!-- .netstandard 1.0 -->
47+
<file src="..\src\FastExpressionCompiler\FastExpressionCompiler.cs" target="contentFiles\cs\netstandard1.0\FastExpressionCompiler.LightExpression" />
48+
<file src="..\src\FastExpressionCompiler.LightExpression\Expression.cs" target="contentFiles\cs\netstandard1.0\FastExpressionCompiler.LightExpression" />
49+
<file src="..\src\FastExpressionCompiler.LightExpression\ExpressionVisitor.cs" target="contentFiles\cs\netstandard1.0\FastExpressionCompiler.LightExpression" />
50+
51+
<!-- .netstandard 1.3 -->
52+
<file src="..\src\FastExpressionCompiler\FastExpressionCompiler.cs" target="contentFiles\cs\netstandard1.3\FastExpressionCompiler.LightExpression" />
53+
<file src="..\src\FastExpressionCompiler.LightExpression\Expression.cs" target="contentFiles\cs\netstandard1.3\FastExpressionCompiler.LightExpression" />
54+
<file src="..\src\FastExpressionCompiler.LightExpression\ExpressionVisitor.cs" target="contentFiles\cs\netstandard1.3\FastExpressionCompiler.LightExpression" />
55+
56+
<!-- .netstandard 2.0 -->
57+
<file src="..\src\FastExpressionCompiler\FastExpressionCompiler.cs" target="contentFiles\cs\netstandard2.0\FastExpressionCompiler.LightExpression" />
58+
<file src="..\src\FastExpressionCompiler.LightExpression\Expression.cs" target="contentFiles\cs\netstandard2.0\FastExpressionCompiler.LightExpression" />
59+
<file src="..\src\FastExpressionCompiler.LightExpression\ExpressionVisitor.cs" target="contentFiles\cs\netstandard2.0\FastExpressionCompiler.LightExpression" />
60+
61+
</files>
62+
</package>

0 commit comments

Comments
 (0)