Skip to content

Commit e4158c8

Browse files
CBenghiCBenghi
committed
Update nuke to resolve a net8 issue.
1 parent 001cf21 commit e4158c8

File tree

10 files changed

+245
-94
lines changed

10 files changed

+245
-94
lines changed

‎.nuke/build.schema.json

Lines changed: 64 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,50 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"title": "Build Schema",
4-
"$ref": "#/definitions/build",
53
"definitions": {
6-
"build": {
7-
"type": "object",
4+
"Host": {
5+
"type": "string",
6+
"enum": [
7+
"AppVeyor",
8+
"AzurePipelines",
9+
"Bamboo",
10+
"Bitbucket",
11+
"Bitrise",
12+
"GitHubActions",
13+
"GitLab",
14+
"Jenkins",
15+
"Rider",
16+
"SpaceAutomation",
17+
"TeamCity",
18+
"Terminal",
19+
"TravisCI",
20+
"VisualStudio",
21+
"VSCode"
22+
]
23+
},
24+
"ExecutableTarget": {
25+
"type": "string",
26+
"enum": [
27+
"AuditAllIdsFiles",
28+
"AuditDocTestCases",
29+
"AuditExamples",
30+
"CleanSchemaProject",
31+
"CompileSchemaProject",
32+
"CreateTestCases",
33+
"TestAccurateInvalid"
34+
]
35+
},
36+
"Verbosity": {
37+
"type": "string",
38+
"description": "",
39+
"enum": [
40+
"Verbose",
41+
"Normal",
42+
"Minimal",
43+
"Quiet"
44+
]
45+
},
46+
"NukeBuild": {
847
"properties": {
9-
"Configuration": {
10-
"type": "string",
11-
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
12-
"enum": [
13-
"Debug",
14-
"Release"
15-
]
16-
},
1748
"Continue": {
1849
"type": "boolean",
1950
"description": "Indicates to continue a previously failed build attempt"
@@ -23,25 +54,8 @@
2354
"description": "Shows the help text for this build assembly"
2455
},
2556
"Host": {
26-
"type": "string",
2757
"description": "Host for execution. Default is 'automatic'",
28-
"enum": [
29-
"AppVeyor",
30-
"AzurePipelines",
31-
"Bamboo",
32-
"Bitbucket",
33-
"Bitrise",
34-
"GitHubActions",
35-
"GitLab",
36-
"Jenkins",
37-
"Rider",
38-
"SpaceAutomation",
39-
"TeamCity",
40-
"Terminal",
41-
"TravisCI",
42-
"VisualStudio",
43-
"VSCode"
44-
]
58+
"$ref": "#/definitions/Host"
4559
},
4660
"NoLogo": {
4761
"type": "boolean",
@@ -70,45 +84,38 @@
7084
"type": "array",
7185
"description": "List of targets to be skipped. Empty list skips all dependencies",
7286
"items": {
73-
"type": "string",
74-
"enum": [
75-
"AuditAllIdsFiles",
76-
"AuditDocTestCases",
77-
"AuditExamples",
78-
"CleanSchemaProject",
79-
"CompileSchemaProject",
80-
"CreateTestCases",
81-
"TestAccurateInvalid"
82-
]
87+
"$ref": "#/definitions/ExecutableTarget"
8388
}
8489
},
8590
"Target": {
8691
"type": "array",
8792
"description": "List of targets to be invoked. Default is '{default_target}'",
8893
"items": {
89-
"type": "string",
90-
"enum": [
91-
"AuditAllIdsFiles",
92-
"AuditDocTestCases",
93-
"AuditExamples",
94-
"CleanSchemaProject",
95-
"CompileSchemaProject",
96-
"CreateTestCases",
97-
"TestAccurateInvalid"
98-
]
94+
"$ref": "#/definitions/ExecutableTarget"
9995
}
10096
},
10197
"Verbosity": {
102-
"type": "string",
10398
"description": "Logging verbosity during build execution. Default is 'Normal'",
99+
"$ref": "#/definitions/Verbosity"
100+
}
101+
}
102+
}
103+
},
104+
"allOf": [
105+
{
106+
"properties": {
107+
"Configuration": {
108+
"type": "string",
109+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
104110
"enum": [
105-
"Minimal",
106-
"Normal",
107-
"Quiet",
108-
"Verbose"
111+
"Debug",
112+
"Release"
109113
]
110114
}
111115
}
116+
},
117+
{
118+
"$ref": "#/definitions/NukeBuild"
112119
}
113-
}
114-
}
120+
]
121+
}

‎Documentation/ImplementersDocumentation/DataTypes.md

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -405,20 +405,16 @@ Columns of the table determine the validity of the type depending on the schema
405405

406406
The list of valid XML base types for the `base` attribute of `xs:restriction`, and the associated regex expression to check for the validity of string representation is as follows:
407407

408-
<!-- markdownlint-disable MD052 -->
409-
410-
| Base type | string regex constraint |
411-
| ----------- | ------------------------------------------------------------------------ |
412-
| xs:boolean | ^(true&#124;false&#124;0&#124;1)$ |
413-
| xs:date | ^\d{4}-\d{2}-\d{2}(Z&#124;([+-]\d{2}:\d{2}))?$ |
414-
| xs:dateTime | ^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z&#124;([+-]\d{2}:\d{2}))?$ |
415-
| xs:double | ^([-+]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?&#124;NaN&#124;\+INF&#124;-INF)$ |
416-
| xs:duration | ^[-+]?P(\d+Y)?(\d+M)?(\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?$ |
417-
| xs:integer | ^[+-]?(\d+)$ |
418-
| xs:string | ^.?$ |
419-
| xs:time | ^\d{2}:\d{2}:\d{2}(\.\d+)?(Z&#124;([+-]\d{2}:\d{2}))?$ |
420-
421-
<!-- markdownlint-enable MD052 -->
408+
| Base type | string regex constraint |
409+
| ----------- | ------------------------------------------------------------------------------ |
410+
| xs:boolean | ```^(true&#124;false&#124;0&#124;1)$``` |
411+
| xs:date | ```^\d{4}-\d{2}-\d{2}(Z&#124;([+-]\d{2}:\d{2}))?$``` |
412+
| xs:dateTime | ```^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z&#124;([+-]\d{2}:\d{2}))?$``` |
413+
| xs:double | ```^([-+]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?&#124;NaN&#124;\+INF&#124;-INF)$``` |
414+
| xs:duration | ```^[-+]?P(\d+Y)?(\d+M)?(\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?$``` |
415+
| xs:integer | ```^[+-]?(\d+)$``` |
416+
| xs:string | ```^.?$``` |
417+
| xs:time | ```^\d{2}:\d{2}:\d{2}(\.\d+)?(Z&#124;([+-]\d{2}:\d{2}))?$``` |
422418

423419
For example:
424420

‎Documentation/ImplementersDocumentation/TestCases/scripts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2422,7 +2422,7 @@ but they can also be associated to the relevant types. E.g. `Pset_WallCommon` on
24222422

24232423
The provided IFC fails because one of the property sets defines the invalid value `FOOBAR`.
24242424

2425-
``` ids property\fail-properties_can_be_associated_to_relevant_object_types.ids
2425+
``` ids property/fail-properties_can_be_associated_to_relevant_object_types.ids
24262426
Properties can be associated to relevant object types
24272427
Optional
24282428
IFC4

‎RepositoryAutomation/.nuke/build.schema.json

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-04/schema#",
3+
"definitions": {
4+
"Host": {
5+
"type": "string",
6+
"enum": [
7+
"AppVeyor",
8+
"AzurePipelines",
9+
"Bamboo",
10+
"Bitbucket",
11+
"Bitrise",
12+
"GitHubActions",
13+
"GitLab",
14+
"Jenkins",
15+
"Rider",
16+
"SpaceAutomation",
17+
"TeamCity",
18+
"Terminal",
19+
"TravisCI",
20+
"VisualStudio",
21+
"VSCode"
22+
]
23+
},
24+
"ExecutableTarget": {
25+
"type": "string",
26+
"enum": [
27+
"AuditAllIdsFiles",
28+
"AuditDocTestCases",
29+
"AuditExamples",
30+
"CleanSchemaProject",
31+
"CompileSchemaProject",
32+
"CreateTestCases",
33+
"TestAccurateInvalid"
34+
]
35+
},
36+
"Verbosity": {
37+
"type": "string",
38+
"description": "",
39+
"enum": [
40+
"Verbose",
41+
"Normal",
42+
"Minimal",
43+
"Quiet"
44+
]
45+
},
46+
"NukeBuild": {
47+
"properties": {
48+
"Continue": {
49+
"type": "boolean",
50+
"description": "Indicates to continue a previously failed build attempt"
51+
},
52+
"Help": {
53+
"type": "boolean",
54+
"description": "Shows the help text for this build assembly"
55+
},
56+
"Host": {
57+
"description": "Host for execution. Default is 'automatic'",
58+
"$ref": "#/definitions/Host"
59+
},
60+
"NoLogo": {
61+
"type": "boolean",
62+
"description": "Disables displaying the NUKE logo"
63+
},
64+
"Partition": {
65+
"type": "string",
66+
"description": "Partition to use on CI"
67+
},
68+
"Plan": {
69+
"type": "boolean",
70+
"description": "Shows the execution plan (HTML)"
71+
},
72+
"Profile": {
73+
"type": "array",
74+
"description": "Defines the profiles to load",
75+
"items": {
76+
"type": "string"
77+
}
78+
},
79+
"Root": {
80+
"type": "string",
81+
"description": "Root directory during build execution"
82+
},
83+
"Skip": {
84+
"type": "array",
85+
"description": "List of targets to be skipped. Empty list skips all dependencies",
86+
"items": {
87+
"$ref": "#/definitions/ExecutableTarget"
88+
}
89+
},
90+
"Target": {
91+
"type": "array",
92+
"description": "List of targets to be invoked. Default is '{default_target}'",
93+
"items": {
94+
"$ref": "#/definitions/ExecutableTarget"
95+
}
96+
},
97+
"Verbosity": {
98+
"description": "Logging verbosity during build execution. Default is 'Normal'",
99+
"$ref": "#/definitions/Verbosity"
100+
}
101+
}
102+
}
103+
},
104+
"allOf": [
105+
{
106+
"properties": {
107+
"Configuration": {
108+
"type": "string",
109+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
110+
"enum": [
111+
"Debug",
112+
"Release"
113+
]
114+
}
115+
}
116+
},
117+
{
118+
"$ref": "#/definitions/NukeBuild"
119+
}
120+
]
121+
}

‎RepositoryAutomation/.nuke/parameters.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"$schema": "./build.schema.json"
3+
}

‎RepositoryAutomation/SchemaProject/program.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ private static void RegenIDS()
7474
if (line.StartsWith("``` ids "))
7575
{
7676
file = line.Substring(8);
77+
file = file.Replace(@"\", "/");
7778
inScript = true;
7879
buffer = new StringBuilder();
7980
firstLine = true;
@@ -134,10 +135,6 @@ private static void RegenIDS()
134135
Console.WriteLine("Suitable matching invalid IFC is found, it has been renamed.");
135136
File.Move(item.FullName, invalidFileName);
136137
}
137-
//else if (allIfcFound)
138-
//{
139-
// // item.Delete();
140-
//}
141138
}
142139
}
143140

0 commit comments

Comments
 (0)