Merge namespaces (#12)

Gitii · Jun 12, 2022 · 1c6e874 · 1c6e874
1 parent b6c40b2
commit 1c6e874
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 23 deletions.
diff --git a/Community.Wsl.Sdk.Tests/CommandTests.cs b/Community.Wsl.Sdk.Tests/CommandTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using Community.Wsl.Sdk.Strategies.Commands;
 using Community.Wsx.Shared;
 using FakeItEasy;
 using FluentAssertions;

diff --git a/Community.Wsl.Sdk.Tests/DistroInfoTests.cs b/Community.Wsl.Sdk.Tests/DistroInfoTests.cs
@@ -1,5 +1,4 @@
 using System;
-using Community.Wsl.Sdk.Strategies.Api;
 using FluentAssertions;
 using NUnit.Framework;
 

diff --git a/Community.Wsl.Sdk.Tests/StreamDataReaderTests.cs b/Community.Wsl.Sdk.Tests/StreamDataReaderTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Community.Wsl.Sdk.Strategies.Commands;
 using FluentAssertions;
 using NUnit.Framework;
 

diff --git a/Community.Wsl.Sdk.Tests/StreamNullReaderTests.cs b/Community.Wsl.Sdk.Tests/StreamNullReaderTests.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Community.Wsl.Sdk.Strategies.Commands;
 using FluentAssertions;
 using NUnit.Framework;
 

diff --git a/Community.Wsl.Sdk.Tests/StreamStringReaderTests.cs b/Community.Wsl.Sdk.Tests/StreamStringReaderTests.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using Community.Wsl.Sdk.Strategies.Commands;
 using FluentAssertions;
 using NUnit.Framework;
 

diff --git a/...ty.Wsl.Sdk/Strategies/Commands/Command.cs → Community.Wsl.Sdk/Command.cs b/...ty.Wsl.Sdk/Strategies/Commands/Command.cs → Community.Wsl.Sdk/Command.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Community.Wsx.Shared;
 
-namespace Community.Wsl.Sdk.Strategies.Commands;
+namespace Community.Wsl.Sdk;
 
 public class Command : ICommand
 {

diff --git a/...Sdk/Strategies/Commands/CommandStreams.cs → Community.Wsl.Sdk/CommandStreams.cs b/...Sdk/Strategies/Commands/CommandStreams.cs → Community.Wsl.Sdk/CommandStreams.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Community.Wsl.Sdk.Strategies.Commands;
+namespace Community.Wsl.Sdk;
 
 /// <summary>
 /// Encapsulates the io stream of a <see cref="ICommand"/>.

diff --git a/Community.Wsl.Sdk/Community.Wsl.Sdk.csproj b/Community.Wsl.Sdk/Community.Wsl.Sdk.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <SupportedOSPlatform>windows</SupportedOSPlatform>
     <Description>SDK for Windows Subsystem for Linux for .NET 6</Description>
-    <Copyright>(c) 2022 Gitii</Copyright>
+    <Copyright>(c) 2021 Gitii</Copyright>
     <PackageProjectUrl>https://github.com/Gitii/community.wsl.sdk</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
 	  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/...ity.Wsl.Sdk/Strategies/Api/DistroFlags.cs → Community.Wsl.Sdk/DistroFlags.cs b/...ity.Wsl.Sdk/Strategies/Api/DistroFlags.cs → Community.Wsl.Sdk/DistroFlags.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Community.Wsl.Sdk.Strategies.Api;
+namespace Community.Wsl.Sdk;
 
 /// <summary>
 /// The enumeration specifies the behavior of a distribution in the Windows Subsystem for Linux (WSL).
@@ -27,4 +27,4 @@ public enum DistroFlags
     /// Automatically mount Windows drives inside of WSL sessions (for example, "C:" will be available under "/mnt/c").
     /// </summary>
     EnableDriveMouting = 0x4
-}
+}
diff --git a/Community.Wsl.Sdk/DistroInfo.cs b/Community.Wsl.Sdk/DistroInfo.cs
@@ -1,5 +1,4 @@
 using System;
-using Community.Wsl.Sdk.Strategies.Api;
 
 namespace Community.Wsl.Sdk;
 

diff --git a/...y.Wsl.Sdk/Strategies/Commands/ICommand.cs → Community.Wsl.Sdk/ICommand.cs b/...y.Wsl.Sdk/Strategies/Commands/ICommand.cs → Community.Wsl.Sdk/ICommand.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Community.Wsl.Sdk.Strategies.Commands;
+namespace Community.Wsl.Sdk;
 
 public interface ICommand : IDisposable
 {

diff --git a/....Sdk/Strategies/Commands/IStreamReader.cs → Community.Wsl.Sdk/IStreamReader.cs b/....Sdk/Strategies/Commands/IStreamReader.cs → Community.Wsl.Sdk/IStreamReader.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Community.Wsl.Sdk.Strategies.Commands;
+namespace Community.Wsl.Sdk;
 
 internal interface IStreamReader
 {

diff --git a/Community.Wsl.Sdk/Strategies/Api/IWslApi.cs → Community.Wsl.Sdk/IWslApi.cs b/Community.Wsl.Sdk/Strategies/Api/IWslApi.cs → Community.Wsl.Sdk/IWslApi.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 
-namespace Community.Wsl.Sdk.Strategies.Api;
+namespace Community.Wsl.Sdk;
 
 /// <summary>
 /// Provides functionality to help you call WSL from .NET applications.

diff --git a/...k/Strategies/Commands/StreamDataReader.cs → Community.Wsl.Sdk/StreamDataReader.cs b/...k/Strategies/Commands/StreamDataReader.cs → Community.Wsl.Sdk/StreamDataReader.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Community.Wsl.Sdk.Strategies.Commands;
+namespace Community.Wsl.Sdk;
 
 internal class StreamDataReader : IStreamReader
 {
@@ -45,10 +45,7 @@ public void Fetch()
                 var data = stream.ToArray();
                 Finished(data);
             }
-        )
-        {
-            IsBackground = true
-        };
+        ) { IsBackground = true };
 
         _thread.Start();
     }

diff --git a/...k/Strategies/Commands/StreamNullReader.cs → Community.Wsl.Sdk/StreamNullReader.cs b/...k/Strategies/Commands/StreamNullReader.cs → Community.Wsl.Sdk/StreamNullReader.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Community.Wsl.Sdk.Strategies.Commands;
+namespace Community.Wsl.Sdk;
 
 internal class StreamNullReader : IStreamReader
 {

diff --git a/...Strategies/Commands/StreamStringReader.cs → Community.Wsl.Sdk/StreamStringReader.cs b/...Strategies/Commands/StreamStringReader.cs → Community.Wsl.Sdk/StreamStringReader.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Community.Wsl.Sdk.Strategies.Commands;
+namespace Community.Wsl.Sdk;
 
 internal class StreamStringReader : StreamDataReader
 {

diff --git a/Community.Wsl.Sdk/Strategies/Api/WslApi.cs → Community.Wsl.Sdk/WslApi.cs b/Community.Wsl.Sdk/Strategies/Api/WslApi.cs → Community.Wsl.Sdk/WslApi.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using Community.Wsx.Shared;
 
-namespace Community.Wsl.Sdk.Strategies.Api;
+namespace Community.Wsl.Sdk;
 
 /// <summary>
 /// <inheritdoc cref="IWslApi"/>
@@ -96,7 +96,7 @@ public IReadOnlyList<DistroInfo> GetDistroList()
                 (keyName) =>
                     ReadFromRegistryKey(
                         lxssKey.OpenSubKey(keyName)!,
-                        Guid.Parse(keyName),
+                        Guid.Parse((string)keyName),
                         defaultGuid
                     )
             )

diff --git a/README.md b/README.md
@@ -138,6 +138,7 @@ Breaking changes:
 * Support for Net. 5 has been removed. Net. 5 is [out of support since May 10, 2022](https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core).
 * Support for .NET Core 3.1 has been removed. .NET Core 3.1 will be [out of support after December 13, 2022](https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core).
 * Migrated to `Community.Wsx.Shared` (replaces most interfaces and implementations for )
+* Moved classes & interfaces in `Strategies.{Api,Commands}.*` to root namespace.
 
 Please upgrade to a newer .NET and .NET Core runtime version.
 The minimum supported Net. version is Net. 6.