Consolidate Actions.Core dependencies (#13)

* Consolidate Environment Keys * Further consolidate Environment variables Add missing variables from https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
IEvangelist · May 7, 2024 · e9c34d3 · e9c34d3
1 parent cd0149a
commit e9c34d3
Show file tree

Hide file tree

Showing 11 changed files with 326 additions and 160 deletions.
diff --git a/samples/Actions.Core.Sample/Actions.Core.Sample.csproj b/samples/Actions.Core.Sample/Actions.Core.Sample.csproj
@@ -3,5 +3,6 @@
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
 
         <ProjectReference Include="..\..\src\Actions.Core\Actions.Core.csproj" />
+        <ProjectReference Include="..\..\src\Actions.Octokit\Actions.Octokit.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/Actions.Core/Actions.Core.csproj b/src/Actions.Core/Actions.Core.csproj
@@ -4,7 +4,11 @@
         <BasedOn>@actions/core</BasedOn>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <DefineConstants>$(DefineConstants);ACTIONS_CORE_ENVIRONMENTVARIABLES_PUBLIC</DefineConstants>
+    </PropertyGroup>
+
     <ItemGroup>
-        <ProjectReference Include="..\Actions.Octokit\Actions.Octokit.csproj" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     </ItemGroup>
 </Project>
diff --git a/src/Actions.Core/Commands/IFileCommandIssuer.cs b/src/Actions.Core/Commands/IFileCommandIssuer.cs
@@ -12,7 +12,7 @@ internal interface IFileCommandIssuer
     /// Asynchronous I/O that issues a command that corresponds to the
     /// given <paramref name="commandSuffix"/>, with the given <paramref name="message"/> value.
     /// </summary>
-    /// <param name="commandSuffix">The command suffix as found in <see cref="Octokit.EnvironmentVariables.Suffixes"/></param>
+    /// <param name="commandSuffix">The command suffix as found in <see cref="EnvironmentVariables.Suffixes"/></param>
     /// <param name="message">An arbitrary message value</param>
     /// <param name="typeInfo">The JSON type info used to serialize.</param>
     /// <returns>A task that represents the asynchronous operation of writing the message to file.</returns>

diff --git a/src/Actions.Core/EnvironmentVariables/Keys.cs b/src/Actions.Core/EnvironmentVariables/Keys.cs
diff --git a/....Octokit/EnvironmentVariables/Prefixes.cs → ...ons.Core/EnvironmentVariables/Prefixes.cs b/....Octokit/EnvironmentVariables/Prefixes.cs → ...ons.Core/EnvironmentVariables/Prefixes.cs
@@ -1,16 +1,19 @@
 // Copyright (c) David Pine. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Actions.Octokit.EnvironmentVariables;
+namespace Actions.Core.EnvironmentVariables;
 
 /// <summary>
 /// A collection of environment variable prefixes, used with corresponding <see cref="Suffixes"/>.
 /// </summary>
-[SuppressMessage(
+[System.Diagnostics.CodeAnalysis.SuppressMessage(
     "Naming",
     "CA1707:Identifiers should not contain underscores",
     Justification = "These values correspond to environment variables and I want them to match exactly.")]
-public static class Prefixes
+#if ACTIONS_CORE_ENVIRONMENTVARIABLES_PUBLIC
+public
+#endif
+static class Prefixes
 {
     /// <summary>
     /// The environment variable key prefix: <c>GITHUB_</c>.

diff --git a/....Octokit/EnvironmentVariables/Suffixes.cs → ...ons.Core/EnvironmentVariables/Suffixes.cs b/....Octokit/EnvironmentVariables/Suffixes.cs → ...ons.Core/EnvironmentVariables/Suffixes.cs
@@ -1,12 +1,15 @@
 // Copyright (c) David Pine. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Actions.Octokit.EnvironmentVariables;
+namespace Actions.Core.EnvironmentVariables;
 
 /// <summary>
 /// A collection of environment variable suffixes, used with corresponding <see cref="Prefixes"/>.
 /// </summary>
-public static class Suffixes
+#if ACTIONS_CORE_ENVIRONMENTVARIABLES_PUBLIC
+public
+#endif
+static class Suffixes
 {
     /// <summary>
     /// The environment variable key suffix: <c>ENV</c>.

diff --git a/src/Actions.Core/GlobalUsings.cs b/src/Actions.Core/GlobalUsings.cs
@@ -21,6 +21,6 @@
 global using static System.Environment;
 global using static System.IO.Path;
 
-global using static Actions.Octokit.EnvironmentVariables.Keys;
-global using static Actions.Octokit.EnvironmentVariables.Prefixes;
-global using static Actions.Octokit.EnvironmentVariables.Suffixes;
+global using static Actions.Core.EnvironmentVariables.Keys;
+global using static Actions.Core.EnvironmentVariables.Prefixes;
+global using static Actions.Core.EnvironmentVariables.Suffixes;
diff --git a/src/Actions.Octokit/Actions.Octokit.csproj b/src/Actions.Octokit/Actions.Octokit.csproj
@@ -12,4 +12,10 @@
     <ItemGroup>
         <InternalsVisibleTo Include="Octokit.Sandbox" />
     </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Actions.Core\EnvironmentVariables\*.cs">
+            <LinkBase>EnvironmentVariables</LinkBase>
+        </Compile>
+    </ItemGroup>
 </Project>
diff --git a/src/Actions.Octokit/EnvironmentVariables/Keys.cs b/src/Actions.Octokit/EnvironmentVariables/Keys.cs
diff --git a/src/Actions.Octokit/GlobalUsings.cs b/src/Actions.Octokit/GlobalUsings.cs
@@ -12,4 +12,4 @@
 global using GitHub.Octokit.Client;
 global using Microsoft.Extensions.DependencyInjection;
 global using static System.Environment;
-global using static Actions.Octokit.EnvironmentVariables.Keys;
+global using static Actions.Core.EnvironmentVariables.Keys;
diff --git a/tests/Actions.Core.Tests/GlobalUsings.cs b/tests/Actions.Core.Tests/GlobalUsings.cs
@@ -14,10 +14,10 @@
 global using Actions.Core.Tests.Output;
 global using Actions.Core.Workflows;
 
-global using Actions.Octokit.EnvironmentVariables;
+global using Actions.Core.EnvironmentVariables;
 
 global using Microsoft.Extensions.DependencyInjection;
 
 global using Xunit;
 
-global using static Actions.Octokit.EnvironmentVariables.Keys;
+global using static Actions.Core.EnvironmentVariables.Keys;