Remove explicit System.IO.Packaging for SDK

dotnet · Jun 28, 2023 · a687fea · a687fea
1 parent e2b8a44
commit a687fea
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 110 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -111,6 +111,8 @@
   <PropertyGroup>
     <SupportsNetStandard>true</SupportsNetStandard>
     <SupportsNetStandard Condition=" '$(TargetFramework)' == 'net35' OR '$(TargetFramework)' == 'net40' OR '$(TargetFramework)' == 'net452'  OR '$(TargetFramework)' == 'net46' ">false</SupportsNetStandard>
+    <IsFramework>false</IsFramework>
+    <IsFramework Condition=" '$(TargetFramework)' == 'net35' AND '$(TargetFramework)' == 'net40' AND '$(TargetFramework)' == 'net46' ">true</IsFramework>
   </PropertyGroup>
 
   <Target Name="UnknownProjectLoadStyle" BeforeTargets="Build" Condition="$(__InvalidProjectLoadStyle)">

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -6,6 +6,11 @@
     <!--<PackageValidationBaselineVersion>2.18.0</PackageValidationBaselineVersion>-->
   </PropertyGroup>
 
+  <ItemGroup Condition="$(IsFramework)">
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+
   <Import Project="$(MSBuildThisFileDirectory)\PEVerify.targets" />
 
   <Import Project="..\Directory.Build.targets" />

diff --git a/src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj b/src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj
@@ -29,46 +29,9 @@
     <RootNamespace>DocumentFormat.OpenXml</RootNamespace>
   </PropertyGroup>
 
-  <Choose>
-    <When Condition=" '$(TargetFramework)' == 'net35'">
-      <PropertyGroup>
-        <CompileWithPeVerify>true</CompileWithPeVerify>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-      </ItemGroup>
-    </When>
-
-    <When Condition=" '$(TargetFramework)' == 'net40' ">
-      <PropertyGroup>
-        <CompileWithPeVerify>true</CompileWithPeVerify>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-      </ItemGroup>
-    </When>
-
-    <When Condition=" '$(TargetFramework)' == 'net46' ">
-      <PropertyGroup>
-        <CompileWithPeVerify>true</CompileWithPeVerify>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-      </ItemGroup>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">
-      <ItemGroup>
-        <PackageReference Include="System.IO.Packaging" />
-      </ItemGroup>
-    </When>
-  </Choose>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">
+    <PackageReference Include="System.IO.Packaging" />
+  </ItemGroup>
 
   <ItemGroup>
     <Compile Update="Resources\ExceptionMessages.Designer.cs">

diff --git a/src/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Linq.csproj b/src/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Linq.csproj
@@ -18,31 +18,8 @@
     <ProjectReference Include="..\DocumentFormat.OpenXml.Framework\DocumentFormat.OpenXml.Framework.csproj" />
   </ItemGroup>
 
-  <Choose>
-    <When Condition=" '$(TargetFramework)' == 'net35'">
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-        <Reference Include="System.Xml.Linq" />
-      </ItemGroup>
-    </When>
-
-    <When Condition=" '$(TargetFramework)' == 'net40'">
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-        <Reference Include="System.Xml.Linq" />
-      </ItemGroup>
-    </When>
-
-    <When Condition=" '$(TargetFramework)' == 'net46'">
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-        <Reference Include="System.Xml.Linq" />
-      </ItemGroup>
-    </When>
-
-  </Choose>
+  <ItemGroup Condition="$(IsFramework)">
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/DocumentFormat.OpenXml/DocumentFormat.OpenXml.csproj b/src/DocumentFormat.OpenXml/DocumentFormat.OpenXml.csproj
@@ -35,45 +35,4 @@
     <ProjectReference Include="../DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj" />
   </ItemGroup>
 
-  <Choose>
-    <When Condition=" '$(TargetFramework)' == 'net35'">
-      <PropertyGroup>
-        <CompileWithPeVerify>true</CompileWithPeVerify>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-      </ItemGroup>
-    </When>
-
-    <When Condition=" '$(TargetFramework)' == 'net40' ">
-      <PropertyGroup>
-        <CompileWithPeVerify>true</CompileWithPeVerify>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-      </ItemGroup>
-    </When>
-
-    <When Condition=" '$(TargetFramework)' == 'net46' ">
-      <PropertyGroup>
-        <CompileWithPeVerify>true</CompileWithPeVerify>
-      </PropertyGroup>
-
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Xml" />
-      </ItemGroup>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">
-      <ItemGroup>
-        <PackageReference Include="System.IO.Packaging" />
-      </ItemGroup>
-    </When>
-  </Choose>
-
 </Project>
diff --git a/src/PEVerify.targets b/src/PEVerify.targets
@@ -3,15 +3,14 @@
   <PropertyGroup>
     <!-- .NET Framework builds should pass PEVerify -->
     <RunPeVerify Condition=" '$(RunPeVerify)' == '' ">false</RunPeVerify>
-    <CompileWithPeVerify Condition=" '$(CompileWithPeVerify)' == '' ">false</CompileWithPeVerify>
     <PeVerifyPath Condition=" '$(PeVerifyPath)' == '' ">C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\PEVerify.exe</PeVerifyPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(CompileWithPeVerify)">
+  <PropertyGroup Condition="$(IsFramework)">
     <Features>$(Features);peverify-compat</Features>
   </PropertyGroup>
 
-  <Target Name="Run PEVerify" AfterTargets="Build" Condition="$(CompileWithPeVerify) AND $(RunPeVerify)">
+  <Target Name="Run PEVerify" AfterTargets="Build" Condition="$(IsFramework) AND $(RunPeVerify)">
     <ItemGroup>
         <_OutputFileToVerify Include="@(FileWrites)" Condition="'%(Extension)' == '.dll' AND $([System.Text.RegularExpressions.Regex]::IsMatch('%(FullPath)', '.+\\bin\\.+'))" />
     </ItemGroup>