Add config de/hydration to un/install to support updates without clob…

…bering custom config changes from users.
aspnet · May 1, 2020 · 516bceb · 516bceb
1 parent 213c6bd
commit 516bceb
Show file tree

Hide file tree

Showing 17 changed files with 351 additions and 472 deletions.
diff --git a/...roviders.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.nuproj b/...roviders.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.nuproj
@@ -29,14 +29,41 @@
       <Source>$(OutputPath)</Source>
       <Destination>tasks</Destination>
     </NuGetContent>
-    <NuGetContent Include="Content\net45\*">
-      <Destination>content\net45</Destination>
+    <NuGetContent Include="Content\config.install.xdt">
+      <Destination>content\net45\app.config.install.xdt</Destination>
     </NuGetContent>
-    <NuGetContent Include="Content\net46\*">
-      <Destination>content\net46</Destination>
+    <NuGetContent Include="Content\config.install.xdt">
+      <Destination>content\net45\web.config.install.xdt</Destination>
     </NuGetContent>
-    <NuGetContent Include="Content\net472\*">
-      <Destination>content\net472</Destination>
+    <NuGetContent Include="Content\config.uninstall.xdt">
+      <Destination>content\net45\app.config.uninstall.xdt</Destination>
+    </NuGetContent>
+    <NuGetContent Include="Content\config.uninstall.xdt">
+      <Destination>content\net45\web.config.uninstall.xdt</Destination>
+    </NuGetContent>
+    <NuGetContent Include="Content\config.install.xdt">
+      <Destination>content\net46\app.config.install.xdt</Destination>
+    </NuGetContent>
+    <NuGetContent Include="Content\config.install.xdt">
+      <Destination>content\net46\web.config.install.xdt</Destination>
+    </NuGetContent>
+    <NuGetContent Include="Content\config.uninstall.xdt">
+      <Destination>content\net46\app.config.uninstall.xdt</Destination>
+    </NuGetContent>
+    <NuGetContent Include="Content\config.uninstall.xdt">
+      <Destination>content\net46\web.config.uninstall.xdt</Destination>
+    </NuGetContent>
+    <NuGetContent Include="Content\config.install.xdt">
+      <Destination>content\net472\app.config.install.xdt</Destination>
+    </NuGetContent>
+    <NuGetContent Include="Content\config.install.xdt">
+      <Destination>content\net472\web.config.install.xdt</Destination>
+    </NuGetContent>
+    <NuGetContent Include="Content\config.uninstall.xdt">
+      <Destination>content\net472\app.config.uninstall.xdt</Destination>
+    </NuGetContent>
+    <NuGetContent Include="Content\config.uninstall.xdt">
+      <Destination>content\net472\web.config.uninstall.xdt</Destination>
     </NuGetContent>
     <NuGetContent Include="build\*">
       <Destination>build\net45</Destination>

diff --git a/...form/content/net45/web.config.install.xdt → ...mpilerPlatform/content/config.install.xdt b/...form/content/net45/web.config.install.xdt → ...mpilerPlatform/content/config.install.xdt
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+
   <!-- If system.codedom tag is absent -->
   <system.codedom xdt:Transform="InsertIfMissing">
   </system.codedom>
@@ -23,13 +24,7 @@
   <!-- Inserting the new compiler -->
   <system.codedom>
     <compilers>
-      <compiler
-        language="c#;cs;csharp"
-        extension=".cs"
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-        warningLevel="4"
-        compilerOptions="/langversion:6 /nowarn:1659;1699;1701;612;618"
-        xdt:Transform="Insert" />
+      <compiler extension=".cs" xdt:Transform="Insert" />
     </compilers>
   </system.codedom>
 
@@ -46,13 +41,7 @@
   <!-- Inserting the new compiler -->
   <system.codedom>
     <compilers>
-      <compiler
-        language="vb;vbs;visualbasic;vbscript"
-        extension=".vb"
-        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-        warningLevel="4"
-        compilerOptions="/langversion:14 /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
-        xdt:Transform="Insert" />
+      <compiler extension=".vb" xdt:Transform="Insert" />
     </compilers>
   </system.codedom>
 </configuration>
diff --git a/...rm/content/net46/app.config.uninstall.xdt → ...ilerPlatform/content/config.uninstall.xdt b/...rm/content/net46/app.config.uninstall.xdt → ...ilerPlatform/content/config.uninstall.xdt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <appSettings>
-    <add key="aspnet:RoslynCompilerLocation" value="roslyn" xdt:Transform="Remove" xdt:Locator="Match(key)" />
+    <add key="aspnet:RoslynCompilerLocation" value="roslyn" xdt:Transform="Remove" xdt:Locator="Condition(@key='aspnet:RoslynCompilerLocation' and @value='roslyn')" />
   </appSettings>
   <appSettings xdt:Transform="Remove" xdt:Locator="Condition(count(child::*) = 0)">
   </appSettings>

diff --git a/...s/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/app.config.install.xdt b/...s/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/app.config.install.xdt
diff --git a/...Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/app.config.uninstall.xdt b/...Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/app.config.uninstall.xdt
diff --git a/...Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.uninstall.xdt b/...Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net45/web.config.uninstall.xdt
diff --git a/...s/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/app.config.install.xdt b/...s/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/app.config.install.xdt
diff --git a/...s/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.install.xdt b/...s/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.install.xdt
diff --git a/...Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.uninstall.xdt b/...Microsoft.CodeDom.Providers.DotNetCompilerPlatform/content/net46/web.config.uninstall.xdt