Merge branch 'develop'

Author: CAPCHIK

azure-pipelines.yml

@@ -2,6 +2,7 @@ trigger:
   branches:
     include:
     - master
+    - develop
   tags:
     include:
     - v*
@@ -12,15 +13,23 @@ stages:
   jobs:
     - job: BuildViewer
       displayName: Build viewer
+      strategy:
+        matrix:
+          win-x64:
+            imageName: windows-latest
+            runtime: win-x64
+          win-x86:
+            imageName: windows-latest
+            runtime: win-x86
       pool:
-        vmImage: 'windows-latest'
+        vmImage: $(imageName)
       steps:
         - script: dotnet tool restore
           displayName: restore nuke tool
-        - script: dotnet nuke Publish -Runtime win-x86
-          displayName: publish application win-x64
+        - script: dotnet nuke Publish -Runtime $(runtime)
+          displayName: publish application $(runtime)
         - publish: output
-          artifact: excursion360-desktop-build-win-x64
+          artifact: excursion360-desktop-build-$(runtime)
           displayName: publish executable artifact
     - job: PublishReleaseNotes
       displayName: Publish release notes
@@ -50,7 +59,7 @@ stages:
             target: '$(Build.SourceVersion)'
             tagSource: 'gitTag'
             releaseNotesFilePath: '$(Pipeline.Workspace)/excursion360-desktop-release-notes/ReleaseNotes.md'
-            assets: '$(Pipeline.Workspace)/excursion360-desktop-build-win-x64/*'
+            assets: '$(Pipeline.Workspace)/excursion360-desktop-build*/*'
             isDraft: true
             changeLogCompareToRelease: 'lastFullRelease'
             changeLogType: 'commitBased'

build/Build.cs

@@ -13,6 +13,7 @@
 using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
+using static Nuke.Common.Logger;
 
 [CheckBuildProjectConfigurations]
 [ShutdownDotNetAfterServerBuild]
@@ -24,7 +25,7 @@ class Build : NukeBuild
     ///   - Microsoft VisualStudio     https://nuke.build/visualstudio
     ///   - Microsoft VSCode           https://nuke.build/vscode
 
-    public static int Main () => Execute<Build>(x => x.Compile);
+    public static int Main () => Execute<Build>(x => x.Publish);
 
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
     readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
@@ -65,8 +66,9 @@ class Build : NukeBuild
         .DependsOn(Compile, Clean)
         .Executes(() =>
         {
+            var projectName = "Excursion360.Desktop";
             DotNetPublish(s => s
-                .SetProject(Solution.GetProject("Excursion360.Desktop"))
+                .SetProject(Solution.GetProject(projectName))
                 .SetConfiguration(Configuration)
                 .SetOutput(OutputDirectory)
                 .SetRuntime(Runtime)
@@ -76,6 +78,14 @@ class Build : NukeBuild
                 .SetProperty("DebugType", "None")
                 .SetProperty("DebugSymbols", false)
                 .EnableNoRestore());
+
+            var executableFile = System.IO.Directory.GetFiles(OutputDirectory)
+                .Select(System.IO.Path.GetFileName)
+                .Where(f => f.StartsWith(projectName))
+                .Single();
+            RenameFile(OutputDirectory / executableFile,
+                $"{OutputDirectory / projectName}.{Runtime}{executableFile.Substring(projectName.Length)}");
+
         });
 
 }