Skip to content

Commit

Permalink
Merge pull request #1 from Meiji01/streamline1
Browse files Browse the repository at this point in the history 
Streamline1
  • Loading branch information
@Meiji01
Meiji01 authored Jul 18, 2024
2 parents d765c48 + fa5032b commit 03168fe
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 34 deletions.
Binary file added .vs/JenkinsAgentContainer/FileContentIndex/357bdf1d-0ca4-40fa-8a51-13a4f2f8ed8d.vsidx
View file
Binary file not shown.
Binary file added .vs/JenkinsAgentContainer/FileContentIndex/3c36bfd8-44c2-4ef9-8ccc-989acc61099c.vsidx
View file
Binary file not shown.
Binary file removed .vs/JenkinsAgentContainer/FileContentIndex/97d214fb-a304-4d72-9839-4d45b2679cb7.vsidx
View file
Binary file not shown.
Binary file removed .vs/JenkinsAgentContainer/FileContentIndex/c4da9c96-ad28-4c0a-9564-a047faba84f4.vsidx
View file
Binary file not shown.
0 ...9c62918-2091-444b-81d7-65fb73ebe4de.vsidx → ...ce0510e-8871-4032-a32e-1eb26a8ca1ce.vsidx
View file
File renamed without changes.
Binary file modified .vs/JenkinsAgentContainer/v17/.suo
View file
Binary file not shown.
64 changes: 34 additions & 30 deletions .vs/JenkinsAgentContainer/v17/DocumentLayout.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,9 @@
"AbsoluteMoniker": "D:0:0:{00000000-0000-0000-0000-000000000000}|\u003CSolution\u003E|AgentContainer||{04B8AB82-A572-4FEF-95CE-5222444B6B64}|"
},
{
"AbsoluteMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|c:\\users\\meijsandbox\\source\\repos\\jenkinsagentcontainer\\agentcontainer\\agentservicemain.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
"AbsoluteMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\agentcontainer\\agentservicemain.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
"RelativeMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|solutionrelative:agentcontainer\\agentservicemain.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
},
{
"AbsoluteMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\agentcontainer\\createcmd.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
"RelativeMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|solutionrelative:agentcontainer\\createcmd.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
},
{
"AbsoluteMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\agentcontainer\\properties.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
"RelativeMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|solutionrelative:agentcontainer\\properties.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
},
{
"AbsoluteMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\agentcontainer\\agentservicemain.designer.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
"RelativeMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|solutionrelative:agentcontainer\\agentservicemain.designer.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
Expand All @@ -29,6 +21,14 @@
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\bin\\Debug\\AgentContainer.exe.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:AgentContainer\\bin\\Debug\\AgentContainer.exe.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}"
},
{
"AbsoluteMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\agentcontainer\\properties.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
"RelativeMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|solutionrelative:agentcontainer\\properties.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
},
{
"AbsoluteMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\agentcontainer\\createcmd.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
"RelativeMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|solutionrelative:agentcontainer\\createcmd.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
},
{
"AbsoluteMoniker": "D:0:0:{259722A3-BF2C-409B-8934-67EC8FA4FB48}|AgentContainer\\AgentContainer.vbproj|c:\\users\\meijsandbox\\source\\repos\\jenkinsagentcontainer\\agentcontainer\\||{B270807C-D8C6-49EB-8EBE-8E8D566637A1}|8998e48e-b89a-4034-b66e-353d8c1fdc2e"
}
Expand All @@ -40,8 +40,21 @@
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 0,
"SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
"DocumentIndex": 4,
"Title": "AgentContainer.exe.config",
"DocumentMoniker": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\bin\\Debug\\AgentContainer.exe.config",
"RelativeDocumentMoniker": "AgentContainer\\bin\\Debug\\AgentContainer.exe.config",
"ToolTip": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\bin\\Debug\\AgentContainer.exe.config",
"RelativeToolTip": "AgentContainer\\bin\\Debug\\AgentContainer.exe.config",
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
"WhenOpened": "2024-07-15T15:49:29.972Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 0,
Expand All @@ -56,31 +69,20 @@
},
{
"$type": "Document",
"DocumentIndex": 3,
"DocumentIndex": 5,
"Title": "Properties.vb",
"DocumentMoniker": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\Properties.vb",
"RelativeDocumentMoniker": "AgentContainer\\Properties.vb",
"ToolTip": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\Properties.vb",
"RelativeToolTip": "AgentContainer\\Properties.vb",
"ViewState": "AQIAAAgAAAAAAAAAAIA7wDcAAAARAAAA",
"ViewState": "AQIAAAkAAAAAAAAAAAAlwDcAAAARAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
"WhenOpened": "2024-07-15T16:52:13.254Z"
"WhenOpened": "2024-07-15T16:52:13.254Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 6,
"Title": "AgentContainer.exe.config",
"DocumentMoniker": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\bin\\Debug\\AgentContainer.exe.config",
"RelativeDocumentMoniker": "AgentContainer\\bin\\Debug\\AgentContainer.exe.config",
"ToolTip": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\bin\\Debug\\AgentContainer.exe.config",
"RelativeToolTip": "AgentContainer\\bin\\Debug\\AgentContainer.exe.config",
"ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000601|",
"WhenOpened": "2024-07-15T15:49:29.972Z"
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "createCmd.vb",
"DocumentMoniker": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\createCmd.vb",
"RelativeDocumentMoniker": "AgentContainer\\createCmd.vb",
Expand All @@ -98,33 +100,35 @@
"RelativeDocumentMoniker": "AgentContainer\\AgentServiceMain.vb",
"ToolTip": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\AgentServiceMain.vb",
"RelativeToolTip": "AgentContainer\\AgentServiceMain.vb",
"ViewState": "AQIAAAMAAAAAAAAAAAAAAA8AAAAAAAAA",
"ViewState": "AQIAAEsAAAAAAAAAAAAowFUAAAAkAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
"WhenOpened": "2024-07-13T12:39:35.462Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 4,
"DocumentIndex": 2,
"Title": "AgentServiceMain.Designer.vb",
"DocumentMoniker": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\AgentServiceMain.Designer.vb",
"RelativeDocumentMoniker": "AgentContainer\\AgentServiceMain.Designer.vb",
"ToolTip": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\AgentServiceMain.Designer.vb",
"RelativeToolTip": "AgentContainer\\AgentServiceMain.Designer.vb",
"ViewState": "AQIAACMAAAAAAAAAAAAAADgAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
"WhenOpened": "2024-07-12T15:25:46.749Z"
"WhenOpened": "2024-07-12T15:25:46.749Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 5,
"DocumentIndex": 3,
"Title": "AgentServiceMain.vb [Design]",
"DocumentMoniker": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\AgentServiceMain.vb",
"RelativeDocumentMoniker": "AgentContainer\\AgentServiceMain.vb",
"ToolTip": "C:\\Users\\MeijSandbox\\source\\repos\\JenkinsAgentContainer\\AgentContainer\\AgentServiceMain.vb [Design]",
"RelativeToolTip": "AgentContainer\\AgentServiceMain.vb [Design]",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
"WhenOpened": "2024-07-11T15:28:56.579Z"
"WhenOpened": "2024-07-11T15:28:56.579Z",
"EditorCaption": " [Design]"
}
]
}
Expand Down
11 changes: 9 additions & 2 deletions AgentContainer/AgentServiceMain.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ Public Class AgentServiceMain

Protected Overrides Sub OnStop()
EventLog.WriteEntry("Stopping Jenkins Agent with" & oProcess.Id)
oProcess.Kill()

If (oProcess.HasExited = False) Then
oProcess.Kill()
End If
EventLog.WriteEntry("Jenkins Agent WinService Ended")
'oProcess.StandardOutput.Close()
'oProcess.Close()
Expand Down Expand Up @@ -89,8 +92,12 @@ Public Class AgentServiceMain
outputerror = oProcess.StandardError.ReadLine
Debug.WriteLine(outputerror)
End While

'Call OnStop()
'oProcess.StandardInput.Close()
oProcess.WaitForExit()
If (oProcess.HasExited) Then
End
End If
End Sub


Expand Down
4 changes: 2 additions & 2 deletions AgentContainer/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("1.0.1.0")>
<Assembly: AssemblyFileVersion("1.0.1.0")>
<Assembly: NeutralResourcesLanguage("en-PH")>

0 comments on commit 03168fe

Please sign in to comment.