Build changes for v0.990

stevemonaco · Jun 19, 2021 · a6b76dc · a6b76dc
1 parent 4b8e301
commit a6b76dc
Show file tree

Hide file tree

Showing 19 changed files with 174 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,11 +24,11 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Cache .tmp, ~/.nuget/packages
+      - name: Cache .nuke/temp, ~/.nuget/packages
         uses: actions/cache@v2
         with:
           path: |
-            .tmp
+            .nuke/temp
             ~/.nuget/packages
           key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
       - name: Run './build.cmd Package'

diff --git a/.nuke b/.nuke
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -0,0 +1,125 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Build Schema",
+  "$ref": "#/definitions/build",
+  "definitions": {
+    "build": {
+      "type": "object",
+      "properties": {
+        "Configuration": {
+          "type": "string",
+          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
+          "enum": [
+            "Debug",
+            "Release"
+          ]
+        },
+        "Continue": {
+          "type": "boolean",
+          "description": "Indicates to continue a previously failed build attempt"
+        },
+        "Help": {
+          "type": "boolean",
+          "description": "Shows the help text for this build assembly"
+        },
+        "Host": {
+          "type": "string",
+          "description": "Host for execution. Default is 'automatic'",
+          "enum": [
+            "AppVeyor",
+            "AzurePipelines",
+            "Bamboo",
+            "Bitrise",
+            "GitHubActions",
+            "GitLab",
+            "Jenkins",
+            "Rider",
+            "SpaceAutomation",
+            "TeamCity",
+            "Terminal",
+            "TravisCI",
+            "VisualStudio",
+            "VSCode"
+          ]
+        },
+        "NoLogo": {
+          "type": "boolean",
+          "description": "Disables displaying the NUKE logo"
+        },
+        "Partition": {
+          "type": "string",
+          "description": "Partition to use on CI"
+        },
+        "Plan": {
+          "type": "boolean",
+          "description": "Shows the execution plan (HTML)"
+        },
+        "Profile": {
+          "type": "array",
+          "description": "Defines the profiles to load",
+          "items": {
+            "type": "string"
+          }
+        },
+        "Root": {
+          "type": "string",
+          "description": "Root directory during build execution"
+        },
+        "Skip": {
+          "type": "array",
+          "description": "List of targets to be skipped. Empty list skips all dependencies",
+          "items": {
+            "type": "string",
+            "enum": [
+              "Clean",
+              "Compile",
+              "Package",
+              "PublishTileShop",
+              "PublishTileShopCLI",
+              "Restore",
+              "Test"
+            ]
+          }
+        },
+        "Solution": {
+          "type": "string",
+          "description": "Path to a solution file that is automatically loaded"
+        },
+        "Target": {
+          "type": "array",
+          "description": "List of targets to be invoked. Default is '{default_target}'",
+          "items": {
+            "type": "string",
+            "enum": [
+              "Clean",
+              "Compile",
+              "Package",
+              "PublishTileShop",
+              "PublishTileShopCLI",
+              "Restore",
+              "Test"
+            ]
+          }
+        },
+        "TileShopCLIVersion": {
+          "type": "string",
+          "description": "TileShopCLI version"
+        },
+        "TileShopVersion": {
+          "type": "string",
+          "description": "TileShop version"
+        },
+        "Verbosity": {
+          "type": "string",
+          "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "enum": [
+            "Minimal",
+            "Normal",
+            "Quiet",
+            "Verbose"
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/.nuke/parameters.json b/.nuke/parameters.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "./build.schema.json",
+  "Solution": "ImageMagitek.sln"
+}
diff --git a/ImageMagitek.Benchmarks/ImageMagitek.Benchmarks.csproj b/ImageMagitek.Benchmarks/ImageMagitek.Benchmarks.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
     <PackageReference Include="Monaco.PathTree" Version="1.1.0" />
   </ItemGroup>
 

diff --git a/ImageMagitek.Build/ImageMagitek.Build.csproj b/ImageMagitek.Build/ImageMagitek.Build.csproj
@@ -7,14 +7,11 @@
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
     <NukeScriptDirectory>..</NukeScriptDirectory>
+    <NukeTelemetryVersion>1</NukeTelemetryVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="5.1.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="..\.github\workflows\ci.yml" />
+    <PackageReference Include="Nuke.Common" Version="5.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ImageMagitek.Services/ImageMagitek.Services.csproj b/ImageMagitek.Services/ImageMagitek.Services.csproj
@@ -8,10 +8,12 @@
     <PackageProjectUrl>https://github.com/stevemonaco/ImageMagitek</PackageProjectUrl>
     <Copyright>2021</Copyright>
     <RepositoryUrl>https://github.com/stevemonaco/ImageMagitek</RepositoryUrl>
+    <AssemblyVersion>0.990.0.0</AssemblyVersion>
+    <FileVersion>0.990.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" />
+    <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="System.Text.Json" Version="5.0.2" />

diff --git a/ImageMagitek.UnitTests/ImageMagitek.UnitTests.csproj b/ImageMagitek.UnitTests/ImageMagitek.UnitTests.csproj
@@ -5,10 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="morelinq" Version="3.3.2" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/ImageMagitek/ImageMagitek.csproj b/ImageMagitek/ImageMagitek.csproj
@@ -3,9 +3,11 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.981</Version>
+    <Version>0.990</Version>
     <Authors>Steve Monaco</Authors>
     <Copyright>2021</Copyright>
+    <AssemblyVersion>0.990.0.0</AssemblyVersion>
+    <FileVersion>0.990.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/TileShop.CLI/Program.cs b/TileShop.CLI/Program.cs
@@ -21,8 +21,9 @@ class Program
 
         static int Main(string[] args)
         {
-            string version = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion;
-            Console.WriteLine($"TileShopCLI v{version} by Klarth");
+            //string assemblyLocation = Assembly.GetExecutingAssembly().Location;
+            //string version = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion;
+            //Console.WriteLine($"TileShopCLI v{version} by Klarth");
 
             var verbs = LoadVerbs();
 
@@ -84,7 +85,7 @@ private static bool BootstrapTileShop(string logFileName)
                 var settings = bootstrapper.ReadConfiguration(settingsFileName);
                 var codecService = bootstrapper.CreateCodecService(codecPath, codecSchemaFileName);
                 var paletteService = bootstrapper.CreatePaletteService(palettePath, settings);
-                var pluginService = bootstrapper.CreatePluginService(pluginPath, codecService);
+                //var pluginService = bootstrapper.CreatePluginService(pluginPath, codecService);
 
                 var defaultResources = paletteService.GlobalPalettes;
                 var serializerFactory = new XmlProjectSerializerFactory(resourceSchemaFileName,
@@ -95,7 +96,7 @@ private static bool BootstrapTileShop(string logFileName)
             }
             catch (Exception ex)
             {
-                Log.Fatal(ex, "TileShopCLI environment failed to load");
+                Log.Fatal(ex, $"TileShopCLI environment failed to load:\n{ex.StackTrace}\n");
                 return false;
             }
         }

diff --git a/TileShop.CLI/Properties/launchSettings.json b/TileShop.CLI/Properties/launchSettings.json
@@ -2,27 +2,27 @@
   "profiles": {
     "FF2 ExportAll": {
       "commandName": "Project",
-      "commandLineArgs": "ExportAll --overwrite \"FF2new\\ff2.xml\" FF2Extract",
+      "commandLineArgs": "ExportAll --overwrite \"FF2new\\FF2project.xml\" FF2Extract",
       "workingDirectory": "D:\\ImageMagitekTest"
     },
     "FF2 ImportAll": {
       "commandName": "Project",
-      "commandLineArgs": "ImportAll -f ff2.xml FF2Extract",
+      "commandLineArgs": "ImportAll -f \"FF2new\\FF2project.xml\" FF2Extract",
       "workingDirectory": "D:\\ImageMagitekTest"
     },
     "FF2 Import": {
       "commandName": "Project",
-      "commandLineArgs": "Import -fr ff2.xml FF2Extract \"FF2\\Character Overworld Sprites\\Cecil Map\" \"/FF2/Portraits\"",
+      "commandLineArgs": "Import -fr \"FF2new\\FF2project.xml\" FF2Extract \"\\Character Overworld Sprites\\Cecil Map\" \"/Character Portraits/Portraits\"",
       "workingDirectory": "D:\\ImageMagitekTest"
     },
     "FF2 Print": {
       "commandName": "Project",
-      "commandLineArgs": "Print --log ff2.log ff2.xml",
+      "commandLineArgs": "Print --log ff2.log \"FF2new\\FF2project.xml\"",
       "workingDirectory": "D:\\ImageMagitekTest"
     },
     "FF2 Export": {
       "commandName": "Project",
-      "commandLineArgs": "Export ff2.xml FF2Extract \"/FF2/Character Overworld Sprites/Cecil Map\" \"FF2\\Portraits\"",
+      "commandLineArgs": "Export \"FF2new\\FF2project.xml\" FF2Extract \"/Character Overworld Sprites/Cecil Map\" \"Character Portraits\\Portraits\"",
       "workingDirectory": "D:\\ImageMagitekTest"
     }
   }

diff --git a/TileShop.CLI/TileShop.CLI.csproj b/TileShop.CLI/TileShop.CLI.csproj
@@ -8,9 +8,10 @@
     <Authors>Klarth</Authors>
     <PackageProjectUrl>https://github.com/stevemonaco/ImageMagitek</PackageProjectUrl>
     <RepositoryUrl>https://github.com/stevemonaco/ImageMagitek</RepositoryUrl>
-    <AssemblyVersion>0.2.0.0</AssemblyVersion>
-    <FileVersion>0.2.0.0</FileVersion>
-    <Version>0.2</Version>
+    <AssemblyVersion>0.990.0.0</AssemblyVersion>
+    <FileVersion>0.990.0.0</FileVersion>
+    <Version>0.990</Version>
+    <Company />
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/TileShop.Shared/TileShop.Shared.csproj b/TileShop.Shared/TileShop.Shared.csproj
@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
+    <Version>0.990</Version>
+    <Authors>Klarth</Authors>
+    <Product />
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/TileShop.WPF/Features/Shell/MenuView.xaml b/TileShop.WPF/Features/Shell/MenuView.xaml
@@ -21,7 +21,6 @@
         <Menu>
             <MenuItem Header="_File">
                 <MenuItem Click="{s:Action NewEmptyProject}" Header="_New Empty Project" />
-                <MenuItem Click="{s:Action NewProjectFromFile}" Header="New Project From _File" />
                 <MenuItem Click="{s:Action OpenProject}" Header="Open _Project" />
                 <Separator />
                 <MenuItem

diff --git a/TileShop.WPF/TileShop.WPF.csproj b/TileShop.WPF/TileShop.WPF.csproj
@@ -6,12 +6,14 @@
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <UseWPF>true</UseWPF>
     <AssemblyName>TileShop</AssemblyName>
-    <Version>0.981</Version>
+    <Version>0.990</Version>
     <Authors>Steve Monaco</Authors>
     <PackageProjectUrl>https://github.com/stevemonaco/ImageMagitek</PackageProjectUrl>
     <RepositoryUrl>https://github.com/stevemonaco/ImageMagitek</RepositoryUrl>
-    <Copyright>2020</Copyright>
+    <Copyright>2021</Copyright>
     <ApplicationIcon>Assets\tsicon.ico</ApplicationIcon>
+    <AssemblyVersion>0.990.0.0</AssemblyVersion>
+    <FileVersion>0.990.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -24,8 +26,8 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="6.2.0" />
-    <PackageReference Include="Dirkster.AvalonDock" Version="4.50.3" />
-    <PackageReference Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.50.3" />
+    <PackageReference Include="Dirkster.AvalonDock" Version="4.51.1" />
+    <PackageReference Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.51.1" />
     <PackageReference Include="gong-wpf-dragdrop" Version="2.3.2" />
     <PackageReference Include="Jot" Version="2.1.8" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />

diff --git a/build.cmd b/build.cmd
@@ -4,4 +4,4 @@
 :; exit $?
 
 @ECHO OFF
-powershell -ExecutionPolicy ByPass -NoProfile "%~dp0build.ps1" %*
+powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %*
diff --git a/build.ps1 b/build.ps1
@@ -14,7 +14,7 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 ###########################################################################
 
 $BuildProjectFile = "$PSScriptRoot\ImageMagitek.Build\ImageMagitek.Build.csproj"
-$TempDirectory = "$PSScriptRoot\\.tmp"
+$TempDirectory = "$PSScriptRoot\\.nuke\temp"
 
 $DotNetGlobalFile = "$PSScriptRoot\\global.json"
 $DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"

diff --git a/build.sh b/build.sh
@@ -10,7 +10,7 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
 ###########################################################################
 
 BUILD_PROJECT_FILE="$SCRIPT_DIR/ImageMagitek.Build/ImageMagitek.Build.csproj"
-TEMP_DIRECTORY="$SCRIPT_DIR//.tmp"
+TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp"
 
 DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
 DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "5.0.301"
+  }
+}