PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Fix property grid stretching rows with low item count (#381) / Fix Jenkins packaging unnecessary binaries (#383)

Browse Source 
* Fix property grid stretching rows with low item count

* Fix Jenkins packaging unnecessary binaries (#383)

* Fix Jenkins packaging DLLs it shouldn't

* Zap more sneaky copy locals

* MSBuild won't cooperate so it will be forced to comply

Co-authored-by: Jimmacle <mindstorms11@cox.net>
This commit is contained in:
Brant Martin
2020-04-22 15:29:28 -04:00
committed by GitHub
parent a3d722eb16
commit 48ddc6389f
5 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Jenkinsfile vendored
View File

@@ -6,6 +6,11 @@ def packageAndArchive(buildMode, packageName, exclude) {
bat "IF EXIST ${packageDir} RMDIR /S /Q ${packageDir}" bat "IF EXIST ${packageDir} RMDIR /S /Q ${packageDir}"
bat "xcopy bin\\x64\\${buildMode} ${packageDir}" bat "xcopy bin\\x64\\${buildMode} ${packageDir}"
bat "del ${packageDir}VRage.*"
bat "del ${packageDir}Sandbox.*"
bat "del ${packageDir}SpaceEngineers.*"
if (exclude.length() > 0) { if (exclude.length() > 0) {
bat "del ${packageDir}${exclude}" bat "del ${packageDir}${exclude}"
} }
@@ -46,7 +51,7 @@ node {
stage('Archive') { stage('Archive') {
archiveArtifacts artifacts: "bin/x64/${buildMode}/Torch*", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true archiveArtifacts artifacts: "bin/x64/${buildMode}/Torch*", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true
packageAndArchive(buildMode, "torch-server", "Torch.Client*") packageAndArchive(buildMode, "torch-server", "System*")
/*packageAndArchive(buildMode, "torch-client", "Torch.Server*")*/ /*packageAndArchive(buildMode, "torch-client", "Torch.Server*")*/
} }

10
Torch.API/Torch.API.csproj
View File

@@ -130,16 +130,6 @@
<HintPath>..\GameBinaries\VRage.Math.dll</HintPath> <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="VRage.Native, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\GameBinaries\VRage.Native.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="VRage.OpenVRWrapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\GameBinaries\VRage.Render.dll</HintPath> <HintPath>..\GameBinaries\VRage.Render.dll</HintPath>

1
Torch.Server/Torch.Server.csproj
View File

@@ -211,6 +211,7 @@
</Reference> </Reference>
<Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"> <Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath> <HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath>
<Private>False</Private>
</Reference> </Reference>
<Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="VRage.Render, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>

9
Torch/Torch.csproj
View File

@@ -161,16 +161,9 @@
<HintPath>..\GameBinaries\VRage.Math.dll</HintPath> <HintPath>..\GameBinaries\VRage.Math.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="VRage.Native">
<HintPath>..\GameBinaries\VRage.Native.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="VRage.OpenVRWrapper">
<HintPath>..\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="VRage.Platform.Windows, Culture=neutral, PublicKeyToken=null"> <Reference Include="VRage.Platform.Windows, Culture=neutral, PublicKeyToken=null">
<HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath> <HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath>
<Private>False</Private>
</Reference> </Reference>
<Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"> <Reference Include="VRage.Platform.Windows, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath> <HintPath>..\GameBinaries\VRage.Platform.Windows.dll</HintPath>

4
Torch/Views/PropertyGrid.xaml.cs
View File

@@ -97,7 +97,7 @@ namespace Torch.Views
var curRow = 0; var curRow = 0;
foreach (var c in categories.OrderBy(x => x.Key)) foreach (var c in categories.OrderBy(x => x.Key))
{ {
grid.RowDefinitions.Add(new RowDefinition()); grid.RowDefinitions.Add(new RowDefinition(){Height = new GridLength(1, GridUnitType.Auto)});
var cl = new TextBlock var cl = new TextBlock
{ {
Text = c.Key, Text = c.Key,
@@ -124,7 +124,7 @@ namespace Torch.Views
if (property.GetGetMethod() == null) if (property.GetGetMethod() == null)
continue; continue;
var def = new RowDefinition(); var def = new RowDefinition(){Height = new GridLength(1, GridUnitType.Auto)};
grid.RowDefinitions.Add(def); grid.RowDefinitions.Add(def);
var descriptor = descriptors[property]; var descriptor = descriptors[property];