Browse Source

项目重命名为:Magicodes.IE.Stash

pull/498/head
吴宏伟 3 years ago
parent
commit
4ae182f355
  1. 28
      Magicodes.IE.sln
  2. 19
      src/JustCode/Magicodes.IE.JustCode/Magicodes.IE.JustCode.csproj
  3. 2
      src/Stash/Magicodes.IE.Stash/Extensions/EPPlusExtensions.cs
  4. 2
      src/Stash/Magicodes.IE.Stash/Extensions/ReflectionExtensions.cs
  5. 2
      src/Stash/Magicodes.IE.Stash/Import/CellValue.cs
  6. 2
      src/Stash/Magicodes.IE.Stash/Import/Contract.cs
  7. 5
      src/Stash/Magicodes.IE.Stash/Import/ExcelImporter.cs
  8. 7
      src/Stash/Magicodes.IE.Stash/Import/ExcelImporter`Reflection.cs
  9. 5
      src/Stash/Magicodes.IE.Stash/Import/ExcelImporter`builder.cs
  10. 2
      src/Stash/Magicodes.IE.Stash/Import/IFunc.cs
  11. 2
      src/Stash/Magicodes.IE.Stash/Import/ImportContext.cs
  12. 2
      src/Stash/Magicodes.IE.Stash/Import/ImportMapDefinition.cs
  13. 2
      src/Stash/Magicodes.IE.Stash/Import/MapItem.cs
  14. 2
      src/Stash/Magicodes.IE.Stash/Import/Pipe.cs
  15. 2
      src/Stash/Magicodes.IE.Stash/Import/VariableItem.cs
  16. 21
      src/Stash/Magicodes.IE.Stash/Magicodes.IE.Stash.csproj
  17. 0
      src/Stash/Magicodes.IE.Stash/readme.md
  18. 2
      src/Stash/Magicodes.IE.StashTests/Extensions/Extensions.cs
  19. 6
      src/Stash/Magicodes.IE.StashTests/Import/ExcelImporterTests.cs
  20. 2
      src/Stash/Magicodes.IE.StashTests/Magicodes.IE.StashTests.csproj
  21. 2
      src/Stash/Magicodes.IE.StashTests/_Models/DaoModel.cs
  22. 0
      src/Stash/Magicodes.IE.StashTests/_res/数据源.xlsx
  23. BIN
      src/Stash/Magicodes.IE.StashTests/_res/正确的定义.xlsx
  24. BIN
      src/Stash/Magicodes.IE.StashTests/_res/重复变量定义.xlsx

28
Magicodes.IE.sln

@ -60,11 +60,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EPPlusTest", "src\EPPlus\EP
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magicodes.IE.Excel.NPOI", "src\Magicodes.IE.Excel.NPOI\Magicodes.IE.Excel.NPOI.csproj", "{1B0F12D3-C689-4085-8868-C214A733A6FF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Magicodes.IE.JustCode", "src\JustCode\Magicodes.IE.JustCode\Magicodes.IE.JustCode.csproj", "{BBDD757F-3D8F-40EF-A753-764A301BFA6E}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stash", "Stash", "{151F53D1-0E7B-4397-8E5E-1DAC6F2078D3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JustCode", "JustCode", "{151F53D1-0E7B-4397-8E5E-1DAC6F2078D3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magicodes.IE.Stash", "src\Stash\Magicodes.IE.Stash\Magicodes.IE.Stash.csproj", "{6BCCCF5F-B43F-4A5E-AD55-5B040D8F28D6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Magicodes.IE.JustCodeTests", "src\JustCode\Magicodes.IE.JustCodeTests\Magicodes.IE.JustCodeTests.csproj", "{C48A7187-982A-4B6D-960C-72F3BFD374F4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magicodes.IE.StashTests", "src\Stash\Magicodes.IE.StashTests\Magicodes.IE.StashTests.csproj", "{C50261E6-D543-4B60-BEC7-9E16E2287AA4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -152,14 +152,14 @@ Global
{1B0F12D3-C689-4085-8868-C214A733A6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B0F12D3-C689-4085-8868-C214A733A6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B0F12D3-C689-4085-8868-C214A733A6FF}.Release|Any CPU.Build.0 = Release|Any CPU
{BBDD757F-3D8F-40EF-A753-764A301BFA6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BBDD757F-3D8F-40EF-A753-764A301BFA6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BBDD757F-3D8F-40EF-A753-764A301BFA6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BBDD757F-3D8F-40EF-A753-764A301BFA6E}.Release|Any CPU.Build.0 = Release|Any CPU
{C48A7187-982A-4B6D-960C-72F3BFD374F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C48A7187-982A-4B6D-960C-72F3BFD374F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C48A7187-982A-4B6D-960C-72F3BFD374F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C48A7187-982A-4B6D-960C-72F3BFD374F4}.Release|Any CPU.Build.0 = Release|Any CPU
{6BCCCF5F-B43F-4A5E-AD55-5B040D8F28D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BCCCF5F-B43F-4A5E-AD55-5B040D8F28D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BCCCF5F-B43F-4A5E-AD55-5B040D8F28D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BCCCF5F-B43F-4A5E-AD55-5B040D8F28D6}.Release|Any CPU.Build.0 = Release|Any CPU
{C50261E6-D543-4B60-BEC7-9E16E2287AA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C50261E6-D543-4B60-BEC7-9E16E2287AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C50261E6-D543-4B60-BEC7-9E16E2287AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C50261E6-D543-4B60-BEC7-9E16E2287AA4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -176,11 +176,11 @@ Global
{C87851D2-869A-42D0-9750-14A79AC71A1B} = {C51DA59B-9F64-4AD0-B3CE-38CD18D01B10}
{19A27D71-AF9A-4536-BF1C-8AD794F379DA} = {3C510281-8FE5-43C3-B5B6-2386EE836234}
{B44800CB-5C50-4D64-AD9A-BE7077EA666E} = {3C510281-8FE5-43C3-B5B6-2386EE836234}
{BBDD757F-3D8F-40EF-A753-764A301BFA6E} = {151F53D1-0E7B-4397-8E5E-1DAC6F2078D3}
{C48A7187-982A-4B6D-960C-72F3BFD374F4} = {151F53D1-0E7B-4397-8E5E-1DAC6F2078D3}
{6BCCCF5F-B43F-4A5E-AD55-5B040D8F28D6} = {151F53D1-0E7B-4397-8E5E-1DAC6F2078D3}
{C50261E6-D543-4B60-BEC7-9E16E2287AA4} = {151F53D1-0E7B-4397-8E5E-1DAC6F2078D3}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6C8A9654-6F23-451B-AE83-8C7D534A7A3C}
RESX_SortFileContentOnSave = True
SolutionGuid = {6C8A9654-6F23-451B-AE83-8C7D534A7A3C}
EndGlobalSection
EndGlobal

19
src/JustCode/Magicodes.IE.JustCode/Magicodes.IE.JustCode.csproj

@ -1,19 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props"></Import>
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Magicodes.JustCode</RootNamespace>
</PropertyGroup>
<ItemGroup>
<Folder Include="Export\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CS-Script" Version="4.6.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Magicodes.ExporterAndImporter.Excel\Magicodes.IE.Excel.csproj" />
</ItemGroup>
</Project>

2
src/JustCode/Magicodes.IE.JustCode/Extensions/EPPlusExtensions.cs → src/Stash/Magicodes.IE.Stash/Extensions/EPPlusExtensions.cs

@ -2,7 +2,7 @@
using System;
using System.Reflection;
namespace Magicodes.JustCode.Extensions
namespace Magicodes.IE.Stash.Extensions
{
/// <summary>
/// EPPlus扩展

2
src/JustCode/Magicodes.IE.JustCode/Extensions/ReflectionExtensions.cs → src/Stash/Magicodes.IE.Stash/Extensions/ReflectionExtensions.cs

@ -5,7 +5,7 @@ using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace Magicodes.JustCode.Extensions
namespace Magicodes.IE.Stash.Extensions
{
/// <summary>
/// 反向扩展

2
src/JustCode/Magicodes.IE.JustCode/Import/CellValue.cs → src/Stash/Magicodes.IE.Stash/Import/CellValue.cs

@ -1,6 +1,6 @@
using OfficeOpenXml;
namespace Magicodes.JustCode.Import
namespace Magicodes.IE.Stash.Import
{
/// <summary>
/// 单元格

2
src/JustCode/Magicodes.IE.JustCode/Contract.cs → src/Stash/Magicodes.IE.Stash/Import/Contract.cs

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Magicodes.JustCode
namespace Magicodes.IE.Stash.Import
{
internal class Contract
{

5
src/JustCode/Magicodes.IE.JustCode/Import/ExcelImporter.cs → src/Stash/Magicodes.IE.Stash/Import/ExcelImporter.cs

@ -8,10 +8,9 @@ using CSScriptLib;
using System.Text;
using CSScripting;
using System.Dynamic;
using Magicodes.JustCode.Extensions;
using Magicodes.JustCode.Import;
using Magicodes.IE.Stash.Extensions;
namespace JustWei.Models
namespace Magicodes.IE.Stash.Import
{
public partial class ExcelImporter
{

7
src/JustCode/Magicodes.IE.JustCode/Import/ExcelImporter`Reflection.cs → src/Stash/Magicodes.IE.Stash/Import/ExcelImporter`Reflection.cs

@ -1,22 +1,17 @@
using CSScriptLib;
using JustWei;
using JustWei.Models;
using Magicodes.JustCode;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace JustWei.Models
namespace Magicodes.IE.Stash.Import
{
public partial class ExcelImporter
{
/// <summary>
/// 查询类型名字对应的ClrType
/// </summary>
/// <param name="typeName">类型名称</param>
/// <returns></returns>
///
public static Func<string, Type> FindType = (typeName) =>
{

5
src/JustCode/Magicodes.IE.JustCode/Import/ExcelImporter`builder.cs → src/Stash/Magicodes.IE.Stash/Import/ExcelImporter`builder.cs

@ -1,13 +1,10 @@
using CSScriptLib;
using JustWei;
using Magicodes.JustCode;
using Magicodes.JustCode.Import;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace JustWei.Models
namespace Magicodes.IE.Stash.Import
{
public partial class ExcelImporter
{

2
src/JustCode/Magicodes.IE.JustCode/Import/IFunc.cs → src/Stash/Magicodes.IE.Stash/Import/IFunc.cs

@ -1,4 +1,4 @@
namespace Magicodes.JustCode.Import
namespace Magicodes.IE.Stash.Import
{
public interface IFunc
{

2
src/JustCode/Magicodes.IE.JustCode/Import/ImportContext.cs → src/Stash/Magicodes.IE.Stash/Import/ImportContext.cs

@ -1,6 +1,6 @@
using System;
namespace Magicodes.JustCode.Import
namespace Magicodes.IE.Stash.Import
{
/// <summary>
/// 动态计算上下文

2
src/JustCode/Magicodes.IE.JustCode/Import/ImportMapDefinition.cs → src/Stash/Magicodes.IE.Stash/Import/ImportMapDefinition.cs

@ -4,7 +4,7 @@ using System.Text.Json.Serialization;
using System.Reflection;
using System;
namespace Magicodes.JustCode.Import
namespace Magicodes.IE.Stash.Import
{
/// <summary>
/// 导入映射定义

2
src/JustCode/Magicodes.IE.JustCode/Import/MapItem.cs → src/Stash/Magicodes.IE.Stash/Import/MapItem.cs

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Magicodes.JustCode.Import
namespace Magicodes.IE.Stash.Import
{
/// <summary>
/// 映射项

2
src/JustCode/Magicodes.IE.JustCode/Import/Pipe.cs → src/Stash/Magicodes.IE.Stash/Import/Pipe.cs

@ -1,4 +1,4 @@
namespace Magicodes.JustCode.Import
namespace Magicodes.IE.Stash.Import
{
public class Pipe
{

2
src/JustCode/Magicodes.IE.JustCode/Import/VariableItem.cs → src/Stash/Magicodes.IE.Stash/Import/VariableItem.cs

@ -1,4 +1,4 @@
namespace Magicodes.JustCode.Import
namespace Magicodes.IE.Stash.Import
{
/// <summary>
/// 变量项

21
src/Stash/Magicodes.IE.Stash/Magicodes.IE.Stash.csproj

@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props"></Import>
<PropertyGroup>
<!--<Version>2.7.4.7</Version>-->
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>10</LangVersion>
<RootNamespace>Magicodes.IE.Stash</RootNamespace>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<Folder Include="Export\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CS-Script" Version="4.6.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Magicodes.ExporterAndImporter.Excel\Magicodes.IE.Excel.csproj" />
</ItemGroup>
</Project>

0
src/JustCode/Magicodes.IE.JustCode/readme.md → src/Stash/Magicodes.IE.Stash/readme.md

2
src/JustCode/Magicodes.IE.JustCodeTests/Extensions/Extensions.cs → src/Stash/Magicodes.IE.StashTests/Extensions/Extensions.cs

@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Magicodes.IE.JustCodeTests.Extensions
namespace Magicodes.IE.StashTests.Extensions
{
public static class Extensions
{

6
src/JustCode/Magicodes.IE.JustCodeTests/Import/ExcelImporterTests.cs → src/Stash/Magicodes.IE.StashTests/Import/ExcelImporterTests.cs

@ -1,13 +1,13 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using JustWei.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Magicodes.IE.JustCodeTests.Extensions;
using Magicodes.IE.Stash.Import;
using Magicodes.IE.StashTests.Extensions;
namespace JustWei.Models.Tests
namespace Magicodes.IE.StashTests.Import
{
[TestClass()]
public class ExcelImporterTests

2
src/JustCode/Magicodes.IE.JustCodeTests/Magicodes.IE.JustCodeTests.csproj → src/Stash/Magicodes.IE.StashTests/Magicodes.IE.StashTests.csproj

@ -17,7 +17,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Magicodes.IE.JustCode\Magicodes.IE.JustCode.csproj" />
<ProjectReference Include="..\Magicodes.IE.Stash\Magicodes.IE.Stash.csproj" />
</ItemGroup>
</Project>

2
src/JustCode/Magicodes.IE.JustCodeTests/_Models/DaoModel.cs → src/Stash/Magicodes.IE.StashTests/_Models/DaoModel.cs

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Magicodes.IE.JustCodeTests._res
namespace Magicodes.IE.StashTests._Models
{
public class DaoModel
{

0
src/JustCode/Magicodes.IE.JustCodeTests/_res/数据源.xlsx → src/Stash/Magicodes.IE.StashTests/_res/数据源.xlsx

BIN
src/JustCode/Magicodes.IE.JustCodeTests/_res/重复变量定义.xlsx → src/Stash/Magicodes.IE.StashTests/_res/正确的定义.xlsx

Binary file not shown.

BIN
src/JustCode/Magicodes.IE.JustCodeTests/_res/正确的定义.xlsx → src/Stash/Magicodes.IE.StashTests/_res/重复变量定义.xlsx

Binary file not shown.
Loading…
Cancel
Save