Merge pull request #3 from intuiface/hotfix/IP-16485_PLNGA_RenamingIAs

Rename IA for PLN GA
intuiface · Nov 22, 2024 · 0b1e6bb · 0b1e6bb
2 parents 8059f61 + 3d10f73
commit 0b1e6bb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/FaceDetection.sln b/FaceDetection.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.852
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33815.320
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaceDetection", "FaceDetection\FaceDetection.csproj", "{BDB468E9-1670-4CB1-9BDF-46BB478EFBEA}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -47,13 +47,11 @@ Global
 		{351ED45E-7E51-40F4-82D8-C21F77CAC745}.Release|x86.ActiveCfg = Release|Any CPU
 		{351ED45E-7E51-40F4-82D8-C21F77CAC745}.Release|x86.Build.0 = Release|Any CPU
 		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Debug|Any CPU.Build.0 = Debug|x64
 		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Debug|x64.ActiveCfg = Debug|x64
 		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Debug|x64.Build.0 = Debug|x64
 		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Debug|x86.ActiveCfg = Debug|Win32
 		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Debug|x86.Build.0 = Debug|Win32
 		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Release|Any CPU.ActiveCfg = Release|x64
-		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Release|Any CPU.Build.0 = Release|x64
 		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Release|x64.ActiveCfg = Release|x64
 		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Release|x64.Build.0 = Release|x64
 		{C1B7C78A-55C9-481E-BAE2-B2E240D9A392}.Release|x86.ActiveCfg = Release|Win32

diff --git a/FaceDetection/FaceDetection.ifd b/FaceDetection/FaceDetection.ifd
@@ -348,9 +348,9 @@
 	},
 	"resources": {
 		"FaceDetection": {
-			"title": "Face Detection with OpenVINO\u2122",
+			"title": "Face Detection with OpenVINO\u2122 - Player Classic",
 			"isInterfaceAsset": true,
-			"description": "Automatically detect, log, and react to age, gender, head pose, and emotion using any camera and the OpenVINO\u2122 toolkit. OpenVINO is a trademark of Intel Corporation or its subsidiaries.",
+			"description": "Automatically detect, log, and react to age, gender, head pose, and emotion using any camera and the OpenVINO\u2122 toolkit. OpenVINO is a trademark of Intel Corporation or its subsidiaries. Only use with Player classic.",
 			"if.templateDesignAccelerator": "Face Detection.dax",
 			"methods": {
 				"ConnectToServer": {

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -15,26 +15,26 @@ pipeline {
 
     stage('Sign') {
       steps {
-		copyArtifacts filter: '**/Cryptifix-x64-*.zip', fingerprintArtifacts: true, projectName: 'IntuiFace/master', selector: lastSuccessful(), target: 'cryptifix'
-		script {
-			def files = findFiles(glob: '**/Cryptifix-x64-*.zip')
-			unzip zipFile: "cryptifix\\${files[0].name}", dir: 'cryptifix'
-		}
-		bat "cryptifix\\Cryptifix.exe sign \"dist\\x64\\Release\\FaceDetection\" --LicenseEdition=FREE --IsAllowedByNonInteractivePlayer=false"
-        callBuildScript workspace: workspace, script:'signcode.pl', params: "\"OpenVINOFaceDetectionServer\" \"dist\\x64\\Release\\OpenVINOFaceDetectionServer\\*.exe\""
+        copyArtifacts filter: '**/Cryptifix-x64-*.zip', fingerprintArtifacts: true, projectName: 'IntuiFace/master', selector: lastSuccessful(), target: 'cryptifix'
+        script {
+            def files = findFiles(glob: '**/Cryptifix-x64-*.zip')
+            unzip zipFile: "cryptifix\\${files[0].name}", dir: 'cryptifix'
+        }
+        bat "cryptifix\\Cryptifix.exe sign \"dist\\x64\\Release\\FaceDetection\" --LicenseEdition=FREE --IsAllowedByNonInteractivePlayer=false"
+        //callBuildScript workspace: workspace, script:'signcode.pl', params: "\"OpenVINOFaceDetectionServer\" \"dist\\x64\\Release\\OpenVINOFaceDetectionServer\\*.exe\""
       }
     }
 
     stage('Package') {
       steps {
-		zip archive: true, dir: "dist\\x64\\Release\\OpenVINOFaceDetectionServer", glob: '', zipFile: "OpenVINOFaceDetectionServer.zip"
-		zip archive: true, dir: "dist\\x64\\Release\\FaceDetection", glob: '', zipFile: "FaceDetection.zip"
+        //zip archive: true, dir: "dist\\x64\\Release\\OpenVINOFaceDetectionServer", glob: '', zipFile: "OpenVINOFaceDetectionServer.zip"
+        zip archive: true, dir: "dist\\x64\\Release\\FaceDetection", glob: '', zipFile: "FaceDetection.zip"
       }
     }
-	
+    
     stage('Archive') {
       steps {
-        archiveArtifacts 'OpenVINOFaceDetectionServer.zip'
+      //  archiveArtifacts 'OpenVINOFaceDetectionServer.zip'
         archiveArtifacts 'FaceDetection.zip'
       }
     }