Migrate to NiceIO package

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: Publish NuGet Package
 on:
   workflow_dispatch:
   push:
-    tags: [ 'release-*' ]
+    tags: [ release-* ]
 
 # TODO: trigger on commit desc '/publish'
 # TODO: switch to https://github.com/xoofx/dotnet-releaser
@@ -15,13 +15,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4.1.1
-        with:
-          submodules: true
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: 7.0.x
 
       - name: Build for publish
         run: dotnet publish -c Release

.github/workflows/validate.yml

@@ -1,23 +1,22 @@
 name: Validate Dev Branch
 
 on:
+  workflow_dispatch:
   push:
-    branches: [ 'dev' ]
+    branches: [ dev ]
 
 jobs:
   validate:
     runs-on: windows-latest
 
     steps:
-      - name: Checkout + submodules
+      - name: Checkout
         uses: actions/checkout@v4.1.1
-        with:
-          submodules: true
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: 7.0.x
 
       # https://stackoverflow.com/a/70552262/14582
       - name: Run tests

Directory.Packages.props

@@ -26,6 +26,7 @@
     <PackageVersion Include="DotNetConfig" Version="1.0.6" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0" />
     <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.3.6" />
+    <PackageVersion Include="OkTools.NiceIO" Version="1.0.1" />
     <PackageVersion Include="PInvoke.Kernel32" Version="0.7.124" />
     <PackageVersion Include="PInvoke.NTDll" Version="0.7.124" />
     <PackageVersion Include="Spectre.Console" Version="0.47.0" />

src/Core/Core.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup><OkFeatures>T4</OkFeatures></PropertyGroup>
   <Import Project="$(OkTargetsRoot)Library.targets" />
 
@@ -7,19 +7,9 @@
     <RootNamespace>OkTools.Core</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>CS1591</NoWarn>
-    <DefineConstants>$(DefineConstants);NICEIO_PUBLIC;NICEIO_OKTOOLS</DefineConstants>
+    <DefineConstants>$(DefineConstants);NICEIO_PUBLIC</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!--
-    TODO: move NiceIO to a new external folder that has overrides for directory props etc. that skips the defaulting we get from the root
-    alternate: see if we can move those files to src\
-    -->
-    <Compile Include="$(OkRoot)external\NiceIO\*.cs">
-      <Link>NiceIO\%(Filename)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
-
   <!-- nuget -->
   <PropertyGroup>
     <GeneratePackageOnBuild>$(_IsPublishing)</GeneratePackageOnBuild>
@@ -37,6 +27,9 @@
   <ItemGroup>
     <PackageReference Include="PInvoke.Kernel32" />
     <PackageReference Include="PInvoke.NTDll" />
+
+    <PackageReference Include="OkTools.NiceIO" />
+    <PreprocessorValue Include="NICEIO_NAMESPACE" Value="OkTools.Core" Visible="false" />
   </ItemGroup>
 
 </Project>

src/Unity/NOTES.md

@@ -20,7 +20,6 @@ Sure would be nice to have a "CLI Helper" nuget that does all kinds of useful te
   * Do everything with sourcegen support so we get type safety, autocomplete, self-documenting (easy schema gen)
 * Dumping abilities including to JSON and YAML
 * Efficient subprocess launching and stdin/out/err routing 
-* NiceIO++
 * Logging w/ rotation
 * VCS-awareness
 

targets/Tests.targets

@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <OkFeatures>$(OkFeatures);Core;NiceIO;Tests</OkFeatures>
+    <OkFeatures>$(OkFeatures);Core;Tests</OkFeatures>
   </PropertyGroup>
   <Import Project="Library.targets" />