diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72c72d08..62fbf136 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,6 +134,19 @@ IOB-WIN:build: - *version-fix script: - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' + +IOB-WIN-NEXT:build: + stage: build + tags: + - win + variables: + APP_NAME: IOB-WIN-NEXT + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' IOB-MAN:deploy: stage: deploy @@ -171,4 +184,24 @@ IOB-WIN:deploy: - *zipper - *hashBuild - *nexusUpload - needs: ["IOB-WIN:build"] \ No newline at end of file + needs: ["IOB-WIN:build"] + +IOB-WIN-NEXT:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: IOB-WIN-NEXT + NEXUS_PATH: MAPO/IOB-WIN-NEXT + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln"-verbosity quiet' + - *version-fix + - *cleanup-zip + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' + - *zipper + - *hashBuild + - *nexusUpload + needs: ["IOB-WIN-NEXT:build"] + diff --git a/IOB-WIN-NEXT.sln b/IOB-WIN-NEXT.sln new file mode 100644 index 00000000..af7b9d05 --- /dev/null +++ b/IOB-WIN-NEXT.sln @@ -0,0 +1,120 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29613.14 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{58E399F3-9D4E-49D3-AB35-9ED536543D50}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CncLib", "CncLib\CncLib.vbproj", "{2D769FFD-1122-4276-A115-29246E6D23C5}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CVCncLib", "CVCncLib\CVCncLib.vbproj", "{DC6B309E-F8E9-4BA2-A621-4F617C072533}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B52E3E86-1B82-4F4D-982C-0C8909CD2A28}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-UT-NEXT", "IOB-UT-NEXT\IOB-UT-NEXT.csproj", "{90512E12-29FC-460D-94CC-648C2A072DBD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOB-WIN-NEXT", "IOB-WIN-NEXT\IOB-WIN-NEXT.csproj", "{B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 + FANUC|Any CPU = FANUC|Any CPU + FANUC|x86 = FANUC|x86 + Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 + SIEMENS|Any CPU = SIEMENS|Any CPU + SIEMENS|x86 = SIEMENS|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.Debug|x86.ActiveCfg = Debug|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.Debug|x86.Build.0 = Debug|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.FANUC|Any CPU.ActiveCfg = Release|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.FANUC|Any CPU.Build.0 = Release|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.FANUC|x86.ActiveCfg = Debug|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.FANUC|x86.Build.0 = Debug|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.Release|Any CPU.Build.0 = Release|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.Release|x86.ActiveCfg = Release|x86 + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.Release|x86.Build.0 = Release|x86 + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.SIEMENS|Any CPU.ActiveCfg = Release|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.SIEMENS|Any CPU.Build.0 = Release|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.SIEMENS|x86.ActiveCfg = Debug|Any CPU + {58E399F3-9D4E-49D3-AB35-9ED536543D50}.SIEMENS|x86.Build.0 = Debug|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.Debug|x86.ActiveCfg = Debug|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.Debug|x86.Build.0 = Debug|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.FANUC|Any CPU.ActiveCfg = FANUC|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.FANUC|Any CPU.Build.0 = FANUC|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.FANUC|x86.ActiveCfg = FANUC|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.FANUC|x86.Build.0 = FANUC|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.Release|Any CPU.Build.0 = Release|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.Release|x86.ActiveCfg = Release|x86 + {2D769FFD-1122-4276-A115-29246E6D23C5}.Release|x86.Build.0 = Release|x86 + {2D769FFD-1122-4276-A115-29246E6D23C5}.SIEMENS|Any CPU.ActiveCfg = SIEMENS|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.SIEMENS|Any CPU.Build.0 = SIEMENS|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.SIEMENS|x86.ActiveCfg = SIEMENS|Any CPU + {2D769FFD-1122-4276-A115-29246E6D23C5}.SIEMENS|x86.Build.0 = SIEMENS|Any CPU + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Debug|x86.ActiveCfg = Debug|x86 + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Debug|x86.Build.0 = Debug|x86 + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.FANUC|Any CPU.ActiveCfg = Release|Any CPU + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.FANUC|Any CPU.Build.0 = Release|Any CPU + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.FANUC|x86.ActiveCfg = Release|x86 + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.FANUC|x86.Build.0 = Release|x86 + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Release|Any CPU.Build.0 = Release|Any CPU + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Release|x86.ActiveCfg = Release|x86 + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.Release|x86.Build.0 = Release|x86 + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|Any CPU.ActiveCfg = Release|Any CPU + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|Any CPU.Build.0 = Release|Any CPU + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|x86.ActiveCfg = Release|x86 + {DC6B309E-F8E9-4BA2-A621-4F617C072533}.SIEMENS|x86.Build.0 = Release|x86 + {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|x86.ActiveCfg = Debug|x86 + {90512E12-29FC-460D-94CC-648C2A072DBD}.Debug|x86.Build.0 = Debug|x86 + {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|Any CPU.ActiveCfg = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|Any CPU.Build.0 = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|x86.ActiveCfg = Debug|x86 + {90512E12-29FC-460D-94CC-648C2A072DBD}.FANUC|x86.Build.0 = Debug|x86 + {90512E12-29FC-460D-94CC-648C2A072DBD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.Release|Any CPU.Build.0 = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.Release|x86.ActiveCfg = Release|x86 + {90512E12-29FC-460D-94CC-648C2A072DBD}.Release|x86.Build.0 = Release|x86 + {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|Any CPU.ActiveCfg = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|Any CPU.Build.0 = Release|Any CPU + {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|x86.ActiveCfg = Debug|x86 + {90512E12-29FC-460D-94CC-648C2A072DBD}.SIEMENS|x86.Build.0 = Debug|x86 + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Debug|x86.ActiveCfg = Debug|x86 + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Debug|x86.Build.0 = Debug|x86 + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|Any CPU.ActiveCfg = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|Any CPU.Build.0 = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|x86.ActiveCfg = Debug|x86 + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.FANUC|x86.Build.0 = Debug|x86 + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Release|Any CPU.Build.0 = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Release|x86.ActiveCfg = Release|x86 + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.Release|x86.Build.0 = Release|x86 + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|Any CPU.ActiveCfg = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|Any CPU.Build.0 = Release|Any CPU + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|x86.ActiveCfg = Debug|x86 + {B2ABB009-C046-4F9C-956C-52DCAA9FE5A9}.SIEMENS|x86.Build.0 = Debug|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {801DCDC5-B7D3-4EA5-B543-783D2C91765F} + EndGlobalSection +EndGlobal