Added a workaround to fix e_sqlite3.dll loading.

Added NoWarn="NU1604" to package references in the kernel projects. Fixed project reference paths in TRKernel.csproj. Project file cleanup.
incognel · Jan 8, 2018 · 0142e03 · 0142e03
1 parent 280defa
commit 0142e03
Show file tree

Hide file tree

Showing 25 changed files with 30 additions and 202 deletions.
diff --git a/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj
@@ -72,7 +72,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cosmos.Build" Version="*" />
+        <PackageReference Include="Cosmos.Build" Version="*" NoWarn="NU1604" />
     </ItemGroup>
 
 </Project>
diff --git a/Demos/Guess/GuessKernel.csproj b/Demos/Guess/GuessKernel.csproj
@@ -57,7 +57,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cosmos.Build" Version="*" />
+        <PackageReference Include="Cosmos.Build" Version="*" NoWarn="NU1604" />
     </ItemGroup>
 
 </Project>
diff --git a/Tests/BoxingTests/BoxingTests.csproj b/Tests/BoxingTests/BoxingTests.csproj
@@ -4,14 +4,10 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="BoxingTestsBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
-</Project>
+</Project>
diff --git a/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj b/Tests/Cosmos.Compiler.Tests.Bcl/Cosmos.Compiler.Tests.Bcl.csproj
@@ -5,10 +5,6 @@
         <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Compiler.Tests.BclBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.Encryption.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Compiler.Tests.EncryptionBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj b/Tests/Cosmos.Compiler.Tests.Exceptions/Cosmos.Compiler.Tests.Exceptions.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Compiler.Tests.ExceptionsBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj b/Tests/Cosmos.Compiler.Tests.Interfaces/Cosmos.Compiler.Tests.Interfaces.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Compiler.Tests.InterfacesBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj b/Tests/Cosmos.Compiler.Tests.LinqTests/Cosmos.Compiler.Tests.LinqTests.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Compiler.Tests.LinqTestsBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj b/Tests/Cosmos.Compiler.Tests.MethodTests/Cosmos.Compiler.Tests.MethodTests.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Compiler.Tests.MethodTestsBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine/Cosmos.Compiler.Tests.SimpleWriteLine.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Compiler.Tests.SimpleWriteLineBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj b/Tests/Cosmos.Compiler.Tests.SingleEchoTest/Cosmos.Compiler.Tests.SingleEchoTest.csproj
@@ -6,10 +6,6 @@
         <AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Compiler.Tests.SingleEchoTestBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/Cosmos.Compiler.Tests.TypeSystem/Cosmos.Compiler.Tests.TypeSystem.csproj b/Tests/Cosmos.Compiler.Tests.TypeSystem/Cosmos.Compiler.Tests.TypeSystem.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
-    <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
+        <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
+    </ItemGroup>
 
 </Project>
diff --git a/Tests/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj b/Tests/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\source\Cosmos.Core\Cosmos.Core.csproj" />
+        <ProjectReference Include="..\..\source\Cosmos.Core\Cosmos.Core.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj b/Tests/Cosmos.Kernel.Tests.Fat/Cosmos.Kernel.Tests.Fat.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Kernel.Tests.FatBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Common\Cosmos.Common.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />

diff --git a/Tests/Cosmos.Kernel.Tests.Fat2/Cosmos.Kernel.Tests.Fat2.csproj b/Tests/Cosmos.Kernel.Tests.Fat2/Cosmos.Kernel.Tests.Fat2.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Kernel.Tests.FatBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Common\Cosmos.Common.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />

diff --git a/Tests/Cosmos.Kernel.Tests.Fat2/Cosmos.Kernel.Tests.Fat2Boot.Cosmos b/Tests/Cosmos.Kernel.Tests.Fat2/Cosmos.Kernel.Tests.Fat2Boot.Cosmos
diff --git a/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj b/Tests/Cosmos.Kernel.Tests.IO/Cosmos.Kernel.Tests.IO.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="Cosmos.Kernel.Tests.IOBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Common\Cosmos.Common.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />

diff --git a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj
@@ -7,30 +7,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Compile Update="Engine.Bochs.cs">
-            <DependentUpon>Engine.cs</DependentUpon>
-        </Compile>
-        <Compile Update="Engine.Helpers.cs">
-            <DependentUpon>Engine.cs</DependentUpon>
-        </Compile>
-        <Compile Update="Engine.HyperV.cs">
-            <DependentUpon>Engine.cs</DependentUpon>
-        </Compile>
-        <Compile Update="Engine.Run.cs">
-            <DependentUpon>Engine.cs</DependentUpon>
-        </Compile>
-        <Compile Update="Engine.Running.cs">
-            <DependentUpon>Engine.cs</DependentUpon>
-        </Compile>
-        <Compile Update="Engine.VMware.cs">
+        <Compile Update="Engine.*.cs">
             <DependentUpon>Engine.cs</DependentUpon>
         </Compile>
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
         <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
         <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-        <PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
     </ItemGroup>
 
     <ItemGroup>
@@ -67,4 +52,4 @@
         <ProjectReference Include="..\VGACompilerCrash\VGACompilerCrash.csproj" />
     </ItemGroup>
 
-</Project>
+</Project>
diff --git a/Tests/GraphicTest/GraphicTest.csproj b/Tests/GraphicTest/GraphicTest.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="GraphicTestBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj b/Tests/SimpleStructsAndArraysTest/SimpleStructsAndArraysTest.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="SimpleStructsAndArraysTestBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />

diff --git a/Tests/VGACompilerCrash/VGACompilerCrash.csproj b/Tests/VGACompilerCrash/VGACompilerCrash.csproj
@@ -4,14 +4,10 @@
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Remove="VGACompilerCrashBoot.Cosmos" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
         <ProjectReference Include="..\..\source\Cosmos.System2\Cosmos.System2.csproj" />
         <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
     </ItemGroup>
 
-</Project>
+</Project>