diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 60821c8..c1e3916 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -21,11 +21,9 @@ on:
 jobs:
   all:
     name: Build & Tests
-    uses: dailydevops/pipelines/.github/workflows/cicd-dotnet.yml@0.14.110
+    uses: dailydevops/pipelines/.github/workflows/build-dotnet-single.yml@1.2.5
     with:
-      enableSonarQube: true
-      dotnet-logging: ${{ inputs.dotnet-logging }}
-      dotnet-quality: ga
-      dotnet-version: ${{ vars.NE_DOTNET_TARGETFRAMEWORKS }}
-      solution: ./Arguments.sln
+      dotnetLogging: ${{ inputs.dotnet-logging }}
+      dotnetVersion: ${{ vars.NE_DOTNET_TARGETFRAMEWORKS }}
+      solution: ./Arguments.slnx
     secrets: inherit
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
new file mode 100644
index 0000000..c3f260a
--- /dev/null
+++ b/.github/workflows/publish-nuget.yml
@@ -0,0 +1,23 @@
+name: NuGet Package
+
+on:
+  workflow_run:
+    workflows: [CI]
+    types: [completed]
+    branches: [main]
+
+permissions:
+  actions: read
+  contents: write
+
+jobs:
+  nuget:
+    name: Publish
+    if: ${{ github.event.workflow_run.conclusion == 'success' && github.actor != 'dependabot[bot]' }}
+    uses: dailydevops/pipelines/.github/workflows/publish-nuget.yml@1.2.5
+    with:
+      workflowName: ${{ github.event.workflow_run.name }}
+      artifactPattern: release-packages-*
+      environment: NuGet
+      runId: ${{ github.event.workflow_run.id }}
+    secrets: inherit
diff --git a/Arguments.sln b/Arguments.sln
deleted file mode 100644
index 7907d87..0000000
--- a/Arguments.sln
+++ /dev/null
@@ -1,54 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{30024133-C82C-44B0-8A1B-AD08D032D682}"
-	ProjectSection(SolutionItems) = preProject
-		.csharpierignore = .csharpierignore
-		.editorconfig = .editorconfig
-		.filenesting.json = .filenesting.json
-		.gitignore = .gitignore
-		.gitmodules = .gitmodules
-		Directory.Build.props = Directory.Build.props
-		Directory.Packages.props = Directory.Packages.props
-		Directory.Solution.props = Directory.Solution.props
-		GitVersion.yml = GitVersion.yml
-		LICENSE = LICENSE
-		new-project.ps1 = new-project.ps1
-		nuget.config = nuget.config
-		README.md = README.md
-		update-solution.ps1 = update-solution.ps1
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2E0F896F-1CFB-4284-8664-93A5A72879B4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetEvolve.Arguments", "src\NetEvolve.Arguments\NetEvolve.Arguments.csproj", "{CFAF10B4-A9F6-4F3F-A4B0-D3BC1862DA7D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EB9C1678-E6F8-462F-BCFE-56EF84A2F530}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetEvolve.Arguments.Tests.Unit", "tests\NetEvolve.Arguments.Tests.Unit\NetEvolve.Arguments.Tests.Unit.csproj", "{71E81AE5-13C2-4E0D-B4B0-39E94534A61C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CFAF10B4-A9F6-4F3F-A4B0-D3BC1862DA7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFAF10B4-A9F6-4F3F-A4B0-D3BC1862DA7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFAF10B4-A9F6-4F3F-A4B0-D3BC1862DA7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFAF10B4-A9F6-4F3F-A4B0-D3BC1862DA7D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71E81AE5-13C2-4E0D-B4B0-39E94534A61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71E81AE5-13C2-4E0D-B4B0-39E94534A61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71E81AE5-13C2-4E0D-B4B0-39E94534A61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71E81AE5-13C2-4E0D-B4B0-39E94534A61C}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CFAF10B4-A9F6-4F3F-A4B0-D3BC1862DA7D} = {2E0F896F-1CFB-4284-8664-93A5A72879B4}
-		{71E81AE5-13C2-4E0D-B4B0-39E94534A61C} = {EB9C1678-E6F8-462F-BCFE-56EF84A2F530}
-	EndGlobalSection
-EndGlobal
diff --git a/Arguments.slnx b/Arguments.slnx
new file mode 100644
index 0000000..db2af55
--- /dev/null
+++ b/Arguments.slnx
@@ -0,0 +1,24 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".csharpierignore" />
+    <File Path=".editorconfig" />
+    <File Path=".filenesting.json" />
+    <File Path=".gitignore" />
+    <File Path=".gitmodules" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="Directory.Solution.props" />
+    <File Path="GitVersion.yml" />
+    <File Path="LICENSE" />
+    <File Path="new-project.ps1" />
+    <File Path="nuget.config" />
+    <File Path="README.md" />
+    <File Path="update-solution.ps1" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/NetEvolve.Arguments/NetEvolve.Arguments.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/NetEvolve.Arguments.Tests.Unit/NetEvolve.Arguments.Tests.Unit.csproj" />
+  </Folder>
+</Solution>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 217c63b..df8a210 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -12,11 +12,7 @@
     <GlobalPackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61" />
     <GlobalPackageReference Include="NetEvolve.Defaults" Version="1.3.86" />
     <GlobalPackageReference Include="Roslynator.Analyzers" Version="4.13.1" />
-    <GlobalPackageReference
-      Include="SonarAnalyzer.CSharp"
-      Version="10.6.0.109712"
-      Condition=" '$(BuildingInsideVisualStudio)' == 'true' "
-    />
+    <GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />