Skip to content
This repository was archived by the owner on Dec 18, 2017. It is now read-only.

Commit c994f49

Browse files
committed
Revert "Revert "Interfaces->Abstractions""
This reverts commit d21efb4.
1 parent a0ba421 commit c994f49

File tree

82 files changed

+38
-38
lines changed

Some content is hidden

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

82 files changed

+38
-38
lines changed

DNX.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{3F68
1919
EndProject
2020
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Runtime.Tests", "test\Microsoft.Framework.Runtime.Tests\Microsoft.Framework.Runtime.Tests.xproj", "{CCC1F7F8-8D3B-49C3-BAD4-17C784499AF1}"
2121
EndProject
22-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Runtime.Interfaces", "src\Microsoft.Framework.Runtime.Interfaces\Microsoft.Framework.Runtime.Interfaces.xproj", "{34E6FF7E-EACA-4542-A569-812738A83EB8}"
22+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Runtime.Abstractions", "src\Microsoft.Framework.Runtime.Abstractions\Microsoft.Framework.Runtime.Abstractions.xproj", "{34E6FF7E-EACA-4542-A569-812738A83EB8}"
2323
EndProject
2424
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Runtime", "src\Microsoft.Framework.Runtime\Microsoft.Framework.Runtime.xproj", "{D346515A-D457-49AC-B74D-1A343D870449}"
2525
EndProject
@@ -80,9 +80,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Bootstrapper.FunctionalTest
8080
EndProject
8181
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ApplicationHost2", "src\Microsoft.Framework.ApplicationHost2\Microsoft.Framework.ApplicationHost2.xproj", "{F6AA0E08-2A20-4019-9720-588D3A0DAF2C}"
8282
EndProject
83-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.DesignTimeHost.Interfaces", "src\Microsoft.Framework.DesignTimeHost.Interfaces\Microsoft.Framework.DesignTimeHost.Interfaces.xproj", "{88772B8E-1D5D-47D5-BDEB-1FDADA481845}"
83+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.DesignTimeHost.Abstractions", "src\Microsoft.Framework.DesignTimeHost.Abstractions\Microsoft.Framework.DesignTimeHost.Abstractions.xproj", "{88772B8E-1D5D-47D5-BDEB-1FDADA481845}"
8484
EndProject
85-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Runtime.Roslyn.Interfaces", "src\Microsoft.Framework.Runtime.Roslyn.Interfaces\Microsoft.Framework.Runtime.Roslyn.Interfaces.xproj", "{F8DC9AE8-54E1-443C-BF04-60AB0D169E3A}"
85+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Runtime.Roslyn.Abstractions", "src\Microsoft.Framework.Runtime.Roslyn.Abstractions\Microsoft.Framework.Runtime.Roslyn.Abstractions.xproj", "{F8DC9AE8-54E1-443C-BF04-60AB0D169E3A}"
8686
EndProject
8787
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.DesignTimeHost.Tests", "test\Microsoft.Framework.DesignTimeHost.Tests\Microsoft.Framework.DesignTimeHost.Tests.xproj", "{D2B06998-051A-4BCA-B005-F9F03FA83AD6}"
8888
EndProject

makefile.shade

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,17 @@ var MANAGED_PROJECTS = '${FindAllProjects(
6666
"Microsoft.Framework.ApplicationHost",
6767
"Microsoft.Framework.CommandLineUtils",
6868
"Microsoft.Framework.DesignTimeHost",
69-
"Microsoft.Framework.DesignTimeHost.Interfaces",
69+
"Microsoft.Framework.DesignTimeHost.Abstractions",
7070
"Microsoft.Framework.PackageManager",
7171
"Microsoft.Framework.Project",
7272
"Microsoft.Framework.Runtime",
7373
"Microsoft.Framework.Runtime.Caching",
74-
"Microsoft.Framework.Runtime.Interfaces",
74+
"Microsoft.Framework.Runtime.Abstractions",
7575
"Microsoft.Framework.Runtime.Compilation.DesignTime",
7676
"Microsoft.Framework.Runtime.Common",
7777
"Microsoft.Framework.Runtime.Loader",
7878
"Microsoft.Framework.Runtime.Roslyn",
79-
"Microsoft.Framework.Runtime.Roslyn.Interfaces",
79+
"Microsoft.Framework.Runtime.Roslyn.Abstractions",
8080
"Microsoft.Framework.Runtime.Roslyn.Common")}'
8181

8282
var WIN_MANAGED_PROJECTS = '${FindAllProjects(
@@ -754,7 +754,7 @@ var CI_DARWIN_DROP_PATH = '${Environment.GetEnvironmentVariable("CI_DARWIN_DROP_
754754

755755
- // ===================== TESTING =====================
756756

757-
#test-package target='integration-test'
757+
#test-package target='integration-tests'
758758
- // We want to run functional tests on both CLR flavors (wrt the RUNTIME_TARGETS)
759759
- // We want to separate function tests from unit tests
760760
@{
@@ -940,7 +940,7 @@ macro name='DoRestore'
940940
var tpaProjects = new[] {
941941
BOOTSTRAPPER_HOST_NAME,
942942
BOOTSTRAPPER_CORECLR_MANAGED_NAME,
943-
"Microsoft.Framework.Runtime.Interfaces",
943+
"Microsoft.Framework.Runtime.Abstractions",
944944
"Microsoft.Framework.Runtime.Loader"
945945
};
946946

samples/HelloWorld/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"exclude": "more/*.cs",
44
"dependencies": {
55
"HelloShared": { "version": "0.1-beta-*", "type": "build" },
6-
"Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-*"
6+
"Microsoft.Framework.Runtime.Roslyn.Abstractions": "1.0.0-*"
77
},
88
"commands": {
99
"hi": "HelloWorld --mode amazing",

src/Microsoft.Framework.ApplicationHost/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"Microsoft.Framework.CommandLineUtils": { "version": "1.0.0-*", "type": "build" },
66
"Microsoft.Framework.Runtime": "1.0.0-*",
77
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
8-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
8+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*"
99
},
1010
"frameworks": {
1111
"dnx451": { },

src/Microsoft.Framework.ApplicationHost2/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"Microsoft.Framework.CommandLineUtils": { "version": "1.0.0-*", "type": "build" },
66
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
77
"Newtonsoft.Json": "6.0.6",
8-
"Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-*",
9-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
8+
"Microsoft.Framework.Runtime.Roslyn.Abstractions": "1.0.0-*",
9+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
1010
"Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }
1111
},
1212
"compile": [

src/Microsoft.Framework.DesignTimeHost.Interfaces/project.json renamed to src/Microsoft.Framework.DesignTimeHost.Abstractions/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "ASP.NET 5 interfaces to take advantage of capabilities exposed by the design time host.",
44
"compilationOptions": { "warningsAsErrors": true },
55
"dependencies": {
6-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
6+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
77
"Newtonsoft.Json": "6.0.6"
88
},
99
"frameworks": {

src/Microsoft.Framework.DesignTimeHost/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"version": "1.0.0-*",
33
"dependencies": {
4-
"Microsoft.Framework.DesignTimeHost.Interfaces": "1.0.0-*",
4+
"Microsoft.Framework.DesignTimeHost.Abstractions": "1.0.0-*",
55
"Microsoft.Framework.NotNullAttribute.Internal": { "version": "1.0.0-*", "type": "build" },
66
"Microsoft.Framework.Runtime": "1.0.0-*",
77
"Microsoft.Framework.Runtime.Compilation.DesignTime": "1.0.0-*",
88
"Microsoft.Framework.Runtime.Compilation.Common": { "version": "1.0.0-*", "type": "build" },
99
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
10-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
10+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
1111
"Microsoft.Framework.Runtime.Roslyn": "1.0.0-*",
1212
"Newtonsoft.Json": "6.0.6"
1313
},

src/Microsoft.Framework.PackageManager/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"Microsoft.Framework.Runtime": "1.0.0-*",
99
"Microsoft.Framework.Runtime.Compilation.Common": { "version": "1.0.0-*", "type": "build" },
1010
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
11-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
11+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*"
1212
},
1313
"compile": "..\\Microsoft.Framework.ApplicationHost\\Impl\\**\\*.cs",
1414

src/Microsoft.Framework.Project/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"Microsoft.Framework.CommandLineUtils" : { "version": "1.0.0-*", "type": "build" },
66
"Microsoft.Framework.Runtime" : "1.0.0-*",
77
"Microsoft.Framework.Runtime.Common" : { "version": "1.0.0-*", "type": "build" },
8-
"Microsoft.Framework.Runtime.Interfaces" : "1.0.0-*"
8+
"Microsoft.Framework.Runtime.Abstractions" : "1.0.0-*"
99
},
1010
"frameworks" : {
1111
"dnx451" : {

src/Microsoft.Framework.Runtime.Caching/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": "1.0.0-*",
33
"dependencies": {
4-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
4+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*"
55
},
66

77
"frameworks": {

src/Microsoft.Framework.Runtime.Compilation.Common/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "(Temporary) Central place for common classes used in compilation. These will live in Microsoft.Framework.Runtime.Compilation",
44
"shared": "**/*.cs",
55
"dependencies": {
6-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
6+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*"
77
},
88

99
"frameworks": {

src/Microsoft.Framework.Runtime.Compilation.DesignTime/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Newtonsoft.Json": "6.0.6",
55
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
66
"Microsoft.Framework.Runtime.Compilation.Common": { "version": "1.0.0-*", "type": "build" },
7-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
7+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*"
88
},
99
"compile": [ "../Microsoft.Framework.Runtime.Hosting/JTokenExtensions.cs" ],
1010
"frameworks": {

src/Microsoft.Framework.Runtime.Hosting/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"NuGet.ProjectModel": "3.0.0-*",
77
"NuGet.DependencyResolver.Core": "3.0.0-*",
88
"Microsoft.Framework.FileSystemGlobbing": "1.0.0-*",
9-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
9+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
1010
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
1111
"Microsoft.Framework.Logging.Interfaces": "1.0.0-*"
1212
},

src/Microsoft.Framework.Runtime.Loader/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": "1.0.0-*",
33
"description": "ASP.NET 5 runtime infrastructure for assembly load contexts.",
44
"dependencies": {
5-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
5+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*"
66
},
77

88
"frameworks": {

src/Microsoft.Framework.Runtime.Roslyn.Interfaces/project.json renamed to src/Microsoft.Framework.Runtime.Roslyn.Abstractions/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": "1.0.0-*",
33
"dependencies": {
4-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
4+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
55
"Microsoft.CodeAnalysis.CSharp": "1.0.0-*"
66
},
77

src/Microsoft.Framework.Runtime.Roslyn.Common/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dependencies": {
66
"Microsoft.CodeAnalysis.CSharp": "1.0.0-*",
77
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
8-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
8+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*"
99
},
1010
"frameworks": {
1111
"dnx451": {

src/Microsoft.Framework.Runtime.Roslyn/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"dependencies": {
66
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
77
"Microsoft.Framework.Runtime.Compilation.Common": { "version": "1.0.0-*", "type": "build" },
8-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
8+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
99
"Microsoft.Framework.Runtime.Roslyn.Common": { "version": "1.0.0-*", "type": "build" },
10-
"Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-*",
10+
"Microsoft.Framework.Runtime.Roslyn.Abstractions": "1.0.0-*",
1111
"Microsoft.Framework.Runtime.Caching": "1.0.0-*"
1212
},
1313
"frameworks": {

src/Microsoft.Framework.Runtime/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"dependencies": {
2020
"Microsoft.Framework.Runtime.Loader": "1.0.0-*",
2121
"Microsoft.Framework.Runtime.Caching": "1.0.0-*",
22-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
22+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
2323
"Microsoft.Framework.Runtime.Compilation.Common": { "version": "1.0.0-*", "type": "build" },
2424
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
2525
"Microsoft.CodeAnalysis.CSharp": { "version": "1.0.0-*", "type": "build" },
26-
"Microsoft.Framework.Runtime.Roslyn.Interfaces": { "version": "1.0.0-*", "type": "build" },
26+
"Microsoft.Framework.Runtime.Roslyn.Abstractions": { "version": "1.0.0-*", "type": "build" },
2727
"Newtonsoft.Json": "6.0.6"
2828
},
2929
"frameworks": {

src/dnx.coreclr.unix/tpa.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BOOL CreateTpaBase(LPCTSTR** ppNames, size_t* pcNames, bool bNative)
1616
{
1717
pArray[0] = _T("dnx.coreclr.managed.ni.dll");
1818
pArray[1] = _T("dnx.host.ni.dll");
19-
pArray[2] = _T("Microsoft.Framework.Runtime.Interfaces.ni.dll");
19+
pArray[2] = _T("Microsoft.Framework.Runtime.Abstractions.ni.dll");
2020
pArray[3] = _T("Microsoft.Framework.Runtime.Loader.ni.dll");
2121
pArray[4] = _T("mscorlib.ni.dll");
2222
pArray[5] = _T("System.AppContext.ni.dll");
@@ -52,7 +52,7 @@ BOOL CreateTpaBase(LPCTSTR** ppNames, size_t* pcNames, bool bNative)
5252
{
5353
pArray[0] = _T("dnx.coreclr.managed.dll");
5454
pArray[1] = _T("dnx.host.dll");
55-
pArray[2] = _T("Microsoft.Framework.Runtime.Interfaces.dll");
55+
pArray[2] = _T("Microsoft.Framework.Runtime.Abstractions.dll");
5656
pArray[3] = _T("Microsoft.Framework.Runtime.Loader.dll");
5757
pArray[4] = _T("mscorlib.dll");
5858
pArray[5] = _T("System.AppContext.dll");

src/dnx.coreclr/tpa.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BOOL CreateTpaBase(LPCTSTR** ppNames, size_t* pcNames, bool bNative)
1616
{
1717
pArray[0] = _T("dnx.coreclr.managed.ni.dll");
1818
pArray[1] = _T("dnx.host.ni.dll");
19-
pArray[2] = _T("Microsoft.Framework.Runtime.Interfaces.ni.dll");
19+
pArray[2] = _T("Microsoft.Framework.Runtime.Abstractions.ni.dll");
2020
pArray[3] = _T("Microsoft.Framework.Runtime.Loader.ni.dll");
2121
pArray[4] = _T("mscorlib.ni.dll");
2222
pArray[5] = _T("System.AppContext.ni.dll");
@@ -52,7 +52,7 @@ BOOL CreateTpaBase(LPCTSTR** ppNames, size_t* pcNames, bool bNative)
5252
{
5353
pArray[0] = _T("dnx.coreclr.managed.dll");
5454
pArray[1] = _T("dnx.host.dll");
55-
pArray[2] = _T("Microsoft.Framework.Runtime.Interfaces.dll");
55+
pArray[2] = _T("Microsoft.Framework.Runtime.Abstractions.dll");
5656
pArray[3] = _T("Microsoft.Framework.Runtime.Loader.dll");
5757
pArray[4] = _T("mscorlib.dll");
5858
pArray[5] = _T("System.AppContext.dll");

submodules/NuGet.Packaging

submodules/NuGet.Versioning

test/Microsoft.Framework.DesignTimeHost.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"Microsoft.Framework.DesignTimeHost": "1.0.0-*",
4-
"Microsoft.Framework.DesignTimeHost.Interfaces": "1.0.0-*",
4+
"Microsoft.Framework.DesignTimeHost.Abstractions": "1.0.0-*",
55
"xunit.runner.aspnet": "2.0.0-aspnet-*"
66
},
77
"frameworks": {

test/Microsoft.Framework.Runtime.FunctionalTests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": {
33
"Microsoft.Framework.CommonTestUtils": "1.0.0-*",
44
"Microsoft.Framework.Runtime": "1.0.0-*",
5-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
5+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
66
"Microsoft.AspNet.Testing": "1.0.0-*",
77
"xunit.runner.aspnet": "2.0.0-aspnet-*"
88
},

test/Microsoft.Framework.Runtime.Roslyn.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
3+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
44
"Microsoft.Framework.Runtime.Roslyn": "1.0.0-*",
55
"xunit.runner.aspnet": "2.0.0-aspnet-*"
66
},

test/Microsoft.Framework.Runtime.Tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"Microsoft.Framework.Runtime": "1.0.0-*",
4-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
4+
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*",
55
"xunit.runner.aspnet": "2.0.0-aspnet-*"
66
},
77
"frameworks": {

0 commit comments

Comments
 (0)