GitTools
diff --git a/‎new-cli/GitVersion.Common/GitVersion.Common.csproj
+7-1 b/‎new-cli/GitVersion.Common/GitVersion.Common.csproj
+7-1
diff --git a/‎new-cli/GitVersion.Common/Helpers/EncodingHelper.cs
-95 b/‎new-cli/GitVersion.Common/Helpers/EncodingHelper.cs
-95
diff --git a/‎new-cli/GitVersion.Common/Helpers/LambdaEqualityHelper.cs
-56 b/‎new-cli/GitVersion.Common/Helpers/LambdaEqualityHelper.cs
-56
diff --git a/‎new-cli/GitVersion.Common/Helpers/LambdaKeyComparer.cs
-31 b/‎new-cli/GitVersion.Common/Helpers/LambdaKeyComparer.cs
-31
diff --git a/‎new-cli/GitVersion.Common/Helpers/PathHelper.cs
-43 b/‎new-cli/GitVersion.Common/Helpers/PathHelper.cs
-43
diff --git a/‎new-cli/GitVersion.Common/Helpers/RetryAction.cs
-68 b/‎new-cli/GitVersion.Common/Helpers/RetryAction.cs
-68
diff --git a/‎new-cli/GitVersion.Common/Helpers/StringComparerUtils.cs
-8 b/‎new-cli/GitVersion.Common/Helpers/StringComparerUtils.cs
-8
diff --git a/‎new-cli/GitVersion.Common/Infrastructure/IEnvironment.cs
-7 b/‎new-cli/GitVersion.Common/Infrastructure/IEnvironment.cs
-7
diff --git a/‎new-cli/GitVersion.Common/Infrastructure/IFileSystem.cs
-20 b/‎new-cli/GitVersion.Common/Infrastructure/IFileSystem.cs
-20
diff --git a/‎new-cli/GitVersion.Core/CoreModule.cs
-1 b/‎new-cli/GitVersion.Core/CoreModule.cs
-1
diff --git a/‎new-cli/GitVersion.Core/GitVersion.Core.csproj
+8 b/‎new-cli/GitVersion.Core/GitVersion.Core.csproj
+8
diff --git a/‎new-cli/GitVersion.Core/Infrastructure/Environment.cs
-8 b/‎new-cli/GitVersion.Core/Infrastructure/Environment.cs
-8
@@ -3,10 +3,16 @@
     <PackageReference Include="Polly" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\src\GitVersion.Core\Core\Exceptions\WarningException.cs" Link="Exceptions\WarningException.cs"/>
+    <Compile Include="..\..\src\GitVersion.Core\Core\Abstractions\IEnvironment.cs" Link="Infrastructure\%(Filename)%(Extension)" />
+    <Compile Include="..\..\src\GitVersion.Core\Core\Abstractions\IFileSystem.cs" Link="Infrastructure\%(Filename)%(Extension)" />
+    <Compile Include="..\..\src\GitVersion.Core\Core\Exceptions\WarningException.cs" Link="Exceptions\%(Filename)%(Extension)"/>
     <Compile Include="..\..\src\GitVersion.Core\Extensions\StringExtensions.cs" Link="Extensions\StringExtensions.cs" />
     <Compile Include="..\..\src\GitVersion.Core\Extensions\CommonExtensions.cs" Link="Extensions\CommonExtensions.cs" />
+    <Compile Include="..\..\src\GitVersion.Core\Helpers\*.cs" Link="Helpers\%(Filename)%(Extension)" />
     <Compile Include="..\..\src\GitVersion.Core\Git\*.cs" Link="Git\%(Filename)%(Extension)" />
     <Compile Include="..\..\src\GitVersion.Core\SemVer\*.cs" Link="SemVer\%(Filename)%(Extension)"/>
   </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="GitVersion.Core" />
+  </ItemGroup>
 </Project>
@@ -1,5 +1,4 @@
 using GitVersion.Infrastructure;
-using Environment = GitVersion.Infrastructure.Environment;
 
 namespace GitVersion;
 
 
@@ -9,4 +9,12 @@
         <PackageReference Include="Serilog.Sinks.File" />
         <PackageReference Include="Serilog.Sinks.Map" />
     </ItemGroup>
+    <ItemGroup>
+      <Compile Include="..\..\src\GitVersion.Core\Core\Environment.cs">
+        <Link>Infrastructure\Environment.cs</Link>
+      </Compile>
+      <Compile Include="..\..\src\GitVersion.Core\Core\FileSystem.cs">
+        <Link>Infrastructure\FileSystem.cs</Link>
+      </Compile>
+    </ItemGroup>
 </Project>
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using GitVersion.Infrastructure;`
`2`		`-using Environment = GitVersion.Infrastructure.Environment;`
`3`	`2`
`4`	`3`	`namespace GitVersion;`
`5`	`4`