Fix generation from within DIS (Import script or add existing script) (SkylineCommunications#36)

MichielOda · MichielOda · commit 80e52a60a4d5 · 2025-03-05T09:57:27.000+01:00
(cherry picked from commit dd57e65)
diff --git a/working/templates/automation-library-project/.template_config/template.json b/working/templates/automation-library-project/.template_config/template.json
@@ -118,12 +118,12 @@
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "../",
-      "condition": "(HostIdentifier == dotnetcli || PlaceSolutionFilesHigh)"
+      "condition": "(HostIdentifier == dotnetcli || HostIdentifier == dis || PlaceSolutionFilesHigh)"
     },
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "./",
-      "condition": "!(HostIdentifier == dotnetcli) && !PlaceSolutionFilesHigh"
+      "condition": "!(HostIdentifier == dotnetcli) && !(HostIdentifier == dis) && !PlaceSolutionFilesHigh"
     },
     {
       "source": "../SharedItems/SkylineDevopsHelp",
diff --git a/working/templates/automation-project/.template_config/template.json b/working/templates/automation-project/.template_config/template.json
@@ -141,12 +141,12 @@
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "../",
-      "condition": "(HostIdentifier == dotnetcli || PlaceSolutionFilesHigh)"
+      "condition": "(HostIdentifier == dotnetcli || HostIdentifier == dis || PlaceSolutionFilesHigh)"
     },
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "./",
-      "condition": "!(HostIdentifier == dotnetcli) && !PlaceSolutionFilesHigh"
+      "condition": "!(HostIdentifier == dotnetcli) && !(HostIdentifier == dis) && !PlaceSolutionFilesHigh"
     },
     {
       "source": "../SharedItems/SkylineDevopsHelp",
diff --git a/working/templates/gqi-ad-hoc-data-source-project/.template_config/template.json b/working/templates/gqi-ad-hoc-data-source-project/.template_config/template.json
@@ -166,12 +166,12 @@
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "../",
-      "condition": "(HostIdentifier == dotnetcli || PlaceSolutionFilesHigh)"
+      "condition": "(HostIdentifier == dotnetcli || HostIdentifier == dis || PlaceSolutionFilesHigh)"
     },
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "./",
-      "condition": "!(HostIdentifier == dotnetcli) && !PlaceSolutionFilesHigh"
+      "condition": "!(HostIdentifier == dotnetcli) && !(HostIdentifier == dis) && !PlaceSolutionFilesHigh"
     },
     {
       "source": "../SharedItems/SkylineDevopsHelp",
diff --git a/working/templates/package-project/.template_config/template.json b/working/templates/package-project/.template_config/template.json
@@ -137,12 +137,12 @@
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "../",
-      "condition": "(HostIdentifier == dotnetcli || PlaceSolutionFilesHigh)"
+      "condition": "(HostIdentifier == dotnetcli || HostIdentifier == dis || PlaceSolutionFilesHigh)"
     },
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "./",
-      "condition": "!(HostIdentifier == dotnetcli) && !PlaceSolutionFilesHigh"
+      "condition": "!(HostIdentifier == dotnetcli) && !(HostIdentifier == dis) && !PlaceSolutionFilesHigh"
     },
     {
       "source": "../SharedItems/CatalogInformation",
diff --git a/working/templates/user-defined-api-project/.template_config/template.json b/working/templates/user-defined-api-project/.template_config/template.json
@@ -141,12 +141,12 @@
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "../",
-      "condition": "(HostIdentifier == dotnetcli || PlaceSolutionFilesHigh)"
+      "condition": "(HostIdentifier == dotnetcli || HostIdentifier == dis || PlaceSolutionFilesHigh)"
     },
     {
       "source": "../SharedItems/OnSolutionLevel",
       "target": "./",
-      "condition": "!(HostIdentifier == dotnetcli) && !PlaceSolutionFilesHigh"
+      "condition": "!(HostIdentifier == dotnetcli) && !(HostIdentifier == dis) && !PlaceSolutionFilesHigh"
     },
     {
       "source": "../SharedItems/SkylineDevopsHelp",

Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,12 @@`
`118`	`118`	`{`
`119`	`119`	`"source": "../SharedItems/OnSolutionLevel",`
`120`	`120`	`"target": "../",`
`121`		`- "condition": "(HostIdentifier == dotnetcli \|\| PlaceSolutionFilesHigh)"`
	`121`	`+ "condition": "(HostIdentifier == dotnetcli \|\| HostIdentifier == dis \|\| PlaceSolutionFilesHigh)"`
`122`	`122`	`},`
`123`	`123`	`{`
`124`	`124`	`"source": "../SharedItems/OnSolutionLevel",`
`125`	`125`	`"target": "./",`
`126`		`- "condition": "!(HostIdentifier == dotnetcli) && !PlaceSolutionFilesHigh"`
	`126`	`+ "condition": "!(HostIdentifier == dotnetcli) && !(HostIdentifier == dis) && !PlaceSolutionFilesHigh"`
`127`	`127`	`},`
`128`	`128`	`{`
`129`	`129`	`"source": "../SharedItems/SkylineDevopsHelp",`
Original file line number	Diff line number	Diff line change
`@@ -141,12 +141,12 @@`
`141`	`141`	`{`
`142`	`142`	`"source": "../SharedItems/OnSolutionLevel",`
`143`	`143`	`"target": "../",`
`144`		`- "condition": "(HostIdentifier == dotnetcli \|\| PlaceSolutionFilesHigh)"`
	`144`	`+ "condition": "(HostIdentifier == dotnetcli \|\| HostIdentifier == dis \|\| PlaceSolutionFilesHigh)"`
`145`	`145`	`},`
`146`	`146`	`{`
`147`	`147`	`"source": "../SharedItems/OnSolutionLevel",`
`148`	`148`	`"target": "./",`
`149`		`- "condition": "!(HostIdentifier == dotnetcli) && !PlaceSolutionFilesHigh"`
	`149`	`+ "condition": "!(HostIdentifier == dotnetcli) && !(HostIdentifier == dis) && !PlaceSolutionFilesHigh"`
`150`	`150`	`},`
`151`	`151`	`{`
`152`	`152`	`"source": "../SharedItems/SkylineDevopsHelp",`
Original file line number	Diff line number	Diff line change
`@@ -166,12 +166,12 @@`
`166`	`166`	`{`
`167`	`167`	`"source": "../SharedItems/OnSolutionLevel",`
`168`	`168`	`"target": "../",`
`169`		`- "condition": "(HostIdentifier == dotnetcli \|\| PlaceSolutionFilesHigh)"`
	`169`	`+ "condition": "(HostIdentifier == dotnetcli \|\| HostIdentifier == dis \|\| PlaceSolutionFilesHigh)"`
`170`	`170`	`},`
`171`	`171`	`{`
`172`	`172`	`"source": "../SharedItems/OnSolutionLevel",`
`173`	`173`	`"target": "./",`
`174`		`- "condition": "!(HostIdentifier == dotnetcli) && !PlaceSolutionFilesHigh"`
	`174`	`+ "condition": "!(HostIdentifier == dotnetcli) && !(HostIdentifier == dis) && !PlaceSolutionFilesHigh"`
`175`	`175`	`},`
`176`	`176`	`{`
`177`	`177`	`"source": "../SharedItems/SkylineDevopsHelp",`
Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,12 @@`
`137`	`137`	`{`
`138`	`138`	`"source": "../SharedItems/OnSolutionLevel",`
`139`	`139`	`"target": "../",`
`140`		`- "condition": "(HostIdentifier == dotnetcli \|\| PlaceSolutionFilesHigh)"`
	`140`	`+ "condition": "(HostIdentifier == dotnetcli \|\| HostIdentifier == dis \|\| PlaceSolutionFilesHigh)"`
`141`	`141`	`},`
`142`	`142`	`{`
`143`	`143`	`"source": "../SharedItems/OnSolutionLevel",`
`144`	`144`	`"target": "./",`
`145`		`- "condition": "!(HostIdentifier == dotnetcli) && !PlaceSolutionFilesHigh"`
	`145`	`+ "condition": "!(HostIdentifier == dotnetcli) && !(HostIdentifier == dis) && !PlaceSolutionFilesHigh"`
`146`	`146`	`},`
`147`	`147`	`{`
`148`	`148`	`"source": "../SharedItems/CatalogInformation",`