🐛 Upgrade to msbuild for Linux

This commit is contained in:
Benito Palacios Sanchez 2021-10-14 16:13:55 +02:00
parent 558f62c850
commit c7960e27ac
5 changed files with 7 additions and 11 deletions

View File

@ -55,7 +55,6 @@
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
@ -70,7 +69,6 @@
<WarningLevel>4</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
@ -182,4 +180,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>

View File

@ -149,4 +149,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

View File

@ -154,5 +154,5 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -136,5 +136,5 @@
<ItemGroup>
<Content Include="Licence.txt" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -41,11 +41,11 @@ if [ -d "$BUILD_DIR" ]; then
fi
# Get compiler and params
XBUILD="xbuild /v:minimal /p:Configuration=$CONF;TargetFrameworkVersion=v4.5"
XBUILD="msbuild /v:minimal /p:Configuration=$CONF"
# Compile program in standard directory, to allow plugins find Ekona
echo "Compiling base library..."
xbuild /v:minimal /p:TargetFrameworkVersion=v4.5 Tinke.sln > build.log
msbuild /v:minimal Tinke.sln > build.log
if [ $? -ne 0 ] ; then
echo "Error compiling Tinke into the default directory. Aborting."
cat build.log
@ -119,8 +119,6 @@ cp "$TINKE_DIR/Licence.txt" "$BUILD_DIR/"
cp "$TINKE_DIR/Tinke/app.config" "$BUILD_DIR/"
# Delete debug files
rm "$BUILD_DIR"/*.mdb
rm "$BUILD_DIR"/Plugins/*.mdb
rm build.log
echo "Done!"