Skip to content

Commit

Permalink
Packages + .NET Standard 2.0 and .NET 6 as targets
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Vallet committed Nov 30, 2021
1 parent 1990e7f commit 4b7db32
Show file tree
Hide file tree
Showing 35 changed files with 224 additions and 74 deletions.
56 changes: 33 additions & 23 deletions OpenXmlPowerTools.Tests/OpenXmlPowerTools.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,30 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;net461;netcoreapp2.0</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net452;net461;net6.0</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="xunit.runner.console" Version="2.4.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.runner.console" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>

</Project>
44 changes: 26 additions & 18 deletions OpenXmlPowerTools/OpenXmlPowerTools.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;net46;netstandard2.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net45;net46;netstandard2.0;net5.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45'">
<Reference Include="System.IO.Compression" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45'">
<Reference Include="System.IO.Compression" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="System.IO.Compression" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="System.IO.Compression" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Drawing.Common" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Drawing.Common" Version="4.5.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Drawing.Common" Version="6.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion OpenXmlPowerToolsExamples/Formulas01/Formulas01.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

<ItemGroup>
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.8.1" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
</ItemGroup>

<ItemGroup>
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
</ItemGroup>
</Project>
Loading

0 comments on commit 4b7db32

Please sign in to comment.