Skip to content

Commit b077d01

Browse files
StephenMolloyStephenMolloy
committed
Make config handling consistent on install/uninstall across all providers.
1 parent b81f88c commit b077d01

File tree

7 files changed

+30
-7
lines changed

7 files changed

+30
-7
lines changed

‎src/packages/ConfigurationBuilders.Azure.nupkg/content/Net471/config.uninstall.xdt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</builders>
88
</configBuilders>
99

10-
<configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
11-
1210
<configSections>
1311
<section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
1412
</configSections>
1513

1614
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
1715

16+
<configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
17+
1818
</configuration>

‎src/packages/ConfigurationBuilders.Base.nupkg/content/Net471/config.uninstall.xdt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
33

4-
<configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
5-
64
<configSections>
75
<section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
86
</configSections>
97

108
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
119

10+
<configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
11+
1212
</configuration>

‎src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.install.xdt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
33

4+
<configSections xdt:Transform="InsertBefore(/configuration/*[1])" />
5+
<configSections xdt:Locator="XPath(/configuration/configSections[last()])">
6+
<section name="configBuilders" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false"/>
7+
</configSections>
8+
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
9+
410
<configBuilders xdt:Transform="InsertAfter(/configuration/configSections)" />
511
<configBuilders xdt:Locator="XPath(/configuration/configBuilders[last()])">
612
<builders xdt:Transform="InsertIfMissing">

‎src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.uninstall.xdt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
</builders>
88
</configBuilders>
99

10+
<configSections>
11+
<section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
12+
</configSections>
13+
14+
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
15+
1016
<configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
1117

1218
</configuration>

‎src/packages/ConfigurationBuilders.Json.nupkg/content/Net471/config.uninstall.xdt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</builders>
88
</configBuilders>
99

10-
<configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
11-
1210
<configSections>
1311
<section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
1412
</configSections>
1513

1614
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
1715

16+
<configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
17+
1818
</configuration>

‎src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.install.xdt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
33

4-
<configBuilders xdt:Transform="InsertAfter(/configuration/configSections)" />
4+
<configSections xdt:Transform="InsertBefore(/configuration/*[1])" />
5+
<configSections xdt:Locator="XPath(/configuration/configSections[last()])">
6+
<section name="configBuilders" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false"/>
7+
</configSections>
8+
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
59

610
<!-- Always configure for ${UserSecretsId}, since the VS dev scenario is the target use case for this feature -->
11+
<configBuilders xdt:Transform="InsertAfter(/configuration/configSections)" />
712
<configBuilders xdt:Locator="XPath(/configuration/configBuilders[last()])">
813
<builders xdt:Transform="InsertIfMissing">
914
<add name="Secrets" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" userSecretsId="${UserSecretsId}" type="Microsoft.Configuration.ConfigurationBuilders.UserSecretsConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.UserSecrets, Version=$version$, Culture=neutral" />

‎src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.uninstall.xdt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
</builders>
88
</configBuilders>
99

10+
<configSections>
11+
<section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
12+
</configSections>
13+
14+
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
15+
1016
<configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
1117

1218
</configuration>

0 commit comments

Comments
 (0)