Skip to content

Commit 2267471

Browse files
mattpodwysockimattpodwysocki
committed
Updating build file
1 parent d503748 commit 2267471

File tree

138 files changed

+61441
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+61441
-2
lines changed

‎Ix.NET/Source/Common.targets‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,62 @@
245245
<SignAssembly>true</SignAssembly>
246246
<DelaySign>true</DelaySign>
247247
</PropertyGroup>
248+
249+
<!--
250+
************************************************
251+
* GENERAL REFERENCES - Microsoft.Bcl and Async *
252+
************************************************
253+
-->
254+
255+
<ItemGroup Condition=" '$(BuildTarget)' == 'PLLITE' ">
256+
<!--- Microsoft.Bcl References -->
257+
<Reference Include="System.Runtime">
258+
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\portable-net40+sl5+win8+wp8\System.Runtime.dll</HintPath>
259+
<Private>False</Private>
260+
</Reference>
261+
<Reference Include="System.Threading.Tasks">
262+
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\portable-net40+sl5+win8+wp8\System.Threading.Tasks.dll</HintPath>
263+
<Private>False</Private>
264+
</Reference>
265+
<!--- Microsoft.Bcl.Async References -->
266+
<Reference Include="Microsoft.Threading.Tasks">
267+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.dll</HintPath>
268+
<Private>False</Private>
269+
</Reference>
270+
<Reference Include="Microsoft.Threading.Tasks.Extensions">
271+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
272+
<Private>False</Private>
273+
</Reference>
274+
</ItemGroup>
275+
276+
<ItemGroup Condition=" '$(BuildTarget)' == '40' ">
277+
278+
<Reference Include="Microsoft.Threading.Tasks">
279+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
280+
<Private>False</Private>
281+
</Reference>
282+
<Reference Include="Microsoft.Threading.Tasks.Extensions">
283+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
284+
<Private>False</Private>
285+
</Reference>
286+
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
287+
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
288+
<Private>False</Private>
289+
</Reference>
290+
<Reference Include="System.Runtime">
291+
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\net40\System.Runtime.dll</HintPath>
292+
<Private>False</Private>
293+
</Reference>
294+
<Reference Include="System.Threading.Tasks">
295+
<HintPath>..\packages\Microsoft.Bcl.1.0.19\lib\net40\System.Threading.Tasks.dll</HintPath>
296+
<Private>False</Private>
297+
</Reference>
298+
</ItemGroup>
248299

249300
<PropertyGroup>
250301
<GetReferenceAssemblyPathsDependsOn>CP_SetBuildReferencePath</GetReferenceAssemblyPathsDependsOn>
251302
</PropertyGroup>
303+
252304
<Target Name="CP_SetBuildReferencePath">
253305
<PropertyGroup>
254306
<TargetFrameworkDirectory>$(ProjectDir)..\..\References\$(BuildFlavor)</TargetFrameworkDirectory>

‎Ix.NET/Source/Import.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
Lines="Auto-generated file, indicates the corresponding binary file needs to be signed." />
3030
</Target>
3131

32-
<!-- Skip validation of packages.config since we are manageing the packages manuallt -->
32+
<!-- Skip validation of packages.config since we are managing the packages manually -->
3333
<PropertyGroup>
3434
<SkipValidatePackageReferences>true</SkipValidatePackageReferences>
3535
</PropertyGroup>

‎Ix.NET/Source/Tests/AsyncTests.Conversions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void ToAsyncEnumerable4()
9999
[TestMethod]
100100
public async Task ToAsyncEnumerable_with_completed_task()
101101
{
102-
var task = Task.FromResult(36);
102+
var task = Task.Factory.StartNew(() => 36);
103103

104104
var xs = task.ToAsyncEnumerable();
105105
var e = xs.GetEnumerator();

‎Ix.NET/Source/packages/Microsoft.Bcl.1.0.19/License.rtf‎

Lines changed: 505 additions & 0 deletions
Large diffs are not rendered by default.

‎Ix.NET/Source/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nupkg‎

862 KB
Binary file not shown.

‎Ix.NET/Source/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nuspec‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<metadata>
4+
<id>Microsoft.Bcl</id>
5+
<version>1.0.19</version>
6+
<title>BCL Portability Pack for .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5</title>
7+
<authors>Microsoft</authors>
8+
<owners>Microsoft</owners>
9+
<licenseUrl>http://go.microsoft.com/fwlink/?LinkID=296435</licenseUrl>
10+
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=280057</projectUrl>
11+
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
12+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13+
<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:
14+
15+
CallerMemberNameAttribute
16+
CallerLineNumberAttribute
17+
CallerFilePathAttribute
18+
Tuple&lt;T1, T2, ...&gt;
19+
IProgress&lt;T&gt;
20+
IStructuralComparable
21+
IStructuralEquatable
22+
Task
23+
24+
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.
25+
26+
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>
27+
<summary>Adds support for types from later versions to .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5.</summary>
28+
<copyright>Copyright © Microsoft Corporation</copyright>
29+
<tags>BCL Microsoft System Task IProgress</tags>
30+
<dependencies>
31+
<dependency id="Microsoft.Bcl.Build" version="1.0.4" />
32+
</dependencies>
33+
<references>
34+
<reference file="System.Runtime.dll" />
35+
<reference file="System.Threading.Tasks.dll" />
36+
<reference file="_._" />
37+
</references>
38+
</metadata>
39+
</package>

‎Ix.NET/Source/packages/Microsoft.Bcl.1.0.19/ReleaseNotes.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Changes in 1.0.16-rc
2+
- Fixed: Adding empty content to .NET 4.5, Windows Phone 8, Windows 8 and portable combinations, so that app.config transforms
3+
are not applied to projects targeting them.
4+
5+
Changes in 1.0.15-rc
6+
7+
- Fixed: System.Runtime is missing a type forward for Tuple<T1, T2>
8+
9+
Changes in 1.0.14-rc
10+
11+
- 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.
12+
13+
Changes in 1.0.13-rc
14+
15+
- Fixed: First-chance exceptions when running on Phone 7.x
16+
17+
Changes in 1.0.12-rc
18+
19+
- Fixed: Microsoft.Bcl.targets are not imported when using NuGet 2.0 to install Microsoft.Bcl
20+
- Changed: Pulled build targets into a separate package (Microsoft.Bcl.Build) so other BCL packages can depend on it.
21+
22+
Changes in 1.0.11-beta
23+
24+
- Initial release

‎Ix.NET/Source/packages/Microsoft.Bcl.1.0.19/content/net45/_._‎

Whitespace-only changes.

‎Ix.NET/Source/packages/Microsoft.Bcl.1.0.19/content/portable-net45+win8+wp8/_._‎

Whitespace-only changes.

‎Ix.NET/Source/packages/Microsoft.Bcl.1.0.19/content/sl4/_._‎

Whitespace-only changes.

0 commit comments

Comments
 (0)