|
@@ -22,16 +22,16 @@
|
|
|
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
|
|
|
</PropertyGroup>
|
|
|
|
|
|
- <!--
|
|
|
- - Override target frameworks on non-Windows to just .NET Core
|
|
|
- - Doing this conditionally in the initial PropertyGroup confuses
|
|
|
- - Visual Studio.
|
|
|
- -->
|
|
|
- <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
|
|
|
- <TargetFrameworks>netstandard1.0;netstandard2.0</TargetFrameworks>
|
|
|
+ <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'netstandard2.0' ">
|
|
|
+ <DefineConstants>$(DefineConstants);GOOGLE_PROTOBUF_SUPPORT_SYSTEM_MEMORY</DefineConstants>
|
|
|
</PropertyGroup>
|
|
|
|
|
|
- <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
|
|
|
+ <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
|
|
|
+ <ItemGroup>
|
|
|
+ <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
|
|
|
+ </ItemGroup>
|
|
|
+
|
|
|
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'netstandard2.0' ">
|
|
|
<PackageReference Include="System.Memory" Version="4.5.2"/>
|
|
|
</ItemGroup>
|
|
|
|