Skip to content

Commit 8dfba5a

Browse files
clackner-gpaclackner-gpa
committed
Run WixFolderGen
1 parent d9a52b7 commit 8dfba5a

6 files changed

Lines changed: 43 additions & 9 deletions

File tree

‎Source/Applications/openHistorian/openHistorianSetup/GrafanaFeatures.wxi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,6 +1117,8 @@
11171117
<ComponentGroupRef Id="Grafana_public_app_plugins_datasource_mssql__Components" />
11181118
<ComponentGroupRef Id="Grafana_public_app_plugins_datasource_mssql_azureauth__Components" />
11191119
<ComponentGroupRef Id="Grafana_public_app_plugins_datasource_mssql_configuration__Components" />
1120+
<ComponentGroupRef Id="Grafana_public_app_plugins_datasource_mssql_dist__Components" />
1121+
<ComponentGroupRef Id="Grafana_public_app_plugins_datasource_mssql_dist_img__Components" />
11201122
<ComponentGroupRef Id="Grafana_public_app_plugins_datasource_mssql_img__Components" />
11211123
<ComponentGroupRef Id="Grafana_public_app_plugins_datasource_mysql__Components" />
11221124
<ComponentGroupRef Id="Grafana_public_app_plugins_datasource_mysql_configuration__Components" />

‎Source/Applications/openHistorian/openHistorianSetup/GrafanaFiles.wxi‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18347,9 +18347,6 @@
1834718347
<Component Id="public_app_plugins_datasource_mssql_module_ts">
1834818348
<File Id="public_app_plugins_datasource_mssql_module.ts" Name="module.ts" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\module.ts" />
1834918349
</Component>
18350-
<Component Id="public_app_plugins_datasource_mssql_MSSqlMetaQuery_test_ts">
18351-
<File Id="public_app_plugins_datasource_mssql_MSSqlMetaQuery.test.ts" Name="MSSqlMetaQuery.test.ts" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\MSSqlMetaQuery.test.ts" />
18352-
</Component>
1835318350
<Component Id="public_app_plugins_datasource_mssql_MSSqlMetaQuery_ts">
1835418351
<File Id="public_app_plugins_datasource_mssql_MSSqlMetaQuery.ts" Name="MSSqlMetaQuery.ts" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\MSSqlMetaQuery.ts" />
1835518352
</Component>
@@ -18362,18 +18359,12 @@
1836218359
<Component Id="public_app_plugins_datasource_mssql_plugin_json">
1836318360
<File Id="public_app_plugins_datasource_mssql_plugin.json" Name="plugin.json" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\plugin.json" />
1836418361
</Component>
18365-
<Component Id="public_app_plugins_datasource_mssql_project_json">
18366-
<File Id="public_app_plugins_datasource_mssql_project.json" Name="project.json" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\project.json" />
18367-
</Component>
1836818362
<Component Id="public_app_plugins_datasource_mssql_README_md">
1836918363
<File Id="public_app_plugins_datasource_mssql_README.md" Name="README.md" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\README.md" />
1837018364
</Component>
1837118365
<Component Id="public_app_plugins_datasource_mssql_sqlCompletionProvider_ts">
1837218366
<File Id="public_app_plugins_datasource_mssql_sqlCompletionProvider.ts" Name="sqlCompletionProvider.ts" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\sqlCompletionProvider.ts" />
1837318367
</Component>
18374-
<Component Id="public_app_plugins_datasource_mssql_sqlUtil_test_ts">
18375-
<File Id="public_app_plugins_datasource_mssql_sqlUtil.test.ts" Name="sqlUtil.test.ts" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\sqlUtil.test.ts" />
18376-
</Component>
1837718368
<Component Id="public_app_plugins_datasource_mssql_sqlUtil_ts">
1837818369
<File Id="public_app_plugins_datasource_mssql_sqlUtil.ts" Name="sqlUtil.ts" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\sqlUtil.ts" />
1837918370
</Component>
@@ -18397,6 +18388,9 @@
1839718388
<Component Id="public_app_plugins_datasource_mssql_azureauth_AzureAuthSettings_tsx">
1839818389
<File Id="public_app_plugins_datasource_mssql_azureauth_AzureAuthSettings.tsx" Name="AzureAuthSettings.tsx" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\azureauth\AzureAuthSettings.tsx" />
1839918390
</Component>
18391+
<Component Id="public_app_plugins_datasource_mssql_azureauth_AzureCredentials_ts">
18392+
<File Id="public_app_plugins_datasource_mssql_azureauth_AzureCredentials.ts" Name="AzureCredentials.ts" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\azureauth\AzureCredentials.ts" />
18393+
</Component>
1840018394
<Component Id="public_app_plugins_datasource_mssql_azureauth_AzureCredentialsConfig_ts">
1840118395
<File Id="public_app_plugins_datasource_mssql_azureauth_AzureCredentialsConfig.ts" Name="AzureCredentialsConfig.ts" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\azureauth\AzureCredentialsConfig.ts" />
1840218396
</Component>
@@ -18412,6 +18406,34 @@
1841218406
<File Id="public_app_plugins_datasource_mssql_configuration_Kerberos.tsx" Name="Kerberos.tsx" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\configuration\Kerberos.tsx" />
1841318407
</Component>
1841418408
</ComponentGroup>
18409+
<ComponentGroup Id="Grafana_public_app_plugins_datasource_mssql_dist__Components" Directory="PUBLICAPPPLUGINSDATASOURCEMSSQLDISTFOLDER">
18410+
<Component Id="public_app_plugins_datasource_mssql_dist_CHANGELOG_md">
18411+
<File Id="public_app_plugins_datasource_mssql_dist_CHANGELOG.md" Name="CHANGELOG.md" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\dist\CHANGELOG.md" />
18412+
</Component>
18413+
<Component Id="public_app_plugins_datasource_mssql_dist_LICENSE">
18414+
<File Id="public_app_plugins_datasource_mssql_dist_LICENSE" Name="LICENSE" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\dist\LICENSE" />
18415+
</Component>
18416+
<Component Id="public_app_plugins_datasource_mssql_dist_module_js">
18417+
<File Id="public_app_plugins_datasource_mssql_dist_module.js" Name="module.js" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\dist\module.js" />
18418+
</Component>
18419+
<Component Id="public_app_plugins_datasource_mssql_dist_module_js_LICENSE_txt">
18420+
<File Id="public_app_plugins_datasource_mssql_dist_module.js.LICENSE.txt" Name="module.js.LICENSE.txt" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\dist\module.js.LICENSE.txt" />
18421+
</Component>
18422+
<Component Id="public_app_plugins_datasource_mssql_dist_module_js_map">
18423+
<File Id="public_app_plugins_datasource_mssql_dist_module.js.map" Name="module.js.map" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\dist\module.js.map" />
18424+
</Component>
18425+
<Component Id="public_app_plugins_datasource_mssql_dist_plugin_json">
18426+
<File Id="public_app_plugins_datasource_mssql_dist_plugin.json" Name="plugin.json" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\dist\plugin.json" />
18427+
</Component>
18428+
<Component Id="public_app_plugins_datasource_mssql_dist_README_md">
18429+
<File Id="public_app_plugins_datasource_mssql_dist_README.md" Name="README.md" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\dist\README.md" />
18430+
</Component>
18431+
</ComponentGroup>
18432+
<ComponentGroup Id="Grafana_public_app_plugins_datasource_mssql_dist_img__Components" Directory="PUBLICAPPPLUGINSDATASOURCEMSSQLDISTIMGFOLDER">
18433+
<Component Id="public_app_plugins_datasource_mssql_dist_img_sql_server_logo_svg">
18434+
<File Id="public_app_plugins_datasource_mssql_dist_img_sql_server_logo.svg" Name="sql_server_logo.svg" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\dist\img\sql_server_logo.svg" />
18435+
</Component>
18436+
</ComponentGroup>
1841518437
<ComponentGroup Id="Grafana_public_app_plugins_datasource_mssql_img__Components" Directory="PUBLICAPPPLUGINSDATASOURCEMSSQLIMGFOLDER">
1841618438
<Component Id="public_app_plugins_datasource_mssql_img_sql_server_logo_svg">
1841718439
<File Id="public_app_plugins_datasource_mssql_img_sql_server_logo.svg" Name="sql_server_logo.svg" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\Grafana\public\app\plugins\datasource\mssql\img\sql_server_logo.svg" />

‎Source/Applications/openHistorian/openHistorianSetup/GrafanaFolders.wxi‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,9 @@
14051405
<Directory Id="PUBLICAPPPLUGINSDATASOURCEMSSQLFOLDER" Name="mssql">
14061406
<Directory Id="PUBLICAPPPLUGINSDATASOURCEMSSQLAZUREAUTHFOLDER" Name="azureauth" />
14071407
<Directory Id="PUBLICAPPPLUGINSDATASOURCEMSSQLCONFIGURATIONFOLDER" Name="configuration" />
1408+
<Directory Id="PUBLICAPPPLUGINSDATASOURCEMSSQLDISTFOLDER" Name="dist">
1409+
<Directory Id="PUBLICAPPPLUGINSDATASOURCEMSSQLDISTIMGFOLDER" Name="img" />
1410+
</Directory>
14081411
<Directory Id="PUBLICAPPPLUGINSDATASOURCEMSSQLIMGFOLDER" Name="img" />
14091412
</Directory>
14101413
<Directory Id="PUBLICAPPPLUGINSDATASOURCEMYSQLFOLDER" Name="mysql">

‎Source/Applications/openHistorian/openHistorianSetup/WebFeatures.wxi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<ComponentGroupRef Id="wwwroot_Content_fonts_Components" />
66
<ComponentGroupRef Id="wwwroot_Images_Components" />
77
<ComponentGroupRef Id="wwwroot_Images_Icons_Components" />
8+
<ComponentGroupRef Id="wwwroot_Images_Map_Components" />
89
<ComponentGroupRef Id="wwwroot_Panels_Components" />
910
<ComponentGroupRef Id="wwwroot_Scripts_Components" />
1011
</Feature>

‎Source/Applications/openHistorian/openHistorianSetup/WebFiles.wxi‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,11 @@
180180
<File Id="Images_Icons_openHistorianWebManager.ico" Name="openHistorianWebManager.ico" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\wwwroot\Images\Icons\openHistorianWebManager.ico" />
181181
</Component>
182182
</ComponentGroup>
183+
<ComponentGroup Id="wwwroot_Images_Map_Components" Directory="IMAGESMAPFOLDER">
184+
<Component Id="Images_Map_CenterMap_svg">
185+
<File Id="Images_Map_CenterMap.svg" Name="CenterMap.svg" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\wwwroot\Images\Map\CenterMap.svg" />
186+
</Component>
187+
</ComponentGroup>
183188
<ComponentGroup Id="wwwroot_Panels_Components" Directory="PANELSFOLDER">
184189
<Component Id="Panels_donut_svg">
185190
<File Id="Panels_donut.svg" Name="donut.svg" Source="$(var.SolutionDir)Applications\openHistorian\openHistorian\wwwroot\Panels\donut.svg" />

‎Source/Applications/openHistorian/openHistorianSetup/WebFolders.wxi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
</Directory>
66
<Directory Id="IMAGESFOLDER" Name="Images">
77
<Directory Id="IMAGESICONSFOLDER" Name="Icons" />
8+
<Directory Id="IMAGESMAPFOLDER" Name="Map" />
89
</Directory>
910
<Directory Id="PANELSFOLDER" Name="Panels" />
1011
<Directory Id="SCRIPTSFOLDER" Name="Scripts" />

0 commit comments

Comments
 (0)