mirror of
				https://github.com/jakeswenson/BitBetter.git
				synced 2025-10-31 04:43:25 +00:00 
			
		
		
		
	[unified] Fix licenseGen according to upstream changes (#247)
* Dockerfile: remove not existing executable argument * licenseGen: fix classes according to upstream changes --------- Co-authored-by: juliokele <>
This commit is contained in:
		
							parent
							
								
									01cdfa2842
								
							
						
					
					
						commit
						a3803cb3bc
					
				|  | @ -12,4 +12,4 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 | ||||||
| WORKDIR /app | WORKDIR /app | ||||||
| COPY --from=build /app . | COPY --from=build /app . | ||||||
| 
 | 
 | ||||||
| ENTRYPOINT [ "dotnet", "/app/licenseGen.dll", "--core", "/app/Core.dll", "--executable", "/app/Api", "--cert", "/app/cert.pfx" ] | ENTRYPOINT [ "dotnet", "/app/licenseGen.dll", "--core", "/app/Core.dll", "--cert", "/app/cert.pfx" ] | ||||||
|  | @ -53,7 +53,7 @@ internal class Program | ||||||
|                 } |                 } | ||||||
| 
 | 
 | ||||||
|                 Console.WriteLine("Interactive license mode..."); |                 Console.WriteLine("Interactive license mode..."); | ||||||
|                  | 
 | ||||||
|                 while (licenseType == "") |                 while (licenseType == "") | ||||||
|                 { |                 { | ||||||
|                     Console.WriteLine("What would you like to generate, a [u]ser license or an [o]rg license: "); |                     Console.WriteLine("What would you like to generate, a [u]ser license or an [o]rg license: "); | ||||||
|  | @ -238,7 +238,7 @@ internal class Program | ||||||
|             CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)"); |             CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)"); | ||||||
|             CommandArgument businessName = config.Argument("BusinessName", "name for the organization (optional)"); |             CommandArgument businessName = config.Argument("BusinessName", "name for the organization (optional)"); | ||||||
|             CommandArgument key = config.Argument("Key", "your key id (optional)"); |             CommandArgument key = config.Argument("Key", "your key id (optional)"); | ||||||
|              | 
 | ||||||
|             config.OnExecute(() => |             config.OnExecute(() => | ||||||
|             { |             { | ||||||
|                 if (!VerifyTopOptions()) |                 if (!VerifyTopOptions()) | ||||||
|  | @ -360,7 +360,7 @@ internal class Program | ||||||
|     { |     { | ||||||
|         Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath); |         Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath); | ||||||
| 
 | 
 | ||||||
|         Type type = core.GetType("Bit.Core.Models.Business.UserLicense"); |         Type type = core.GetType("Bit.Core.Billing.Models.Business.UserLicense"); | ||||||
|         Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType"); |         Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType"); | ||||||
| 
 | 
 | ||||||
|         Object license = Activator.CreateInstance(type); |         Object license = Activator.CreateInstance(type); | ||||||
|  | @ -393,7 +393,7 @@ internal class Program | ||||||
|     { |     { | ||||||
|         Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath); |         Assembly core = AssemblyLoadContext.Default.LoadFromAssemblyPath(corePath); | ||||||
| 
 | 
 | ||||||
|         Type type = core.GetType("Bit.Core.Models.Business.OrganizationLicense"); |         Type type = core.GetType("Bit.Core.Billing.Models.Business.OrganizationLicense"); | ||||||
|         Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType"); |         Type licenseTypeEnum = core.GetType("Bit.Core.Enums.LicenseType"); | ||||||
|         Type planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType"); |         Type planTypeEnum = core.GetType("Bit.Core.Billing.Enums.PlanType"); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user