Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move to major version packages #71

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

move to major version packages #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36999f7
move to major version packages
andrewheumann Nov 5, 2023
7d8f1ae
bump define program reqs
andrewheumann Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LayoutFunctions/ClassroomLayout/dependencies/ClassroomLayout.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Hypar.Elements" Version="2.1.0-alpha.22" />
<PackageReference Include="Hypar.Functions" Version="1.9.0-alpha.3" />
<PackageReference Include="Hypar.Elements" Version="2.1.0" />
<PackageReference Include="Hypar.Functions" Version="1.10.0" />
<!-- <PackageReference Include="Hypar.Space.LayoutFunctionCommon" Version="1.4.0" /> -->
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions LayoutFunctions/ClassroomLayout/dependencies/ClassroomLayoutInputs.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ namespace ClassroomLayout

[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")]

public class ClassroomLayoutInputs : S3Args
public class ClassroomLayoutInputs : ArgsBase

{
[Newtonsoft.Json.JsonConstructor]

public ClassroomLayoutInputs(bool @createWalls, Overrides @overrides, string bucketName, string uploadsBucket, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(bucketName, uploadsBucket, modelInputKeys, gltfKey, elementsKey, ifcKey)
public ClassroomLayoutInputs(bool @createWalls, Overrides @overrides, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(modelInputKeys, gltfKey, elementsKey, ifcKey)
{
var validator = Validator.Instance.GetFirstValidatorForType<ClassroomLayoutInputs>();
if(validator != null)
Expand Down
8 changes: 2 additions & 6 deletions LayoutFunctions/ClassroomLayout/dependencies/ClassroomLayoutOutputs.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,22 @@ public class ClassroomLayoutOutputs: SystemResults
/// Total count of seats
/// </summary>
[JsonProperty("Total count of desk seats")]
public double TotalCountOfDeskSeats {get; set;}


public double TotalCountOfDeskSeats { get; set; }

/// <summary>
/// Construct a ClassroomLayoutOutputs with default inputs.
/// This should be used for testing only.
/// </summary>
public ClassroomLayoutOutputs() : base()
{

}


/// <summary>
/// Construct a ClassroomLayoutOutputs specifying all inputs.
/// </summary>
/// <returns></returns>
[JsonConstructor]
public ClassroomLayoutOutputs(double totalCountOfDeskSeats): base()
public ClassroomLayoutOutputs(double totalCountOfDeskSeats) : base()
{
this.TotalCountOfDeskSeats = totalCountOfDeskSeats;

Expand Down
16 changes: 4 additions & 12 deletions LayoutFunctions/ClassroomLayout/src/Function.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Edits to this code will be overwritten the next time you run 'hypar init'.
// DO NOT EDIT THIS FILE.

using Amazon;
using Amazon.Lambda.Core;
using Hypar.Functions.Execution;
using Hypar.Functions.Execution.AWS;
Expand All @@ -19,9 +18,9 @@ public class Function
{
// Cache the model store for use by subsequent
// executions of this lambda.
private IModelStore<ClassroomLayoutInputs> store;
private UrlModelStore<ClassroomLayoutInputs> store;

public async Task<ClassroomLayoutOutputs> Handler(ClassroomLayoutInputs args, ILambdaContext context)
public async Task<ClassroomLayoutOutputs> Handler(ClassroomLayoutInputs args)
{
// Preload dependencies (if they exist),
// so that they are available during model deserialization.
Expand Down Expand Up @@ -61,15 +60,8 @@ public async Task<ClassroomLayoutOutputs> Handler(ClassroomLayoutInputs args, IL
Console.WriteLine($"Time to load assemblies: {sw.Elapsed.TotalSeconds})");

if(this.store == null)
{
if (args.SignedResourceUrls == null)
{
this.store = new S3ModelStore<ClassroomLayoutInputs>(RegionEndpoint.GetBySystemName("us-west-1"));
}
else
{
this.store = new UrlModelStore<ClassroomLayoutInputs>();
}
{
this.store = new UrlModelStore<ClassroomLayoutInputs>();
}


Expand Down
4 changes: 2 additions & 2 deletions LayoutFunctions/CustomLayout/dependencies/CustomSpaceType.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Hypar.Elements" Version="2.1.0-alpha.22" />
<PackageReference Include="Hypar.Functions" Version="1.9.0-alpha.3" />
<PackageReference Include="Hypar.Elements" Version="2.1.0" />
<PackageReference Include="Hypar.Functions" Version="1.10.0" />
<PackageReference Include="Hypar.Elements.Components" Version="2.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions LayoutFunctions/DataHall/dependencies/DataHallLayout.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Hypar.Elements" Version="2.1.0-alpha.22" />
<PackageReference Include="Hypar.Functions" Version="1.9.0-alpha.3" />
<PackageReference Include="Hypar.Elements" Version="2.1.0" />
<PackageReference Include="Hypar.Functions" Version="1.10.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions LayoutFunctions/DataHall/dependencies/DataHallLayoutInputs.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ namespace DataHallLayout

[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")]

public class DataHallLayoutInputs : S3Args
public class DataHallLayoutInputs : ArgsBase

{
[Newtonsoft.Json.JsonConstructor]

public DataHallLayoutInputs(DataHallLayoutInputsCabinetDepth @cabinetDepth, DataHallLayoutInputsCabinetHeight @cabinetHeight, double @kWRack, double @hotAisleWidth, double @coldAisleWidth, double @clearance, bool @flipDirection, bool @swapColdHotPattern, string bucketName, string uploadsBucket, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(bucketName, uploadsBucket, modelInputKeys, gltfKey, elementsKey, ifcKey)
public DataHallLayoutInputs(DataHallLayoutInputsCabinetDepth @cabinetDepth, DataHallLayoutInputsCabinetHeight @cabinetHeight, double @kWRack, double @hotAisleWidth, double @coldAisleWidth, double @clearance, bool @flipDirection, bool @swapColdHotPattern, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(modelInputKeys, gltfKey, elementsKey, ifcKey)
{
var validator = Validator.Instance.GetFirstValidatorForType<DataHallLayoutInputs>();
if(validator != null)
Expand Down
10 changes: 3 additions & 7 deletions LayoutFunctions/DataHall/dependencies/DataHallLayoutOutputs.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,28 @@ public class DataHallLayoutOutputs: SystemResults
/// The number of server cabinets.
/// </summary>
[JsonProperty("Rack Count")]
public double RackCount {get; set;}
public double RackCount { get; set; }

/// <summary>
/// Watts per square foot
/// </summary>
[JsonProperty("Watts/sf")]
public string Wattssf {get; set;}


public string Wattssf { get; set; }

/// <summary>
/// Construct a DataHallLayoutOutputs with default inputs.
/// This should be used for testing only.
/// </summary>
public DataHallLayoutOutputs() : base()
{

}


/// <summary>
/// Construct a DataHallLayoutOutputs specifying all inputs.
/// </summary>
/// <returns></returns>
[JsonConstructor]
public DataHallLayoutOutputs(double rackCount, string wattssf): base()
public DataHallLayoutOutputs(double rackCount, string wattssf) : base()
{
this.RackCount = rackCount;
this.Wattssf = wattssf;
Expand Down
16 changes: 4 additions & 12 deletions LayoutFunctions/DataHall/src/Function.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Edits to this code will be overwritten the next time you run 'hypar init'.
// DO NOT EDIT THIS FILE.

using Amazon;
using Amazon.Lambda.Core;
using Hypar.Functions.Execution;
using Hypar.Functions.Execution.AWS;
Expand All @@ -19,9 +18,9 @@ public class Function
{
// Cache the model store for use by subsequent
// executions of this lambda.
private IModelStore<DataHallLayoutInputs> store;
private UrlModelStore<DataHallLayoutInputs> store;

public async Task<DataHallLayoutOutputs> Handler(DataHallLayoutInputs args, ILambdaContext context)
public async Task<DataHallLayoutOutputs> Handler(DataHallLayoutInputs args)
{
// Preload dependencies (if they exist),
// so that they are available during model deserialization.
Expand Down Expand Up @@ -61,15 +60,8 @@ public async Task<DataHallLayoutOutputs> Handler(DataHallLayoutInputs args, ILam
Console.WriteLine($"Time to load assemblies: {sw.Elapsed.TotalSeconds})");

if(this.store == null)
{
if (args.SignedResourceUrls == null)
{
this.store = new S3ModelStore<DataHallLayoutInputs>(RegionEndpoint.GetBySystemName("us-west-1"));
}
else
{
this.store = new UrlModelStore<DataHallLayoutInputs>();
}
{
this.store = new UrlModelStore<DataHallLayoutInputs>();
}


Expand Down
4 changes: 2 additions & 2 deletions LayoutFunctions/Doors/dependencies/Doors.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Hypar.Elements" Version="2.1.0-alpha.22" />
<PackageReference Include="Hypar.Functions" Version="1.9.0-alpha.3" />
<PackageReference Include="Hypar.Elements" Version="2.1.0" />
<PackageReference Include="Hypar.Functions" Version="1.10.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions LayoutFunctions/InteriorPartitions/dependencies/InteriorPartitions.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectReference Include="..\..\LayoutFunctionCommon\LayoutFunctionCommon.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Hypar.Elements" Version="2.1.0-alpha.22" />
<PackageReference Include="Hypar.Functions" Version="1.9.0-alpha.3" />
<PackageReference Include="Hypar.Elements" Version="2.1.0" />
<PackageReference Include="Hypar.Functions" Version="1.10.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions LayoutFunctions/InteriorPartitions/dependencies/InteriorPartitionsInputs.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ namespace InteriorPartitions

[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")]

public class InteriorPartitionsInputs : S3Args
public class InteriorPartitionsInputs : ArgsBase

{
[Newtonsoft.Json.JsonConstructor]

public InteriorPartitionsInputs(string bucketName, string uploadsBucket, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(bucketName, uploadsBucket, modelInputKeys, gltfKey, elementsKey, ifcKey)
public InteriorPartitionsInputs(Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(modelInputKeys, gltfKey, elementsKey, ifcKey)
{
var validator = Validator.Instance.GetFirstValidatorForType<InteriorPartitionsInputs>();
if(validator != null)
Expand Down
3 changes: 0 additions & 3 deletions LayoutFunctions/InteriorPartitions/dependencies/InteriorPartitionsOutputs.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@ namespace InteriorPartitions
public class InteriorPartitionsOutputs: SystemResults
{


/// <summary>
/// Construct a InteriorPartitionsOutputs with default inputs.
/// This should be used for testing only.
/// </summary>
public InteriorPartitionsOutputs() : base()
{

}


}
}
2 changes: 1 addition & 1 deletion LayoutFunctions/InteriorPartitions/server/InteriorPartitions.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Hypar.Server" Version="1.9.0-alpha.3" />
<PackageReference Include="Hypar.Server" Version="1.10.0" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion LayoutFunctions/InteriorPartitions/server/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ await HyparServer.StartAsync(
var input = executionRequest.Args.ToObject<InteriorPartitions.InteriorPartitionsInputs>();
var function = new InteriorPartitions.Function();
Directory.SetCurrentDirectory(Path.GetDirectoryName(typeof(InteriorPartitions.Function).Assembly.Location)!);
return await function.Handler(input, null);
return await function.Handler(input);
});
}
}
Expand Down
16 changes: 4 additions & 12 deletions LayoutFunctions/InteriorPartitions/src/Function.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Edits to this code will be overwritten the next time you run 'hypar init'.
// DO NOT EDIT THIS FILE.

using Amazon;
using Amazon.Lambda.Core;
using Hypar.Functions.Execution;
using Hypar.Functions.Execution.AWS;
Expand All @@ -19,9 +18,9 @@ public class Function
{
// Cache the model store for use by subsequent
// executions of this lambda.
private IModelStore<InteriorPartitionsInputs> store;
private UrlModelStore<InteriorPartitionsInputs> store;

public async Task<InteriorPartitionsOutputs> Handler(InteriorPartitionsInputs args, ILambdaContext context)
public async Task<InteriorPartitionsOutputs> Handler(InteriorPartitionsInputs args)
{
// Preload dependencies (if they exist),
// so that they are available during model deserialization.
Expand Down Expand Up @@ -61,15 +60,8 @@ public async Task<InteriorPartitionsOutputs> Handler(InteriorPartitionsInputs ar
Console.WriteLine($"Time to load assemblies: {sw.Elapsed.TotalSeconds})");

if(this.store == null)
{
if (args.SignedResourceUrls == null)
{
this.store = new S3ModelStore<InteriorPartitionsInputs>(RegionEndpoint.GetBySystemName("us-west-1"));
}
else
{
this.store = new UrlModelStore<InteriorPartitionsInputs>();
}
{
this.store = new UrlModelStore<InteriorPartitionsInputs>();
}


Expand Down
6 changes: 3 additions & 3 deletions LayoutFunctions/LayoutFunctionCommon/LayoutFunctionCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Hypar.Elements" Version="2.1.0-alpha.22" />
<PackageReference Include="Hypar.Elements.Components" Version="2.1.0-alpha.22" />
<PackageReference Include="Hypar.Functions" Version="1.9.0-alpha.3" />
<PackageReference Include="Hypar.Elements" Version="2.1.0" />
<PackageReference Include="Hypar.Elements.Components" Version="2.1.0" />
<PackageReference Include="Hypar.Functions" Version="1.9.0" />
<!-- <ProjectReference Include="..\..\..\Hypar\Hypar.Functions\src\Hypar.Functions.csproj" /> -->
<PackageReference Include="Elements.LargestInteriorRectangle" Version="2.0.0" />
<!-- <ProjectReference Include="../../../Elements/Elements/src/Elements.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions LayoutFunctions/LoungeLayout/dependencies/LoungeLayout.Dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Hypar.Elements" Version="2.1.0-alpha.22" />
<PackageReference Include="Hypar.Functions" Version="1.9.0-alpha.3" />
<PackageReference Include="Hypar.Elements" Version="2.1.0" />
<PackageReference Include="Hypar.Functions" Version="1.10.0" />
<ProjectReference Include="..\..\LayoutFunctionCommon\LayoutFunctionCommon.csproj" />
</ItemGroup>
<!-- <ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions LayoutFunctions/LoungeLayout/dependencies/LoungeLayoutInputs.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ namespace LoungeLayout

[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")]

public class LoungeLayoutInputs : S3Args
public class LoungeLayoutInputs : ArgsBase

{
[Newtonsoft.Json.JsonConstructor]

public LoungeLayoutInputs(Overrides @overrides, string bucketName, string uploadsBucket, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(bucketName, uploadsBucket, modelInputKeys, gltfKey, elementsKey, ifcKey)
public LoungeLayoutInputs(Overrides @overrides, Dictionary<string, string> modelInputKeys, string gltfKey, string elementsKey, string ifcKey):
base(modelInputKeys, gltfKey, elementsKey, ifcKey)
{
var validator = Validator.Instance.GetFirstValidatorForType<LoungeLayoutInputs>();
if(validator != null)
Expand Down
3 changes: 0 additions & 3 deletions LayoutFunctions/LoungeLayout/dependencies/LoungeLayoutOutputs.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@ namespace LoungeLayout
public class LoungeLayoutOutputs: SystemResults
{


/// <summary>
/// Construct a LoungeLayoutOutputs with default inputs.
/// This should be used for testing only.
/// </summary>
public LoungeLayoutOutputs() : base()
{

}


}
}
Loading
Loading