Skip to content

Commit

Permalink
Merge pull request #423 from dotnet/IxAsyncCSharp8
Browse files Browse the repository at this point in the history
System.Interactive.Async with C# 8.0 proposed interfaces
  • Loading branch information
bartdesmet authored Mar 1, 2019
2 parents 9666473 + 9e72e46 commit c256fe2
Show file tree
Hide file tree
Showing 460 changed files with 94,134 additions and 32,390 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ stylecop.*
artifacts/
Generated_Code #added for RIA/Silverlight projects
ApiApprovalTests.*.received.txt
coverlet/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
Expand Down Expand Up @@ -185,3 +186,6 @@ nuget.exe

# dotnet local cache
.dotnet

# JetBrains Rider adds these
.idea/
1 change: 1 addition & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Arthur Watson
Gert Drapers
Mark Shields
Eric Rozell
Oren Novotny

Rx.js and Ix.js:
Matthew Podwysocki
Expand Down
35 changes: 35 additions & 0 deletions Ix.NET/Source/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (console) - Ix.NET.sln",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build - Ix.NET.sln",
"program": "${workspaceFolder}/Playground/bin/Debug/netcoreapp2.1/Playground.dll",
"args": [],
"cwd": "${workspaceFolder}/Playground",
"console": "internalConsole",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": ".NET Core Launch (console) - Ix.Async.NET.sln",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build - Ix.Async.NET.sln",
"program": "${workspaceFolder}/Playground/bin/Debug/netcoreapp2.1/Playground.dll",
"args": [],
"cwd": "${workspaceFolder}/Playground",
"console": "internalConsole",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
,]
}
35 changes: 35 additions & 0 deletions Ix.NET/Source/.vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build - Ix.NET.sln",
"command": "dotnet",
"args": [
"build",
"${workspaceFolder}/Ix.NET.sln",
"/property:GenerateFullPaths=true"
],
"type": "shell",
"group": "build",
"presentation": {
"reveal": "silent"
},
"problemMatcher": "$msCompile"
},
{
"label": "build - Ix.Async.NET.sln",
"command": "dotnet",
"args": [
"build",
"${workspaceFolder}/Ix.NET.sln",
"/property:GenerateFullPaths=true"
],
"type": "shell",
"group": "build",
"presentation": {
"reveal": "silent"
},
"problemMatcher": "$msCompile"
}
]
}
17 changes: 17 additions & 0 deletions Ix.NET/Source/ApiCompare/ApiCompare.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\System.Interactive.Async.Providers\System.Interactive.Async.Providers.csproj" />
<ProjectReference Include="..\System.Interactive.Async\System.Interactive.Async.csproj" />
<ProjectReference Include="..\System.Interactive.Providers\System.Interactive.Providers.csproj" />
<ProjectReference Include="..\System.Interactive\System.Interactive.csproj" />
<ProjectReference Include="..\System.Linq.Async.Queryable\System.Linq.Async.Queryable.csproj" />
<ProjectReference Include="..\System.Linq.Async\System.Linq.Async.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit c256fe2

Please sign in to comment.