Merge pull request #993 from SixLabors/js/update-submodule

Beta7

.editorconfig

@@ -79,6 +79,7 @@ dotnet_naming_rule.private_and_internal_fields_should_be_camel_case.symbols = pr
 dotnet_naming_rule.public_and_protected_declarations_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.public_and_protected_declarations_should_be_pascal_case.style = pascal_case
 dotnet_naming_rule.public_and_protected_declarations_should_be_pascal_case.symbols = public_and_protected_declarations
+dotnet_naming_symbols.public_and_protected_declarations.applicable_kinds = method, field, event, property
 
 dotnet_naming_rule.static_readonly_declarations_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.static_readonly_declarations_should_be_pascal_case.style = pascal_case
@@ -322,11 +323,11 @@ csharp_space_between_square_brackets = false
 #   suggest conditional delegate calls,
 #   suggest deconstructed variable declarations,
 #   generate expression-bodied accessors,
-#   don't generate expression-bodied constructors,
+#   generate expression-bodied constructors,
 #   generate expression-bodied indexers,
 #   generate expression-bodied lambdas,
-#   don't generate expression-bodied methods,
-#   don't generate expression-bodied operators,
+#   generate expression-bodied methods,
+#   generate expression-bodied operators,
 #   generate expression-bodied properties,
 #   suggest inlined variable declarations,
 #   suggest local over anonymous functions,
@@ -348,11 +349,11 @@ csharp_style_conditional_delegate_call = true:suggestion
 csharp_style_deconstructed_variable_declaration = true:suggestion
 
 csharp_style_expression_bodied_accessors = true:silent
-csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_constructors = true:silent
 csharp_style_expression_bodied_indexers = true:silent
 csharp_style_expression_bodied_lambdas = true:silent
-csharp_style_expression_bodied_methods = false:silent
-csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_methods = true:silent
+csharp_style_expression_bodied_operators = true:silent
 csharp_style_expression_bodied_properties = true:silent
 
 csharp_style_inlined_variable_declaration = true:suggestion

.gitmodules

@@ -2,6 +2,6 @@
 	path = tests/Images/External
 	url = https://github.com/SixLabors/Imagesharp.Tests.Images.git
 	branch = master
-[submodule "standards"]
-	path = standards
-	url = https://github.com/SixLabors/Standards
+[submodule "shared-infrastructure"]
+	path = shared-infrastructure
+	url = https://github.com/SixLabors/SharedInfrastructure

Directory.Build.props

@@ -52,7 +52,7 @@
 
   <!-- Default settings that are otherwise undefined -->
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)standards/SixLabors.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk</AssemblyOriginatorKeyFile>
     <Copyright>Copyright © Six Labors and Contributors</Copyright>
     <Features>strict;IOperation</Features>
     <HighEntropyVA>true</HighEntropyVA>

Directory.Build.targets

@@ -28,10 +28,10 @@
     <PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.1.0" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Update="Moq" Version="4.10.0" />
-    <PackageReference Update="SixLabors.Core" Version="1.0.0-dev000101" />
-    <PackageReference Update="SixLabors.Fonts" Version="1.0.0-beta0008" />
-    <PackageReference Update="SixLabors.Shapes" Version="1.0.0-beta0008" />
-    <PackageReference Update="SixLabors.Shapes.Text" Version="1.0.0-beta0007" />
+    <PackageReference Update="SixLabors.Core" Version="1.0.0-beta0008" />
+    <PackageReference Update="SixLabors.Fonts" Version="1.0.0-beta0009" />
+    <PackageReference Update="SixLabors.Shapes" Version="1.0.0-beta0009" />
+    <PackageReference Update="SixLabors.Shapes.Text" Version="1.0.0-beta0009" />
     <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
     <PackageReference Update="System.Drawing.Common" Version="4.5.1" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />

ImageSharp.sln

@@ -21,7 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 		LICENSE = LICENSE
 		README.md = README.md
 		run-tests.ps1 = run-tests.ps1
-		stylecop.json = stylecop.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1799C43E-5C54-4A8F-8D64-B1475241DB0D}"

src/Directory.Build.props

@@ -18,12 +18,12 @@
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
 
   <PropertyGroup>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\shared-infrastructure\SixLabors.ruleset</CodeAnalysisRuleSet>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)..\standards\stylecop.json" />
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)..\shared-infrastructure\stylecop.json" />
   </ItemGroup>
 
   <ItemGroup>

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -11,6 +11,15 @@
     <TargetFrameworks>netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
+  <!-- TODO: Include .NETSTANDARD2.1 when released-->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp2')) ">
+    <DefineConstants>$(DefineConstants);SUPPORTS_MATHF</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp2.1')) ">
+    <DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="SixLabors.Fonts" />
     <PackageReference Include="SixLabors.Shapes" />

src/ImageSharp/Common/Helpers/DebugGuard.cs

@@ -1,168 +1,17 @@
-// Copyright (c) Six Labors and contributors.
+// Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
 using System.Diagnostics;
 
 // TODO: These should just call the guard equivalents
-namespace SixLabors.ImageSharp
+namespace SixLabors
 {
     /// <summary>
     /// Provides methods to protect against invalid parameters for a DEBUG build.
     /// </summary>
-    [DebuggerStepThrough]
-    internal static class DebugGuard
+    internal static partial class DebugGuard
     {
-        /// <summary>
-        /// Verifies, that the method parameter with specified object value is not null
-        /// and throws an exception if it is found to be so.
-        /// </summary>
-        /// <param name="value">The target object, which cannot be null.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <exception cref="ArgumentNullException"><paramref name="value"/> is null</exception>
-        [Conditional("DEBUG")]
-        public static void NotNull<T>(T value, string parameterName)
-            where T : class
-        {
-            if (value is null)
-            {
-                throw new ArgumentNullException(parameterName);
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is less than a maximum value
-        /// and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="max">The maximum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is greater than the maximum value.
-        /// </exception>
-        [Conditional("DEBUG")]
-        public static void MustBeLessThan<TValue>(TValue value, TValue max, string parameterName)
-                    where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(max) >= 0)
-            {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be less than {max}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is less than or equal to a maximum value
-        /// and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="max">The maximum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is greater than the maximum value.
-        /// </exception>
-        [Conditional("DEBUG")]
-        public static void MustBeLessThanOrEqualTo<TValue>(TValue value, TValue max, string parameterName)
-                    where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(max) > 0)
-            {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be less than or equal to {max}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is greater than a minimum value
-        /// and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="min">The minimum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is less than the minimum value.
-        /// </exception>
-        [Conditional("DEBUG")]
-        public static void MustBeGreaterThan<TValue>(TValue value, TValue min, string parameterName)
-            where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(min) <= 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    parameterName,
-                    $"Value must be greater than {min}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is greater than or equal to a minimum value
-        /// and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="min">The minimum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is less than the minimum value.
-        /// </exception>
-        [Conditional("DEBUG")]
-        public static void MustBeGreaterThanOrEqualTo<TValue>(TValue value, TValue min, string parameterName)
-            where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(min) < 0)
-            {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be greater than or equal to {min}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the specified value is greater than or equal to a minimum value and less than
-        /// or equal to a maximum value and throws an exception if it is not.
-        /// </summary>
-        /// <param name="value">The target value, which should be validated.</param>
-        /// <param name="min">The minimum value.</param>
-        /// <param name="max">The maximum value.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <typeparam name="TValue">The type of the value.</typeparam>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="value"/> is less than the minimum value of greater than the maximum value.
-        /// </exception>
-        [Conditional("DEBUG")]
-        public static void MustBeBetweenOrEqualTo<TValue>(TValue value, TValue min, TValue max, string parameterName)
-           where TValue : IComparable<TValue>
-        {
-            if (value.CompareTo(min) < 0 || value.CompareTo(max) > 0)
-            {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value {value} must be greater than or equal to {min} and less than or equal to {max}.");
-            }
-        }
-
-        /// <summary>
-        /// Verifies, that the method parameter with specified target value is true
-        /// and throws an exception if it is found to be so.
-        /// </summary>
-        /// <param name="target">
-        /// The target value, which cannot be false.
-        /// </param>
-        /// <param name="parameterName">
-        /// The name of the parameter that is to be checked.
-        /// </param>
-        /// <param name="message">
-        /// The error message, if any to add to the exception.
-        /// </param>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="target"/> is false
-        /// </exception>
-        [Conditional("DEBUG")]
-        public static void IsTrue(bool target, string parameterName, string message)
-        {
-            if (!target)
-            {
-                throw new ArgumentException(message, parameterName);
-            }
-        }
-
         /// <summary>
         /// Verifies whether a specific condition is met, throwing an exception if it's false.
         /// </summary>
@@ -177,25 +26,6 @@ public static void IsTrue(bool target, string message)
             }
         }
 
-        /// <summary>
-        /// Verifies, that the method parameter with specified target value is false
-        /// and throws an exception if it is found to be so.
-        /// </summary>
-        /// <param name="target">The target value, which cannot be true.</param>
-        /// <param name="parameterName">The name of the parameter that is to be checked.</param>
-        /// <param name="message">The error message, if any to add to the exception.</param>
-        /// <exception cref="ArgumentException">
-        /// <paramref name="target"/> is true
-        /// </exception>
-        [Conditional("DEBUG")]
-        public static void IsFalse(bool target, string parameterName, string message)
-        {
-            if (target)
-            {
-                throw new ArgumentException(message, parameterName);
-            }
-        }
-
         /// <summary>
         /// Verifies, that the target span is of same size than the 'other' span.
         /// </summary>
@@ -236,4 +66,4 @@ public static void MustBeSizedAtLeast<T>(Span<T> target, Span<T> minSpan, string
             }
         }
     }
-}
+}