Skip to content

Commit 9f2e165

Browse files
yfakariyayfakariya
committed
Fix build errors and warnings in *.Windows.sln
1 parent 1664de6 commit 9f2e165

File tree

16 files changed

+65
-22
lines changed

16 files changed

+65
-22
lines changed

‎MsgPack.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<AppDesignerFolder>Properties</AppDesignerFolder>
55
<RootNamespace>MsgPack</RootNamespace>

‎src/MsgPack/MsgPack.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,6 @@
526526
<XamarinMSBuildExtensionsPath>$(VSMSBuildExtensionsPath)</XamarinMSBuildExtensionsPath>
527527
</PropertyGroup>
528528
<Import Project="$(VSMSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" Condition="'$(TargetFramework)' == 'uap10.0'" />
529-
<Import Project="$(XamarinMSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" Condition="'$(TargetFramework)' == 'MonoAndroid10'" />
530-
<Import Project="$(XamarinMSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" Condition="'$(TargetFramework)' == 'Xamarin.iOS10'" />
529+
<Import Project="$(XamarinMSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" Condition="'$(TargetFramework)' == 'MonoAndroid10' and $(SkipXamarin) != 'true'" />
530+
<Import Project="$(XamarinMSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" Condition="'$(TargetFramework)' == 'Xamarin.iOS10' and $(SkipXamarin) != 'true'" />
531531
</Project>

‎src/netstandard/build/NetStandardProjectBuilder.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<ItemGroup>
3737
<!-- A reference to the entire .NET Framework is automatically included -->
3838
<None Include="build.cmd" />
39-
<None Include="build.sh" />
4039
</ItemGroup>
4140
<ItemGroup>
4241
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -46,6 +45,9 @@
4645
<PreBuildEvent Condition="'$(OS)' == 'Windows_NT'">$(ProjectDir)\build.cmd $(SolutionDir) $(ConfigurationName)</PreBuildEvent>
4746
<PreBuildEvent Condition="'$(OS)' != 'Windows_NT'">echo This project supports only Windows specific builds.</PreBuildEvent>
4847
</PropertyGroup>
48+
<PropertyGroup>
49+
<PreBuildEvent>$(ProjectDir)\build.cmd $(SolutionDir) $(ConfigurationName)</PreBuildEvent>
50+
</PropertyGroup>
4951
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5052
Other similar extension points exist, see Microsoft.Common.targets.
5153
<Target Name="BeforeBuild">

‎src/netstandard/build/build.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ echo Retore netstandard 1.1/1.3 project...
22
echo %0 %1 %2
33
echo You must restore MsgPack.csproj manually...
44
echo Build netstandard 1.1/1.3 project...
5-
dotnet build %1src\MsgPack\MsgPack.csproj -f netstandard1.1 -c %2
5+
dotnet build %1src\MsgPack\MsgPack.csproj -f netstandard1.1 -c %2 -o %1src\netstandard\bin\Debug\netstandard1.1 /p:SkipXamarin=true /p:DebugType=full
66
if not %ERRORLEVEL%==0 (
77
echo "Failed to build netstandard1.1"
88
exit 1
99
)
10-
dotnet build %1src\MsgPack\MsgPack.csproj -f netstandard1.3 -c %2
10+
dotnet build %1src\MsgPack\MsgPack.csproj -f netstandard1.3 -c %2 -o %1src\netstandard\bin\Debug\netstandard1.3 /p:SkipXamarin=true /p:DebugType=full
1111
if not %ERRORLEVEL%==0 (
1212
echo "Failed to build netstandard1.3"
1313
exit 1

‎test/MsgPack.UnitTest.BclExtensions.WinRT/MsgPack.UnitTest.BclExtensions.WinRT.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<DefineConstants>$(DefineConstants);NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST</DefineConstants>
2828
<NoWarn>;2008</NoWarn>
2929
</PropertyGroup>
30+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
31+
<DebugType>full</DebugType>
32+
</PropertyGroup>
33+
<PropertyGroup Condition="'$(Configuration)' != 'Debug'">
34+
<DebugType>pdbonly</DebugType>
35+
</PropertyGroup>
3036
<PropertyGroup Condition="'$(Platform)' == 'ARM'">
3137
<PlatformTarget>ARM</PlatformTarget>
3238
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -101,9 +107,9 @@
101107
</ProjectReference>
102108
</ItemGroup>
103109
<ItemGroup>
104-
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
110+
<Reference Include="MsgPack, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
105111
<SpecificVersion>False</SpecificVersion>
106-
<HintPath>..\..\src\MsgPack\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
112+
<HintPath>..\..\src\netstandard\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
107113
</Reference>
108114
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
109115
<HintPath>..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>

‎test/MsgPack.UnitTest.Uwp/MsgPack.UnitTest.Uwp.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<DocumentationFile></DocumentationFile>
2222
<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;FEATURE_TAP</DefineConstants>
2323
<NoWarn>;2008</NoWarn>
24+
<SignAssembly>false</SignAssembly>
2425
</PropertyGroup>
2526
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
2627
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>

‎test/MsgPack.UnitTest.WinRT.WindowsPhone/MsgPack.UnitTest.WinRT.WindowsPhone.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_PHONE_APP;NETSTANDARD1_1;FEATURE_TAP;MSTEST</DefineConstants>
2727
<NoWarn>;2008</NoWarn>
2828
</PropertyGroup>
29+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
30+
<DebugType>full</DebugType>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)' != 'Debug'">
33+
<DebugType>pdbonly</DebugType>
34+
</PropertyGroup>
2935
<PropertyGroup Condition="'$(Platform)' == 'x86'">
3036
<PlatformTarget>x86</PlatformTarget>
3137
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -479,9 +485,9 @@
479485
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
480486
</ItemGroup>
481487
<ItemGroup>
482-
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
488+
<Reference Include="MsgPack, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
483489
<SpecificVersion>False</SpecificVersion>
484-
<HintPath>..\..\src\MsgPack\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
490+
<HintPath>..\..\src\netstandard\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
485491
</Reference>
486492
</ItemGroup>
487493
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">

‎test/MsgPack.UnitTest.WinRT.WindowsPhone/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// MessagePack for CLI
44
//
5-
// Copyright (C) 2015 FUJIWARA, Yusuke
5+
// Copyright (C) 2015-2017 FUJIWARA, Yusuke
66
//
77
// Licensed under the Apache License, Version 2.0 (the "License");
88
// you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
3030
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2015" )]
3131

3232
[assembly: ComVisible( false )]
33+
[assembly: CLSCompliant( true )]
3334
[assembly: NeutralResourcesLanguage( "en-US" )]
3435
[assembly: AssemblyVersion( "1.0.0.0" )]
3536
[assembly: AssemblyFileVersion( "0.1.0.0" )]

‎test/MsgPack.UnitTest.WinRT/MsgPack.UnitTest.WinRT.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
<DefineConstants>$(DefineConstants);NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST</DefineConstants>
2424
<NoWarn>;2008</NoWarn>
2525
</PropertyGroup>
26+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
27+
<DebugType>full</DebugType>
28+
</PropertyGroup>
29+
<PropertyGroup Condition="'$(Configuration)' != 'Debug'">
30+
<DebugType>pdbonly</DebugType>
31+
</PropertyGroup>
2632
<PropertyGroup Condition="'$(Platform)' == 'ARM'">
2733
<PlatformTarget>ARM</PlatformTarget>
2834
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -493,9 +499,9 @@
493499
</ProjectReference>
494500
</ItemGroup>
495501
<ItemGroup>
496-
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
502+
<Reference Include="MsgPack, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
497503
<SpecificVersion>False</SpecificVersion>
498-
<HintPath>..\..\src\MsgPack\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
504+
<HintPath>..\..\src\netstandard\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
499505
</Reference>
500506
<Reference Include="System.Numerics.Vectors, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
501507
<HintPath>..\..\packages\System.Numerics.Vectors.4.1.1-rc2-24027\lib\portable-net45+win8\System.Numerics.Vectors.dll</HintPath>

‎test/MsgPack.UnitTest.WinRT/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// MessagePack for CLI
44
//
5-
// Copyright (C) 2010 FUJIWARA, Yusuke
5+
// Copyright (C) 2010-2017 FUJIWARA, Yusuke
66
//
77
// Licensed under the Apache License, Version 2.0 (the "License");
88
// you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
3030
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010" )]
3131

3232
[assembly: ComVisible( false )]
33+
[assembly: CLSCompliant( true )]
3334
[assembly: NeutralResourcesLanguage( "en-US" )]
3435
[assembly: AssemblyVersion( "1.0.0.0" )]
3536
[assembly: AssemblyFileVersion( "0.1.0.0" )]

0 commit comments

Comments
 (0)