dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-06-12 19:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates.

Browse source
This commit is contained in:
José Pedro 2017-07-06 00:34:04 +01:00
parent e244fbd4df
commit 1ce42933e3
11 changed files with 29 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
appveyor.yml
View file

@ -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"
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:

5
global.json Normal file
View file

@ -0,0 +1,5 @@
{
"sdk": {
"version": "1.0.4"
}
}

14
source/Cosmos.Build.Builder/CosmosTask.cs
View file

@ -276,19 +276,19 @@ namespace Cosmos.Build.Builder {
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 @@ namespace Cosmos.Build.Builder {
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() {

5
source/Cosmos.Build.MSBuild/Cosmos.Build.MSBuild.csproj
View file

@ -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>

6
source/Cosmos.Core/Cosmos.Core.csproj
View file

@ -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>

6
source/Cosmos.Core_Plugs/Cosmos.Core_Plugs.csproj
View file

@ -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>

2
source/Cosmos.Debug.Hosts/HyperV.cs
View file

@ -41,7 +41,7 @@ namespace Cosmos.Debug.Hosts
// Target exe or file
var info = new ProcessStartInfo(@"C:\Windows\sysnative\VmConnect.exe", @"""localhost"" ""Cosmos""")
{
UseShellExecute = true
UseShellExecute = false
};
mProcess = new Process();

9
source/Cosmos.HAL/Cosmos.HAL.csproj
View file

@ -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>

2
source/Cosmos.IL2CPU/ILScanner.cs
View file

@ -545,7 +545,7 @@ namespace Cosmos.IL2CPU
}
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

6
source/Cosmos.System.Plugs/Cosmos.System.Plugs.csproj
View file

@ -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>

6
source/Cosmos.System/Cosmos.System.csproj
View file

@ -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>