Skip to content

Commit 6b1e52c

Browse files
AlphaBsAlphaBs
committed
Merge branch 'v3.4.0'
2 parents 24e2d02 + f524163 commit 6b1e52c

File tree

272 files changed

+11435
-10788
lines changed

Some content is hidden

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

272 files changed

+11435
-10788
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,3 +261,4 @@ __pycache__/
261261
*.pyc
262262

263263
./release
264+
benchmark/BenchmarkDotNet.Artifacts/

‎.vscode/launch.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
25
"version": "0.2.0",
36
"configurations": [
47
{
5-
// Use IntelliSense to find out which attributes exist for C# debugging
6-
// Use hover for the description of the existing attributes
7-
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
88
"name": ".NET Core Launch (console)",
99
"type": "coreclr",
1010
"request": "launch",
1111
"preLaunchTask": "build",
12-
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/CmlLibCoreSample/bin/Debug/net6.0/CmlLibCoreSample.dll",
12+
"program": "${workspaceFolder}/examples/console/bin/Debug/net6.0/CmlLibCoreSample.dll",
1413
"args": [],
15-
"cwd": "${workspaceFolder}/CmlLibCoreSample",
16-
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
17-
"console": "integratedTerminal",
18-
"internalConsoleOptions": "neverOpen",
14+
"cwd": "${workspaceFolder}/examples/console",
15+
"console": "internalConsole",
1916
"stopAtEntry": false
2017
},
2118
{

‎.vscode/tasks.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"type": "process",
88
"args": [
99
"build",
10-
"${workspaceFolder}/CmlLibCoreSample/CmlLibCoreSample.csproj",
10+
"${workspaceFolder}/CmlLib.Core.sln",
1111
"/property:GenerateFullPaths=true",
12-
"/consoleloggerparameters:NoSummary"
12+
"/consoleloggerparameters:NoSummary;ForceNoAlign"
1313
],
1414
"problemMatcher": "$msCompile"
1515
},
@@ -19,9 +19,9 @@
1919
"type": "process",
2020
"args": [
2121
"publish",
22-
"${workspaceFolder}/CmlLibCoreSample/CmlLibCoreSample.csproj",
22+
"${workspaceFolder}/CmlLib.Core.sln",
2323
"/property:GenerateFullPaths=true",
24-
"/consoleloggerparameters:NoSummary"
24+
"/consoleloggerparameters:NoSummary;ForceNoAlign"
2525
],
2626
"problemMatcher": "$msCompile"
2727
},
@@ -33,7 +33,7 @@
3333
"watch",
3434
"run",
3535
"--project",
36-
"${workspaceFolder}/CmlLibCoreSample/CmlLibCoreSample.csproj"
36+
"${workspaceFolder}/CmlLib.Core.sln"
3737
],
3838
"problemMatcher": "$msCompile"
3939
}

‎CmlLib.Core.sln

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLib.Core.Test", "test\CmlLib.Core.Test.csproj", "{86827E6C-1353-4DF1-968F-31801A5EB032}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{6C52D5EC-0391-43EB-B34A-E5AA1E5BBBFE}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLibCoreSample", "examples\console\CmlLibCoreSample.csproj", "{C9F876F3-5579-4B3A-A808-17845BB9C744}"
11+
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLibWinFormSample", "examples\winform\CmlLibWinFormSample.csproj", "{362D93FE-B624-451E-AAD9-D66EFBE90EC3}"
13+
EndProject
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLib.Core.Benchmarks", "benchmark\CmlLib.Core.Benchmarks.csproj", "{99852557-DBA7-4E13-A883-4B535F0D33FB}"
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLib.Core", "src\CmlLib.Core.csproj", "{F9718097-45C5-40CD-80B1-42408BEA8935}"
17+
EndProject
18+
Global
19+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
20+
Debug|Any CPU = Debug|Any CPU
21+
Release|Any CPU = Release|Any CPU
22+
EndGlobalSection
23+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24+
{86827E6C-1353-4DF1-968F-31801A5EB032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{86827E6C-1353-4DF1-968F-31801A5EB032}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{86827E6C-1353-4DF1-968F-31801A5EB032}.Release|Any CPU.ActiveCfg = Release|Any CPU
27+
{86827E6C-1353-4DF1-968F-31801A5EB032}.Release|Any CPU.Build.0 = Release|Any CPU
28+
{C9F876F3-5579-4B3A-A808-17845BB9C744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{C9F876F3-5579-4B3A-A808-17845BB9C744}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{C9F876F3-5579-4B3A-A808-17845BB9C744}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{C9F876F3-5579-4B3A-A808-17845BB9C744}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{362D93FE-B624-451E-AAD9-D66EFBE90EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{362D93FE-B624-451E-AAD9-D66EFBE90EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{362D93FE-B624-451E-AAD9-D66EFBE90EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{362D93FE-B624-451E-AAD9-D66EFBE90EC3}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{99852557-DBA7-4E13-A883-4B535F0D33FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{99852557-DBA7-4E13-A883-4B535F0D33FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{99852557-DBA7-4E13-A883-4B535F0D33FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{99852557-DBA7-4E13-A883-4B535F0D33FB}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{F9718097-45C5-40CD-80B1-42408BEA8935}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{F9718097-45C5-40CD-80B1-42408BEA8935}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{F9718097-45C5-40CD-80B1-42408BEA8935}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{F9718097-45C5-40CD-80B1-42408BEA8935}.Release|Any CPU.Build.0 = Release|Any CPU
44+
EndGlobalSection
45+
GlobalSection(SolutionProperties) = preSolution
46+
HideSolutionNode = FALSE
47+
EndGlobalSection
48+
GlobalSection(NestedProjects) = preSolution
49+
{C9F876F3-5579-4B3A-A808-17845BB9C744} = {6C52D5EC-0391-43EB-B34A-E5AA1E5BBBFE}
50+
{362D93FE-B624-451E-AAD9-D66EFBE90EC3} = {6C52D5EC-0391-43EB-B34A-E5AA1E5BBBFE}
51+
EndGlobalSection
52+
GlobalSection(ExtensibilityGlobals) = postSolution
53+
SolutionGuid = {B19F9927-91FB-4CA6-96D9-6C375C06B3C8}
54+
EndGlobalSection
55+
EndGlobal

‎CmlLib.sln

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎CmlLib.sln.DotSettings

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)