From 5be9c18a1ec2edca140926f7e710cfa387fcdf4a Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 8 Jun 2017 18:15:45 +0100 Subject: [PATCH] [SL.Core] rename project from Primitives to Core --- README.md | 2 +- ...abors.Primitives.ruleset => SixLabors.Core.ruleset | 0 SixLabors.Primitives.sln => SixLabors.Core.sln | 4 ++-- ....sln.DotSettings => SixLabors.Core.sln.DotSettings | 0 appveyor.yml | 2 +- build.cmd | 6 +++--- src/Shared/AssemblyInfo.Common.cs | 6 +++--- .../Constants.cs | 2 +- .../HashHelpers.cs | 2 +- src/{SixLabors.Primitives => SixLabors.Core}/MathF.cs | 2 +- .../Primitives}/Matrix3x2Extensions.cs | 0 .../Primitives}/Point.cs | 0 .../Primitives}/PointF.cs | 0 .../Primitives}/Rectangle.cs | 0 .../Primitives}/RectangleF.cs | 0 .../Primitives}/Size.cs | 0 .../Primitives}/SizeF.cs | 0 .../SixLabors.Core.csproj} | 9 +++++---- .../stylecop.json | 0 tests/CodeCoverage/CodeCoverage.cmd | 8 ++++---- .../Primitives}/PointFTests.cs | 0 .../Primitives}/PointTests.cs | 0 .../Primitives}/RectangleFTests.cs | 0 .../Primitives}/RectangleTests.cs | 0 .../Primitives}/SizeFTests.cs | 0 .../Primitives}/SizeTests.cs | 0 .../SixLabors.Core.Tests.csproj} | 11 ++++++----- 27 files changed, 28 insertions(+), 26 deletions(-) rename SixLabors.Primitives.ruleset => SixLabors.Core.ruleset (100%) rename SixLabors.Primitives.sln => SixLabors.Core.sln (86%) rename SixLabors.Primitives.sln.DotSettings => SixLabors.Core.sln.DotSettings (100%) rename src/{SixLabors.Primitives => SixLabors.Core}/Constants.cs (93%) rename src/{SixLabors.Primitives => SixLabors.Core}/HashHelpers.cs (95%) rename src/{SixLabors.Primitives => SixLabors.Core}/MathF.cs (99%) rename src/{SixLabors.Primitives => SixLabors.Core/Primitives}/Matrix3x2Extensions.cs (100%) rename src/{SixLabors.Primitives => SixLabors.Core/Primitives}/Point.cs (100%) rename src/{SixLabors.Primitives => SixLabors.Core/Primitives}/PointF.cs (100%) rename src/{SixLabors.Primitives => SixLabors.Core/Primitives}/Rectangle.cs (100%) rename src/{SixLabors.Primitives => SixLabors.Core/Primitives}/RectangleF.cs (100%) rename src/{SixLabors.Primitives => SixLabors.Core/Primitives}/Size.cs (100%) rename src/{SixLabors.Primitives => SixLabors.Core/Primitives}/SizeF.cs (100%) rename src/{SixLabors.Primitives/SixLabors.Primitives.csproj => SixLabors.Core/SixLabors.Core.csproj} (87%) rename src/{SixLabors.Primitives => SixLabors.Core}/stylecop.json (100%) rename tests/{SixLabors.Primitives.Tests => SixLabors.Core.Tests/Primitives}/PointFTests.cs (100%) rename tests/{SixLabors.Primitives.Tests => SixLabors.Core.Tests/Primitives}/PointTests.cs (100%) rename tests/{SixLabors.Primitives.Tests => SixLabors.Core.Tests/Primitives}/RectangleFTests.cs (100%) rename tests/{SixLabors.Primitives.Tests => SixLabors.Core.Tests/Primitives}/RectangleTests.cs (100%) rename tests/{SixLabors.Primitives.Tests => SixLabors.Core.Tests/Primitives}/SizeFTests.cs (100%) rename tests/{SixLabors.Primitives.Tests => SixLabors.Core.Tests/Primitives}/SizeTests.cs (100%) rename tests/{SixLabors.Primitives.Tests/SixLabors.Primitives.Tests.csproj => SixLabors.Core.Tests/SixLabors.Core.Tests.csproj} (87%) diff --git a/README.md b/README.md index 635228705..5b92ec28f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# Primitives +# Core Point, Rectangle, Size Primitives for use across SixLabors libraries. diff --git a/SixLabors.Primitives.ruleset b/SixLabors.Core.ruleset similarity index 100% rename from SixLabors.Primitives.ruleset rename to SixLabors.Core.ruleset diff --git a/SixLabors.Primitives.sln b/SixLabors.Core.sln similarity index 86% rename from SixLabors.Primitives.sln rename to SixLabors.Core.sln index b1a03f64f..63fe397d4 100644 --- a/SixLabors.Primitives.sln +++ b/SixLabors.Core.sln @@ -21,9 +21,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9E574A src\Shared\stylecop.json = src\Shared\stylecop.json EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SixLabors.Primitives", "src\SixLabors.Primitives\SixLabors.Primitives.csproj", "{09E744EC-4852-4FC7-BE78-C1B399F17967}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SixLabors.Core", "src\SixLabors.Core\SixLabors.Core.csproj", "{09E744EC-4852-4FC7-BE78-C1B399F17967}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SixLabors.Primitives.Tests", "tests\SixLabors.Primitives.Tests\SixLabors.Primitives.Tests.csproj", "{F836E8E6-B4D9-4208-8346-140C74678B91}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SixLabors.Core.Tests", "tests\SixLabors.Core.Tests\SixLabors.Core.Tests.csproj", "{F836E8E6-B4D9-4208-8346-140C74678B91}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/SixLabors.Primitives.sln.DotSettings b/SixLabors.Core.sln.DotSettings similarity index 100% rename from SixLabors.Primitives.sln.DotSettings rename to SixLabors.Core.sln.DotSettings diff --git a/appveyor.yml b/appveyor.yml index 0c1d45047..edb297ed4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ build_script: - cmd: tests\CodeCoverage\CodeCoverage.cmd after_build: - - cmd: appveyor PushArtifact "artifacts\SixLabors.Primitives.%GitVersion_NuGetVersion%.nupkg" + - cmd: appveyor PushArtifact "artifacts\SixLabors.Core.%GitVersion_NuGetVersion%.nupkg" deploy: - provider: NuGet diff --git a/build.cmd b/build.cmd index 727bdf880..d1eaa59b0 100644 --- a/build.cmd +++ b/build.cmd @@ -14,13 +14,13 @@ if not "%GitVersion_NuGetVersion%" == "" ( ) if not "%errorlevel%"=="0" goto failure -dotnet test ./tests/SixLabors.Primitives.Tests/SixLabors.Primitives.Tests.csproj +dotnet test ./tests/SixLabors.Core.Tests/SixLabors.Primitives.Tests.csproj if not "%GitVersion_NuGetVersion%" == "" ( - dotnet pack ./src/SixLabors.Primitives/ -c Release --output ../../artifacts --no-build /p:packageversion=%GitVersion_NuGetVersion% + dotnet pack ./src/SixLabors.Core/ -c Release --output ../../artifacts --no-build /p:packageversion=%GitVersion_NuGetVersion% )ELSE ( - dotnet pack ./src/SixLabors.Primitives/ -c Release --output ../../artifacts --no-build + dotnet pack ./src/SixLabors.Core/ -c Release --output ../../artifacts --no-build ) if not "%errorlevel%"=="0" goto failure diff --git a/src/Shared/AssemblyInfo.Common.cs b/src/Shared/AssemblyInfo.Common.cs index b140dd917..c9cc15b73 100644 --- a/src/Shared/AssemblyInfo.Common.cs +++ b/src/Shared/AssemblyInfo.Common.cs @@ -12,8 +12,8 @@ using System.Runtime.CompilerServices; // associated with an assembly. [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Scott Williams")] -[assembly: AssemblyProduct("SixLabors.Primitives")] +[assembly: AssemblyCompany("Six Labors")] +[assembly: AssemblyProduct("SixLabors.Core")] [assembly: AssemblyCopyright("Copyright (c) Six Labors and contributors.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -34,4 +34,4 @@ using System.Runtime.CompilerServices; [assembly: AssemblyInformationalVersion("1.0.0.0")] // Ensure the internals can be tested. -[assembly: InternalsVisibleTo("SixLabors.Primitives.Tests")] +[assembly: InternalsVisibleTo("SixLabors.Core.Tests")] diff --git a/src/SixLabors.Primitives/Constants.cs b/src/SixLabors.Core/Constants.cs similarity index 93% rename from src/SixLabors.Primitives/Constants.cs rename to src/SixLabors.Core/Constants.cs index 44f68f898..1d9dd24d9 100644 --- a/src/SixLabors.Primitives/Constants.cs +++ b/src/SixLabors.Core/Constants.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace SixLabors.Primitives +namespace SixLabors { /// /// Common constants used throughout the project diff --git a/src/SixLabors.Primitives/HashHelpers.cs b/src/SixLabors.Core/HashHelpers.cs similarity index 95% rename from src/SixLabors.Primitives/HashHelpers.cs rename to src/SixLabors.Core/HashHelpers.cs index d622d308c..e481e03da 100644 --- a/src/SixLabors.Primitives/HashHelpers.cs +++ b/src/SixLabors.Core/HashHelpers.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace SixLabors.Primitives +namespace SixLabors { // lifted from coreFX repo internal static class HashHelpers diff --git a/src/SixLabors.Primitives/MathF.cs b/src/SixLabors.Core/MathF.cs similarity index 99% rename from src/SixLabors.Primitives/MathF.cs rename to src/SixLabors.Core/MathF.cs index eeaca821b..b05914e74 100644 --- a/src/SixLabors.Primitives/MathF.cs +++ b/src/SixLabors.Core/MathF.cs @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0. // -namespace SixLabors.Primitives +namespace SixLabors { using System; using System.Runtime.CompilerServices; diff --git a/src/SixLabors.Primitives/Matrix3x2Extensions.cs b/src/SixLabors.Core/Primitives/Matrix3x2Extensions.cs similarity index 100% rename from src/SixLabors.Primitives/Matrix3x2Extensions.cs rename to src/SixLabors.Core/Primitives/Matrix3x2Extensions.cs diff --git a/src/SixLabors.Primitives/Point.cs b/src/SixLabors.Core/Primitives/Point.cs similarity index 100% rename from src/SixLabors.Primitives/Point.cs rename to src/SixLabors.Core/Primitives/Point.cs diff --git a/src/SixLabors.Primitives/PointF.cs b/src/SixLabors.Core/Primitives/PointF.cs similarity index 100% rename from src/SixLabors.Primitives/PointF.cs rename to src/SixLabors.Core/Primitives/PointF.cs diff --git a/src/SixLabors.Primitives/Rectangle.cs b/src/SixLabors.Core/Primitives/Rectangle.cs similarity index 100% rename from src/SixLabors.Primitives/Rectangle.cs rename to src/SixLabors.Core/Primitives/Rectangle.cs diff --git a/src/SixLabors.Primitives/RectangleF.cs b/src/SixLabors.Core/Primitives/RectangleF.cs similarity index 100% rename from src/SixLabors.Primitives/RectangleF.cs rename to src/SixLabors.Core/Primitives/RectangleF.cs diff --git a/src/SixLabors.Primitives/Size.cs b/src/SixLabors.Core/Primitives/Size.cs similarity index 100% rename from src/SixLabors.Primitives/Size.cs rename to src/SixLabors.Core/Primitives/Size.cs diff --git a/src/SixLabors.Primitives/SizeF.cs b/src/SixLabors.Core/Primitives/SizeF.cs similarity index 100% rename from src/SixLabors.Primitives/SizeF.cs rename to src/SixLabors.Core/Primitives/SizeF.cs diff --git a/src/SixLabors.Primitives/SixLabors.Primitives.csproj b/src/SixLabors.Core/SixLabors.Core.csproj similarity index 87% rename from src/SixLabors.Primitives/SixLabors.Primitives.csproj rename to src/SixLabors.Core/SixLabors.Core.csproj index 3a1265cff..f7f25dfc1 100644 --- a/src/SixLabors.Primitives/SixLabors.Primitives.csproj +++ b/src/SixLabors.Core/SixLabors.Core.csproj @@ -9,14 +9,14 @@ netstandard1.1 true true - SixLabors.Primitives - SixLabors.Primitives + SixLabors.Core + SixLabors.Core rectangle;point;size,primitives https://raw.githubusercontent.com/SixLabors/Home/master/logo.png - https://github.com/SixLabors/Primitives + https://github.com/SixLabors/Core http://www.apache.org/licenses/LICENSE-2.0 git - https://github.com/SixLabors/Primitives + https://github.com/SixLabors/Core false false false @@ -27,6 +27,7 @@ false false full + SixLabors diff --git a/src/SixLabors.Primitives/stylecop.json b/src/SixLabors.Core/stylecop.json similarity index 100% rename from src/SixLabors.Primitives/stylecop.json rename to src/SixLabors.Core/stylecop.json diff --git a/tests/CodeCoverage/CodeCoverage.cmd b/tests/CodeCoverage/CodeCoverage.cmd index 2547eace1..7a89ab210 100644 --- a/tests/CodeCoverage/CodeCoverage.cmd +++ b/tests/CodeCoverage/CodeCoverage.cmd @@ -7,15 +7,15 @@ nuget restore packages.config -PackagesDirectory . cd .. cd .. -dotnet restore SixLabors.Primitives.sln -dotnet build SixLabors.Primitives.sln --no-incremental -c debug /p:codecov=true +dotnet restore SixLabors.Core.sln +dotnet build SixLabors.Core.sln --no-incremental -c debug /p:codecov=true rem The -threshold options prevents this taking ages... rem tests\CodeCoverage\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"dotnet.exe" -targetargs:"test tests\SixLabors.Shapes.Tests\SixLabors.Shapes.Tests.csproj --no-build -c Release /p:codecov=true" -threshold:10 -register:user -filter:"+[SixLabors.Shapes*]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -hideskipped:All -returntargetcode -output:.\SixLabors.Shapes.Coverage.xml -tests\CodeCoverage\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"dotnet.exe" -targetargs:"test tests\SixLabors.Primitives.Tests\SixLabors.Primitives.Tests.csproj --no-build -c debug" -searchdirs:"tests\SixLabors.Primitives.Tests\bin\Release\netcoreapp1.1" -register:user -output:.\SixLabors.Primitives.Coverage.xml -hideskipped:All -returntargetcode -oldStyle -filter:"+[SixLabors.Primitives*]*" +tests\CodeCoverage\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:"dotnet.exe" -targetargs:"test tests\SixLabors.Core.Tests\SixLabors.Core.Tests.csproj --no-build -c debug" -searchdirs:"tests\SixLabors.Core.Tests\bin\Release\netcoreapp1.1" -register:user -output:.\SixLabors.Core.Coverage.xml -hideskipped:All -returntargetcode -oldStyle -filter:"+[SixLabors.*]*" if %errorlevel% neq 0 exit /b %errorlevel% SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH% pip install codecov -codecov -f "SixLabors.Primitives.Coverage.xml" \ No newline at end of file +codecov -f "SixLabors.Core.Coverage.xml" \ No newline at end of file diff --git a/tests/SixLabors.Primitives.Tests/PointFTests.cs b/tests/SixLabors.Core.Tests/Primitives/PointFTests.cs similarity index 100% rename from tests/SixLabors.Primitives.Tests/PointFTests.cs rename to tests/SixLabors.Core.Tests/Primitives/PointFTests.cs diff --git a/tests/SixLabors.Primitives.Tests/PointTests.cs b/tests/SixLabors.Core.Tests/Primitives/PointTests.cs similarity index 100% rename from tests/SixLabors.Primitives.Tests/PointTests.cs rename to tests/SixLabors.Core.Tests/Primitives/PointTests.cs diff --git a/tests/SixLabors.Primitives.Tests/RectangleFTests.cs b/tests/SixLabors.Core.Tests/Primitives/RectangleFTests.cs similarity index 100% rename from tests/SixLabors.Primitives.Tests/RectangleFTests.cs rename to tests/SixLabors.Core.Tests/Primitives/RectangleFTests.cs diff --git a/tests/SixLabors.Primitives.Tests/RectangleTests.cs b/tests/SixLabors.Core.Tests/Primitives/RectangleTests.cs similarity index 100% rename from tests/SixLabors.Primitives.Tests/RectangleTests.cs rename to tests/SixLabors.Core.Tests/Primitives/RectangleTests.cs diff --git a/tests/SixLabors.Primitives.Tests/SizeFTests.cs b/tests/SixLabors.Core.Tests/Primitives/SizeFTests.cs similarity index 100% rename from tests/SixLabors.Primitives.Tests/SizeFTests.cs rename to tests/SixLabors.Core.Tests/Primitives/SizeFTests.cs diff --git a/tests/SixLabors.Primitives.Tests/SizeTests.cs b/tests/SixLabors.Core.Tests/Primitives/SizeTests.cs similarity index 100% rename from tests/SixLabors.Primitives.Tests/SizeTests.cs rename to tests/SixLabors.Core.Tests/Primitives/SizeTests.cs diff --git a/tests/SixLabors.Primitives.Tests/SixLabors.Primitives.Tests.csproj b/tests/SixLabors.Core.Tests/SixLabors.Core.Tests.csproj similarity index 87% rename from tests/SixLabors.Primitives.Tests/SixLabors.Primitives.Tests.csproj rename to tests/SixLabors.Core.Tests/SixLabors.Core.Tests.csproj index 2dd674fdc..cd34a8421 100644 --- a/tests/SixLabors.Primitives.Tests/SixLabors.Primitives.Tests.csproj +++ b/tests/SixLabors.Core.Tests/SixLabors.Core.Tests.csproj @@ -3,7 +3,7 @@ 0.0.0 netcoreapp1.1 - SixLabors.Primitives.Tests + SixLabors.Core.Tests SixLabors.Shapes.Tests true false @@ -13,12 +13,9 @@ false false full + SixLabors.Tests - - - - @@ -26,6 +23,10 @@ + + + +