Merge: Upgrade to msbuild for Linux (Part 2)

This commit is contained in:
R-YaTian 2023-04-13 14:34:12 +08:00 committed by GitHub
parent 20575e4bad
commit b66c21b3bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions

View File

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

View File

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

View File

@ -41,11 +41,11 @@ if [ -d "$BUILD_DIR" ]; then
fi fi
# Get compiler and params # 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 # Compile program in standard directory, to allow plugins find Ekona
echo "Compiling base library..." 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 if [ $? -ne 0 ] ; then
echo "Error compiling Tinke into the default directory. Aborting." echo "Error compiling Tinke into the default directory. Aborting."
cat build.log cat build.log
@ -119,8 +119,6 @@ cp "$TINKE_DIR/Licence.txt" "$BUILD_DIR/"
cp "$TINKE_DIR/Tinke/app.config" "$BUILD_DIR/" cp "$TINKE_DIR/Tinke/app.config" "$BUILD_DIR/"
# Delete debug files # Delete debug files
rm "$BUILD_DIR"/*.mdb
rm "$BUILD_DIR"/Plugins/*.mdb
rm build.log rm build.log
echo "Done!" echo "Done!"