Skip to content

Commit

Permalink
Merge branch 'v3.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
AlphaBs committed Mar 29, 2024
2 parents 24e2d02 + f524163 commit 6b1e52c
Show file tree
Hide file tree
Showing 272 changed files with 11,435 additions and 10,788 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,4 @@ __pycache__/
*.pyc

./release
benchmark/BenchmarkDotNet.Artifacts/
15 changes: 6 additions & 9 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/CmlLibCoreSample/bin/Debug/net6.0/CmlLibCoreSample.dll",
"program": "${workspaceFolder}/examples/console/bin/Debug/net6.0/CmlLibCoreSample.dll",
"args": [],
"cwd": "${workspaceFolder}/CmlLibCoreSample",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"cwd": "${workspaceFolder}/examples/console",
"console": "internalConsole",
"stopAtEntry": false
},
{
Expand Down
10 changes: 5 additions & 5 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"type": "process",
"args": [
"build",
"${workspaceFolder}/CmlLibCoreSample/CmlLibCoreSample.csproj",
"${workspaceFolder}/CmlLib.Core.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
Expand All @@ -19,9 +19,9 @@
"type": "process",
"args": [
"publish",
"${workspaceFolder}/CmlLibCoreSample/CmlLibCoreSample.csproj",
"${workspaceFolder}/CmlLib.Core.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
Expand All @@ -33,7 +33,7 @@
"watch",
"run",
"--project",
"${workspaceFolder}/CmlLibCoreSample/CmlLibCoreSample.csproj"
"${workspaceFolder}/CmlLib.Core.sln"
],
"problemMatcher": "$msCompile"
}
Expand Down
55 changes: 55 additions & 0 deletions CmlLib.Core.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLib.Core.Test", "test\CmlLib.Core.Test.csproj", "{86827E6C-1353-4DF1-968F-31801A5EB032}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{6C52D5EC-0391-43EB-B34A-E5AA1E5BBBFE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLibCoreSample", "examples\console\CmlLibCoreSample.csproj", "{C9F876F3-5579-4B3A-A808-17845BB9C744}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLibWinFormSample", "examples\winform\CmlLibWinFormSample.csproj", "{362D93FE-B624-451E-AAD9-D66EFBE90EC3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLib.Core.Benchmarks", "benchmark\CmlLib.Core.Benchmarks.csproj", "{99852557-DBA7-4E13-A883-4B535F0D33FB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLib.Core", "src\CmlLib.Core.csproj", "{F9718097-45C5-40CD-80B1-42408BEA8935}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{86827E6C-1353-4DF1-968F-31801A5EB032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{86827E6C-1353-4DF1-968F-31801A5EB032}.Debug|Any CPU.Build.0 = Debug|Any CPU
{86827E6C-1353-4DF1-968F-31801A5EB032}.Release|Any CPU.ActiveCfg = Release|Any CPU
{86827E6C-1353-4DF1-968F-31801A5EB032}.Release|Any CPU.Build.0 = Release|Any CPU
{C9F876F3-5579-4B3A-A808-17845BB9C744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9F876F3-5579-4B3A-A808-17845BB9C744}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9F876F3-5579-4B3A-A808-17845BB9C744}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9F876F3-5579-4B3A-A808-17845BB9C744}.Release|Any CPU.Build.0 = Release|Any CPU
{362D93FE-B624-451E-AAD9-D66EFBE90EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{362D93FE-B624-451E-AAD9-D66EFBE90EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{362D93FE-B624-451E-AAD9-D66EFBE90EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{362D93FE-B624-451E-AAD9-D66EFBE90EC3}.Release|Any CPU.Build.0 = Release|Any CPU
{99852557-DBA7-4E13-A883-4B535F0D33FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{99852557-DBA7-4E13-A883-4B535F0D33FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{99852557-DBA7-4E13-A883-4B535F0D33FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{99852557-DBA7-4E13-A883-4B535F0D33FB}.Release|Any CPU.Build.0 = Release|Any CPU
{F9718097-45C5-40CD-80B1-42408BEA8935}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9718097-45C5-40CD-80B1-42408BEA8935}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9718097-45C5-40CD-80B1-42408BEA8935}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9718097-45C5-40CD-80B1-42408BEA8935}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{C9F876F3-5579-4B3A-A808-17845BB9C744} = {6C52D5EC-0391-43EB-B34A-E5AA1E5BBBFE}
{362D93FE-B624-451E-AAD9-D66EFBE90EC3} = {6C52D5EC-0391-43EB-B34A-E5AA1E5BBBFE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B19F9927-91FB-4CA6-96D9-6C375C06B3C8}
EndGlobalSection
EndGlobal
37 changes: 0 additions & 37 deletions CmlLib.sln

This file was deleted.

3 changes: 0 additions & 3 deletions CmlLib.sln.DotSettings

This file was deleted.

Loading

0 comments on commit 6b1e52c

Please sign in to comment.