Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

[automated] Merge branch 'release/2.2' => 'master' #1723

Merged
merged 13 commits into from
Jul 24, 2018
Merged

[automated] Merge branch 'release/2.2' => 'master' #1723

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8c84e35
Update dependencies.props
aspnetci May 4, 2018
2698d77
Update dependencies.props
aspnetci May 29, 2018
436cdb0
Bumping version from 2.1.0 to 2.1.1
May 30, 2018
d65a4f3
Update dependencies.props
aspnetci Jun 12, 2018
e49b0e4
Bumping version from 2.1.1 to 2.1.2
May 30, 2018
a04813e
Set 2.1 baselines
ryanbrandenburg Jun 14, 2018
5fa87a0
Update dependencies.props
aspnetci Jul 8, 2018
0da7460
Reverting version from 2.1.2 back to 2.1.1
Jul 11, 2018
578124e
Updating dependencies to 2.1.2 and adding a section for pinned variab…
Jul 12, 2018
ea3a7bc
Pin version variables to the ASP.NET Core 2.1.2 baseline
Jul 12, 2018
c834259
Update dependencies.props
aspnetci Jul 15, 2018
9c74160
Update dependencies.props
aspnetci Jul 22, 2018
a4bb72e
Merge branch 'release/2.1' into release/2.2
Jul 24, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Set 2.1 baselines
  • Loading branch information
@ryanbrandenburg
ryanbrandenburg committed Jun 14, 2018
commit a04813edc3456446dfb2e8059a7589f9d405db16
2 changes: 1 addition & 1 deletion src/Microsoft.AspNetCore.NodeServices.Sockets/baseline.netcore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"AssemblyIdentity": "Microsoft.AspNetCore.NodeServices.Sockets, Version=2.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"AssemblyIdentity": "Microsoft.AspNetCore.NodeServices.Sockets, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.AspNetCore.NodeServices.Sockets.NodeServicesOptionsExtensions",
Expand Down
24 changes: 12 additions & 12 deletions src/Microsoft.AspNetCore.NodeServices/baseline.netcore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"AssemblyIdentity": "Microsoft.AspNetCore.NodeServices, Version=2.0.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"AssemblyIdentity": "Microsoft.AspNetCore.NodeServices, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.Extensions.DependencyInjection.NodeServicesServiceCollectionExtensions",
Expand Down Expand Up @@ -714,6 +714,17 @@
"Microsoft.AspNetCore.NodeServices.HostingModels.INodeInstance"
],
"Members": [
{
"Kind": "Method",
"Name": "Dispose",
"Parameters": [],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.IDisposable",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "InvokeExportAsync<T0>",
Expand Down Expand Up @@ -749,17 +760,6 @@
}
]
},
{
"Kind": "Method",
"Name": "Dispose",
"Parameters": [],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.IDisposable",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "InvokeExportAsync<T0>",
Expand Down
Loading