Skip to content

Commit 1d538a3

Browse files
committed
Merge branch 'IxAsyncCSharp8' of https://github.com/dotnet/reactive into IxAsyncCSharp8
2 parents 908eb23 + 9460634 commit 1d538a3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Ix.NET/Source/Directory.build.targets

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
<DefineConstants>$(DefineConstants);USE_ASYNC_ITERATOR</DefineConstants>
1515
</PropertyGroup>
1616
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'netstandard2.1'">
17-
<!--
18-
NB: USE_ASYNC_ITERATOR relies on members in the framework only present in .NET Core 3.0 Preview 2 at the moment:
19-
error CS0518: Predefined type 'System.Runtime.CompilerServices.AsyncIteratorMethodBuilder' is not defined or imported
20-
error CS0656: Missing compiler required member 'System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1.*
21-
-->
2217
<DefineConstants>$(DefineConstants);USE_ASYNC_ITERATOR;HAS_ASYNCENUMERABLE;HAS_ASYNCDISPOSABLE;BCL_HAS_CONFIGUREAWAIT</DefineConstants>
2318
</PropertyGroup>
2419

2520
<PropertyGroup>
2621
<Product>$(AssemblyName) ($(TargetFramework))</Product>
2722
</PropertyGroup>
2823

24+
<ItemGroup>
25+
<!-- Workaround https://github.com/dotnet/sdk/issues/2976 -->
26+
<PackageReference Update="Microsoft.NETCore.Platforms" PrivateAssets="All" />
27+
</ItemGroup>
28+
2929
<PropertyGroup Condition="'$(IsTestProject)' == 'true'">
3030
<UseSourceLink>true</UseSourceLink>
3131
<CoverletOutputFormat>cobertura</CoverletOutputFormat>

azure-pipelines.ix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
trigger:
1+
ntrigger:
22
branches:
33
include:
44
- master
@@ -22,7 +22,7 @@ pr:
2222
- azure-pipelines.ix.yml
2323

2424
pool:
25-
vmImage: vs2017-win2016
25+
vmImage: windows-2019
2626

2727
variables:
2828
BuildConfiguration: Release

0 commit comments

Comments
 (0)