Skip to content

Commit 1b1f083

Browse files
equimanequiman
committed
Update to 1.8.0 version with dotnet 6 support
1 parent 8dad177 commit 1b1f083

File tree

14 files changed

+212
-182
lines changed

14 files changed

+212
-182
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
branches: [master]
88

99
env:
10-
dotnet: 5.0.100
11-
version: 1.7.1
10+
dotnet: 6.0.201
11+
version: 1.8.0
1212
key: dein:toolbox
1313
organization: dein
1414
name: ToolBox

‎.github/workflows/pack.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
- "v*"
77

88
env:
9-
dotnet: 5.0.100
10-
version: 1.7.1
9+
dotnet: 6.0.201
10+
version: 1.8.0
1111

1212
jobs:
1313
pack:

‎.vscode/launch.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
// Use IntelliSense to find out which attributes exist for C# debugging
3-
// Use hover for the description of the existing attributes
4-
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5-
"version": "0.2.0",
6-
"configurations": [
7-
{
8-
"name": ".NET Launch (console)",
9-
"type": "coreclr",
10-
"request": "launch",
11-
"preLaunchTask": "build",
12-
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/ToolBox.Tests/bin/Debug/net5.0/ToolBox.Tests.dll",
14-
"args": [],
15-
"cwd": "${workspaceFolder}/ToolBox.Tests",
16-
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
17-
"console": "internalConsole",
18-
"stopAtEntry": false,
19-
"internalConsoleOptions": "openOnSessionStart"
20-
},
21-
{
22-
"name": ".NET Attach",
23-
"type": "coreclr",
24-
"request": "attach",
25-
"processId": "${command:pickProcess}"
26-
}
27-
]
28-
}
2+
// Use IntelliSense to find out which attributes exist for C# debugging
3+
// Use hover for the description of the existing attributes
4+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": ".NET Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/ToolBox.Tests/bin/Debug/net6.0/ToolBox.Tests.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}/ToolBox.Tests",
16+
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
17+
"console": "internalConsole",
18+
"stopAtEntry": false,
19+
"internalConsoleOptions": "openOnSessionStart"
20+
},
21+
{
22+
"name": ".NET Attach",
23+
"type": "coreclr",
24+
"request": "attach",
25+
"processId": "${command:pickProcess}"
26+
}
27+
]
28+
}

‎.vscode/settings.json‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,12 @@
3636
],
3737
"dotnet-test-explorer.testArguments": "/p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=../lcov",
3838
"editor.tabSize": 4,
39-
"grammarly.userWords": [
40-
"NotificationSystem"
41-
],
39+
"grammarly.userWords": ["NotificationSystem"],
4240
"grammarly.diagnostics": {
4341
"[markdown]": {
44-
"ignore": [
45-
"inlineCode",
46-
"code"
47-
]
42+
"ignore": ["inlineCode", "code"]
4843
}
4944
},
50-
"omnisharp.useEditorFormattingSettings": true
51-
}
45+
"omnisharp.useEditorFormattingSettings": true,
46+
"cSpell.words": ["dotnet", "netstandard"]
47+
}

‎.vscode/tasks.json‎

Lines changed: 114 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,116 @@
11
{
2-
"version": "2.0.0",
3-
"tasks": [{
4-
"label": "build",
5-
"command": "dotnet",
6-
"type": "process",
7-
"group": {
8-
"kind": "build",
9-
"isDefault": true
10-
},
11-
"args": [
12-
"build",
13-
"${workspaceFolder}/ToolBox/ToolBox.csproj"
14-
],
15-
"problemMatcher": "$msCompile"
16-
},
17-
{
18-
"label": "build tests",
19-
"command": "dotnet",
20-
"type": "process",
21-
"group": "build",
22-
"args": [
23-
"build",
24-
"${workspaceFolder}/ToolBox.Tests/ToolBox.Tests.csproj"
25-
],
26-
"problemMatcher": "$msCompile"
27-
},
28-
{
29-
"label": "test",
30-
"command": "dotnet",
31-
"type": "process",
32-
"group": {
33-
"kind": "test",
34-
"isDefault": true
35-
},
36-
"args": [
37-
"test",
38-
"${workspaceFolder}/ToolBox.Tests/ToolBox.Tests.csproj",
39-
"/p:CollectCoverage=true",
40-
"/p:CoverletOutputFormat=\"opencover,lcov\"",
41-
"/p:CoverletOutput=../lcov"
42-
],
43-
"problemMatcher": "$msCompile"
44-
},
45-
{
46-
"label": "publish win",
47-
"command": "dotnet",
48-
"group": "none",
49-
"args": [
50-
"publish",
51-
"${workspaceRoot}/ToolBox/ToolBox.csproj",
52-
"-o",
53-
"${workspaceRoot}/Library/win/",
54-
"-c",
55-
"release",
56-
"-r",
57-
"win10-x64"
58-
],
59-
"problemMatcher": "$msCompile"
60-
},
61-
{
62-
"label": "publish mac",
63-
"command": "dotnet",
64-
"args": [
65-
"publish",
66-
"${workspaceRoot}/ToolBox/ToolBox.csproj",
67-
"-o",
68-
"${workspaceRoot}/Library/mac/",
69-
"-c",
70-
"release",
71-
"-r",
72-
"osx.10.12-x64"
73-
],
74-
"problemMatcher": "$msCompile"
75-
},
76-
{
77-
"label": "pack",
78-
"command": "dotnet",
79-
"args": [
80-
"pack",
81-
"${workspaceRoot}/ToolBox/ToolBox.csproj",
82-
"/p:NuspecFile=${workspaceRoot}/ToolBox/ToolBox.nuspec",
83-
"-o",
84-
"${workspaceRoot}/Package/",
85-
"-c",
86-
"release"
87-
],
88-
"problemMatcher": "$msCompile"
89-
},
90-
{
91-
"label": "permissions",
92-
"type": "shell",
93-
"osx": {
94-
"command": "chmod +x ${workspaceRoot}/sonar.sh"
95-
},
96-
"presentation": {
97-
"reveal": "always",
98-
"panel": "new"
99-
},
100-
"problemMatcher": []
101-
},
102-
{
103-
"label": "sonar",
104-
"type": "shell",
105-
"windows": {
106-
"command": "${workspaceRoot}\\sonar.bat"
107-
},
108-
"osx": {
109-
"command": "${workspaceRoot}/sonar.sh"
110-
},
111-
"presentation": {
112-
"reveal": "always",
113-
"panel": "new"
114-
},
115-
"problemMatcher": []
116-
}
117-
]
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"group": {
9+
"kind": "build",
10+
"isDefault": true
11+
},
12+
"args": ["build", "${workspaceFolder}/ToolBox/ToolBox.csproj"],
13+
"problemMatcher": "$msCompile"
14+
},
15+
{
16+
"label": "build tests",
17+
"command": "dotnet",
18+
"type": "process",
19+
"group": "build",
20+
"args": [
21+
"build",
22+
"${workspaceFolder}/ToolBox.Tests/ToolBox.Tests.csproj"
23+
],
24+
"problemMatcher": "$msCompile"
25+
},
26+
{
27+
"label": "test",
28+
"command": "dotnet",
29+
"type": "process",
30+
"group": {
31+
"kind": "test",
32+
"isDefault": true
33+
},
34+
"args": [
35+
"test",
36+
"${workspaceFolder}/ToolBox.Tests/ToolBox.Tests.csproj",
37+
"/p:CollectCoverage=true",
38+
"/p:CoverletOutputFormat=\"opencover,lcov\"",
39+
"/p:CoverletOutput=../lcov"
40+
],
41+
"problemMatcher": "$msCompile"
42+
},
43+
{
44+
"label": "publish win",
45+
"command": "dotnet",
46+
"group": "none",
47+
"args": [
48+
"publish",
49+
"${workspaceRoot}/ToolBox/ToolBox.csproj",
50+
"-o",
51+
"${workspaceRoot}/Library/win/",
52+
"-c",
53+
"release",
54+
"-r",
55+
"win10-x64"
56+
],
57+
"problemMatcher": "$msCompile"
58+
},
59+
{
60+
"label": "publish mac",
61+
"command": "dotnet",
62+
"args": [
63+
"publish",
64+
"${workspaceRoot}/ToolBox/ToolBox.csproj",
65+
"-o",
66+
"${workspaceRoot}/Library/mac/",
67+
"-c",
68+
"release",
69+
"-r",
70+
"osx.10.12-x64"
71+
],
72+
"problemMatcher": "$msCompile"
73+
},
74+
{
75+
"label": "pack",
76+
"command": "dotnet",
77+
"args": [
78+
"pack",
79+
"${workspaceRoot}/ToolBox/ToolBox.csproj",
80+
"/p:NuspecFile=${workspaceRoot}/ToolBox/ToolBox.nuspec",
81+
"-o",
82+
"${workspaceRoot}/Package/",
83+
"-c",
84+
"release"
85+
],
86+
"problemMatcher": "$msCompile"
87+
},
88+
{
89+
"label": "permissions",
90+
"type": "shell",
91+
"osx": {
92+
"command": "chmod +x ${workspaceRoot}/sonar.sh"
93+
},
94+
"presentation": {
95+
"reveal": "always",
96+
"panel": "new"
97+
},
98+
"problemMatcher": []
99+
},
100+
{
101+
"label": "sonar",
102+
"type": "shell",
103+
"windows": {
104+
"command": "${workspaceRoot}\\sonar.bat"
105+
},
106+
"osx": {
107+
"command": "${workspaceRoot}/sonar.sh"
108+
},
109+
"presentation": {
110+
"reveal": "always",
111+
"panel": "new"
112+
},
113+
"problemMatcher": []
114+
}
115+
]
118116
}

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ Fixed for any bug fixes.
99
Security to invite users to upgrade in case of vulnerabilities.
1010
-->
1111

12+
## [1.8.0] - 2022-03-20
13+
14+
**Added:**
15+
16+
- Support for .Net version 6.0
17+
- Support for netstandard version 2.1
18+
1219
## [1.7.1] - 2020-12-01
1320

1421
**Fixed:**

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ What things you need to install?
5454

5555
- [.Net SDK](https://www.microsoft.com/net/download)
5656

57-
**ToolBox** supports `netcoreapp3.1` and `net5.0` target frameworks.
57+
**ToolBox** supports `netstandard2.1`, `netcoreapp3.1`, `net5.0` and `net6.0` target frameworks.
5858

5959
### Installing
6060

@@ -102,12 +102,12 @@ Inside your .csproj add Command Bridge files on build:
102102

103103
```xml
104104
<Project Sdk="Microsoft.NET.Sdk">
105-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
105+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
106106
<!-- Command Bridge -->
107107
<None Update="cmd.sh" CopyToOutputDirectory="PreserveNewest" />
108108
<None Update="cmd.bat" CopyToOutputDirectory="PreserveNewest" />
109109
<!-- Packages -->
110-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
110+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
111111
<!-- Projects -->
112112
<ProjectReference Include="..\..\_devTB\ToolBox\ToolBox.csproj" />
113113
</ItemGroup>

‎Sample/Sample.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="dein.Colorify" Version="2.6.0" />
4-
<PackageReference Include="dein.ToolBox" Version="1.7.1" />
5-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
3+
<PackageReference Include="dein.Colorify" Version="2.7.0" />
4+
<PackageReference Include="dein.ToolBox" Version="1.8.0" />
5+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
66
</ItemGroup>
77
<PropertyGroup>
88
<OutputType>Exe</OutputType>
9-
<TargetFramework>net5.0</TargetFramework>
9+
<TargetFramework>net6.0</TargetFramework>
1010
</PropertyGroup>
1111
</Project>

0 commit comments

Comments
 (0)