Updates.

TomLeeLive · Jul 5, 2017 · 1ce4293 · 1ce4293
1 parent e244fbd
commit 1ce4293
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 53 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -5,23 +5,24 @@ platform: AnyCPU
 shallow_clone: true
 clone_folder: c:\Cosmos
 
-#install:
-#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/install-nuget-3-4-0.ps1'))
-
 build_script:
 - cmd: >-
     rem %APPVEYOR_BUILD_FOLDER%
 
 
     nuget restore "Builder.sln"
 
-    nuget restore "Cosmos.sln"
+    nuget restore "Build.sln"
 
-    msbuild "Builder.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:DeployExtension=false
+    nuget restore "Test.sln"
 
+    
+    msbuild "Builder.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:DeployExtension=false
 
     msbuild "Build.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:OutputPath="%APPVEYOR_BUILD_FOLDER%\Build\VSIP" /p:DeployExtension=false
 
+    msbuild "Test.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug
+
 
     xcopy /Y "%APPVEYOR_BUILD_FOLDER%\Build\VSIP\Cosmos.targets" "%ProgramFiles(x86)%\MSBuild\Cosmos\"
 
@@ -61,20 +62,18 @@ build_script:
     reg add HKCR\BochsConfigFile\shell\Run\command /ve /d "\"C:\Program Files (x86)\Bochs-2.6.8\Bochs.exe\" -q -f \"%1\""
 
 
-    msbuild "Cosmos.sln" /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Platform="Any CPU" /p:Configuration=Debug /p:DeployExtension=false
-
 #test: off
 #  assemblies:
 #  - Cosmos.Core.Memory.Test.dll
 #  - DebugCompiler.dll
 #  - Cosmos.TestRunner.UnitTest.dll
 
 test_script:
-- cmd: >-
-    dotnet test Tests\Cosmos.TestRunner.UnitTest\Cosmos.TestRunner.UnitTest.csproj --logger "trx;LogFileName=c:\Cosmos\TestResult.xml"
-- ps: >-    
+- cmd: dotnet test Tests\Cosmos.TestRunner.UnitTest\Cosmos.TestRunner.UnitTest.csproj --logger "trx;LogFileName=c:\Cosmos\TestResult.xml"
+
+on_finish:
+- ps: |
     $wc = New-Object 'System.Net.WebClient'
-    
     $wc.UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", "c:\Cosmos\TestResult.xml")
 
 notifications:

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "1.0.4"
+    }
+}
diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs
@@ -276,19 +276,19 @@ private void Publish(string project, string destDir) {
     private void CompileCosmos() {
       string xVSIPDir = Path.Combine(mCosmosPath, "Build", "VSIP");
       string xPackagesDir = Path.Combine(xVSIPDir, "KernelPackages");
-      string xVersion = "1.0.1";
+      string xVersion = "1.0.2";
 
       if (!App.IsUserKit) {
         xVersion += "-" + DateTime.Now.ToString("yyyyMMddHHmm");
       }
 
-      Section("Clear Nuget Local");
+      Section("Clean NuGet Local Feed");
       Clean(Path.Combine(mCosmosPath, @"Cosmos.sln"));
 
-      Section("Restore Nuget Packages");
+      Section("Restore NuGet Packages");
       Restore(Path.Combine(mCosmosPath, @"Cosmos.sln"));
 
-      Section("Update Nuget Params");
+      Section("Update NuGet");
       Update(Path.Combine(mCosmosPath, @"Cosmos.sln"));
 
       Section("Build Cosmos");
@@ -343,12 +343,12 @@ private void CreateSetup() {
       string xCfg = App.IsUserKit ? "UserKit" : "DevKit";
       string vsVersionConfiguration = "vs2017";
 
-      // Use configuration which will instal to the VS Exp Hive
+      // Use configuration which will install to the VS Exp Hive
       if (App.UseVsHive) {
         vsVersionConfiguration += "Exp";
       }
-      Log.WriteLine($"  {xISCC} /Q {Quoted(mInnoFile)} /dBuildConfiguration={xCfg} /dVSVersion={vsVersionConfiguration} /dVSPath={Quoted(Paths.VSPath)} /dChangeSetVersion={Quoted(mReleaseNo.ToString())}");
-      StartConsole(xISCC, $"/Q {Quoted(mInnoFile)} /dBuildConfiguration={xCfg} /dVSVersion={vsVersionConfiguration} /dVSPath={Quoted(Paths.VSPath)} /dChangeSetVersion={Quoted(mReleaseNo.ToString())}");
+      Log.WriteLine($"  {xISCC} /Q {Quoted(mInnoFile)} /dBuildConfiguration={xCfg} /dVSVersion={vsVersionConfiguration} /dChangeSetVersion={Quoted(mReleaseNo.ToString())}");
+      StartConsole(xISCC, $"/Q {Quoted(mInnoFile)} /dBuildConfiguration={xCfg} /dVSVersion={vsVersionConfiguration} /dChangeSetVersion={Quoted(mReleaseNo.ToString())}");
     }
 
     private void LaunchVS() {

diff --git a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
@@ -5,6 +5,11 @@
     <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\Cosmos.snk</AssemblyOriginatorKeyFile>
+    <!--
+        NU1605 (Detected package downgrade) is being logged as error, which may cause the build to fail.
+        The .NET Standard libraries can't be upgraded, as this project targets .NET Framework 4.6.2.
+    -->
+    <NoWarn>NU1605</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/source/Cosmos.Core/Cosmos.Core.csproj b/source/Cosmos.Core/Cosmos.Core.csproj
@@ -16,10 +16,4 @@
     <ProjectReference Include="..\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Cosmos.IL2CPU">
-      <HintPath>..\..\Build\bin\Cosmos.IL2CPU.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj b/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj
@@ -22,10 +22,4 @@
     <ProjectReference Include="..\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Cosmos.IL2CPU">
-      <HintPath>..\..\Build\bin\Cosmos.IL2CPU.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/source/Cosmos.Debug.Hosts/HyperV.cs b/source/Cosmos.Debug.Hosts/HyperV.cs
@@ -41,7 +41,7 @@ public override void Start()
             // Target exe or file
             var info = new ProcessStartInfo(@"C:\Windows\sysnative\VmConnect.exe", @"""localhost"" ""Cosmos""")
             {
-                UseShellExecute = true
+                UseShellExecute = false
             };
 
             mProcess = new Process();

diff --git a/source/Cosmos.HAL/Cosmos.HAL.csproj b/source/Cosmos.HAL/Cosmos.HAL.csproj
@@ -16,13 +16,4 @@
         <ProjectReference Include="..\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Reference Include="Cosmos.Assembler">
-        <HintPath>..\..\Build\bin\Cosmos.Assembler.dll</HintPath>
-      </Reference>
-      <Reference Include="Cosmos.IL2CPU">
-        <HintPath>..\..\Build\bin\Cosmos.IL2CPU.dll</HintPath>
-      </Reference>
-    </ItemGroup>
-
 </Project>
diff --git a/source/Cosmos.IL2CPU/ILScanner.cs b/source/Cosmos.IL2CPU/ILScanner.cs
@@ -545,7 +545,7 @@ protected void ScanMethod(MethodBase aMethod, bool aIsPlug, string sourceItem)
                 }
                 if (xNeedsPlug)
                 {
-                    throw new Exception("Native code encountered, plug required. Please see https://github.com/CosmosOS/Cosmos/wiki/Plugs). " + LabelName.GetFullName(aMethod) + "." + Environment.NewLine + " Called from :" + Environment.NewLine + sourceItem);
+                    throw new Exception("Native code encountered, plug required. Please see http://www.gocosmos.org/docs/plugs/). " + LabelName.GetFullName(aMethod) + "." + Environment.NewLine + " Called from :" + Environment.NewLine + sourceItem);
                 }
 
                 //TODO: As we scan each method, we could update or put in a new list

diff --git a/source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj b/source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj
@@ -15,10 +15,4 @@
         <ProjectReference Include="..\Cosmos.System\Cosmos.System.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Reference Include="Cosmos.IL2CPU">
-        <HintPath>..\..\Build\bin\Cosmos.IL2CPU.dll</HintPath>
-      </Reference>
-    </ItemGroup>
-
 </Project>
diff --git a/source/Cosmos.System/Cosmos.System.csproj b/source/Cosmos.System/Cosmos.System.csproj
@@ -15,10 +15,4 @@
     <ProjectReference Include="..\Cosmos.IL2CPU.Plugs\Cosmos.IL2CPU.Plugs.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Cosmos.IL2CPU">
-      <HintPath>..\..\Build\bin\Cosmos.IL2CPU.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>