Skip to content

Commit d354405

Browse files
StephenMolloyStephenMolloy
authored
Merge pull request #104 from aspnet/ConfigHydration
Config hydration
2 parents 213c6bd + 47077c8 commit d354405

17 files changed

Lines changed: 388 additions & 525 deletions

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.nuproj‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,41 @@
2929
<Source>$(OutputPath)</Source>
3030
<Destination>tasks</Destination>
3131
</NuGetContent>
32-
<NuGetContent Include="Content\net45\*">
33-
<Destination>content\net45</Destination>
32+
<NuGetContent Include="Content\config.install.xdt">
33+
<Destination>content\net45\app.config.install.xdt</Destination>
3434
</NuGetContent>
35-
<NuGetContent Include="Content\net46\*">
36-
<Destination>content\net46</Destination>
35+
<NuGetContent Include="Content\config.install.xdt">
36+
<Destination>content\net45\web.config.install.xdt</Destination>
3737
</NuGetContent>
38-
<NuGetContent Include="Content\net472\*">
39-
<Destination>content\net472</Destination>
38+
<NuGetContent Include="Content\config.uninstall.xdt">
39+
<Destination>content\net45\app.config.uninstall.xdt</Destination>
40+
</NuGetContent>
41+
<NuGetContent Include="Content\config.uninstall.xdt">
42+
<Destination>content\net45\web.config.uninstall.xdt</Destination>
43+
</NuGetContent>
44+
<NuGetContent Include="Content\config.install.xdt">
45+
<Destination>content\net46\app.config.install.xdt</Destination>
46+
</NuGetContent>
47+
<NuGetContent Include="Content\config.install.xdt">
48+
<Destination>content\net46\web.config.install.xdt</Destination>
49+
</NuGetContent>
50+
<NuGetContent Include="Content\config.uninstall.xdt">
51+
<Destination>content\net46\app.config.uninstall.xdt</Destination>
52+
</NuGetContent>
53+
<NuGetContent Include="Content\config.uninstall.xdt">
54+
<Destination>content\net46\web.config.uninstall.xdt</Destination>
55+
</NuGetContent>
56+
<NuGetContent Include="Content\config.install.xdt">
57+
<Destination>content\net472\app.config.install.xdt</Destination>
58+
</NuGetContent>
59+
<NuGetContent Include="Content\config.install.xdt">
60+
<Destination>content\net472\web.config.install.xdt</Destination>
61+
</NuGetContent>
62+
<NuGetContent Include="Content\config.uninstall.xdt">
63+
<Destination>content\net472\app.config.uninstall.xdt</Destination>
64+
</NuGetContent>
65+
<NuGetContent Include="Content\config.uninstall.xdt">
66+
<Destination>content\net472\web.config.uninstall.xdt</Destination>
4067
</NuGetContent>
4168
<NuGetContent Include="build\*">
4269
<Destination>build\net45</Destination>

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/app.config.uninstall.xdt renamed to src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/config.install.xdt

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
3-
<appSettings>
4-
<add key="aspnet:RoslynCompilerLocation" value="roslyn" xdt:Transform="Remove" xdt:Locator="Match(key)" />
5-
</appSettings>
6-
<appSettings xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)">
7-
</appSettings>
83

4+
<!-- If system.codedom tag is absent -->
5+
<system.codedom xdt:Transform="InsertIfMissing">
6+
</system.codedom>
7+
8+
<!-- If compilers tag is absent -->
9+
<system.codedom>
10+
<compilers xdt:Transform="InsertIfMissing" />
11+
</system.codedom>
12+
13+
<!-- If a .cs compiler is already present, the existing entry needs to be removed before inserting the new entry -->
914
<system.codedom>
1015
<compilers>
1116
<compiler
@@ -14,6 +19,8 @@
1419
xdt:Locator="Match(extension)" />
1520
</compilers>
1621
</system.codedom>
22+
23+
<!-- If a .vb compiler is already present, the existing entry needs to be removed before inserting the new entry -->
1724
<system.codedom>
1825
<compilers>
1926
<compiler
@@ -22,8 +29,5 @@
2229
xdt:Locator="Match(extension)" />
2330
</compilers>
2431
</system.codedom>
25-
<system.codedom>
26-
<compilers xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)" />
27-
</system.codedom>
28-
<system.codedom xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)" />
32+
2933
</configuration>

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/app.config.uninstall.xdt renamed to src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/config.uninstall.xdt

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,10 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
33
<appSettings>
4-
<add key="aspnet:RoslynCompilerLocation" value="roslyn" xdt:Transform="Remove" xdt:Locator="Match(key)" />
4+
<add key="aspnet:RoslynCompilerLocation" value="roslyn" xdt:Transform="Remove" xdt:Locator="Condition(@key='aspnet:RoslynCompilerLocation' and @value='roslyn')" />
55
</appSettings>
66
<appSettings xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)">
77
</appSettings>
8-
9-
<system.codedom>
10-
<compilers>
11-
<compiler
12-
extension=".cs"
13-
xdt:Transform="Remove"
14-
xdt:Locator="Match(extension)" />
15-
</compilers>
16-
</system.codedom>
17-
<system.codedom>
18-
<compilers>
19-
<compiler
20-
extension=".vb"
21-
xdt:Transform="Remove"
22-
xdt:Locator="Match(extension)" />
23-
</compilers>
24-
</system.codedom>
258
<system.codedom>
269
<compilers xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)" />
2710
</system.codedom>

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/app.config.install.xdt‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.install.xdt‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.uninstall.xdt‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/app.config.install.xdt‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.install.xdt‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)