Update ILRepack to version 2.0.36

ricaun-io · Jan 16, 2025 · c607579 · c607579
1 parent 038a4d4
commit c607579
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 101 deletions.
diff --git a/Build/.nuke/build.schema.json b/Build/.nuke/build.schema.json
@@ -1,62 +1,69 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "$ref": "#/definitions/build",
-  "title": "Build Schema",
   "definitions": {
-    "build": {
-      "type": "object",
+    "Host": {
+      "type": "string",
+      "enum": [
+        "AppVeyor",
+        "AzurePipelines",
+        "Bamboo",
+        "Bitbucket",
+        "Bitrise",
+        "GitHubActions",
+        "GitLab",
+        "Jenkins",
+        "Rider",
+        "SpaceAutomation",
+        "TeamCity",
+        "Terminal",
+        "TravisCI",
+        "VisualStudio",
+        "VSCode"
+      ]
+    },
+    "ExecutableTarget": {
+      "type": "string",
+      "enum": [
+        "Build",
+        "Clean",
+        "Compile",
+        "GitPreRelease",
+        "GitRelease",
+        "Pack",
+        "PrePack",
+        "Release",
+        "Sign",
+        "Test"
+      ]
+    },
+    "Verbosity": {
+      "type": "string",
+      "description": "",
+      "enum": [
+        "Verbose",
+        "Normal",
+        "Minimal",
+        "Quiet"
+      ]
+    },
+    "NukeBuild": {
       "properties": {
         "Continue": {
           "type": "boolean",
           "description": "Indicates to continue a previously failed build attempt"
         },
-        "Folder": {
-          "type": "string"
-        },
-        "GitHubToken": {
-          "type": "string",
-          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
-        },
         "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",
-            "Bitbucket",
-            "Bitrise",
-            "GitHubActions",
-            "GitLab",
-            "Jenkins",
-            "Rider",
-            "SpaceAutomation",
-            "TeamCity",
-            "Terminal",
-            "TravisCI",
-            "VisualStudio",
-            "VSCode"
-          ]
-        },
-        "MainName": {
-          "type": "string"
+          "$ref": "#/definitions/Host"
         },
         "NoLogo": {
           "type": "boolean",
           "description": "Disables displaying the NUKE logo"
         },
-        "NugetApiKey": {
-          "type": "string",
-          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
-        },
-        "NugetApiUrl": {
-          "type": "string",
-          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
-        },
         "Partition": {
           "type": "string",
           "description": "Partition to use on CI"
@@ -65,79 +72,86 @@
           "type": "boolean",
           "description": "Shows the execution plan (HTML)"
         },
-        "PreReleaseFilter": {
+        "Profile": {
           "type": "array",
+          "description": "Defines the profiles to load",
           "items": {
             "type": "string"
           }
         },
-        "Profile": {
+        "Root": {
+          "type": "string",
+          "description": "Root directory during build execution"
+        },
+        "Skip": {
           "type": "array",
-          "description": "Defines the profiles to load",
+          "description": "List of targets to be skipped. Empty list skips all dependencies",
           "items": {
-            "type": "string"
+            "$ref": "#/definitions/ExecutableTarget"
           }
         },
-        "ReleaseFolder": {
-          "type": "string"
+        "Target": {
+          "type": "array",
+          "description": "List of targets to be invoked. Default is '{default_target}'",
+          "items": {
+            "$ref": "#/definitions/ExecutableTarget"
+          }
         },
-        "ReleaseNameVersion": {
+        "Verbosity": {
+          "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "$ref": "#/definitions/Verbosity"
+        }
+      }
+    }
+  },
+  "allOf": [
+    {
+      "properties": {
+        "EnableForkedRepository": {
           "type": "boolean"
         },
-        "Root": {
+        "Folder": {
+          "type": "string"
+        },
+        "GitHubToken": {
           "type": "string",
-          "description": "Root directory during build execution"
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
-        "SignFile": {
+        "MainName": {
+          "type": "string"
+        },
+        "NugetApiKey": {
           "type": "string",
           "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
-        "SignPassword": {
+        "NugetApiUrl": {
           "type": "string",
           "default": "Secrets must be entered via 'nuke :secrets [profile]'"
         },
-        "Skip": {
+        "PreReleaseFilter": {
           "type": "array",
-          "description": "List of targets to be skipped. Empty list skips all dependencies",
           "items": {
-            "type": "string",
-            "enum": [
-              "Build",
-              "Clean",
-              "Compile",
-              "GitPreRelease",
-              "GitRelease",
-              "Pack",
-              "PrePack",
-              "Release",
-              "Sign",
-              "Test"
-            ]
+            "type": "string"
           }
         },
+        "ReleaseFolder": {
+          "type": "string"
+        },
+        "ReleaseNameVersion": {
+          "type": "boolean"
+        },
+        "SignFile": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
+        },
+        "SignPassword": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
+        },
         "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": [
-              "Build",
-              "Clean",
-              "Compile",
-              "GitPreRelease",
-              "GitRelease",
-              "Pack",
-              "PrePack",
-              "Release",
-              "Sign",
-              "Test"
-            ]
-          }
-        },
         "TestBuildStopWhenFailed": {
           "type": "boolean"
         },
@@ -149,18 +163,11 @@
         },
         "UnlistNuget": {
           "type": "boolean"
-        },
-        "Verbosity": {
-          "type": "string",
-          "description": "Logging verbosity during build execution. Default is 'Normal'",
-          "enum": [
-            "Minimal",
-            "Normal",
-            "Quiet",
-            "Verbose"
-          ]
         }
       }
+    },
+    {
+      "$ref": "#/definitions/NukeBuild"
     }
-  }
+  ]
 }
diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ricaun.Nuke.PackageBuilder" Version="*" />
+    <PackageReference Include="ricaun.Nuke" Version="*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [1.0.0] / 2024-09-03 - 2024-09-20
+## [1.0.0] / 2024-09-03 - 2025-01-16
+- Update `ILRepack` to version `2.0.36`.
 - Add `ILRepack` options using `PropertyGroups`.
 - Add `ILRepackIgnoreReferences` to ignore references to be repack.
 - Add `Tests` to validate the repack.

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+	<PropertyGroup>
+    <Version>1.0.0-beta.1</Version>
+	</PropertyGroup>
+</Project>
diff --git a/ricaun.ILRepack.Sample/ricaun.ILRepack.Sample.csproj b/ricaun.ILRepack.Sample/ricaun.ILRepack.Sample.csproj
@@ -45,7 +45,7 @@
   <PropertyGroup>
     <ILRepackImportance>High</ILRepackImportance>
     <ILRepackCommandImportance>low</ILRepackCommandImportance>
-    <ILRepackCommandExtra></ILRepackCommandExtra>
+    <ILRepackCommandExtra>/allowdup</ILRepackCommandExtra>
   </PropertyGroup>
 
 </Project>
diff --git a/ricaun.ILRepack.sln b/ricaun.ILRepack.sln
@@ -10,6 +10,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{E0782E91-0FF1-4CB8-BA4E-137F2C59CCE2}"
 	ProjectSection(SolutionItems) = preProject
 		CHANGELOG.md = CHANGELOG.md
+		Directory.Build.props = Directory.Build.props
 		LICENSE = LICENSE
 		nuget.config = nuget.config
 		README.md = README.md

diff --git a/ricaun.ILRepack/ricaun.ILRepack.csproj b/ricaun.ILRepack/ricaun.ILRepack.csproj
@@ -31,7 +31,6 @@
 
   <PropertyGroup>
     <PackageId>ricaun.ILRepack</PackageId>
-    <Version>1.0.0-beta</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -98,7 +97,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ILRepack" Version="2.0.34" />
+    <PackageReference Include="ILRepack" Version="2.0.36" />
   </ItemGroup>
 
   <Target Name="CopyPackFiles" AfterTargets="Pack">