diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-02-21 22:49:11 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-02-21 22:57:23 +0300 |
| commit | bfc51e7ce8d8946b43afd1e4dfa0f35cb21accd9 (patch) | |
| tree | 383a57abcb9c61310fe40cb0c06aa2065dfc9417 /src/System.ValueTuple | |
| parent | 15b841969574eb994649ba683f763ab2b1e1002a (diff) | |
Fix mscorlib-portable build of ValueTuple
This was previously turned off, turn it back on.
Diffstat (limited to 'src/System.ValueTuple')
5 files changed, 18 insertions, 6 deletions
diff --git a/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj b/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj index 91e0776d97..4ddfa4570d 100644 --- a/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj +++ b/src/System.ValueTuple/pkg/System.ValueTuple.pkgproj @@ -6,6 +6,10 @@ <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81;$(AllXamarinFrameworks)</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.ValueTuple.csproj" /> + + <!-- a bug in previous version of the package included these bogus files --> + <HarvestExcludePaths Include="lib/portable-net40+sl4+win8+wp8/.xml" /> + <HarvestExcludePaths Include="lib/netstandard1.0/.xml" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.ValueTuple/ref/Configurations.props b/src/System.ValueTuple/ref/Configurations.props index 1e2339791e..b07fde584c 100644 --- a/src/System.ValueTuple/ref/Configurations.props +++ b/src/System.ValueTuple/ref/Configurations.props @@ -6,7 +6,7 @@ uap; netstandard; netstandard1.0; - <!-- portable_net40+sl4+win8+wp8-Windows_NT; Looks like our filtering mechanism doesn't understand this targetgroup. Do we even need it? --> + portable_net40+sl4+win8+wp8; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.ValueTuple/ref/System.ValueTuple.csproj b/src/System.ValueTuple/ref/System.ValueTuple.csproj index e3976e972a..9e9b334002 100644 --- a/src/System.ValueTuple/ref/System.ValueTuple.csproj +++ b/src/System.ValueTuple/ref/System.ValueTuple.csproj @@ -18,10 +18,13 @@ <ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp' And '$(TargetGroup)' != 'uap'"> <Compile Include="System.ValueTuple.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'portable-net40+sl4+win8+wp8'"> + <ItemGroup Condition="'$(TargetGroup)' == 'portable_net40+sl4+win8+wp8'"> <!-- Those files only serve to unblock the compilation given that this profile didn't have those attributes --> <Compile Include="System.Security.AllowPartiallyTrustedCallersAttribute.cs" /> <Compile Include="System.Runtime.CompilerServices.ReferenceAssemblyAttribute.cs" /> + <Compile Include="$(CommonPath)\System\Reflection\AssemblyMetadataAttribute.cs"> + <Link>Common\System\Reflection\AssemblyMetadataAttribute.cs</Link> + </Compile> </ItemGroup> <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' Or '$(TargetGroup)' == 'uap'"> <Compile Include="System.ValueTuple.TypeForwards.cs" /> @@ -29,7 +32,7 @@ <ItemGroup Condition="'$(TargetGroup)' == 'netstandard1.0'"> <Reference Include="System.Runtime" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'portable-net40+sl4+win8+wp8'"> + <ItemGroup Condition="'$(TargetGroup)' == 'portable_net40+sl4+win8+wp8'"> <Reference Include="mscorlib" /> <Reference Include="System" /> <Reference Include="System.Core" /> diff --git a/src/System.ValueTuple/src/Configurations.props b/src/System.ValueTuple/src/Configurations.props index 16c5458872..d095ea0061 100644 --- a/src/System.ValueTuple/src/Configurations.props +++ b/src/System.ValueTuple/src/Configurations.props @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - <!-- portable_net40+sl4+win8+wp8-Windows_NT; Looks like our filtering mechanism doesn't understand this targetgroup. Do we even need it? --> + portable_net40+sl4+win8+wp8; netstandard1.0; netstandard; netcoreapp; diff --git a/src/System.ValueTuple/src/System.ValueTuple.csproj b/src/System.ValueTuple/src/System.ValueTuple.csproj index 04c6ffae81..78ff4a2ff7 100644 --- a/src/System.ValueTuple/src/System.ValueTuple.csproj +++ b/src/System.ValueTuple/src/System.ValueTuple.csproj @@ -29,12 +29,17 @@ <Link>Common\System\Numerics\Hashing\HashHelpers.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'portable-net40+sl4+win8+wp8'"> + <ItemGroup Condition="'$(TargetGroup)' == 'portable_net40+sl4+win8+wp8'"> + <Compile Include="$(CommonPath)\System\Reflection\AssemblyMetadataAttribute.cs"> + <Link>Common\System\Reflection\AssemblyMetadataAttribute.cs</Link> + </Compile> + </ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' == 'portable_net40+sl4+win8+wp8'"> <Reference Include="mscorlib" /> <Reference Include="System" /> <Reference Include="System.Core" /> </ItemGroup> - <ItemGroup> + <ItemGroup Condition="'$(TargetGroup)' != 'portable_net40+sl4+win8+wp8'"> <Reference Include="System.Collections" /> <Reference Include="System.Diagnostics.Debug" /> <Reference Include="System.Resources.ResourceManager" /> |