diff --git a/appveyor.yml b/appveyor.yml index 6f2e926ac1..a2b23e593a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,9 +5,6 @@ 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% @@ -15,13 +12,17 @@ build_script: 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,8 +62,6 @@ 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 @@ -70,11 +69,11 @@ build_script: # - 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 new file mode 100644 index 0000000000..8f5f5082e0 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "1.0.4" + } +} \ No newline at end of file diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs index 68c018d015..f0d37d20f3 100644 --- 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 index 75c86ea801..a06acc2741 100644 --- a/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj +++ b/source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj @@ -5,6 +5,11 @@ win7-x86 True ..\..\Cosmos.snk + + NU1605 diff --git a/source/Cosmos.Core/Cosmos.Core.csproj b/source/Cosmos.Core/Cosmos.Core.csproj index b7a9af5318..8f15bff9ee 100644 --- a/source/Cosmos.Core/Cosmos.Core.csproj +++ b/source/Cosmos.Core/Cosmos.Core.csproj @@ -16,10 +16,4 @@ - - - ..\..\Build\bin\Cosmos.IL2CPU.dll - - - diff --git a/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj b/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj index fbbe24ceb8..be84f3d3e4 100644 --- a/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj +++ b/source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj @@ -22,10 +22,4 @@ - - - ..\..\Build\bin\Cosmos.IL2CPU.dll - - - \ No newline at end of file diff --git a/source/Cosmos.Debug.Hosts/HyperV.cs b/source/Cosmos.Debug.Hosts/HyperV.cs index de15bd4d9e..656b7e9659 100644 --- 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 index 89e8fd0075..e51ad1d7d4 100644 --- a/source/Cosmos.HAL/Cosmos.HAL.csproj +++ b/source/Cosmos.HAL/Cosmos.HAL.csproj @@ -16,13 +16,4 @@ - - - ..\..\Build\bin\Cosmos.Assembler.dll - - - ..\..\Build\bin\Cosmos.IL2CPU.dll - - - \ No newline at end of file diff --git a/source/Cosmos.IL2CPU/ILScanner.cs b/source/Cosmos.IL2CPU/ILScanner.cs index 8245a5ddcc..6f30569058 100644 --- 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 index 85cc8c5528..b620005edb 100644 --- a/source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj +++ b/source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj @@ -15,10 +15,4 @@ - - - ..\..\Build\bin\Cosmos.IL2CPU.dll - - - diff --git a/source/Cosmos.System/Cosmos.System.csproj b/source/Cosmos.System/Cosmos.System.csproj index 1c1011b8da..2fe7823997 100644 --- a/source/Cosmos.System/Cosmos.System.csproj +++ b/source/Cosmos.System/Cosmos.System.csproj @@ -15,10 +15,4 @@ - - - ..\..\Build\bin\Cosmos.IL2CPU.dll - - -