Merge branch 'develop'

Author: KuraiAndras

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 6.1.2
+- `UseUnity` requires all parameters specified
+
 # 6.1.1
 - Use `ConfigureHostConfiguration` instead of `ConfigureAppConfiguration`
 

MainProject/Directory.Build.props

@@ -3,7 +3,7 @@
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
 
-    <CurrentVersion>6.1.1</CurrentVersion>
+    <CurrentVersion>6.1.2</CurrentVersion>
 
     <Version>$(CurrentVersion)</Version>
     <PakcageVersion>$(CurrentVersion)</PakcageVersion>

UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/UnityHostBuilderExtensions.cs

@@ -37,17 +37,17 @@ public static IHostBuilder UseUnityLifetime(this IHostBuilder hostBuilder) =>
         /// Configure <see cref="IHost"/> to sensible defaults for Unity
         /// </summary>
         /// <param name="configureOptions">The delegate for configuring the <see cref="UnityLifetime"/>.</param>
-        /// <param name="ignoreCommandLineArgs">Don't add command line parameters. Defaults to false</param>
-        /// <param name="ignoreEnvironmentVariables">Don't add environment variables. Defaults to false</param>
+        /// <param name="ignoreCommandLineArgs">Don't add command line parameters</param>
+        /// <param name="ignoreEnvironmentVariables">Don't add environment variables</param>
         /// <param name="jsonConfigurations">Text assets which contain json data. Load the files using <see cref="Resources.Load(string)"/> or use the new Addressables package.</param>
         /// <returns>The original builder</returns>
         public static IHostBuilder UseUnity
         (
             this IHostBuilder builder,
             Action<UnityLifeTimeOptions> configureOptions,
-            bool ignoreCommandLineArgs = false,
-            bool ignoreEnvironmentVariables = false,
-            params TextAsset[] jsonConfigurations
+            bool ignoreCommandLineArgs,
+            bool ignoreEnvironmentVariables,
+            TextAsset[] jsonConfigurations
         )
         {
             var resourcesFolder = Path.GetFullPath(Application.dataPath);
@@ -64,9 +64,12 @@ params TextAsset[] jsonConfigurations
                 if (!ignoreCommandLineArgs) configurationBuilder.AddCommandLine(Environment.GetCommandLineArgs());
                 if (!ignoreEnvironmentVariables) configurationBuilder.AddEnvironmentVariables();
 
-                foreach (var jsonConfiguration in jsonConfigurations.Select(c => c.text.ToStream()))
+                if (jsonConfigurations != null)
                 {
-                    configurationBuilder.AddJsonStream(jsonConfiguration);
+                    foreach (var jsonConfiguration in jsonConfigurations.Select(c => c.text.ToStream()))
+                    {
+                        configurationBuilder.AddJsonStream(jsonConfiguration);
+                    }
                 }
             });
 

UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.injecter.hosting.unity",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "displayName": "Injecter.Hosting.Unity",
     "license": "MIT",
     "licensesUrl": "https://github.com/KuraiAndras/Injecter/blob/master/LICENSE.md",
@@ -13,6 +13,6 @@
         "url": "https://github.com/KuraiAndras/Injecter"
     },
     "dependencies": {
-        "com.injecter.unity": "6.1.1"
+        "com.injecter.unity": "6.1.2"
     }
 }

UnityProject/Injecter.Unity/Assets/Injecter.Unity/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.injecter.unity",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "displayName": "Injecter.Unity",
     "license": "MIT",
     "licensesUrl": "https://github.com/KuraiAndras/Injecter/blob/master/LICENSE.md",