Skip to content

Commit

Permalink
Updating build file
Browse files Browse the repository at this point in the history
  • Loading branch information
mattpodwysocki committed Aug 2, 2014
1 parent d503748 commit 2267471
Show file tree
Hide file tree
Showing 138 changed files with 61,441 additions and 2 deletions.
52 changes: 52 additions & 0 deletions Ix.NET/Source/Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,62 @@
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
</PropertyGroup>

<!--
************************************************
* GENERAL REFERENCES - Microsoft.Bcl and Async *
************************************************
-->

<ItemGroup Condition=" '$(BuildTarget)' == 'PLLITE' ">
<!--- Microsoft.Bcl References -->
<Reference Include="System.Runtime">
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\portable-net40+sl5+win8+wp8\System.Runtime.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\portable-net40+sl5+win8+wp8\System.Threading.Tasks.dll</HintPath>
<Private>False</Private>
</Reference>
<!--- Microsoft.Bcl.Async References -->
<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

<ItemGroup Condition=" '$(BuildTarget)' == '40' ">

<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Runtime">
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\net40\System.Runtime.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Threading.Tasks">
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\net40\System.Threading.Tasks.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

<PropertyGroup>
<GetReferenceAssemblyPathsDependsOn>CP_SetBuildReferencePath</GetReferenceAssemblyPathsDependsOn>
</PropertyGroup>

<Target Name="CP_SetBuildReferencePath">
<PropertyGroup>
<TargetFrameworkDirectory>$(ProjectDir)..\..\References\$(BuildFlavor)</TargetFrameworkDirectory>
Expand Down
2 changes: 1 addition & 1 deletion Ix.NET/Source/Import.targets
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
Lines="Auto-generated file, indicates the corresponding binary file needs to be signed." />
</Target>

<!-- Skip validation of packages.config since we are manageing the packages manuallt -->
<!-- Skip validation of packages.config since we are managing the packages manually -->
<PropertyGroup>
<SkipValidatePackageReferences>true</SkipValidatePackageReferences>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Ix.NET/Source/Tests/AsyncTests.Conversions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void ToAsyncEnumerable4()
[TestMethod]
public async Task ToAsyncEnumerable_with_completed_task()
{
var task = Task.FromResult(36);
var task = Task.Factory.StartNew(() => 36);

var xs = task.ToAsyncEnumerable();
var e = xs.GetEnumerator();
Expand Down
505 changes: 505 additions & 0 deletions Ix.NET/Source/packages/Microsoft.Bcl.1.0.19/License.rtf

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>Microsoft.Bcl</id>
<version>1.0.19</version>
<title>BCL Portability Pack for .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>http://go.microsoft.com/fwlink/?LinkID=296435</licenseUrl>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=280057</projectUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>This packages enables projects targeting .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5 (including any portable library combinations) to use new types from later versions of .NET including:

CallerMemberNameAttribute
CallerLineNumberAttribute
CallerFilePathAttribute
Tuple&lt;T1, T2, ...&gt;
IProgress&lt;T&gt;
IStructuralComparable
IStructuralEquatable
Task

These types are "unified" to their later version equivalent. For example, when running on .NET Framework 4.5, IProgress&lt;T&gt; from this package will be seen by the runtime as the same type as the one already in the platform.

This package is not required for projects targeting .NET Framework 4.5 or .NET for Windows Store apps. For known issues, please see: http://blogs.msdn.com/b/bclteam/p/asynctargetingpackkb.aspx.</description>
<summary>Adds support for types from later versions to .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5.</summary>
<copyright>Copyright © Microsoft Corporation</copyright>
<tags>BCL Microsoft System Task IProgress</tags>
<dependencies>
<dependency id="Microsoft.Bcl.Build" version="1.0.4" />
</dependencies>
<references>
<reference file="System.Runtime.dll" />
<reference file="System.Threading.Tasks.dll" />
<reference file="_._" />
</references>
</metadata>
</package>
24 changes: 24 additions & 0 deletions Ix.NET/Source/packages/Microsoft.Bcl.1.0.19/ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Changes in 1.0.16-rc
- Fixed: Adding empty content to .NET 4.5, Windows Phone 8, Windows 8 and portable combinations, so that app.config transforms
are not applied to projects targeting them.

Changes in 1.0.15-rc

- Fixed: System.Runtime is missing a type forward for Tuple<T1, T2>

Changes in 1.0.14-rc

- Fixed: System.Runtime now has a fixed version for Phone 7.x due to the lack of a way to redirect them to a later version.

Changes in 1.0.13-rc

- Fixed: First-chance exceptions when running on Phone 7.x

Changes in 1.0.12-rc

- Fixed: Microsoft.Bcl.targets are not imported when using NuGet 2.0 to install Microsoft.Bcl
- Changed: Pulled build targets into a separate package (Microsoft.Bcl.Build) so other BCL packages can depend on it.

Changes in 1.0.11-beta

- Initial release
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Loading

0 comments on commit 2267471

Please sign in to comment.