Skip to content

Regenerate various reference packages #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/referencePackages/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<When Condition="'$(ProjectTemplateVersion)' == '2'">
<PropertyGroup>
<!-- 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. -->
<DisableImplicitFrameworkReferences Condition="'$(DisableImplicitFrameworkReferences)' == '' and $(TargetFramework.StartsWith('netstandard1')) and $(NetStandard1xPackage.Contains('$(AssemblyName);'))">true</DisableImplicitFrameworkReferences>
<DisableImplicitFrameworkReferences Condition="'$(DisableImplicitFrameworkReferences)' == '' and ($(TargetFramework.StartsWith('netstandard1')) or '$(TargetFramework)' == 'netcoreapp1.1') and $(NetStandard1xPackage.Contains('$(AssemblyName);'))">true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,46 +1,37 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<PropertyGroup>
<OutputPath>$(ArtifactsBinDir)system.runtime.interopservices/4.3.0/ref/</OutputPath>
<IntermediateOutputPath>$(ArtifactsObjDir)system.runtime.interopservices/4.3.0</IntermediateOutputPath>
</PropertyGroup>

<ItemGroup>
<Compile Include="**/ref/$(TargetFramework)/*.cs" />
<Compile Include="**/lib/$(TargetFramework)/*.cs" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.0" />
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.2' ">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.2'">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.0" />
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
Expand All @@ -49,7 +40,7 @@
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
Expand Down
Loading