Merge pull request #13 from skbkontur/a.dobrynin/net6-target

A.dobrynin/net6 target
skbkontur · Jan 23, 2023 · 3ba12ad · 3ba12ad
2 parents f716427 + a2305d8
commit 3ba12ad
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2021.2.2",
+      "version": "2022.3.1",
       "commands": [
         "jb"
       ]

diff --git a/Benchmark/Benchmark.csproj b/Benchmark/Benchmark.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/Excel.TemplateEngine.Tests/Excel.TemplateEngine.Tests.csproj b/Excel.TemplateEngine.Tests/Excel.TemplateEngine.Tests.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
-    <PackageReference Include="Vostok.Logging.Console" Version="1.0.6" />
+    <PackageReference Include="FluentAssertions" Version="6.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="Vostok.Logging.Console" Version="1.0.9" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Excel.TemplateEngine/Excel.TemplateEngine.csproj b/Excel.TemplateEngine/Excel.TemplateEngine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net471;netstandard2.0;net6.0</TargetFrameworks>
     <AssemblyName>SkbKontur.Excel.TemplateEngine</AssemblyName>
     <RootNamespace>$(AssemblyName)</RootNamespace>
     <LangVersion>latest</LangVersion>
@@ -10,9 +10,9 @@
   <ItemGroup>
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="C5" Version="2.5.3" />
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.14.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
-    <PackageReference Include="Vostok.Logging.Abstractions" Version="1.0.21" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+    <PackageReference Include="Vostok.Logging.Abstractions" Version="1.0.30" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net471'">

diff --git a/Excel.TemplateEngine/FileGenerating/Primitives/Implementations/ExcelWorksheet.cs b/Excel.TemplateEngine/FileGenerating/Primitives/Implementations/ExcelWorksheet.cs
@@ -20,6 +20,7 @@
 using Vostok.Logging.Abstractions;
 
 using Tuple = System.Tuple;
+using NotNullAttribute = JetBrains.Annotations.NotNullAttribute;
 
 namespace SkbKontur.Excel.TemplateEngine.FileGenerating.Primitives.Implementations
 {