Skip to content

Commit c160d4b

Browse files
committed
Fix build scripts.
1 parent e96e869 commit c160d4b

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

MsgPack.Common.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@
3737
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
40-
<DocumentationFile>$(OutputPath)\$(AssemblyName).XML</DocumentationFile>
4140
<SignAssembly>false</SignAssembly>
4241
</PropertyGroup>
43-
<PropertyGroup Condition="'$(TargetFramework)' != 'MonoAndroid10' and '$(TargetFramework)' != 'Xamarin.iOS10'">
42+
<PropertyGroup>
4443
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).XML</DocumentationFile>
4544
</PropertyGroup>
4645
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">

build/Build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ if ( $LastExitCode -ne 0 )
147147

148148
if ( $buildConfig -eq 'Release' )
149149
{
150-
& $msbuild ../src/MsgPack/MsgPack.csproj /t:pack /p:Configuration=$buildConfig /p:IncludeSymbols=true /p:IncludeSource=true /p:NuspecProperties=version=$env:PackageVersion
150+
& $msbuild ../src/MsgPack/MsgPack.csproj /t:pack /v:minimal /p:Configuration=$buildConfig /p:IncludeSource=true /p:NuspecProperties=version=$env:PackageVersion
151151

152152
Move-Item ../bin/*.nupkg ../dist/
153153
Copy-Item ../bin/* ./MsgPack-CLI/ -Recurse -Exclude @("*.vshost.*")

src/MsgPack/MsgPack.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,19 @@
99
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
1010
<NuspecFile>$(SolutionDir)/msgpack.nuspec</NuspecFile>
1111
</PropertyGroup>
12+
<Import Project="..\..\MsgPack.Common.props" />
1213
<PropertyGroup Condition="'$(Configuration)' == 'Release' and ('$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10')">
1314
<OutputPath>..\..\bin\$(TargetFramework)\</OutputPath>
1415
</PropertyGroup>
1516
<PropertyGroup Condition="'$(Configuration)' == 'Release' and '$(TargetFramework)' != 'MonoAndroid10' and '$(TargetFramework)' != 'Xamarin.iOS10'">
1617
<OutputPath>..\..\bin\</OutputPath>
1718
</PropertyGroup>
18-
<PropertyGroup Condition="'$(Configuration)' != 'Release'">
19-
<OutputPath>bin\$(Configuration)\$(TargetFramework)\</OutputPath>
20-
</PropertyGroup>
2119
<PropertyGroup Condition="'$(Configuration)' != 'Release' and ('$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10')">
2220
<OutputPath>bin\$(Configuration)\$(TargetFramework)\</OutputPath>
2321
</PropertyGroup>
2422
<PropertyGroup Condition="'$(Configuration)' != 'Release' and '$(TargetFramework)' != 'MonoAndroid10' and '$(TargetFramework)' != 'Xamarin.iOS10'">
2523
<OutputPath>bin\$(Configuration)\</OutputPath>
2624
</PropertyGroup>
27-
<Import Project="..\..\MsgPack.Common.props" />
2825
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10'">
2926
<!-- Workaround for VS 15.3 -->
3027
<NuGetTargetMoniker>MonoAndroid,Version=1.0</NuGetTargetMoniker>

0 commit comments

Comments
 (0)