Skip to content

Commit

Permalink
feat: drop support of .net standard (#69)
Browse files Browse the repository at this point in the history
  • Loading branch information
sergey-tihon authored Sep 8, 2023
1 parent f414e2b commit 75798f5
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 43 deletions.
2 changes: 1 addition & 1 deletion Clippit.Tests/Clippit.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<RollForward>LatestMajor</RollForward>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<LangVersion>latest</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion Clippit/Clippit.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>latest</LangVersion>
<AssemblyName>Clippit</AssemblyName>
<RootNamespace>Clippit</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion Clippit/Html/HtmlToWmlConverterCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2452,7 +2452,7 @@ private static SizeEmu GetImageSizeInEmus(XElement img, Image bmp)
{
var hres = bmp.Metadata.HorizontalResolution;
var vres = bmp.Metadata.VerticalResolution;
var s = bmp.Size();
var s = bmp.Size;
Emu cx = (long)((double)(s.Width / hres) * (double)Emu.s_EmusPerInch);
Emu cy = (long)((double)(s.Height / vres) * (double)Emu.s_EmusPerInch);

Expand Down
8 changes: 1 addition & 7 deletions Clippit/paket.template
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,16 @@ licenseUrl
requireLicenseAcceptance
false
copyright
Copyright 2012-2022
Copyright 2012-2023
tags
OpenXML PowerTools PowerPoint Word Excel HTML
description
Fresh PowerTools for OpenXml
files
bin/Release/netstandard2.0/Clippit.dll ==> lib/netstandard2.0
bin/Release/netstandard2.0/Clippit.pdb ==> lib/netstandard2.0
bin/Release/net6.0/Clippit.dll ==> lib/net6.0
bin/Release/net6.0/Clippit.pdb ==> lib/net6.0

dependencies
framework: netstandard20
DocumentFormat.OpenXml >= LOCKEDVERSION
DocumentFormat.OpenXml.Framework >= LOCKEDVERSION
SixLabors.ImageSharp.Drawing >= LOCKEDVERSION
framework: net6.0
DocumentFormat.OpenXml >= LOCKEDVERSION
DocumentFormat.OpenXml.Framework >= LOCKEDVERSION
Expand Down
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#### 2.0.0-theta-003 Sep 7, 2023
#### 2.0.0-theta-004 Sep 7, 2023
- Migration to .NET 6.0
- DocumentFormat.OpenXml 3.0.0-beta0003
- `System.Drawing.Common` replaced by `SixLabors.ImageSharp.Drawing`
Expand Down
4 changes: 2 additions & 2 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
source https://api.nuget.org/v3/index.json

storage: none
framework: net6.0, netstandard2.0
framework: net6.0

nuget DocumentFormat.OpenXml 3.0.0-beta0003
nuget DocumentFormat.OpenXml.Framework 3.0.0-beta0003
nuget SixLabors.ImageSharp.Drawing
nuget SixLabors.ImageSharp 2.1.5
nuget SixLabors.ImageSharp

nuget System.IO.Packaging
nuget Microsoft.NETCore.Platforms
Expand Down
41 changes: 11 additions & 30 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -1,58 +1,39 @@
STORAGE: NONE
RESTRICTION: || (== net6.0) (== netstandard2.0)
RESTRICTION: == net6.0
NUGET
remote: https://api.nuget.org/v3/index.json
DocumentFormat.OpenXml (3.0.0-beta0003)
DocumentFormat.OpenXml.Framework (>= 3.0.0-beta0003)
DocumentFormat.OpenXml.Framework (3.0.0-beta0003)
System.IO.Packaging (>= 7.0)
IDisposableAnalyzers (4.0.6)
Microsoft.CodeCoverage (17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
Microsoft.CodeCoverage (17.7.2)
Microsoft.NET.Test.Sdk (17.7.2)
Microsoft.CodeCoverage (>= 17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
Microsoft.TestPlatform.TestHost (>= 17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Microsoft.CodeCoverage (>= 17.7.2)
Microsoft.TestPlatform.TestHost (>= 17.7.2)
Microsoft.NETCore.Platforms (7.0.4)
Microsoft.TestPlatform.ObjectModel (17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Microsoft.TestPlatform.ObjectModel (17.7.2)
NuGet.Frameworks (>= 6.5)
System.Reflection.Metadata (>= 1.6)
Microsoft.TestPlatform.TestHost (17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Microsoft.TestPlatform.ObjectModel (>= 17.7.2) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Microsoft.TestPlatform.TestHost (17.7.2)
Microsoft.TestPlatform.ObjectModel (>= 17.7.2)
Newtonsoft.Json (>= 13.0.1)
NETStandard.Library (2.0.3)
Microsoft.NETCore.Platforms (>= 1.1)
Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
NuGet.Frameworks (6.7) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Newtonsoft.Json (13.0.3)
NuGet.Frameworks (6.7)
SixLabors.Fonts (1.0)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.7) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (== netstandard2.0)
SixLabors.ImageSharp (2.1.5)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0)
System.Memory (>= 4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 5.0)
System.Text.Encoding.CodePages (>= 5.0)
SixLabors.ImageSharp (3.0.2)
SixLabors.ImageSharp.Drawing (1.0)
SixLabors.Fonts (>= 1.0)
SixLabors.ImageSharp (>= 2.1.5)
System.Buffers (4.5.1) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0)
System.Collections.Immutable (7.0)
System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
System.IO.Packaging (7.0)
System.Memory (>= 4.5.5) - restriction: == netstandard2.0
System.Memory (4.5.5) - restriction: == netstandard2.0
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (4.5) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (== netstandard2.0)
System.Reflection.Metadata (7.0.2)
System.Collections.Immutable (>= 7.0)
System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (6.0)
System.Text.Encoding.CodePages (7.0)
System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
xunit (2.5)
xunit.analyzers (>= 1.2)
Expand Down

0 comments on commit 75798f5

Please sign in to comment.