Tweak web.config handling

Exclude web.config and web.*.config from default items. Pull in web.config, web.{Configuration}.config, web.{PublishProfile}.config files based on EnableWebFormsDefaultItems setting
CZEMacLeod · Mar 13, 2022 · 2da79a2 · 2da79a2
1 parent 3f42bb4
commit 2da79a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultItems.props b/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultItems.props
@@ -9,7 +9,7 @@
   <ItemGroup Condition="'$(EnableWebFormsDefaultItems)'=='true'">
     <Content Include="Web.config" />
     <_WebConfigConfigurations Include="$(Configurations)" />
-    <None Update="@(_WebConfigConfigurations->'Web.%(Identity).config')">
+    <None Include="@(_WebConfigConfigurations->'Web.%(Identity).config')">
       <DependentUpon>Web.config</DependentUpon>
     </None>
     <Content Include="Web.*.config" Exclude="@(_WebConfigConfigurations->'Web.%(Identity).config')">

diff --git a/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultItems.targets b/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultItems.targets
@@ -8,6 +8,7 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);**\*.aspx;*.aspx</DefaultItemExcludes>
     <DefaultItemExcludes>$(DefaultItemExcludes);**\*.master;*.master</DefaultItemExcludes>
     <DefaultItemExcludes>$(DefaultItemExcludes);**\*.svc;*.svc</DefaultItemExcludes>
+    <DefaultItemExcludes>$(DefaultItemExcludes);web.config;web.*.config</DefaultItemExcludes>
     <!-- DefaultWebFormsItemExcludes prevents including build and publish outputs - Closes #25 -->
     <DefaultWebFormsItemExcludes Condition="'$(DefaultWebFormsItemExcludes)'!=''">$(DefaultWebFormsItemExcludes);</DefaultWebFormsItemExcludes>
     <DefaultWebFormsItemExcludes>$(DefaultWebFormsItemExcludes)$([MSBuild]::EnsureTrailingSlash($(OutputPath)))**</DefaultWebFormsItemExcludes>