Skip to content

Commit 23b8ab3

Browse files
ChrisMaunderChrisMaunder
committed
Version 1.0 Beta: Installer added, general cleanup
1 parent 4ccbd7f commit 23b8ab3

File tree

93 files changed

+19311
-935
lines changed

Some content is hidden

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

93 files changed

+19311
-935
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,3 +388,5 @@ FodyWeavers.xsd
388388
/src/AnalysisLayer/CodeProject.SenseAI.AnalysisLayer.Yolo/assets/yolov5s.onnx
389389
/src/AnalysisLayer/CodeProject.SenseAI.AnalysisLayer.Yolo/assets/yolov5n.onnx
390390
/src/AnalysisLayer/CodeProject.SenseAI.AnalysisLayer.Yolo/assets/yolov5m.onnx
391+
/Installers/downloads
392+
*.DS_Store

‎.vscode/launch.json‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@
33
"configurations": [
44

55
{
6-
"name": "CodeProject.SenseAI Analysis Layer",
6+
"name": "Build CodeProject.SenseAI",
77
"type": "coreclr",
88
"request": "launch",
9-
"preLaunchTask": "start-analysis",
10-
"program": "noop.bat",
11-
"args": [ ],
12-
"cwd": "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer/",
13-
"stopAtEntry": false
9+
"program": "dotnet",
10+
"args": [
11+
"build",
12+
"${workspaceFolder}/src/API/Server/FrontEnd",
13+
"/property:GenerateFullPaths=true",
14+
"/consoleloggerparameters:NoSummary"
15+
],
16+
"cwd": "${workspaceFolder}/src/API/Server/FrontEnd/",
17+
"stopAtEntry": false,
18+
"env": {
19+
"ASPNETCORE_ENVIRONMENT": "Development"
20+
}
1421
},
1522

1623
{
@@ -27,7 +34,7 @@
2734
"linux": {
2835
"program": "${workspaceFolder}/src/API/Server/FrontEnd/bin/Debug/net5.0/CodeProject.SenseAI.Server.dll"
2936
},
30-
"args" : ["--VISION-FACE=true", "--VISION-DETECTION=true", "--VISION-SCENE=true", "--PORT=5000"],
37+
"args" : [ "--PORT=5000" ],
3138
"cwd": "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer/",
3239
"stopAtEntry": false,
3340

‎.vscode/tasks.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,24 @@
8383
]
8484
},
8585

86+
/* Now started by the front end server
8687
{
8788
"label": "start-analysis",
8889
"type": "process",
8990
"isBackground": true,
9091
"windows": {
9192
"command": "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer/start.bat",
92-
"args": [ "--no-color", "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer" ],
93+
"args": [ "--no-color", "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer" ]
9394
},
9495
"linux": {
9596
"command": "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer/start.sh",
96-
"args": [ "--no-color", "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer" ],
97+
"args": [ "--no-color", "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer" ]
9798
},
9899
"osx": {
99100
"command": "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer/start.sh",
100-
"args": [ "--no-color", "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer" ],
101+
"args": [ "--no-color", "${workspaceFolder}/src/AnalysisLayer/DeepStack/intelligencelayer" ]
101102
},
103+
102104
// This task needs to run in the background. It never exits, so to ensure VSCode moves on with life, we need
103105
// to give VSCode enough to be satisfied and just let it run
104106
"problemMatcher": [
@@ -119,6 +121,8 @@
119121
}
120122
]
121123
},
124+
*/
125+
122126
{
123127
"label": "start-api",
124128
"windows": {

‎CodeProject.SenseAI.sln‎

Lines changed: 117 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.31911.196
4+
VisualStudioVersion = 16.0.32126.315
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A8B76501-496A-4011-9C37-8308A1EBDFA7}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D982BD8C-2257-413B-8513-8043AB3035F3}"
99
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{7F18EB64-C857-49C4-9380-70D3CCE6242B}"
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demos", "demos", "{7F18EB64-C857-49C4-9380-70D3CCE6242B}"
1111
EndProject
1212
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Python", "demos\Python\Python.pyproj", "{25750BF1-1502-4F65-8D69-CEA8C87D6446}"
1313
EndProject
@@ -17,21 +17,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{3BF27572-9
1717
ProjectSection(SolutionItems) = preProject
1818
LICENCE.md = LICENCE.md
1919
README.md = README.md
20+
THIRD-PARTY-NOTICES.md = THIRD-PARTY-NOTICES.md
2021
docs\Welcome.html = docs\Welcome.html
2122
EndProjectSection
2223
EndProject
2324
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AnalysisLayer", "AnalysisLayer", "{156BFEDA-D477-43B2-92DA-FCC9BAF1F893}"
2425
EndProject
25-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "install", "install", "{D885EE64-C1BD-44D6-84D8-1E46806298D9}"
26-
ProjectSection(SolutionItems) = preProject
27-
install\create_installer_win.bat = install\create_installer_win.bat
28-
install\load_environment.bat = install\load_environment.bat
29-
install\save_environment.bat = install\save_environment.bat
30-
install\set_environment.sh = install\set_environment.sh
31-
install\setup_dev_env_win.bat = install\setup_dev_env_win.bat
32-
install\Setup_SenseAI_Win.bat = install\Setup_SenseAI_Win.bat
33-
install\Start_SenseAI_Win.bat = install\Start_SenseAI_Win.bat
34-
EndProjectSection
26+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{D885EE64-C1BD-44D6-84D8-1E46806298D9}"
3527
EndProject
3628
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "DeepStack", "src\AnalysisLayer\DeepStack\intelligencelayer\DeepStack.pyproj", "{E5D27495-EE4F-4AAF-8749-A6BA848111E2}"
3729
EndProject
@@ -99,6 +91,7 @@ EndProject
9991
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Images", "Images", "{8C92DCAE-EDE7-4DEC-A5CB-BB2388905064}"
10092
ProjectSection(SolutionItems) = preProject
10193
docs\images\Choose-launch.png = docs\images\Choose-launch.png
94+
docs\images\example-detect.png = docs\images\example-detect.png
10295
docs\images\Mulitple-Project-Toolbar.png = docs\images\Mulitple-Project-Toolbar.png
10396
docs\images\Set-Startup_Projects.png = docs\images\Set-Startup_Projects.png
10497
EndProjectSection
@@ -127,6 +120,65 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Yolov5Net.Scorer", "Yolov5N
127120
EndProject
128121
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yolov5Net.Scorer", "src\AnalysisLayer\SDK\ModelRunners\Yolov5Net.Scorer\Yolov5Net.Scorer.csproj", "{7DC0A312-39AD-41B0-BB53-72ACACC76959}"
129122
EndProject
123+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{83C828B9-2B1E-4982-B4B7-69D173DFBB27}"
124+
EndProject
125+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "YoloNet.Installer", "Installers\Windows\YoloNet.Installer\YoloNet.Installer.wixproj", "{E0AEDE8A-E336-49C6-9D6A-7A05E8155AB9}"
126+
EndProject
127+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{5F1052CB-8586-49CB-8F46-427A5F6901C2}"
128+
ProjectSection(SolutionItems) = preProject
129+
Installers\Windows\favicon.ico = Installers\Windows\favicon.ico
130+
Installers\Windows\license.rtf = Installers\Windows\license.rtf
131+
Installers\Windows\logo.png = Installers\Windows\logo.png
132+
Installers\Windows\logoSide.png = Installers\Windows\logoSide.png
133+
Installers\Windows\Sense-install-BG.png = Installers\Windows\Sense-install-BG.png
134+
Installers\Windows\Sense-install-sidebar.png = Installers\Windows\Sense-install-sidebar.png
135+
Installers\Windows\Sense-install-topbanner.png = Installers\Windows\Sense-install-topbanner.png
136+
Installers\Windows\SharedConfiguration.wxi = Installers\Windows\SharedConfiguration.wxi
137+
Installers\Windows\SharedDirectories.wxi = Installers\Windows\SharedDirectories.wxi
138+
Installers\Windows\SharedUIConfiguration.wxi = Installers\Windows\SharedUIConfiguration.wxi
139+
EndProjectSection
140+
EndProject
141+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SenseAI.BootStrapper", "Installers\Windows\SenseAI.BootStrapper\SenseAI.BootStrapper.wixproj", "{C04BBD0D-FD36-4FA4-805B-106BCCD9BC79}"
142+
ProjectSection(ProjectDependencies) = postProject
143+
{ED492608-6013-4552-A29B-A7E14F4BEB0B} = {ED492608-6013-4552-A29B-A7E14F4BEB0B}
144+
{D0B74BE9-8195-4907-AEEE-45631E37251F} = {D0B74BE9-8195-4907-AEEE-45631E37251F}
145+
{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06} = {3F34EAEE-8A53-40D1-8CDB-A13AE728FA06}
146+
EndProjectSection
147+
EndProject
148+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Old School Scripts", "Old School Scripts", "{FDB25B74-D0CD-4665-9152-DE968A1028D8}"
149+
ProjectSection(SolutionItems) = preProject
150+
Installers\Old School\create_installer_win.bat = Installers\Old School\create_installer_win.bat
151+
Installers\Old School\load_environment.bat = Installers\Old School\load_environment.bat
152+
Installers\Old School\save_environment.bat = Installers\Old School\save_environment.bat
153+
Installers\Old School\set_environment.sh = Installers\Old School\set_environment.sh
154+
Installers\Old School\setup_dev_env_win.bat = Installers\Old School\setup_dev_env_win.bat
155+
Installers\Old School\Setup_SenseAI_Win.bat = Installers\Old School\Setup_SenseAI_Win.bat
156+
Installers\Old School\Start_SenseAI_Win.bat = Installers\Old School\Start_SenseAI_Win.bat
157+
EndProjectSection
158+
EndProject
159+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DeepStack.Installer", "Installers\Windows\DeepStack.Installer\DeepStack.Installer.wixproj", "{ED492608-6013-4552-A29B-A7E14F4BEB0B}"
160+
EndProject
161+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DeepStackModels.Installer", "Installers\Windows\DeepStackModels.Installer\DeepStackModels.Installer.wixproj", "{D0B74BE9-8195-4907-AEEE-45631E37251F}"
162+
EndProject
163+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Python37.Installer", "Installers\Windows\Python37.Installer\Python37.Installer.wixproj", "{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06}"
164+
EndProject
165+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SenseAI.Server.Installer", "Installers\Windows\SenseAI.Server.Installer\SenseAI.Server.Installer.wixproj", "{A1AFA75C-324E-4B79-BE13-5557E495FBBE}"
166+
EndProject
167+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WipInstallers", "WipInstallers", "{888C04E1-6F50-4800-93FE-F128B78AE645}"
168+
EndProject
169+
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "SenseAI.Server.Installer", "Installers\WipInstallers\SenseAI.Server.Installer\SenseAI.Server.Installer.vdproj", "{18603392-CD64-4C1C-B892-381E99995451}"
170+
EndProject
171+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dev", "Dev", "{00BBF52C-217D-421F-BEAF-918C167D4C20}"
172+
ProjectSection(SolutionItems) = preProject
173+
Installers\Dev\setup_dev_env_linux.sh = Installers\Dev\setup_dev_env_linux.sh
174+
Installers\Dev\setup_dev_env_win.bat = Installers\Dev\setup_dev_env_win.bat
175+
EndProjectSection
176+
EndProject
177+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET 3.5.1", ".NET 3.5.1", "{8A423F72-C92C-4C8E-87D8-02849FD079E2}"
178+
ProjectSection(SolutionItems) = preProject
179+
Installers\Windows\.NET 3.5.1\Download .NET Framework 3.5 SP1.url = Installers\Windows\.NET 3.5.1\Download .NET Framework 3.5 SP1.url
180+
EndProjectSection
181+
EndProject
130182
Global
131183
GlobalSection(SolutionConfigurationPlatforms) = preSolution
132184
Debug|Any CPU = Debug|Any CPU
@@ -199,6 +251,46 @@ Global
199251
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Release|Any CPU.Build.0 = Release|Any CPU
200252
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Release|x86.ActiveCfg = Release|Any CPU
201253
{7DC0A312-39AD-41B0-BB53-72ACACC76959}.Release|x86.Build.0 = Release|Any CPU
254+
{E0AEDE8A-E336-49C6-9D6A-7A05E8155AB9}.Debug|Any CPU.ActiveCfg = Debug|x86
255+
{E0AEDE8A-E336-49C6-9D6A-7A05E8155AB9}.Debug|x86.ActiveCfg = Debug|x86
256+
{E0AEDE8A-E336-49C6-9D6A-7A05E8155AB9}.Debug|x86.Build.0 = Debug|x86
257+
{E0AEDE8A-E336-49C6-9D6A-7A05E8155AB9}.Release|Any CPU.ActiveCfg = Release|x86
258+
{E0AEDE8A-E336-49C6-9D6A-7A05E8155AB9}.Release|x86.ActiveCfg = Release|x86
259+
{E0AEDE8A-E336-49C6-9D6A-7A05E8155AB9}.Release|x86.Build.0 = Release|x86
260+
{C04BBD0D-FD36-4FA4-805B-106BCCD9BC79}.Debug|Any CPU.ActiveCfg = Debug|x86
261+
{C04BBD0D-FD36-4FA4-805B-106BCCD9BC79}.Debug|x86.ActiveCfg = Debug|x86
262+
{C04BBD0D-FD36-4FA4-805B-106BCCD9BC79}.Debug|x86.Build.0 = Debug|x86
263+
{C04BBD0D-FD36-4FA4-805B-106BCCD9BC79}.Release|Any CPU.ActiveCfg = Release|x86
264+
{C04BBD0D-FD36-4FA4-805B-106BCCD9BC79}.Release|x86.ActiveCfg = Release|x86
265+
{C04BBD0D-FD36-4FA4-805B-106BCCD9BC79}.Release|x86.Build.0 = Release|x86
266+
{ED492608-6013-4552-A29B-A7E14F4BEB0B}.Debug|Any CPU.ActiveCfg = Debug|x86
267+
{ED492608-6013-4552-A29B-A7E14F4BEB0B}.Debug|x86.ActiveCfg = Debug|x86
268+
{ED492608-6013-4552-A29B-A7E14F4BEB0B}.Debug|x86.Build.0 = Debug|x86
269+
{ED492608-6013-4552-A29B-A7E14F4BEB0B}.Release|Any CPU.ActiveCfg = Release|x86
270+
{ED492608-6013-4552-A29B-A7E14F4BEB0B}.Release|x86.ActiveCfg = Release|x86
271+
{ED492608-6013-4552-A29B-A7E14F4BEB0B}.Release|x86.Build.0 = Release|x86
272+
{D0B74BE9-8195-4907-AEEE-45631E37251F}.Debug|Any CPU.ActiveCfg = Debug|x86
273+
{D0B74BE9-8195-4907-AEEE-45631E37251F}.Debug|x86.ActiveCfg = Debug|x86
274+
{D0B74BE9-8195-4907-AEEE-45631E37251F}.Debug|x86.Build.0 = Debug|x86
275+
{D0B74BE9-8195-4907-AEEE-45631E37251F}.Release|Any CPU.ActiveCfg = Release|x86
276+
{D0B74BE9-8195-4907-AEEE-45631E37251F}.Release|x86.ActiveCfg = Release|x86
277+
{D0B74BE9-8195-4907-AEEE-45631E37251F}.Release|x86.Build.0 = Release|x86
278+
{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06}.Debug|Any CPU.ActiveCfg = Debug|x86
279+
{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06}.Debug|x86.ActiveCfg = Debug|x86
280+
{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06}.Debug|x86.Build.0 = Debug|x86
281+
{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06}.Release|Any CPU.ActiveCfg = Release|x86
282+
{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06}.Release|x86.ActiveCfg = Release|x86
283+
{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06}.Release|x86.Build.0 = Release|x86
284+
{A1AFA75C-324E-4B79-BE13-5557E495FBBE}.Debug|Any CPU.ActiveCfg = Debug|x86
285+
{A1AFA75C-324E-4B79-BE13-5557E495FBBE}.Debug|x86.ActiveCfg = Debug|x86
286+
{A1AFA75C-324E-4B79-BE13-5557E495FBBE}.Debug|x86.Build.0 = Debug|x86
287+
{A1AFA75C-324E-4B79-BE13-5557E495FBBE}.Release|Any CPU.ActiveCfg = Release|x86
288+
{A1AFA75C-324E-4B79-BE13-5557E495FBBE}.Release|x86.ActiveCfg = Release|x86
289+
{A1AFA75C-324E-4B79-BE13-5557E495FBBE}.Release|x86.Build.0 = Release|x86
290+
{18603392-CD64-4C1C-B892-381E99995451}.Debug|Any CPU.ActiveCfg = Debug
291+
{18603392-CD64-4C1C-B892-381E99995451}.Debug|x86.ActiveCfg = Debug
292+
{18603392-CD64-4C1C-B892-381E99995451}.Release|Any CPU.ActiveCfg = Release
293+
{18603392-CD64-4C1C-B892-381E99995451}.Release|x86.ActiveCfg = Release
202294
EndGlobalSection
203295
GlobalSection(SolutionProperties) = preSolution
204296
HideSolutionNode = FALSE
@@ -224,6 +316,19 @@ Global
224316
{55C41D48-17AC-4ED5-9440-B42AF65CCE4E} = {FF0C329F-41E8-4540-BCDB-97690911077D}
225317
{7E981C51-DADD-4047-AF5B-21B0E3442B99} = {55C41D48-17AC-4ED5-9440-B42AF65CCE4E}
226318
{7DC0A312-39AD-41B0-BB53-72ACACC76959} = {7E981C51-DADD-4047-AF5B-21B0E3442B99}
319+
{83C828B9-2B1E-4982-B4B7-69D173DFBB27} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
320+
{E0AEDE8A-E336-49C6-9D6A-7A05E8155AB9} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
321+
{5F1052CB-8586-49CB-8F46-427A5F6901C2} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
322+
{C04BBD0D-FD36-4FA4-805B-106BCCD9BC79} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
323+
{FDB25B74-D0CD-4665-9152-DE968A1028D8} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
324+
{ED492608-6013-4552-A29B-A7E14F4BEB0B} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
325+
{D0B74BE9-8195-4907-AEEE-45631E37251F} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
326+
{3F34EAEE-8A53-40D1-8CDB-A13AE728FA06} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
327+
{A1AFA75C-324E-4B79-BE13-5557E495FBBE} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
328+
{888C04E1-6F50-4800-93FE-F128B78AE645} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
329+
{18603392-CD64-4C1C-B892-381E99995451} = {888C04E1-6F50-4800-93FE-F128B78AE645}
330+
{00BBF52C-217D-421F-BEAF-918C167D4C20} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
331+
{8A423F72-C92C-4C8E-87D8-02849FD079E2} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
227332
EndGlobalSection
228333
GlobalSection(ExtensibilityGlobals) = postSolution
229334
SolutionGuid = {83740BD9-AEEF-49C7-A722-D7703D3A38CB}

0 commit comments

Comments
 (0)