Merge branch 'develop'

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "nuke.globaltool": {
-      "version": "5.0.2",
+      "version": "5.1.0",
       "commands": [
         "nuke"
       ]

.github/workflows/publish.yml

@@ -28,6 +28,11 @@ jobs:
       - name: Setup Current .NET SDK
         uses: actions/[email protected]
 
+      - name: Setup Tools .NET SDK
+        uses: actions/[email protected]
+        with:
+          dotnet-version: '3.1.x'
+
       - name: Run Nuke
         shell: pwsh
         env:

.nuke/build.schema.json

@@ -0,0 +1,112 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Build Schema",
+  "$ref": "#/definitions/build",
+  "definitions": {
+    "build": {
+      "type": "object",
+      "properties": {
+        "CiBuild": {
+          "type": "boolean",
+          "description": "Should be true for continuous integration builds"
+        },
+        "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",
+            "SpaceAutomation",
+            "TeamCity",
+            "Terminal",
+            "TravisCI"
+          ]
+        },
+        "NoLogo": {
+          "type": "boolean",
+          "description": "Disables displaying the NUKE logo"
+        },
+        "NugetApiKey": {
+          "type": "string",
+          "description": "NuGet API key to use for authentication with the NuGet server"
+        },
+        "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": [
+              "Compile",
+              "Pack",
+              "PushNuGet",
+              "Restore"
+            ]
+          }
+        },
+        "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": [
+              "Compile",
+              "Pack",
+              "PushNuGet",
+              "Restore"
+            ]
+          }
+        },
+        "Verbosity": {
+          "type": "string",
+          "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "enum": [
+            "Minimal",
+            "Normal",
+            "Quiet",
+            "Verbose"
+          ]
+        }
+      }
+    }
+  }
+}

.nuke/parameters.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "./build.schema.json",
+  "Solution": "CsprojToAsmdef.sln"
+}

CsprojToAsmdef.Build/Build.cs

@@ -19,7 +19,7 @@ partial class Build : NukeBuild
     [Parameter("Should be true for continuous integration builds")] readonly bool CiBuild;
 
     [Solution] readonly Solution Solution = default!;
-    [GitVersion(Framework = "net5.0")] readonly GitVersion GitVersion = default!;
+    [GitVersion(Framework = "netcoreapp3.1")] readonly GitVersion GitVersion = default!;
 
     Project CliProject => Solution.AllProjects.Single(p => p.Name == "CsprojToAsmdef.Cli");
 

CsprojToAsmdef.Build/CsprojToAsmdef.Build.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="5.0.2" />
+    <PackageReference Include="Nuke.Common" Version="5.1.0" />
   </ItemGroup>
 
   <ItemGroup>

CsprojToAsmdef.Cli/CsprojToAsmdef.Cli.csproj

@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="System.Text.Json" Version="5.0.2" />
   </ItemGroup>
 
   <ItemGroup>

CsprojToAsmdef/Assets/CsprojToAsmdef/CHANGELOG.md

@@ -1,5 +1,11 @@
+# 0.3.4
+- Update dependencies
+- Update SDK version
+- Use correct framework version for GitVersion
+
 # 0.3.3
 - Run NuGet publish after OpenUPM publish
+
 # 0.3.2
 - Run NuGet publish as separate job on push to main
 
@@ -9,6 +15,7 @@
 # 0.3.0
 - Reorganize build and restore tasks to "Fix up"
 - Use DotNet tool to evaluate project properties. This is invoked through a build task using Exec
+- Downgrade Unity min version to 2019.2
 
 # 0.2.0
 - Added: Generate assembly references from DLL references

CsprojToAsmdef/Assets/CsprojToAsmdef/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.kuraiandras.csprojtoasmdef",
-    "version": "0.3.3",
+    "version": "0.3.4",
     "displayName": "Csproj To Asmdef",
     "unity": "2019.2",
     "author": {

build.ps1

@@ -14,7 +14,7 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 ###########################################################################
 
 $BuildProjectFile = "$PSScriptRoot\CsprojToAsmdef.Build\CsprojToAsmdef.Build.csproj"
-$TempDirectory = "$PSScriptRoot\\.tmp"
+$TempDirectory = "$PSScriptRoot\\.nuke\temp"
 
 $DotNetGlobalFile = "$PSScriptRoot\\global.json"
 $DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"

build.sh

@@ -10,7 +10,7 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
 ###########################################################################
 
 BUILD_PROJECT_FILE="$SCRIPT_DIR/CsprojToAsmdef.Build/CsprojToAsmdef.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"

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "5.0.201"
+    "version": "5.0.202"
   }
 }