Skip to content

Commit e798ac5

Browse files
Regenerate various reference packages (#754)
1 parent 38c4726 commit e798ac5

21 files changed

+6085
-4073
lines changed

src/referencePackages/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<When Condition="'$(ProjectTemplateVersion)' == '2'">
5757
<PropertyGroup>
5858
<!-- When the library targets netstandard1.x and is part of the .NET Standard 1.x dependency graph, disable the implicit framework references to avoid cyclic dependencies. -->
59-
<DisableImplicitFrameworkReferences Condition="'$(DisableImplicitFrameworkReferences)' == '' and $(TargetFramework.StartsWith('netstandard1')) and $(NetStandard1xPackage.Contains('$(AssemblyName);'))">true</DisableImplicitFrameworkReferences>
59+
<DisableImplicitFrameworkReferences Condition="'$(DisableImplicitFrameworkReferences)' == '' and ($(TargetFramework.StartsWith('netstandard1')) or '$(TargetFramework)' == 'netcoreapp1.1') and $(NetStandard1xPackage.Contains('$(AssemblyName);'))">true</DisableImplicitFrameworkReferences>
6060
</PropertyGroup>
6161

6262
<ItemGroup>

src/referencePackages/src/system.runtime.interopservices/4.3.0/System.Runtime.InteropServices.4.3.0.csproj

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,37 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.5;netcoreapp1.1</TargetFrameworks>
5-
<NuspecFile>$(ArtifactsBinDir)system.runtime.interopservices/4.3.0/system.runtime.interopservices.nuspec</NuspecFile>
4+
<TargetFrameworks>netcoreapp1.1;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.5</TargetFrameworks>
5+
<AssemblyName>System.Runtime.InteropServices</AssemblyName>
6+
<ProjectTemplateVersion>2</ProjectTemplateVersion>
67
</PropertyGroup>
78

8-
<PropertyGroup>
9-
<OutputPath>$(ArtifactsBinDir)system.runtime.interopservices/4.3.0/ref/</OutputPath>
10-
<IntermediateOutputPath>$(ArtifactsObjDir)system.runtime.interopservices/4.3.0</IntermediateOutputPath>
11-
</PropertyGroup>
12-
13-
<ItemGroup>
14-
<Compile Include="**/ref/$(TargetFramework)/*.cs" />
15-
<Compile Include="**/lib/$(TargetFramework)/*.cs" />
16-
</ItemGroup>
17-
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
9+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
1910
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
2011
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
2112
<PackageReference Include="System.Reflection" Version="4.3.0" />
2213
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
2314
<PackageReference Include="System.Runtime" Version="4.3.0" />
15+
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
2416
</ItemGroup>
2517

26-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.2' ">
18+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
2719
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
2820
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
2921
<PackageReference Include="System.Reflection" Version="4.3.0" />
3022
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
3123
<PackageReference Include="System.Runtime" Version="4.3.0" />
3224
</ItemGroup>
3325

34-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
26+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.2'">
3527
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
3628
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
3729
<PackageReference Include="System.Reflection" Version="4.3.0" />
3830
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
3931
<PackageReference Include="System.Runtime" Version="4.3.0" />
40-
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
4132
</ItemGroup>
4233

43-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
34+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
4435
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
4536
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
4637
<PackageReference Include="System.Reflection" Version="4.3.0" />
@@ -49,7 +40,7 @@
4940
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
5041
</ItemGroup>
5142

52-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
43+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
5344
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
5445
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
5546
<PackageReference Include="System.Reflection" Version="4.3.0" />

src/referencePackages/src/system.runtime.interopservices/4.3.0/ref/net45/_._

Whitespace-only changes.

0 commit comments

Comments
 (0)