Merge pull request #3 from zjklee/feature/use-only-code-package

Use only code package with exposing `internal only`

Author: oformaniuk

.github/workflows/CI.yml

@@ -75,11 +75,7 @@ jobs:
         run: git fetch --depth 500
       - name: Determine version
         run: echo "::set-env name=VERSION::$(git describe --tags --abbrev=0)"    
-        
-      - name: pack binary
-        working-directory: ./src
-        run: dotnet pack ./ExpressionShortcuts/ExpressionShortcuts.csproj -c Release /p:version=${{ env.VERSION }}.${{ github.run_number }}
-        
+          
       - name: pack code
         working-directory: ./src
         run: dotnet pack ./ExpressionShortcuts/ExpressionShortcuts.Source.csproj /p:version=${{ env.VERSION }}.${{ github.run_number }}

.github/workflows/Release.yml

@@ -18,11 +18,7 @@ jobs:
       - name: pack binary
         working-directory: ./src
         run: dotnet pack ./ExpressionShortcuts/ExpressionShortcuts.csproj -c Release /p:version=${{ github.event.release.tag_name }}
-        
-      - name: pack binary
-        working-directory: ./src
-        run: dotnet pack ./ExpressionShortcuts/ExpressionShortcuts.Source.csproj /p:version=${{ github.event.release.tag_name }}
-        
+          
       - name: publish
         working-directory: ./src
         run: dotnet nuget push **/*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json

src/ExpressionShortcuts/BlockBuilder.cs

@@ -8,7 +8,7 @@ namespace Expressions.Shortcuts
     /// <summary>
     /// Shortcut for <see cref="BlockExpression"/>
     /// </summary>
-    public class BlockBuilder: ExpressionContainer
+    internal class BlockBuilder: ExpressionContainer
     {
         private readonly Type _returnType;
         private readonly List<Expression> _expressions;

src/ExpressionShortcuts/ConditionBuilder.cs

@@ -6,7 +6,7 @@ namespace Expressions.Shortcuts
     /// <summary>
     /// 
     /// </summary>
-    public class ConditionBuilder : ExpressionContainer
+    internal class ConditionBuilder : ExpressionContainer
     {
         private Expression _condition;
         private Expression _then;

src/ExpressionShortcuts/Exclude/Friends.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("ExpressionShortcuts.Tests")]

src/ExpressionShortcuts/ExpressionContainer.cs

@@ -5,7 +5,7 @@ namespace Expressions.Shortcuts
     /// <summary>
     /// Wrapper around of <see cref="System.Linq.Expressions.Expression"/> to provide addition functionality
     /// </summary>
-    public class ExpressionContainer
+    internal class ExpressionContainer
     {
         /// <summary>
         /// 
@@ -66,7 +66,7 @@ public class ExpressionContainer
     /// </summary>
     /// <remarks>Used to trick C# compiler in cases like <see cref="ExpressionShortcuts.Call"/> in order to pass value to target method.</remarks>
     /// <typeparam name="T">Type of expected <see cref="Expression"/> result value.</typeparam>
-    public class ExpressionContainer<T> : ExpressionContainer
+    internal class ExpressionContainer<T> : ExpressionContainer
     {
         /// <summary>
         /// Used to trick C# compiler

src/ExpressionShortcuts/ExpressionContainerExtensions.cs

@@ -5,7 +5,7 @@
 
 namespace Expressions.Shortcuts
 {
-    public static partial class ExpressionShortcuts
+    internal static partial class ExpressionShortcuts
     {
         /// <summary>
         /// Creates strongly typed representation of the <see cref="Expression.Property(System.Linq.Expressions.Expression,System.String)"/>

src/ExpressionShortcuts/ExpressionShortcuts.Source.csproj

@@ -3,9 +3,9 @@
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
     <PropertyGroup>
-        <PackageId>ExpressionShortcuts.Source</PackageId>
+        <PackageId>ExpressionShortcuts</PackageId>
         <TargetFrameworks>net452;netstandard1.3;netstandard2.0</TargetFrameworks>
-        <Version>1.1.22</Version>
+        <Version>1.0.0</Version>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <IsPackable>true</IsPackable>
         <Configuration>Source</Configuration>
@@ -50,17 +50,17 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Compile Include="**\*.cs" Exclude="obj\**\*.*">
+        <Compile Include="**\*.cs" Exclude="Exclude\**\*.*;obj\**\*.*">
             <Pack>true</Pack>
             <Visible>false</Visible>
             <PackagePath>$(ContentTargetFolders)\cs\netstandard2.0\$(PackageId)\%(Identity)</PackagePath>
         </Compile>
-        <Compile Include="**\*.cs" Exclude="obj\**\*.*;netstandard2.0\**\*.cs">
+        <Compile Include="**\*.cs" Exclude="Exclude\**\*.*;obj\**\*.*;netstandard2.0\**\*.cs">
             <Pack>true</Pack>
             <Visible>false</Visible>
             <PackagePath>$(ContentTargetFolders)\cs\netstandard1.3\$(PackageId)\%(Identity)</PackagePath>
         </Compile>
-        <Compile Include="**\*.cs" Exclude="obj\**\*.*;netstandard2.0\**\*.cs">
+        <Compile Include="**\*.cs" Exclude="Exclude\**\*.*;obj\**\*.*;netstandard2.0\**\*.cs">
             <Pack>true</Pack>
             <Visible>false</Visible>
             <PackagePath>$(ContentTargetFolders)\cs\net452\$(PackageId)\%(Identity)</PackagePath>

src/ExpressionShortcuts/ExpressionShortcuts.cs

@@ -9,7 +9,7 @@ namespace Expressions.Shortcuts
     /// <summary>
     /// Stands for <see cref="Expression"/> shortcuts.
     /// </summary>
-    public static partial class ExpressionShortcuts
+    internal static partial class ExpressionShortcuts
     {
         /// <summary>
         /// Creates strongly typed representation of the <paramref name="expression"/>

src/ExpressionShortcuts/ExpressionUtils.cs

@@ -10,7 +10,7 @@ namespace Expressions.Shortcuts
     /// <summary>
     /// 
     /// </summary>
-    public static class ExpressionUtils
+    internal static class ExpressionUtils
     {
         /// <summary>
         /// Visits <paramref name="expressions"/> and replaces <see cref="ParameterExpression"/> by <paramref name="newValues"/> performing match by <see cref="Expression.Type"/>