[SL.Core] rename project from Primitives to Core

README.md

@@ -1,2 +1,2 @@
-# Primitives
+# Core
 Point, Rectangle, Size Primitives for use across SixLabors libraries.

SixLabors.Primitives.sln → 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

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

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

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")]

src/SixLabors.Primitives/Constants.cs → src/SixLabors.Core/Constants.cs

@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace SixLabors.Primitives
+namespace SixLabors
 {
     /// <summary>
     /// Common constants used throughout the project

src/SixLabors.Primitives/HashHelpers.cs → 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

src/SixLabors.Primitives/MathF.cs → src/SixLabors.Core/MathF.cs

@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace SixLabors.Primitives
+namespace SixLabors
 {
     using System;
     using System.Runtime.CompilerServices;

src/SixLabors.Primitives/SixLabors.Primitives.csproj → src/SixLabors.Core/SixLabors.Core.csproj

@@ -9,14 +9,14 @@
     <TargetFramework>netstandard1.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>SixLabors.Primitives</AssemblyName>
-    <PackageId>SixLabors.Primitives</PackageId>
+    <AssemblyName>SixLabors.Core</AssemblyName>
+    <PackageId>SixLabors.Core</PackageId>
     <PackageTags>rectangle;point;size,primitives</PackageTags>
     <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Home/master/logo.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/SixLabors/Primitives</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/SixLabors/Core</PackageProjectUrl>
     <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/SixLabors/Primitives</RepositoryUrl>
+    <RepositoryUrl>https://github.com/SixLabors/Core</RepositoryUrl>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
@@ -27,6 +27,7 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <DebugType Condition="$(codecov) == 'true'">full</DebugType>
+    <RootNamespace>SixLabors</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

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"
+codecov -f "SixLabors.Core.Coverage.xml"

tests/SixLabors.Primitives.Tests/SixLabors.Primitives.Tests.csproj → tests/SixLabors.Core.Tests/SixLabors.Core.Tests.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <VersionPrefix>0.0.0</VersionPrefix>
     <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
-    <AssemblyName>SixLabors.Primitives.Tests</AssemblyName>
+    <AssemblyName>SixLabors.Core.Tests</AssemblyName>
     <PackageId>SixLabors.Shapes.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
@@ -13,12 +13,9 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <DebugType Condition="$(codecov) != ''">full</DebugType>
+    <RootNamespace>SixLabors.Tests</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\SixLabors.Primitives\SixLabors.Primitives.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
@@ -26,6 +23,10 @@
     <PackageReference Include="Moq" Version="4.7.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\SixLabors.Core\SixLabors.Core.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>