Moving all projects under their own folder under src and the tests un…

…der their own test project under tests. Updating project.json to reflect the new folder structure. Also, incremental building is not working, so I had to turn off parallel building in MSBuild. Lastly, I removed dotnet pack for the test projects so that they are not published to the myget feed. Adding a corefxlab.sln file and removing the individual solutions under the individual projects.
blackstarzes · Feb 12, 2016 · 58b57d1 · 58b57d1
1 parent 645673c
commit 58b57d1
Show file tree

Hide file tree

Showing 418 changed files with 392 additions and 693 deletions.
diff --git a/build.cmd b/build.cmd
@@ -39,7 +39,7 @@ call :build %*
 goto :AfterBuild
 
 :build
-%_buildprefix% msbuild "%_buildproj%" /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%_buildlog%";Append %* %_buildpostfix%
+%_buildprefix% msbuild "%_buildproj%" /nologo /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%_buildlog%";Append %* %_buildpostfix%
 set BUILDERRORLEVEL=%ERRORLEVEL%
 goto :eof
 

diff --git a/build.proj b/build.proj
@@ -4,6 +4,7 @@
 
   <ItemGroup>
     <Project Include="src\dirs.proj" />
+    <Project Include="tests\dirs.proj" />
   </ItemGroup>
 
   <Import Project="dir.targets" />

diff --git a/corefxlab.sln b/corefxlab.sln
diff --git a/dotnet-test.targets b/dotnet-test.targets
@@ -5,6 +5,12 @@
     <TestCommandLine>(set DOTNET_HOME=$(DotnetPath)) &amp; $(DotnetExe) test &quot;$(ProjectJson)&quot; {XunitTraitOptions}</TestCommandLine>
   </PropertyGroup>
 
+  <Target Name="Build">
+    <!-- This was the only place I could find where this was guaranteed to be executed. The other targets I tried work in some cases (build.cmd) but not others (msbuild). I went with this simple approach for now. -->
+    <Exec Command="$(DotnetExe) restore &quot;$(ProjectJson)&quot;" StandardOutputImportance="Low" CustomErrorRegularExpression="^Unable to locate .*" />
+    <Exec Command="$(DotnetExe) build &quot;$(ProjectJson)&quot;" />
+  </Target>
+
   <Target Name="RunTestsForProject"
           DependsOnTargets="DiscoverTestInputs"
           AfterTargets="CheckTestCategories"
@@ -37,8 +43,6 @@
           BeforeTargets="RunTestsForProject">
     <Message Text="Running CopyTestToTestDirectory: $(TestPath)%(TestTargetFramework.Folder)" Importance="High" />
 
-    <MakeDir Directories="$(TestPath)%(TestTargetFramework.Folder)" />
-
-    <Exec Command="$(DotnetExe) build &quot;$(ProjectJson)&quot;" />
+    <MakeDir Directories="$(TestPath)%(TestTargetFramework.Folder)" />    
   </Target>
 </Project>
diff --git a/src/Microsoft.CodeAnalysis.StackOnlyTypes/Microsoft.CodeAnalysis.StackOnlyTypes.sln b/src/Microsoft.CodeAnalysis.StackOnlyTypes/Microsoft.CodeAnalysis.StackOnlyTypes.sln
diff --git a/src/System.Buffers/src/System.Buffers.xproj → ...Buffers.Experimental/System.Buffers.xproj b/src/System.Buffers/src/System.Buffers.xproj → ...Buffers.Experimental/System.Buffers.xproj
@@ -15,5 +15,10 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />  
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="Build">
+    <!-- This was the only place I could find where this was guaranteed to be executed. The other targets I tried work in some cases (build.cmd) but not others (msbuild). I went with this simple approach for now. -->
+    <Exec Command="$(DotnetExe) restore &quot;$(ProjectJson)&quot;" StandardOutputImportance="Low" CustomErrorRegularExpression="^Unable to locate .*" />
+    <Exec Command="$(DotnetExe) pack &quot;$(ProjectJson)&quot; -o &quot;$(ProjectDir)nuget&quot; -c Release --version-suffix $([System.DateTime]::Now.ToString(&quot;eyyMMdd-1&quot;)) -t &quot;$(OutputPath)temp&quot;" />
+  </Target>  
 </Project>
diff --git a/...ers/src/System/Buffers/BufferUtilities.cs → ...imental/System/Buffers/BufferUtilities.cs b/...ers/src/System/Buffers/BufferUtilities.cs → ...imental/System/Buffers/BufferUtilities.cs
diff --git a/...src/System/Buffers/ManagedBufferBucket.cs → ...tal/System/Buffers/ManagedBufferBucket.cs b/...src/System/Buffers/ManagedBufferBucket.cs → ...tal/System/Buffers/ManagedBufferBucket.cs
diff --git a/...s/src/System/Buffers/ManagedBufferPool.cs → ...ental/System/Buffers/ManagedBufferPool.cs b/...s/src/System/Buffers/ManagedBufferPool.cs → ...ental/System/Buffers/ManagedBufferPool.cs
diff --git a/.../src/System/Buffers/NativeBufferBucket.cs → ...ntal/System/Buffers/NativeBufferBucket.cs b/.../src/System/Buffers/NativeBufferBucket.cs → ...ntal/System/Buffers/NativeBufferBucket.cs
diff --git a/...rs/src/System/Buffers/NativeBufferPool.cs → ...mental/System/Buffers/NativeBufferPool.cs b/...rs/src/System/Buffers/NativeBufferPool.cs → ...mental/System/Buffers/NativeBufferPool.cs
diff --git a/src/System.Buffers/src/project.json → src/System.Buffers.Experimental/project.json b/src/System.Buffers/src/project.json → src/System.Buffers.Experimental/project.json
@@ -16,7 +16,7 @@
   "requireLicenseAcceptance": true,
   "compilationOptions": {
     "allowUnsafe": true,
-    "keyFile": "../../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "System.Diagnostics.Debug": "4.0.0",

diff --git a/src/System.Buffers/System.Buffers.sln b/src/System.Buffers/System.Buffers.sln
diff --git a/...nary/src/Properties/Resources.Designer.cs → ...ctionary/Properties/Resources.Designer.cs b/...nary/src/Properties/Resources.Designer.cs → ...ctionary/Properties/Resources.Designer.cs
diff --git a/...eDictionary/src/Properties/Resources.resx → ...ValueDictionary/Properties/Resources.resx b/...eDictionary/src/Properties/Resources.resx → ...ValueDictionary/Properties/Resources.resx
diff --git a/src/System.Collections.Generic.MultiValueDictionary/System.Collections.sln b/src/System.Collections.Generic.MultiValueDictionary/System.Collections.sln
diff --git a/...ueDictionary/src/System.Collections.xproj → ...iValueDictionary/System.Collections.xproj b/...ueDictionary/src/System.Collections.xproj → ...iValueDictionary/System.Collections.xproj
diff --git a/...llections/Generic/MultiValueDictionary.cs → ...llections/Generic/MultiValueDictionary.cs b/...llections/Generic/MultiValueDictionary.cs → ...llections/Generic/MultiValueDictionary.cs
diff --git a/...ric.MultiValueDictionary/src/project.json → ...Generic.MultiValueDictionary/project.json b/...ric.MultiValueDictionary/src/project.json → ...Generic.MultiValueDictionary/project.json
@@ -18,7 +18,7 @@
     "Properties.Resources": "Properties/Resources.resx"
   },
   "compilationOptions": {
-    "keyFile": "../../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "System.Collections": "4.0.0",

diff --git a/...em.CommandLine/src/Properties/Assembly.cs → ...System.CommandLine/Properties/Assembly.cs b/...em.CommandLine/src/Properties/Assembly.cs → ...System.CommandLine/Properties/Assembly.cs
diff --git a/src/System.CommandLine/System.CommandLine.sln b/src/System.CommandLine/System.CommandLine.sln
diff --git a/....CommandLine/src/System.CommandLine.xproj → ...stem.CommandLine/System.CommandLine.xproj b/....CommandLine/src/System.CommandLine.xproj → ...stem.CommandLine/System.CommandLine.xproj
diff --git a/...ndLine/src/System/CommandLine/Argument.cs → ...ommandLine/System/CommandLine/Argument.cs b/...ndLine/src/System/CommandLine/Argument.cs → ...ommandLine/System/CommandLine/Argument.cs
diff --git a/...src/System/CommandLine/ArgumentCommand.cs → ...ine/System/CommandLine/ArgumentCommand.cs b/...src/System/CommandLine/ArgumentCommand.cs → ...ine/System/CommandLine/ArgumentCommand.cs
diff --git a/...c/System/CommandLine/ArgumentCommand`1.cs → ...e/System/CommandLine/ArgumentCommand`1.cs b/...c/System/CommandLine/ArgumentCommand`1.cs → ...e/System/CommandLine/ArgumentCommand`1.cs
diff --git a/...e/src/System/CommandLine/ArgumentLexer.cs → ...dLine/System/CommandLine/ArgumentLexer.cs b/...e/src/System/CommandLine/ArgumentLexer.cs → ...dLine/System/CommandLine/ArgumentLexer.cs
diff --git a/.../src/System/CommandLine/ArgumentList`1.cs → ...Line/System/CommandLine/ArgumentList`1.cs b/.../src/System/CommandLine/ArgumentList`1.cs → ...Line/System/CommandLine/ArgumentList`1.cs
diff --git a/.../src/System/CommandLine/ArgumentParser.cs → ...Line/System/CommandLine/ArgumentParser.cs b/.../src/System/CommandLine/ArgumentParser.cs → ...Line/System/CommandLine/ArgumentParser.cs
diff --git a/.../src/System/CommandLine/ArgumentSyntax.cs → ...Line/System/CommandLine/ArgumentSyntax.cs b/.../src/System/CommandLine/ArgumentSyntax.cs → ...Line/System/CommandLine/ArgumentSyntax.cs
diff --git a/...em/CommandLine/ArgumentSyntaxException.cs → ...em/CommandLine/ArgumentSyntaxException.cs b/...em/CommandLine/ArgumentSyntaxException.cs → ...em/CommandLine/ArgumentSyntaxException.cs
diff --git a/...em/CommandLine/ArgumentSyntax_Definers.cs → ...em/CommandLine/ArgumentSyntax_Definers.cs b/...em/CommandLine/ArgumentSyntax_Definers.cs → ...em/CommandLine/ArgumentSyntax_Definers.cs
diff --git a/...e/src/System/CommandLine/ArgumentToken.cs → ...dLine/System/CommandLine/ArgumentToken.cs b/...e/src/System/CommandLine/ArgumentToken.cs → ...dLine/System/CommandLine/ArgumentToken.cs
diff --git a/...Line/src/System/CommandLine/Argument`1.cs → ...mandLine/System/CommandLine/Argument`1.cs b/...Line/src/System/CommandLine/Argument`1.cs → ...mandLine/System/CommandLine/Argument`1.cs
diff --git a/...c/System/CommandLine/HelpTextGenerator.cs → ...e/System/CommandLine/HelpTextGenerator.cs b/...c/System/CommandLine/HelpTextGenerator.cs → ...e/System/CommandLine/HelpTextGenerator.cs
diff --git a/.../System/CommandLine/InternalsVisibleTo.cs → .../System/CommandLine/InternalsVisibleTo.cs b/.../System/CommandLine/InternalsVisibleTo.cs → .../System/CommandLine/InternalsVisibleTo.cs
diff --git a/...ommandLine/src/System/Strings.Designer.cs → ...em.CommandLine/System/Strings.Designer.cs b/...ommandLine/src/System/Strings.Designer.cs → ...em.CommandLine/System/Strings.Designer.cs
diff --git a/...ystem.CommandLine/src/System/Strings.resx → src/System.CommandLine/System/Strings.resx b/...ystem.CommandLine/src/System/Strings.resx → src/System.CommandLine/System/Strings.resx
diff --git a/src/System.CommandLine/src/project.json → src/System.CommandLine/project.json b/src/System.CommandLine/src/project.json → src/System.CommandLine/project.json
@@ -15,7 +15,7 @@
   "projectUrl": "https://github.com/dotnet/corefxlab",
   "requireLicenseAcceptance": true,
   "compilationOptions": {
-    "keyFile": "../../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
     "System.Collections": "4.0.10-*",

diff --git a/...raphics/src/Resources/Strings.Designer.cs → ...g.Graphics/Properties/Strings.Designer.cs b/...raphics/src/Resources/Strings.Designer.cs → ...g.Graphics/Properties/Strings.Designer.cs
diff --git a/...awing.Graphics/src/Resources/Strings.resx → ....Drawing.Graphics/Properties/Strings.resx b/...awing.Graphics/src/Resources/Strings.resx → ....Drawing.Graphics/Properties/Strings.resx
diff --git a/src/System.Drawing.Graphics/System.Drawing.Graphics.sln b/src/System.Drawing.Graphics/System.Drawing.Graphics.sln
diff --git a/...raphics/src/System.Drawing.Graphics.xproj → ...ng.Graphics/System.Drawing.Graphics.xproj b/...raphics/src/System.Drawing.Graphics.xproj → ...ng.Graphics/System.Drawing.Graphics.xproj
diff --git a/...src/System/Drawing/Graphics/DLLImports.cs → ...ics/System/Drawing/Graphics/DLLImports.cs b/...src/System/Drawing/Graphics/DLLImports.cs → ...ics/System/Drawing/Graphics/DLLImports.cs
diff --git a/...ystem/Drawing/Graphics/GDStreamWrapper.cs → ...ystem/Drawing/Graphics/GDStreamWrapper.cs b/...ystem/Drawing/Graphics/GDStreamWrapper.cs → ...ystem/Drawing/Graphics/GDStreamWrapper.cs
diff --git a/...hics/src/System/Drawing/Graphics/Image.cs → ...Graphics/System/Drawing/Graphics/Image.cs b/...hics/src/System/Drawing/Graphics/Image.cs → ...Graphics/System/Drawing/Graphics/Image.cs
diff --git a/...ystem/Drawing/Graphics/ImageExtensions.cs → ...ystem/Drawing/Graphics/ImageExtensions.cs b/...ystem/Drawing/Graphics/ImageExtensions.cs → ...ystem/Drawing/Graphics/ImageExtensions.cs
diff --git a/...g/Graphics/Interop/Linux/Interop.Linux.cs → ...g/Graphics/Interop/Linux/Interop.Linux.cs b/...g/Graphics/Interop/Linux/Interop.Linux.cs → ...g/Graphics/Interop/Linux/Interop.Linux.cs
diff --git a/...awing/Graphics/Interop/OSX/Interop.OSX.cs → ...awing/Graphics/Interop/OSX/Interop.OSX.cs b/...awing/Graphics/Interop/OSX/Interop.OSX.cs → ...awing/Graphics/Interop/OSX/Interop.OSX.cs
diff --git a/...aphics/Interop/Windows/Interop.Windows.cs → ...aphics/Interop/Windows/Interop.Windows.cs b/...aphics/Interop/Windows/Interop.Windows.cs → ...aphics/Interop/Windows/Interop.Windows.cs
diff --git a/...aphics/src/System/Drawing/Graphics/Jpg.cs → ...g.Graphics/System/Drawing/Graphics/Jpg.cs b/...aphics/src/System/Drawing/Graphics/Jpg.cs → ...g.Graphics/System/Drawing/Graphics/Jpg.cs
diff --git a/...aphics/src/System/Drawing/Graphics/Png.cs → ...g.Graphics/System/Drawing/Graphics/Png.cs b/...aphics/src/System/Drawing/Graphics/Png.cs → ...g.Graphics/System/Drawing/Graphics/Png.cs
diff --git a/src/System.Drawing.Graphics/src/project.json → src/System.Drawing.Graphics/project.json b/src/System.Drawing.Graphics/src/project.json → src/System.Drawing.Graphics/project.json
@@ -16,11 +16,11 @@
   "requireLicenseAcceptance": true,
   "compilationOptions": {
     "allowUnsafe": true,
-    "keyFile": "../../../tools/Key.snk"
-  },  
+    "keyFile": "../../tools/Key.snk"
+  },
   "compileExclude": [ "**/*.OSX.cs", "**/*.Linux.cs"],
   "namedResource": {
-    "Resources.Strings": "Resources/Strings.resx"
+    "Resources.Strings": "Properties/Strings.resx"
   },
   "dependencies": {
     "System.Diagnostics.Debug": "4.0.10-*",

diff --git a/src/System.Drawing.Graphics/tests/LibgdBins/x64Bin/libgd.dll b/src/System.Drawing.Graphics/tests/LibgdBins/x64Bin/libgd.dll
diff --git a/src/System.Drawing.Graphics/tests/LibgdBins/x86Bin/libgd.dll b/src/System.Drawing.Graphics/tests/LibgdBins/x86Bin/libgd.dll
diff --git a/src/System.Drawing.Graphics/tests/libgd.dll b/src/System.Drawing.Graphics/tests/libgd.dll
diff --git a/...olling/src/Properties/Strings.Designer.cs → ...er.Polling/Properties/Strings.Designer.cs b/...olling/src/Properties/Strings.Designer.cs → ...er.Polling/Properties/Strings.Designer.cs
diff --git a/...tcher.Polling/src/Properties/Strings.resx → ...m.Watcher.Polling/Properties/Strings.resx b/...tcher.Polling/src/Properties/Strings.resx → ...m.Watcher.Polling/Properties/Strings.resx
diff --git a/src/System.IO.FileSystem.Watcher.Polling/System.IO.FileSystem.Watcher.Polling.sln b/src/System.IO.FileSystem.Watcher.Polling/System.IO.FileSystem.Watcher.Polling.sln
diff --git a/...ystem.IO.FileSystem.Watcher.Polling.xproj → ...ystem.IO.FileSystem.Watcher.Polling.xproj b/...ystem.IO.FileSystem.Watcher.Polling.xproj → ...ystem.IO.FileSystem.Watcher.Polling.xproj
diff --git a/...tcher.Polling/src/System/IO/ChangeType.cs → ...m.Watcher.Polling/System/IO/ChangeType.cs b/...tcher.Polling/src/System/IO/ChangeType.cs → ...m.Watcher.Polling/System/IO/ChangeType.cs
diff --git a/...r.Polling/src/System/IO/Datastructures.cs → ...tcher.Polling/System/IO/Datastructures.cs b/...r.Polling/src/System/IO/Datastructures.cs → ...tcher.Polling/System/IO/Datastructures.cs
diff --git a/...tcher.Polling/src/System/IO/FileChange.cs → ...m.Watcher.Polling/System/IO/FileChange.cs b/...tcher.Polling/src/System/IO/FileChange.cs → ...m.Watcher.Polling/System/IO/FileChange.cs
diff --git a/...ling/src/System/IO/InteropDeclarations.cs → ....Polling/System/IO/InteropDeclarations.cs b/...ling/src/System/IO/InteropDeclarations.cs → ....Polling/System/IO/InteropDeclarations.cs
diff --git a/...src/System/IO/PathToFileStateHashtable.cs → ...ing/System/IO/PathToFileStateHashtable.cs b/...src/System/IO/PathToFileStateHashtable.cs → ...ing/System/IO/PathToFileStateHashtable.cs
diff --git a/...r.Polling/src/System/IO/PollingWatcher.cs → ...tcher.Polling/System/IO/PollingWatcher.cs b/...r.Polling/src/System/IO/PollingWatcher.cs → ...tcher.Polling/System/IO/PollingWatcher.cs
diff --git a/...leSystem.Watcher.Polling/src/project.json → ...O.FileSystem.Watcher.Polling/project.json b/...leSystem.Watcher.Polling/src/project.json → ...O.FileSystem.Watcher.Polling/project.json
@@ -19,7 +19,7 @@
   },
   "compilationOptions": {
     "allowUnsafe": true,
-    "keyFile": "../../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk"
   },  
   "dependencies": {
     "System.Collections": "4.0.0",

diff --git a/src/System.Net.Libuv/System.Net.Libuv.sln b/src/System.Net.Libuv/System.Net.Libuv.sln
diff --git a/...stem.Net.Libuv/src/System.Net.Libuv.xproj → src/System.Net.Libuv/System.Net.Libuv.xproj b/...stem.Net.Libuv/src/System.Net.Libuv.xproj → src/System.Net.Libuv/System.Net.Libuv.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,13 +7,12 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>C5FD8740-19EA-4BCC-B518-7F16B55D23CA</ProjectGuid>
+    <ProjectGuid>2f2109e8-6e5d-4063-8e59-07f0e798adf2</ProjectGuid>
     <RootNamespace>System.Net.Libuv</RootNamespace>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />  
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
diff --git a/....Net.Libuv/src/System/Net/Libuv/Buffer.cs → ...stem.Net.Libuv/System/Net/Libuv/Buffer.cs b/....Net.Libuv/src/System/Net/Libuv/Buffer.cs → ...stem.Net.Libuv/System/Net/Libuv/Buffer.cs
diff --git a/...m.Net.Libuv/src/System/Net/Libuv/Error.cs → ...ystem.Net.Libuv/System/Net/Libuv/Error.cs b/...m.Net.Libuv/src/System/Net/Libuv/Error.cs → ...ystem.Net.Libuv/System/Net/Libuv/Error.cs
diff --git a/....Net.Libuv/src/System/Net/Libuv/Handle.cs → ...stem.Net.Libuv/System/Net/Libuv/Handle.cs b/....Net.Libuv/src/System/Net/Libuv/Handle.cs → ...stem.Net.Libuv/System/Net/Libuv/Handle.cs
diff --git a/...Net.Libuv/src/System/Net/Libuv/Interop.cs → ...tem.Net.Libuv/System/Net/Libuv/Interop.cs b/...Net.Libuv/src/System/Net/Libuv/Interop.cs → ...tem.Net.Libuv/System/Net/Libuv/Interop.cs
diff --git a/...et.Libuv/src/System/Net/Libuv/Listener.cs → ...em.Net.Libuv/System/Net/Libuv/Listener.cs b/...et.Libuv/src/System/Net/Libuv/Listener.cs → ...em.Net.Libuv/System/Net/Libuv/Listener.cs
diff --git a/...em.Net.Libuv/src/System/Net/Libuv/Loop.cs → ...System.Net.Libuv/System/Net/Libuv/Loop.cs b/...em.Net.Libuv/src/System/Net/Libuv/Loop.cs → ...System.Net.Libuv/System/Net/Libuv/Loop.cs
diff --git a/...Net.Libuv/src/System/Net/Libuv/Request.cs → ...tem.Net.Libuv/System/Net/Libuv/Request.cs b/...Net.Libuv/src/System/Net/Libuv/Request.cs → ...tem.Net.Libuv/System/Net/Libuv/Request.cs
diff --git a/....Net.Libuv/src/System/Net/Libuv/Stream.cs → ...stem.Net.Libuv/System/Net/Libuv/Stream.cs b/....Net.Libuv/src/System/Net/Libuv/Stream.cs → ...stem.Net.Libuv/System/Net/Libuv/Stream.cs
diff --git a/...tem.Net.Libuv/src/System/Net/Libuv/Tcp.cs → src/System.Net.Libuv/System/Net/Libuv/Tcp.cs b/...tem.Net.Libuv/src/System/Net/Libuv/Tcp.cs → src/System.Net.Libuv/System/Net/Libuv/Tcp.cs
diff --git a/src/System.Net.Libuv/src/project.json → src/System.Net.Libuv/project.json b/src/System.Net.Libuv/src/project.json → src/System.Net.Libuv/project.json
@@ -16,7 +16,7 @@
   "requireLicenseAcceptance": true,
   "compilationOptions": {
     "allowUnsafe": true,
-    "keyFile": "../../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk"
   },  
   "dependencies": {
     "System.Buffers.Experimental": "0.1.0-*",

diff --git a/src/System.Net.Libuv/src/libuv.dll b/src/System.Net.Libuv/src/libuv.dll