Merge pull request #12 from skbkontur/packages_update

Packages update
skbkontur · Aug 21, 2020 · aefae3d · aefae3d
2 parents 78582e1 + 4b9dd48
commit aefae3d
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 16 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "jetbrains.resharper.globaltools": {
+      "version": "2020.2.0",
+      "commands": [
+        "jb"
+      ]
+    }
+  }
+}
diff --git a/Cassandra.ThriftClient.Tests/Cassandra.ThriftClient.Tests.csproj b/Cassandra.ThriftClient.Tests/Cassandra.ThriftClient.Tests.csproj
@@ -8,13 +8,13 @@
 
   <ItemGroup>
     <PackageReference Include="CassandraCSharpDriver" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Moq" Version="4.14.5" />
     <PackageReference Include="morelinq" Version="3.3.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="SkbKontur.Cassandra.Local" Version="1.4.1" />
-    <PackageReference Include="Vostok.Logging.File" Version="1.0.6" />
+    <PackageReference Include="Vostok.Logging.File" Version="1.0.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/CassandraFunctionalTestBase.cs b/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/CassandraFunctionalTestBase.cs
@@ -122,4 +122,4 @@ private static void RunMethodWithException<TE>(Action method, Action<TE> excepti
         protected IColumnFamilyConnection columnFamilyConnectionDefaultTtl;
         protected ICassandraSchemaActualizer cassandraSchemaActualizer;
     }
-}
+}
diff --git a/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/SchemaTests/ActualizeKeyspaceTest.cs b/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/SchemaTests/ActualizeKeyspaceTest.cs
@@ -208,4 +208,4 @@ public void TestUpdateColumnFamilyCaching()
         private CassandraClusterSpy cluster;
         private ICassandraSchemaActualizer cassandraSchemaActualizer;
     }
-}
+}
diff --git a/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/TimeBasedColumnFamilyConnectionTest.cs b/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/TimeBasedColumnFamilyConnectionTest.cs
@@ -164,4 +164,4 @@ private static void AssertColumn(TimeBasedColumn actual, byte expected)
 
         private ITimeBasedColumnFamilyConnection cfConnection;
     }
-}
+}
diff --git a/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/TimeBasedColumnFamilyTest.cs b/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/TimeBasedColumnFamilyTest.cs
@@ -147,4 +147,4 @@ private static TimeBasedColumn[] RandomColumnsByNode(int count)
 
         private IColumnFamilyConnectionImplementation cfConnection;
     }
-}
+}
diff --git a/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/UpdateKeyspaceTest.cs b/Cassandra.ThriftClient.Tests/FunctionalTests/Tests/UpdateKeyspaceTest.cs
@@ -130,4 +130,4 @@ public void TestActualizeColumnFamily()
             Assert.AreEqual(0.02d, actualColumnFamily.BloomFilterFpChance);
         }
     }
-}
+}
diff --git a/Cassandra.ThriftClient/Annotations.cs b/Cassandra.ThriftClient/Annotations.cs
@@ -204,19 +204,22 @@ internal enum ImplicitUseTargetFlags
     }
 
     /// <summary>
-    /// This attribute is intended to mark publicly available API
-    /// which should not be removed and so is treated as used.
+    ///     This attribute is intended to mark publicly available API
+    ///     which should not be removed and so is treated as used.
     /// </summary>
     [MeansImplicitUse(ImplicitUseTargetFlags.WithMembers)]
     internal sealed class PublicAPIAttribute : Attribute
     {
-        public PublicAPIAttribute() { }
+        public PublicAPIAttribute()
+        {
+        }
 
         public PublicAPIAttribute([NotNull] string comment)
         {
             Comment = comment;
         }
 
-        [CanBeNull] public string Comment { get; }
+        [CanBeNull]
+        public string Comment { get; }
     }
 }
diff --git a/Cassandra.ThriftClient/Cassandra.ThriftClient.csproj b/Cassandra.ThriftClient/Cassandra.ThriftClient.csproj
@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="SkbKontur.Cassandra.TimeGuid" Version="1.0.16" />
-    <PackageReference Include="SkbKontur.Metrics.Net" Version="1.0.15" />
-    <PackageReference Include="Vostok.Logging.Abstractions" Version="1.0.9" />
+    <PackageReference Include="SkbKontur.Metrics.Net" Version="1.0.20" />
+    <PackageReference Include="Vostok.Logging.Abstractions" Version="1.0.17" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.74" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/appveyor.yml b/appveyor.yml
@@ -28,12 +28,15 @@ nuget:
 before_build:
   - cmd: dotnet --info
   - cmd: dotnet restore ./Cassandra.ThriftClient.sln --verbosity minimal
+  - cmd: dotnet tool restore
 
 build_script:
   - cmd: dotnet build --configuration Release ./Cassandra.ThriftClient.sln
   - cmd: dotnet pack --no-build --configuration Release ./Cassandra.ThriftClient.sln
 
 test_script:
+  - cmd: dotnet jb cleanupcode Cassandra.ThriftClient.sln --profile=CatalogueCleanup --exclude=Cassandra.ThriftClient/Internal/**/*.cs --verbosity=WARN
+  - cmd: git diff --exit-code
   - cmd: dotnet test --no-build --verbosity normal --configuration Release ./Cassandra.ThriftClient.Tests/Cassandra.ThriftClient.Tests.csproj
 
 artifacts:
-Original file line number
+Diff line change
@@ Expand Up @@
             protected IColumnFamilyConnection columnFamilyConnectionDefaultTtl;
             protected ICassandraSchemaActualizer cassandraSchemaActualizer;
         }
-    }
+    }