Moved plugs references to Cosmos.targets.

ChristofBecu · Jul 14, 2017 · d3ae9f0 · d3ae9f0
1 parent 585ed51
commit d3ae9f0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 57 deletions.
diff --git a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic Subsystem.csproj b/Demos/Cosmos Graphic Subsystem/Cosmos Graphic Subsystem.csproj
@@ -14,10 +14,4 @@
     <ProjectReference Include="..\..\source\Cosmos.System\Cosmos.System.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Cosmos.IL2CPU">
-      <HintPath>..\..\Build\bin\Cosmos.IL2CPU.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic SubsystemBoot.Cosmos b/Demos/Cosmos Graphic Subsystem/Cosmos Graphic SubsystemBoot.Cosmos
@@ -24,26 +24,11 @@
     <Compile Remove="*" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\Cosmos.Core_Asm\Cosmos.Core_Asm.csproj">
-      <Name>Cosmos.Core_Asm</Name>
-      <Project>{3c186d37-21c3-417c-95f1-19be538af88a}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\source\Cosmos.Core_Plugs\Cosmos.Core_Plugs.csproj">
-      <Name>Cosmos.Core_Plugs</Name>
-      <Project>{1132e689-18b0-4d87-94e8-934d4802c540}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\source\Cosmos.System_Plugs\Cosmos.System_Plugs.csproj">
-      <Name>Cosmos.System_Plugs</Name>
-      <Project>{9431ff1f-ad75-4a1e-b38a-46e0f109411d}</Project>
-      <Private>True</Private>
-    </ProjectReference>
     <ProjectReference Include="..\Cosmos Graphic Subsystem\Cosmos Graphic Subsystem.csproj">
       <Name>Cosmos Graphic Subsystem</Name>
       <Project>{49f2c01d-d2c5-4564-810b-1ae92236c5c1}</Project>
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
-</Project>
+</Project>
diff --git a/Demos/Guess/GuessKernelBoot.Cosmos b/Demos/Guess/GuessKernelBoot.Cosmos
@@ -24,25 +24,10 @@
     <Compile Remove="*" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\source\Cosmos.Core_Asm\Cosmos.Core_Asm.csproj">
-      <Name>Cosmos.Core_Asm</Name>
-      <Project>{3c186d37-21c3-417c-95f1-19be538af88a}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\source\Cosmos.Core_Plugs\Cosmos.Core_Plugs.csproj">
-      <Name>Cosmos.Core_Plugs</Name>
-      <Project>{1132e689-18b0-4d87-94e8-934d4802c540}</Project>
-      <Private>True</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\source\Cosmos.System_Plugs\Cosmos.System_Plugs.csproj">
-      <Name>Cosmos.System_Plugs</Name>
-      <Project>{9431ff1f-ad75-4a1e-b38a-46e0f109411d}</Project>
-      <Private>True</Private>
-    </ProjectReference>
     <ProjectReference Include="..\Guess\GuessKernel.csproj">
       <Name>GuessKernel</Name>
       <Project>{e35e0dbf-555f-4d38-8f28-acdfa9dc97bd}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
-</Project>
+</Project>
diff --git a/source/Cosmos.Build.MSBuild/Cosmos.targets b/source/Cosmos.Build.MSBuild/Cosmos.targets
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <CosmosDir Condition="$(CosmosDir) == ''">$([MSBuild]::GetRegistryValue("HKEY_LOCAL_MACHINE\Software\Cosmos", "UserKit"))</CosmosDir>
+    <CosmosDir Condition="$(CosmosDir) == ''">$(AppData)\Cosmos User Kit</CosmosDir>
     <BuildToolsDir Condition="$(BuildToolsDir) == ''">$(CosmosDir)\Build\Tools</BuildToolsDir>
     <VSIPDir Condition="$(VSIPDir) == ''">$(CosmosDir)\Build\VSIP</VSIPDir>
     <NasmFile Condition="'$(NasmFile)' == ''">$(BuildToolsDir)\Nasm\nasm.exe</NasmFile>
@@ -17,7 +17,15 @@
     <CosmosBuildTaskAssemblyFile Condition="'$(CosmosBuildTaskAssemblyFile)' == ''">$(VSIPDir)\Cosmos.Build.MSBuild.dll</CosmosBuildTaskAssemblyFile>
     <AssemblySearchPaths>$(CosmosDir)\Kernel</AssemblySearchPaths>
   </PropertyGroup>
-
+
+  <ItemGroup>
+    <Reference Include="Cosmos.Core_Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
+    <Reference Include="Cosmos.Core_Asm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
+    <Reference Include="Cosmos.Debug.Kernel.Plugs.Asm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
+    <Reference Include="Cosmos.System_Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
+    <Reference Exclude="System.Core" />
+  </ItemGroup>
+
   <UsingTask TaskName="Cosmos.Build.MSBuild.IL2CPU" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
   <UsingTask TaskName="Cosmos.Build.MSBuild.NAsm" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>
   <UsingTask TaskName="Cosmos.Build.MSBuild.MakeISO" AssemblyFile="$(CosmosBuildTaskAssemblyFile)"/>

diff --git a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj
@@ -18,7 +18,6 @@
     <ProjectReference Include="..\Cosmos.Core\Cosmos.Core.csproj" />
     <ProjectReference Include="..\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj" />
     <ProjectReference Include="..\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj" />
-    <ProjectReference Include="..\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj" />
     <ProjectReference Include="..\XSharp.Common\XSharp.Common.csproj" />
   </ItemGroup>
 

diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/CosmosProject.Cosmos b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/Cosmos/CosmosProject.Cosmos
@@ -25,13 +25,6 @@
     <Compile Remove="*" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Cosmos.Core_Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-    <Reference Include="Cosmos.Core_Asm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-    <Reference Include="Cosmos.Debug.Kernel.Plugs.Asm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-    <Reference Include="Cosmos.System_Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-  </ItemGroup>
-
   <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
 
-</Project>
+</Project>
diff --git a/source/Cosmos.VS.Wizards/CosmosProject.Cosmos b/source/Cosmos.VS.Wizards/CosmosProject.Cosmos
@@ -32,13 +32,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Cosmos.Core_Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-    <Reference Include="Cosmos.Core_Asm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-    <Reference Include="Cosmos.Debug.Kernel.Plugs.Asm, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-    <Reference Include="Cosmos.System_Plugs, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5ae71220097cb983" />
-  </ItemGroup>
-
   <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
 
-</Project>
+</Project>