Skip to content

Commit dc58f59

Browse files
committed
Fix NetStandardProjectBuilder
This project now only supports that VS2015's test project will be able to refer netstadanrd1.1/1.3 builds. So, .sh is no longer needed, and then just call dotnet build for only netstd (note that other frameworks causes build error because dotnet CLI does not support .NET 3.5, Xamarin, etc.)
1 parent 1c68e3a commit dc58f59

File tree

7 files changed

+19
-36
lines changed

7 files changed

+19
-36
lines changed

src/netstandard/build/NetStandardProjectBuilder.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
4545
<PropertyGroup>
4646
<PreBuildEvent Condition="'$(OS)' == 'Windows_NT'">$(ProjectDir)\build.cmd $(SolutionDir) $(ConfigurationName)</PreBuildEvent>
47-
<PreBuildEvent Condition="'$(OS)' != 'Windows_NT'">bash $(ProjectDir)/build.sh $(SolutionDir) $(ConfigurationName)</PreBuildEvent>
47+
<PreBuildEvent Condition="'$(OS)' != 'Windows_NT'">echo This project supports only Windows specific builds.</PreBuildEvent>
4848
</PropertyGroup>
4949
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5050
Other similar extension points exist, see Microsoft.Common.targets.

src/netstandard/build/build.cmd

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
echo Retore netstandard 1.1/1.3 project...
22
echo %0 %1 %2
3-
dotnet restore %1src\MsgPack\MsgPack.csproj
3+
echo You must restore MsgPack.csproj manually...
4+
echo Build netstandard 1.1/1.3 project...
5+
dotnet build %1src\MsgPack\MsgPack.csproj -f netstandard1.1 -c %2
46
if not %ERRORLEVEL%==0 (
5-
echo "Failed to restore netstandard1.1/1.3"
7+
echo "Failed to build netstandard1.1"
68
exit 1
79
)
8-
9-
echo Build netstandard 1.1/1.3 project...
10-
dotnet build %1src\MsgPack\MsgPack.csproj -c %2
10+
dotnet build %1src\MsgPack\MsgPack.csproj -f netstandard1.3 -c %2
1111
if not %ERRORLEVEL%==0 (
12-
echo "Failed to build netstandard1.1/1.3"
12+
echo "Failed to build netstandard1.3"
1313
exit 1
1414
)

src/netstandard/build/build.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@
165165
</ProjectReference>
166166
</ItemGroup>
167167
<ItemGroup>
168-
<Reference Include="MsgPack, Version=0.7.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
168+
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
169169
<SpecificVersion>False</SpecificVersion>
170-
<HintPath>..\..\src\MsgPack.CoreClr\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
170+
<HintPath>..\..\src\MsgPack\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
171171
</Reference>
172172
<Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
173173
<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: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,11 +1899,6 @@
18991899
<Content Include="Assets\Wide310x150Logo.png" />
19001900
<Content Include="Properties\Default.rd.xml" />
19011901
</ItemGroup>
1902-
<ItemGroup>
1903-
<Reference Include="MsgPack">
1904-
<HintPath>..\..\src\MsgPack.CoreClr\bin\Debug\netstandard1.3\MsgPack.dll</HintPath>
1905-
</Reference>
1906-
</ItemGroup>
19071902
<ItemGroup>
19081903
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
19091904
</ItemGroup>
@@ -1919,6 +1914,12 @@
19191914
<SubType>Designer</SubType>
19201915
</Page>
19211916
</ItemGroup>
1917+
<ItemGroup>
1918+
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
1919+
<SpecificVersion>False</SpecificVersion>
1920+
<HintPath>..\..\src\MsgPack\bin\Debug\netstandard1.3\MsgPack.dll</HintPath>
1921+
</Reference>
1922+
</ItemGroup>
19221923
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
19231924
<VisualStudioVersion>14.0</VisualStudioVersion>
19241925
</PropertyGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,9 @@
462462
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
463463
</ItemGroup>
464464
<ItemGroup>
465-
<Reference Include="MsgPack, Version=0.7.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
465+
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
466466
<SpecificVersion>False</SpecificVersion>
467-
<HintPath>..\..\src\MsgPack.CoreClr\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
467+
<HintPath>..\..\src\MsgPack\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
468468
</Reference>
469469
</ItemGroup>
470470
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,9 @@
511511
</ProjectReference>
512512
</ItemGroup>
513513
<ItemGroup>
514-
<Reference Include="MsgPack, Version=0.7.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
514+
<Reference Include="MsgPack, Version=0.9.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
515515
<SpecificVersion>False</SpecificVersion>
516-
<HintPath>..\..\src\MsgPack.CoreClr\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
516+
<HintPath>..\..\src\MsgPack\bin\Debug\netstandard1.1\MsgPack.dll</HintPath>
517517
</Reference>
518518
<Reference Include="System.Numerics.Vectors, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
519519
<HintPath>..\..\packages\System.Numerics.Vectors.4.1.1-rc2-24027\lib\portable-net45+win8\System.Numerics.Vectors.dll</HintPath>

0 commit comments

Comments
 (0)