Merge pull request #187 from SceneGate/feature/rename-media

👕 Rename Yarhl.Media to Yarhl.Media.Text

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.1.0",
+      "version": "2.2.0",
       "commands": [
         "dotnet-cake"
       ]

.github/workflows/build-and-release.yml

@@ -11,7 +11,7 @@ on:
     tags: [ "v*" ]
 
 env:
-  NET_SDK: '6.0.200'
+  NET_SDK: '6.0.302'
 
 jobs:
   build_main:

README.md

@@ -8,7 +8,7 @@ plugin support. It's built in C# / .NET and works in Windows, Linux and Mac OS
 X.
 
 <!-- prettier-ignore -->
-| NuGet              | [![Yarhl](https://img.shields.io/nuget/v/Yarhl?label=Yarhl)](https://www.nuget.org/packages/Yarhl) [![Yarhl.Media](https://img.shields.io/nuget/v/Yarhl?label=Yarhl.Media)](https://www.nuget.org/packages/Yarhl.Media) |
+| NuGet              | [![Yarhl](https://img.shields.io/nuget/v/Yarhl?label=Yarhl)](https://www.nuget.org/packages/Yarhl) [![Yarhl.Media.Text](https://img.shields.io/nuget/v/Yarhl.Media.Text?label=Yarhl.Media.Text)](https://www.nuget.org/packages/Yarhl.Media.Text) |
 | ------------------ | ------ |
 | **Build & Test**   | ![Build and release](https://github.com/SceneGate/Yarhl/workflows/Build%20and%20release/badge.svg?branch=develop) |
 | **Quality report** | [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2919/badge)](https://bestpractices.coreinfrastructure.org/projects/2919) |
@@ -28,7 +28,7 @@ and the complete API documentation
 Stable releases are available from nuget.org:
 
 - [Yarhl](https://www.nuget.org/packages/Yarhl)
-- [Yarhl.Media](https://www.nuget.org/packages/Yarhl.Media)
+- [Yarhl.Media.Text](https://www.nuget.org/packages/Yarhl.Media.Text)
 
 The libraries only support the latest version of .NET and its LTS (.NET 6).
 

build.cake

@@ -7,7 +7,7 @@ Task("Define-Project")
     info.CoverageTarget = 90; // can't be 100 due to platform-specific code paths
 
     info.AddLibraryProjects("Yarhl");
-    info.AddLibraryProjects("Yarhl.Media");
+    info.AddLibraryProjects("Yarhl.Media.Text");
     info.AddTestProjects("Yarhl.UnitTests");
     info.AddTestProjects("Yarhl.IntegrationTests");
 
@@ -20,7 +20,7 @@ Task("Prepare-IntegrationTests")
     .Does<BuildInfo>(info =>
 {
     // Copy a good and bad plugin to test the assembly load logic
-    string pluginPath = $"src/Yarhl.Media/bin/{info.Configuration}/net6.0/Yarhl.Media.dll";
+    string pluginPath = $"src/Yarhl.Media.Text/bin/{info.Configuration}/net6.0/Yarhl.Media.Text.dll";
     string badPluginPath = info.SolutionFile; // this isn't a DLL for sure :D
 
     string outputBasePath = $"src/Yarhl.IntegrationTests/bin/{info.Configuration}";
@@ -29,7 +29,7 @@ Task("Prepare-IntegrationTests")
     foreach (string framework in GetTargetFrameworks(testProjectPath)) {
         string pluginDir = $"{outputBasePath}/{framework}/Plugins";
         CreateDirectory(pluginDir);
-        CopyFile(pluginPath, $"{pluginDir}/Yarhl.Media.dll");
+        CopyFile(pluginPath, $"{pluginDir}/Yarhl.Media.Text.dll");
         CopyFile(badPluginPath, $"{pluginDir}/MyBadPlugin.dll");
     }
 });

docs/docfx.json

@@ -5,7 +5,7 @@
           {
             "files": [
               "Yarhl/bin/**/Yarhl.dll",
-              "Yarhl.Media/bin/**/Yarhl.Media.dll"
+              "Yarhl.Media.Text/bin/**/Yarhl.Media.Text.dll"
             ],
             "src": "../src"
           }

src/Yarhl.IntegrationTests/PluginDiscovery.cs

@@ -34,9 +34,9 @@ public void YarhlMediaIsInPluginsFolder()
             string pluginDir = Path.Combine(programDir, PluginManager.PluginDirectory);
             Assert.IsTrue(Directory.Exists(pluginDir));
 
-            Assert.IsTrue(File.Exists(Path.Combine(pluginDir, "Yarhl.Media.dll")));
+            Assert.IsTrue(File.Exists(Path.Combine(pluginDir, "Yarhl.Media.Text.dll")));
 
-            Assert.IsFalse(File.Exists(Path.Combine(programDir, "Yarhl.Media.dll")));
+            Assert.IsFalse(File.Exists(Path.Combine(programDir, "Yarhl.Media.Text.dll")));
         }
 
         [Test]

src/Yarhl.Media.Text/Yarhl.Media.Text.csproj

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Yarhl library for text format and conversion support.</Description>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Yarhl.UnitTests" />
+    <AssemblyAttribute Include="System.CLSCompliantAttribute">
+      <_Parameter1>true</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.InteropServices.ComVisibleAttribute">
+      <_Parameter1>true</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="../../docs/images/favicon-128.png" Pack="true" PackagePath="$(PackageIcon)" Visible="false" />
+    <None Include="../../README.md" Pack="true" PackagePath="README.md" Visible="false" />
+
+    <EmbeddedResource Include="Encodings\index-jis0208.txt" />
+    <EmbeddedResource Include="Encodings\index-jis0212.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Yarhl\Yarhl.csproj" />
+  </ItemGroup>
+
+</Project>

src/Yarhl.UnitTests/Yarhl.UnitTests.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Yarhl\Yarhl.csproj" />
-    <ProjectReference Include="..\Yarhl.Media\Yarhl.Media.csproj" />
+    <ProjectReference Include="..\Yarhl.Media.Text\Yarhl.Media.Text.csproj" />
 
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />

src/Yarhl.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yarhl", "Yarhl\Yarhl.csproj", "{9477DC2F-8F66-4F40-A34D-94B773B77F14}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yarhl.Media", "Yarhl.Media\Yarhl.Media.csproj", "{9EC7B7B0-C67C-4834-AC0B-8916A6F00A96}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yarhl.Media.Text", "Yarhl.Media.Text\Yarhl.Media.Text.csproj", "{9EC7B7B0-C67C-4834-AC0B-8916A6F00A96}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yarhl.UnitTests", "Yarhl.UnitTests\Yarhl.UnitTests.csproj", "{032CD3C2-4BEA-4C52-8FB5-28B4DCCB044A}"
 EndProject

src/nuget.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear/>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>