Skip to content

Commit bf6a9f5

Browse files
committed
merge
2 parents f367a2c + 475546f commit bf6a9f5

File tree

77 files changed

+647
-37726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+647
-37726
lines changed

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
TestResults
22
src/CatLib.Framework/bin
33
src/CatLib.Framework/obj
4+
src/CatLib.Framework.NetStandard/bin
5+
src/CatLib.Framework.NetStandard/obj
46
src/CatLib.Framework.Tests/bin
57
src/CatLib.Framework.Tests/obj
68
src/CatLib.Framework.API/bin
79
src/CatLib.Framework.API/obj
10+
src/CatLib.Framework.API.NetStandard/bin
11+
src/CatLib.Framework.API.NetStandard/obj
812
src/coverage.xml
13+
build
914

1015
.vscode
1116
.vs

CatLib.Framework.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.16
4+
VisualStudioVersion = 15.0.27004.2002
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CatLib.Framework", "src\CatLib.Framework\CatLib.Framework.csproj", "{BBB2DAE2-638B-4419-9591-3CECCA312E4E}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CatLib.Framework.Tests", "src\CatLib.Framework.Tests\CatLib.Framework.Tests.csproj", "{8D8774B0-B6CE-4571-89F6-F3707FFFC167}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CatLib.Framework.API", "src\CatLib.Framework.API\CatLib.Framework.API.csproj", "{5BF5D9DC-26F3-46AE-A735-FE37B0D4FE2E}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatLib.Framework.NetStandard", "src\CatLib.Framework\CatLib.Framework.NetStandard.csproj", "{646FFB7D-2628-4EF1-BF97-83CDC14CC915}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatLib.Framework.NetStandard", "src\CatLib.Framework.NetStandard\CatLib.Framework.NetStandard.csproj", "{646FFB7D-2628-4EF1-BF97-83CDC14CC915}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatLib.Framework.API.NetStandard", "src\CatLib.Framework.API\CatLib.Framework.API.NetStandard.csproj", "{4EB52E2B-5BE7-4975-9B92-99B2DA4624C8}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CatLib.Framework.API.NetStandard", "src\CatLib.Framework.API.NetStandard\CatLib.Framework.API.NetStandard.csproj", "{4EB52E2B-5BE7-4975-9B92-99B2DA4624C8}"
1515
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution

build/CatLib.Core.dll

-65.5 KB
Binary file not shown.

build/CatLib.Core.pdb

-188 KB
Binary file not shown.

build/CatLib.Framework.API.dll

-18.5 KB
Binary file not shown.

build/CatLib.Framework.API.pdb

-33.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)