Changes for the install.

ElveStudio · Feb 1, 2017 · d561610 · d561610
1 parent 04c5db4
commit d561610
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 36 deletions.
diff --git a/Build/Tools/nuget.exe b/Build/Tools/nuget.exe
diff --git a/Builder.sln b/Builder.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Builder", "Cosmos.Build.Builder\Cosmos.Build.Builder.csproj", "{74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Builder", "source\Cosmos.Build.Builder\Cosmos.Build.Builder.csproj", "{74A9329A-2B0B-4C0A-976C-E4FB7228D8B2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Installer", "Cosmos.Build.Installer\Cosmos.Build.Installer.csproj", "{27D94586-FE88-4203-BE6A-C99013FD5018}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Build.Installer", "source\Cosmos.Build.Installer\Cosmos.Build.Installer.csproj", "{27D94586-FE88-4203-BE6A-C99013FD5018}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/install-VS2015.bat b/install-VS2015.bat
@@ -3,8 +3,8 @@
 cls
 del source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.*
 
-"Build\Tools\nuget.exe" restore "source\Cosmos.sln"
+"Build\Tools\nuget.exe" restore "Cosmos.sln"
 
-"%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild.exe" "source\Builder.sln" /nologo /maxcpucount /p:Configuration="Debug" /p:Platform="Any CPU"
+"%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild.exe" "Builder.sln" /nologo /maxcpucount /p:Configuration="Debug" /p:Platform="Any CPU"
 
 start source\Cosmos.Build.Builder\bin\Debug\Cosmos.Build.Builder.exe -bat -VS2015 %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs
@@ -21,15 +21,13 @@ public class CosmosTask : Task
         protected int mReleaseNo;
         protected string mInnoFile;
         protected string mInnoPath;
-        // Instead of throwing every exception, we collect them in a list
         protected List<string> mExceptionList = new List<string>();
         public string InnoScriptTargetFile = "Current.iss";
 
         public CosmosTask(string aCosmosDir, int aReleaseNo)
         {
             mCosmosDir = aCosmosDir;
-            mAppDataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                "Cosmos User Kit");
+            mAppDataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Cosmos User Kit");
             mReleaseNo = aReleaseNo;
             mInnoFile = Path.Combine(mCosmosDir, @"Setup\Cosmos.iss");
         }
@@ -126,20 +124,20 @@ protected override List<string> DoRun()
                 {
                     Echo("all checks succeeded");
                 }
-                //Cleanup();                                   
+                //Cleanup();
 
-                //CompileCosmos();                             
-                //CopyTemplates();                             
+                //CompileCosmos();
+                //CopyTemplates();
                 //if (App.IsUserKit)
                 //{
-                //    CreateUserKitScript();                   
+                //    CreateUserKitScript();
                 //}
-                //CreateSetup();                               
+                //CreateSetup();
                 //if (!App.IsUserKit)
                 //{
-                //    RunSetup();                              
-                //    WriteDevKit();                           
-                //    if (!App.DoNotLaunchVS) { LaunchVS(); }  
+                //    RunSetup();
+                //    WriteDevKit();
+                //    if (!App.DoNotLaunchVS) { LaunchVS(); }
                 //}
 
                 //Done();
@@ -386,7 +384,7 @@ protected void CheckPrereqs()
             CheckForInno();
             bool vmWareInstalled = IsVMWareInstalled();
             bool bochsInstalled = IsBochsInstalled();
-            
+
             if (!vmWareInstalled && !bochsInstalled)
             {
                 NotFound("VMWare or Bochs");
@@ -564,7 +562,7 @@ void CompileCosmos()
         {
             Section("Compiling Cosmos");
 
-            MsBuild(Path.Combine(mCosmosDir, @"source\Build.sln"), "Debug");
+            MsBuild(Path.Combine(mCosmosDir, @"Build.sln"), "Debug");
         }
 
         void CopyTemplates()
@@ -634,7 +632,7 @@ void LaunchVS()
 
             Echo("Launching Visual Studio");
             // Fix issue #15565
-            Start(xVisualStudio, Quoted(mCosmosDir + @"\source\Cosmos.sln"), false, true);
+            Start(xVisualStudio, Quoted(mCosmosDir + @"Cosmos.sln"), false, true);
         }
 
         void RunSetup()
@@ -677,4 +675,4 @@ void Done()
             Section("Build Complete!");
         }
     }
-}
+}
diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
@@ -55,32 +55,32 @@
     <Compile Include="ReadNAsmMapToDebugInfo.cs" />
     <Compile Include="TestClass.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Cosmos.snk">
+      <Link>Cosmos.snk</Link>
+    </None>
+    <None Include=".editorconfig" />
+    <None Include="App.config" />
+    <None Include="Cosmos.Build.MSBuild.project.json" />
+    <None Include="Cosmos.targets">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462e82b-8c29-41a9-8265-9c89038adb29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
-      <Project>{AB24E403-54F3-4F67-B5E0-119A7227AAC1}</Project>
+      <Project>{ab24e403-54f3-4f67-b5e0-119a7227aac1}</Project>
       <Name>Cosmos.Debug.Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\Cosmos.Debug.Symbols\Cosmos.Debug.Symbols.csproj">
       <Project>{2e740096-911f-47d0-a46d-998dbb76fc5d}</Project>
       <Name>Cosmos.Debug.Symbols</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\Cosmos.snk">
-      <Link>Cosmos.snk</Link>
-    </None>
-    <None Include=".editorconfig" />
-    <None Include="App.config" />
-    <None Include="Cosmos.Build.MSBuild.project.json" />
-    <None Include="Cosmos.targets">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj b/source/Cosmos.Debug.Hosts/Cosmos.Debug.Hosts.csproj
@@ -57,6 +57,8 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
       <Project>{0462e82b-8c29-41a9-8265-9c89038adb29}</Project>
       <Name>Cosmos.Build.Common</Name>

diff --git a/source/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj b/source/Cosmos.Debug.VSDebugEngine/Cosmos.Debug.VSDebugEngine.csproj
@@ -142,11 +142,11 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cosmos.Build.Common\Cosmos.Build.Common.csproj">
-      <Project>{0462E82B-8C29-41A9-8265-9C89038ADB29}</Project>
+      <Project>{0462e82b-8c29-41a9-8265-9c89038adb29}</Project>
       <Name>Cosmos.Build.Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
-      <Project>{AB24E403-54F3-4F67-B5E0-119A7227AAC1}</Project>
+      <Project>{ab24e403-54f3-4f67-b5e0-119a7227aac1}</Project>
       <Name>Cosmos.Debug.Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\Cosmos.Debug.DebugConnectors\Cosmos.Debug.DebugConnectors.csproj">

diff --git a/source/Cosmos.VS.Package/Cosmos.VS.Package.csproj b/source/Cosmos.VS.Package/Cosmos.VS.Package.csproj
@@ -259,7 +259,7 @@
       <Name>Cosmos.Build.MSBuild</Name>
     </ProjectReference>
     <ProjectReference Include="..\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
-      <Project>{AB24E403-54F3-4F67-B5E0-119A7227AAC1}</Project>
+      <Project>{ab24e403-54f3-4f67-b5e0-119a7227aac1}</Project>
       <Name>Cosmos.Debug.Common</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj b/source/Cosmos.VS.Windows/Cosmos.VS.Windows.csproj
@@ -237,7 +237,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cosmos.Debug.Common\Cosmos.Debug.Common.csproj">
-      <Project>{AB24E403-54F3-4F67-B5E0-119A7227AAC1}</Project>
+      <Project>{ab24e403-54f3-4f67-b5e0-119a7227aac1}</Project>
       <Name>Cosmos.Debug.Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\Cosmos.Debug.DebugConnectors\Cosmos.Debug.DebugConnectors.csproj">