dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-19 04:18:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build updates.

Browse source
This commit is contained in:
José Pedro 2018-11-16 00:47:37 +00:00
parent 7da7149aab
commit 10e214aed0
No known key found for this signature in database
GPG key ID: B8247B9301707B83
6 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -9,9 +9,10 @@
# Build results
[Oo]bj/
[Aa]rtifacts
[Bb]in
[Pp]ackages/
[Oo]bj/
*.[Oo]bj
*.suo

4
Build/Targets/RepoLayout.props
View file

@ -2,8 +2,8 @@
<PropertyGroup>
<ArtifactsDir Condition="'$(ArtifactsDir)' == ''">$(RepoRoot)artifacts\$(Configuration)\</ArtifactsDir>
<DefaultPackageOutputPath>$(ArtifactsDir)nupkg\</DefaultPackageOutputPath>
<!--<PackageOutputPath>$(DefaultPackageOutputPath)</PackageOutputPath>-->
<DefaultPackageOutputPath>$(ArtifactsDir)nupkg\</DefaultPackageOutputPath>
<PackageOutputPath>$(DefaultPackageOutputPath)</PackageOutputPath>
<VsixOutputPath>$(ArtifactsDir)VSIX\</VsixOutputPath>
</PropertyGroup>

2
Build/Targets/VSIX.targets
View file

@ -4,13 +4,11 @@
<UseCodebase>True</UseCodebase>
</PropertyGroup>
<!--
<PropertyGroup>
<_TargetVsixContainerDir>$(VsixOutputPath)</_TargetVsixContainerDir>
<TargetVsixContainerName Condition="'$(TargetVsixContainerName)' == ''">$(TargetName).vsix</TargetVsixContainerName>
<TargetVsixContainer Condition="'$(TargetVsixContainer)' == ''">$(_TargetVsixContainerDir)$(TargetVsixContainerName)</TargetVsixContainer>
</PropertyGroup>
-->
<ItemGroup>
<PackageReference Include="Microsoft.VSSDK.BuildTools" PrivateAssets="All" />

4
source/Cosmos.Build.Builder/BuildTasks/BuildTask.cs
View file

@ -22,13 +22,15 @@ namespace Cosmos.Build.Builder.BuildTasks
public BuildTask(
IMSBuildService msBuildService,
string projectFilePath,
string outputPath)
string outputPath,
string vsixOutputPath)
: base(msBuildService)
{
ProjectFilePath = projectFilePath;
_properties = new Dictionary<string, string>();
_properties.Add("OutputPath", outputPath);
_properties.Add("VsixOutputPath", vsixOutputPath);
}
}
}

9
source/Cosmos.Build.Builder/BuildTasks/MSBuildTargetBuildTaskBase.cs
View file

@ -35,7 +35,14 @@ namespace Cosmos.Build.Builder.BuildTasks
{
foreach (var property in Properties)
{
args += $" /p:\"{property.Key}={property.Value}\"";
var value = property.Value;
if (value.EndsWith("\\"))
{
value += '\\';
}
args += $" /p:\"{property.Key}={value}\"";
}
}

5
source/Cosmos.Build.Builder/CosmosBuildDefinition.cs
View file

@ -70,14 +70,13 @@ namespace Cosmos.Build.Builder
}
var il2cpuDir = Path.GetFullPath(Path.Combine(_cosmosDir, "..", "IL2CPU"));
var xsharpDir = Path.GetFullPath(Path.Combine(_cosmosDir, "..", "XSharp"));
var cosmosSourceDir = Path.Combine(_cosmosDir, "source");
var il2cpuSourceDir = Path.Combine(il2cpuDir, "source");
var buildSlnPath = Path.Combine(_cosmosDir, "Build.sln");
var vsipDir = Path.Combine(_cosmosDir, "Build", "VSIP");
var vsipDir = Path.Combine(_cosmosDir, "Build", "VSIP") + '\\';
if (Directory.Exists(vsipDir))
{
@ -90,7 +89,7 @@ namespace Cosmos.Build.Builder
// Build Build.sln
yield return new BuildTask(_msBuildService, buildSlnPath, vsipDir);
yield return new BuildTask(_msBuildService, buildSlnPath, vsipDir, vsipDir);
// Publish IL2CPU