Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit e30a432

Browse files
committed
Adding packages for Immutable, Metadata, and Dataflow
[tfs] Previously these assemblies shipped in nuget v2 packages built from the OOB branch. This change adds nuget v2 packages that support all the existing targets supported by the old packages. [corefx] Add support to corefx github targets to enable packaging their output directly. [corefx] I made the assembly version of these projects consistent with what was previously shipped from our OOB branch. [tfs-changeset: 1489213]
1 parent f9b54a8 commit e30a432

File tree

5 files changed

+30
-2
lines changed

5 files changed

+30
-2
lines changed

src/System.Collections.Immutable/src/System.Collections.Immutable.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<FileAlignment>512</FileAlignment>
1616
<DocumentationFile>$(OutputPath)System.Collections.Immutable.xml</DocumentationFile>
1717
<GenerateAppxPackageOnBuild>False</GenerateAppxPackageOnBuild>
18-
<AssemblyVersion>1.1.9999</AssemblyVersion>
18+
<AssemblyVersion>1.1.37</AssemblyVersion>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2121
<DebugSymbols>true</DebugSymbols>

src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<DefaultLanguage>en-US</DefaultLanguage>
1717
<NoWarn>1591</NoWarn>
1818
<CLSCompliant>false</CLSCompliant>
19-
<AssemblyVersion>1.0.9999.0</AssemblyVersion>
19+
<AssemblyVersion>1.0.22.0</AssemblyVersion>
2020
</PropertyGroup>
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
2222
<PlatformTarget>AnyCPU</PlatformTarget>

src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.WP8.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>System.Threading.Tasks.Dataflow</RootNamespace>
1111
<AssemblyName>System.Threading.Tasks.Dataflow</AssemblyName>
12+
<AssemblyVersion>4.5.25.0</AssemblyVersion>
1213
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1314
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
1415
<FileAlignment>512</FileAlignment>

src/System.Threading.Tasks.Dataflow/src/System.Threading.Tasks.Dataflow.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>System.Threading.Tasks.Dataflow</RootNamespace>
1111
<AssemblyName>System.Threading.Tasks.Dataflow</AssemblyName>
12+
<AssemblyVersion>4.5.25.0</AssemblyVersion>
1213
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1314
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
1415
<FileAlignment>512</FileAlignment>

src/dir.targets

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,32 @@
1010
<Target Name="GetAssemblyVersion"
1111
Returns="$(AssemblyVersion)"/>
1212

13+
<!-- Returns the set of files to be included in the nuget package
14+
with appropriate metadata.-->
15+
<Target Name="GetFilesToPackage"
16+
Returns="@(FilesToPackage)">
17+
18+
<PropertyGroup>
19+
<PackagePath Condition="'$(PackagePath)' == ''">$(TargetPath)</PackagePath>
20+
<DocPackagePath Condition="'$(DocPackagePath)' == ''">$(DocumentationFile)</DocPackagePath>
21+
22+
<!-- default to treat as 'dotnet' package based portable library -->
23+
<PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">dotnet</PackageTargetFramework>
24+
<PackageTargetPath Condition="'$(PackageTargetPath)' == ''">lib/dotnet</PackageTargetPath>
25+
</PropertyGroup>
26+
27+
<ItemGroup>
28+
<FilesToPackage Include="$(PackagePath)">
29+
<TargetFramework>$(PackageTargetFramework)</TargetFramework>
30+
<TargetPath>$(PackageTargetPath)</TargetPath>
31+
</FilesToPackage>
32+
<FilesToPackage Include="$(DocPackagePath)" Condition="Exists('$(DocPackagePath)')">
33+
<TargetFramework>$(PackageTargetFramework)</TargetFramework>
34+
<TargetPath>$(PackageTargetPath)</TargetPath>
35+
</FilesToPackage>
36+
</ItemGroup>
37+
</Target>
38+
1339
<Import Project="$(ToolsDir)Build.Common.targets" Condition="Exists('$(ToolsDir)Build.Common.targets')" />
1440
<Import Project="..\override.targets" Condition="Exists('..\override.targets')"/>
1541

0 commit comments

Comments
 (0)