Add .svc extension to default items

CZEMacLeod · Mar 13, 2022 · 3f42bb4 · 3f42bb4
1 parent 30ca616
commit 3f42bb4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultItems.props b/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultItems.props
@@ -1,5 +1,12 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Condition="'$(EnableDefaultItems)'=='true'">
+
+  <!-- EnableWebFormsDefaultItems follows EnableSystemWebDefaultItems and adds WebForms items as content - Closes #24 -->
+  <PropertyGroup>
+    <EnableWebFormsDefaultItems Condition="'$(EnableWebFormsDefaultItems)'==''">$(EnableDefaultItems)</EnableWebFormsDefaultItems>
+    <EnableWebFormsDefaultItems Condition="'$(EnableWebFormsDefaultItems)'==''">true</EnableWebFormsDefaultItems> <!-- If $(EnableDefaultItems) is undefined-->
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(EnableWebFormsDefaultItems)'=='true'">
     <Content Include="Web.config" />
     <_WebConfigConfigurations Include="$(Configurations)" />
     <None Update="@(_WebConfigConfigurations->'Web.%(Identity).config')">
@@ -53,11 +60,6 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);**\bower_components\**;bower_components\**</DefaultItemExcludes>
   </PropertyGroup>
 
-  <!-- EnableWebFormsDefaultItems follows EnableDefaultItems and adds WebForms items as content - Closes #24 -->
-  <PropertyGroup>
-    <EnableWebFormsDefaultItems Condition="'$(EnableWebFormsDefaultItems)'==''">$(EnableDefaultItems)</EnableWebFormsDefaultItems>
-  </PropertyGroup>
-
   <!-- Include WebForms items as content -->
   <ItemGroup Condition="'$(EnableWebFormsDefaultItems)'=='true'">
     <Content Include="**\*.asax" Exclude="$(DefaultWebFormsItemExcludes)" />
@@ -66,5 +68,6 @@
     <Content Include="**\*.asmx" Exclude="$(DefaultWebFormsItemExcludes)" />
     <Content Include="**\*.aspx" Exclude="$(DefaultWebFormsItemExcludes)" />
     <Content Include="**\*.master" Exclude="$(DefaultWebFormsItemExcludes)" />
+    <Content Include="**\*.svc" Exclude="$(DefaultWebFormsItemExcludes)" />
   </ItemGroup>
 </Project>
diff --git a/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultItems.targets b/src/MSBuild.SDK.SystemWeb/Sdk/MSBuild.SDK.SystemWeb.DefaultItems.targets
@@ -7,6 +7,7 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);**\*.asmx;*.asmx</DefaultItemExcludes>
     <DefaultItemExcludes>$(DefaultItemExcludes);**\*.aspx;*.aspx</DefaultItemExcludes>
     <DefaultItemExcludes>$(DefaultItemExcludes);**\*.master;*.master</DefaultItemExcludes>
+    <DefaultItemExcludes>$(DefaultItemExcludes);**\*.svc;*.svc</DefaultItemExcludes>
     <!-- DefaultWebFormsItemExcludes prevents including build and publish outputs - Closes #25 -->
     <DefaultWebFormsItemExcludes Condition="'$(DefaultWebFormsItemExcludes)'!=''">$(DefaultWebFormsItemExcludes);</DefaultWebFormsItemExcludes>
     <DefaultWebFormsItemExcludes>$(DefaultWebFormsItemExcludes)$([MSBuild]::EnsureTrailingSlash($(OutputPath)))**</DefaultWebFormsItemExcludes>