Skip to content

Commit d3aa978

Browse files
Merge of theolivenbaum PR
2 parents 4e95bb3 + a5bc910 commit d3aa978

File tree

185 files changed

+6139
-6119
lines changed

Some content is hidden

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

185 files changed

+6139
-6119
lines changed

.devops/build-nuget.yaml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
variables:
2+
PackageVersion: 19.0.9.$(Build.BuildId)
3+
projectAPI: './ElectronNET.API/ElectronNET.API.csproj'
4+
projectCLI: './ElectronNET.CLI/ElectronNET.CLI.csproj'
5+
6+
trigger:
7+
- master
8+
9+
pool:
10+
vmImage: windows-latest
11+
12+
steps:
13+
- checkout: self
14+
submodules: true
15+
fetchDepth: 10
16+
17+
- task: NuGetToolInstaller@1
18+
19+
- task: UseDotNet@2
20+
displayName: 'Use .NET Core sdk'
21+
inputs:
22+
packageType: sdk
23+
version: 6.0.100
24+
installationPath: $(Agent.ToolsDirectory)/dotnet
25+
26+
- task: DotNetCoreCLI@2
27+
displayName: 'restore nuget'
28+
inputs:
29+
command: 'restore'
30+
projects: '$(projectAPI)'
31+
32+
- task: DotNetCoreCLI@2
33+
displayName: 'restore nuget'
34+
inputs:
35+
command: 'restore'
36+
projects: '$(projectCLI)'
37+
38+
39+
- task: DotNetCoreCLI@2
40+
inputs:
41+
command: 'build'
42+
projects: '$(projectAPI)'
43+
arguments: '--configuration Release --force /property:Version=$(PackageVersion)'
44+
45+
- task: DotNetCoreCLI@2
46+
inputs:
47+
command: 'build'
48+
projects: '$(projectCLI)'
49+
arguments: '--configuration Release --force /property:Version=$(PackageVersion)'
50+
51+
- task: DotNetCoreCLI@2
52+
inputs:
53+
command: 'pack'
54+
packagesToPack: '$(projectAPI)'
55+
configuration: 'Release'
56+
versioningScheme: 'off'
57+
buildProperties: 'Version=$(PackageVersion)'
58+
arguments: -IncludeReferencedProjects
59+
60+
- task: DotNetCoreCLI@2
61+
inputs:
62+
command: 'pack'
63+
packagesToPack: '$(projectCLI)'
64+
configuration: 'Release'
65+
versioningScheme: 'off'
66+
buildProperties: 'Version=$(PackageVersion)'
67+
68+
69+
70+
- task: NuGetCommand@2
71+
displayName: 'push API to nuget'
72+
inputs:
73+
command: 'push'
74+
packagesToPush: '$(Build.ArtifactStagingDirectory)/h5.ElectronNET.API.$(PackageVersion).nupkg'
75+
nuGetFeedType: 'external'
76+
publishFeedCredentials: 'nuget-curiosity'
77+
78+
- task: NuGetCommand@2
79+
displayName: 'push CLI to nuget'
80+
inputs:
81+
command: 'push'
82+
packagesToPush: '$(Build.ArtifactStagingDirectory)/h5.ElectronNET.CLI.$(PackageVersion).nupkg'
83+
nuGetFeedType: 'external'
84+
publishFeedCredentials: 'nuget-curiosity'

.vscode/tasks.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
{
2-
"version": "0.1.0",
2+
"version": "2.0.0",
33
"command": "dotnet",
4-
"isShellCommand": true,
54
"args": [],
65
"tasks": [
76
{
8-
"taskName": "build",
7+
"label": "build",
8+
"type": "shell",
9+
"command": "dotnet",
910
"args": [
11+
"build",
1012
"${workspaceRoot}/ElectronNET.CLI/ElectronNET.CLI.csproj"
1113
],
12-
"isBuildCommand": true,
13-
"problemMatcher": "$msCompile"
14+
"problemMatcher": "$msCompile",
15+
"group": {
16+
"_id": "build",
17+
"isDefault": false
18+
}
1419
}
1520
]
1621
}

.vscode/tasks.json.old

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "0.1.0",
3+
"command": "dotnet",
4+
"isShellCommand": true,
5+
"args": [],
6+
"tasks": [
7+
{
8+
"taskName": "build",
9+
"args": [
10+
"${workspaceRoot}/ElectronNET.CLI/ElectronNET.CLI.csproj"
11+
],
12+
"isBuildCommand": true,
13+
"problemMatcher": "$msCompile"
14+
}
15+
]
16+
}

0 commit comments

Comments
 (0)