Skip to content
This repository was archived by the owner on Nov 6, 2018. It is now read-only.

Commit bf092bc

Browse files
TratcherTratcher
committed
#48 Seperate Physical and Embedded into their own packages.
1 parent ecfa7aa commit bf092bc

32 files changed

+222
-52
lines changed

‎FileSystem.sln

Lines changed: 76 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.22710.0
4+
VisualStudioVersion = 14.0.22803.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A1477614-E825-4204-A684-385004B63AEB}"
77
EndProject
8-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FileProviders", "src\Microsoft.AspNet.FileProviders\Microsoft.AspNet.FileProviders.xproj", "{A830B046-595A-4992-B9E1-3C28C6440707}"
9-
EndProject
108
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E399495E-82B8-4C06-8779-C1D02BEF4495}"
119
EndProject
12-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FileProviders.Tests", "test\Microsoft.AspNet.FileProviders.Tests\Microsoft.AspNet.FileProviders.Tests.xproj", "{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}"
13-
EndProject
1410
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1A060559-74DD-4B5A-BBA1-E8A441E729C1}"
1511
ProjectSection(SolutionItems) = preProject
1612
global.json = global.json
@@ -22,6 +18,16 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.FileSys
2218
EndProject
2319
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.FileSystemGlobbing.Tests", "test\Microsoft.Framework.FileSystemGlobbing.Tests\Microsoft.Framework.FileSystemGlobbing.Tests.xproj", "{45A5A942-4EFB-4839-AEA3-EB1D2BAB332C}"
2420
EndProject
21+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FileProviders.Embedded", "src\Microsoft.AspNet.FileProviders.Embedded\Microsoft.AspNet.FileProviders.Embedded.xproj", "{BD98C115-7FA6-4A78-8198-9650A4706B79}"
22+
EndProject
23+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FileProviders.Physical", "src\Microsoft.AspNet.FileProviders.Physical\Microsoft.AspNet.FileProviders.Physical.xproj", "{BA56E837-C793-4A7D-824D-84492028E066}"
24+
EndProject
25+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FileProviders.Embedded.Tests", "test\Microsoft.AspNet.FileProviders.Embedded.Tests\Microsoft.AspNet.FileProviders.Embedded.Tests.xproj", "{6B6BA57A-B32D-430A-AF39-09CAA85308C2}"
26+
EndProject
27+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FileProviders.Physical.Tests", "test\Microsoft.AspNet.FileProviders.Physical.Tests\Microsoft.AspNet.FileProviders.Physical.Tests.xproj", "{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}"
28+
EndProject
29+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FileProviders.Common", "src\Microsoft.AspNet.FileProviders.Common\Microsoft.AspNet.FileProviders.Common.xproj", "{92C2C85C-D1A5-44BD-BE23-238E08471B4D}"
30+
EndProject
2531
Global
2632
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2733
Debug|Any CPU = Debug|Any CPU
@@ -32,26 +38,6 @@ Global
3238
Release|x86 = Release|x86
3339
EndGlobalSection
3440
GlobalSection(ProjectConfigurationPlatforms) = postSolution
35-
{A830B046-595A-4992-B9E1-3C28C6440707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{A830B046-595A-4992-B9E1-3C28C6440707}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{A830B046-595A-4992-B9E1-3C28C6440707}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
38-
{A830B046-595A-4992-B9E1-3C28C6440707}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
39-
{A830B046-595A-4992-B9E1-3C28C6440707}.Debug|x86.ActiveCfg = Debug|Any CPU
40-
{A830B046-595A-4992-B9E1-3C28C6440707}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{A830B046-595A-4992-B9E1-3C28C6440707}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{A830B046-595A-4992-B9E1-3C28C6440707}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
43-
{A830B046-595A-4992-B9E1-3C28C6440707}.Release|Mixed Platforms.Build.0 = Release|Any CPU
44-
{A830B046-595A-4992-B9E1-3C28C6440707}.Release|x86.ActiveCfg = Release|Any CPU
45-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
48-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
49-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|x86.ActiveCfg = Debug|Any CPU
50-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|Any CPU.Build.0 = Release|Any CPU
52-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
53-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
54-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|x86.ActiveCfg = Release|Any CPU
5541
{DD94B7E8-3A59-4F84-98A0-8139BE259A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5642
{DD94B7E8-3A59-4F84-98A0-8139BE259A87}.Debug|Any CPU.Build.0 = Debug|Any CPU
5743
{DD94B7E8-3A59-4F84-98A0-8139BE259A87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -86,15 +72,78 @@ Global
8672
{45A5A942-4EFB-4839-AEA3-EB1D2BAB332C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
8773
{45A5A942-4EFB-4839-AEA3-EB1D2BAB332C}.Release|x86.ActiveCfg = Release|Any CPU
8874
{45A5A942-4EFB-4839-AEA3-EB1D2BAB332C}.Release|x86.Build.0 = Release|Any CPU
75+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Debug|Any CPU.Build.0 = Debug|Any CPU
77+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
78+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
79+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Debug|x86.ActiveCfg = Debug|Any CPU
80+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Debug|x86.Build.0 = Debug|Any CPU
81+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Release|Any CPU.ActiveCfg = Release|Any CPU
82+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Release|Any CPU.Build.0 = Release|Any CPU
83+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
84+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Release|Mixed Platforms.Build.0 = Release|Any CPU
85+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Release|x86.ActiveCfg = Release|Any CPU
86+
{BD98C115-7FA6-4A78-8198-9650A4706B79}.Release|x86.Build.0 = Release|Any CPU
87+
{BA56E837-C793-4A7D-824D-84492028E066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88+
{BA56E837-C793-4A7D-824D-84492028E066}.Debug|Any CPU.Build.0 = Debug|Any CPU
89+
{BA56E837-C793-4A7D-824D-84492028E066}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
90+
{BA56E837-C793-4A7D-824D-84492028E066}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
91+
{BA56E837-C793-4A7D-824D-84492028E066}.Debug|x86.ActiveCfg = Debug|Any CPU
92+
{BA56E837-C793-4A7D-824D-84492028E066}.Debug|x86.Build.0 = Debug|Any CPU
93+
{BA56E837-C793-4A7D-824D-84492028E066}.Release|Any CPU.ActiveCfg = Release|Any CPU
94+
{BA56E837-C793-4A7D-824D-84492028E066}.Release|Any CPU.Build.0 = Release|Any CPU
95+
{BA56E837-C793-4A7D-824D-84492028E066}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
96+
{BA56E837-C793-4A7D-824D-84492028E066}.Release|Mixed Platforms.Build.0 = Release|Any CPU
97+
{BA56E837-C793-4A7D-824D-84492028E066}.Release|x86.ActiveCfg = Release|Any CPU
98+
{BA56E837-C793-4A7D-824D-84492028E066}.Release|x86.Build.0 = Release|Any CPU
99+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
100+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
101+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
102+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
103+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Debug|x86.ActiveCfg = Debug|Any CPU
104+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Debug|x86.Build.0 = Debug|Any CPU
105+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
106+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Release|Any CPU.Build.0 = Release|Any CPU
107+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
108+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
109+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Release|x86.ActiveCfg = Release|Any CPU
110+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2}.Release|x86.Build.0 = Release|Any CPU
111+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
113+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
114+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
115+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|x86.ActiveCfg = Debug|Any CPU
116+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Debug|x86.Build.0 = Debug|Any CPU
117+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
118+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|Any CPU.Build.0 = Release|Any CPU
119+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
120+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
121+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|x86.ActiveCfg = Release|Any CPU
122+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9}.Release|x86.Build.0 = Release|Any CPU
123+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
124+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
125+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
126+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
127+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Debug|x86.ActiveCfg = Debug|Any CPU
128+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Debug|x86.Build.0 = Debug|Any CPU
129+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
130+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Release|Any CPU.Build.0 = Release|Any CPU
131+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
132+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
133+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Release|x86.ActiveCfg = Release|Any CPU
134+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D}.Release|x86.Build.0 = Release|Any CPU
89135
EndGlobalSection
90136
GlobalSection(SolutionProperties) = preSolution
91137
HideSolutionNode = FALSE
92138
EndGlobalSection
93139
GlobalSection(NestedProjects) = preSolution
94-
{A830B046-595A-4992-B9E1-3C28C6440707} = {A1477614-E825-4204-A684-385004B63AEB}
95-
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9} = {E399495E-82B8-4C06-8779-C1D02BEF4495}
96140
{DD94B7E8-3A59-4F84-98A0-8139BE259A87} = {A1477614-E825-4204-A684-385004B63AEB}
97141
{970449A2-3BBB-4E87-8513-C41F109B1A3E} = {A1477614-E825-4204-A684-385004B63AEB}
98142
{45A5A942-4EFB-4839-AEA3-EB1D2BAB332C} = {E399495E-82B8-4C06-8779-C1D02BEF4495}
143+
{BD98C115-7FA6-4A78-8198-9650A4706B79} = {A1477614-E825-4204-A684-385004B63AEB}
144+
{BA56E837-C793-4A7D-824D-84492028E066} = {A1477614-E825-4204-A684-385004B63AEB}
145+
{6B6BA57A-B32D-430A-AF39-09CAA85308C2} = {E399495E-82B8-4C06-8779-C1D02BEF4495}
146+
{66FE5FDF-BBF9-4573-A7B7-53551731C0F9} = {E399495E-82B8-4C06-8779-C1D02BEF4495}
147+
{92C2C85C-D1A5-44BD-BE23-238E08471B4D} = {A1477614-E825-4204-A684-385004B63AEB}
99148
EndGlobalSection
100149
EndGlobal

‎src/Microsoft.AspNet.FileProviders/Implementation/EnumerableDirectoryContents.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Common/Implementation/EnumerableDirectoryContents.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.AspNet.FileProviders
88
{
9-
public class EnumerableDirectoryContents : IDirectoryContents
9+
internal class EnumerableDirectoryContents : IDirectoryContents
1010
{
1111
private readonly IEnumerable<IFileInfo> _entries;
1212

‎src/Microsoft.AspNet.FileProviders/Implementation/NoopTrigger.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Common/Implementation/NoopTrigger.cs

File renamed without changes.

‎src/Microsoft.AspNet.FileProviders/Implementation/NotFoundDirectoryContents.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Common/Implementation/NotFoundDirectoryContents.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Microsoft.AspNet.FileProviders
99
{
10-
public class NotFoundDirectoryContents : IDirectoryContents
10+
internal class NotFoundDirectoryContents : IDirectoryContents
1111
{
1212
public NotFoundDirectoryContents()
1313
{

‎src/Microsoft.AspNet.FileProviders/Implementation/NotFoundFileInfo.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Common/Implementation/NotFoundFileInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.AspNet.FileProviders
99
/// <summary>
1010
/// Represents a non-existing file.
1111
/// </summary>
12-
public class NotFoundFileInfo : IFileInfo
12+
internal class NotFoundFileInfo : IFileInfo
1313
{
1414
private readonly string _name;
1515

@@ -50,7 +50,7 @@ public string PhysicalPath
5050

5151
public Stream CreateReadStream()
5252
{
53-
throw new InvalidOperationException(string.Format("The file {0} does not exist.", Name));
53+
throw new FileNotFoundException(string.Format("The file {0} does not exist.", Name));
5454
}
5555
}
5656
}

‎src/Microsoft.AspNet.FileProviders/Microsoft.AspNet.FileProviders.xproj renamed to ‎src/Microsoft.AspNet.FileProviders.Common/Microsoft.AspNet.FileProviders.Common.xproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="__ToolsVersion__" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
55
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
66
</PropertyGroup>
77
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
9-
<ProjectGuid>a830b046-595a-4992-b9e1-3c28c6440707</ProjectGuid>
10-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
11-
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
9+
<ProjectGuid>92c2c85c-d1a5-44bd-be23-238e08471b4d</ProjectGuid>
10+
</PropertyGroup>
11+
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
13+
</PropertyGroup>
14+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
1215
</PropertyGroup>
1316
<PropertyGroup>
1417
<SchemaVersion>2.0</SchemaVersion>

‎src/Microsoft.AspNet.FileProviders.Common/project.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "1.0.0-*",
3+
"shared": "**/*.cs",
4+
"dependencies": {
5+
"Microsoft.AspNet.FileProviders.Interfaces": "1.0.0-*"
6+
},
7+
"frameworks": {
8+
"net45": { },
9+
"dnx451": { },
10+
"dnxcore50": {
11+
"dependencies": {
12+
"System.Linq": "4.0.0-beta-*"
13+
}
14+
}
15+
}
16+
}

‎src/Microsoft.AspNet.FileProviders/EmbeddedFileProvider.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Embedded/EmbeddedFileProvider.cs

File renamed without changes.

‎src/Microsoft.AspNet.FileProviders.Embedded/Microsoft.AspNet.FileProviders.Embedded.xproj

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="__ToolsVersion__" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>bd98c115-7fa6-4a78-8198-9650a4706b79</ProjectGuid>
10+
</PropertyGroup>
11+
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
13+
</PropertyGroup>
14+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
15+
</PropertyGroup>
16+
<PropertyGroup>
17+
<SchemaVersion>2.0</SchemaVersion>
18+
</PropertyGroup>
19+
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
20+
</Project>

‎src/Microsoft.AspNet.FileProviders/Properties/AssemblyInfo.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Embedded/Properties/AssemblyInfo.cs

File renamed without changes.

‎src/Microsoft.AspNet.FileProviders.Embedded/project.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": "1.0.0-*",
3+
"description": "Implementation of ASP.NET 5 file provider abstractions for embedded resources.",
4+
"dependencies": {
5+
"Microsoft.AspNet.FileProviders.Common": { "version": "1.0.0-*", "type": "build" },
6+
"Microsoft.AspNet.FileProviders.Interfaces": "1.0.0-*"
7+
},
8+
"frameworks": {
9+
"net45": { },
10+
"dnx451": { },
11+
"dnxcore50": {
12+
"dependencies": {
13+
"System.Reflection": "4.0.10-*",
14+
"System.Runtime.Extensions": "4.0.10-beta-*"
15+
}
16+
}
17+
}
18+
}

‎src/Microsoft.AspNet.FileProviders/Implementation/FileChangeTrigger.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Physical/FileChangeTrigger.cs

File renamed without changes.

‎src/Microsoft.AspNet.FileProviders/Implementation/FileSystemInfoHelper.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Physical/FileSystemInfoHelper.cs

File renamed without changes.

‎src/Microsoft.AspNet.FileProviders.Physical/Microsoft.AspNet.FileProviders.Physical.xproj

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="__ToolsVersion__" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>ba56e837-c793-4a7d-824d-84492028e066</ProjectGuid>
10+
</PropertyGroup>
11+
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
13+
</PropertyGroup>
14+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
15+
</PropertyGroup>
16+
<PropertyGroup>
17+
<SchemaVersion>2.0</SchemaVersion>
18+
</PropertyGroup>
19+
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
20+
</Project>

‎src/Microsoft.AspNet.FileProviders/PhysicalFileProvider.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Physical/PhysicalFileProvider.cs

File renamed without changes.

‎src/Microsoft.AspNet.FileProviders/Implementation/PhysicalFilesWatcher.cs renamed to ‎src/Microsoft.AspNet.FileProviders.Physical/PhysicalFilesWatcher.cs

File renamed without changes.

‎src/Microsoft.AspNet.FileProviders.Physical/Properties/AssemblyInfo.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using System.Reflection;
5+
6+
[assembly: AssemblyMetadata("Serviceable", "True")]

‎src/Microsoft.AspNet.FileProviders/project.json renamed to ‎src/Microsoft.AspNet.FileProviders.Physical/project.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"version": "1.0.0-*",
3-
"description": "Implementation of ASP.NET 5 file provider abstractions.",
3+
"description": "Implementation of ASP.NET 5 file provider abstractions for physical files.",
44
"dependencies": {
5+
"Microsoft.AspNet.FileProviders.Common": { "version": "1.0.0-*", "type": "build" },
56
"Microsoft.AspNet.FileProviders.Interfaces": "1.0.0-*"
67
},
78
"frameworks": {
@@ -12,12 +13,10 @@
1213
"System.Collections.Concurrent": "4.0.10-beta-*",
1314
"System.IO.FileSystem.Watcher": "4.0.0-beta-*",
1415
"System.IO.FileSystem": "4.0.0-beta-*",
15-
"System.Linq": "4.0.0-beta-*",
16-
"System.Reflection": "4.0.10-*",
1716
"System.Runtime.Extensions": "4.0.10-beta-*",
1817
"System.Text.RegularExpressions": "4.0.10-beta-*",
1918
"System.Threading": "4.0.10-beta-*"
2019
}
2120
}
2221
}
23-
}
22+
}

‎test/Microsoft.AspNet.FileProviders.Tests/EmbeddedFileProviderTests.cs renamed to ‎test/Microsoft.AspNet.FileProviders.Embedded.Tests/EmbeddedFileProviderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Shouldly;
88
using Xunit;
99

10-
namespace Microsoft.AspNet.FileProviders.Tests
10+
namespace Microsoft.AspNet.FileProviders.Embedded.Tests
1111
{
1212
public class EmbeddedFileProviderTests
1313
{

‎test/Microsoft.AspNet.FileProviders.Tests/File.txt renamed to ‎test/Microsoft.AspNet.FileProviders.Embedded.Tests/File.txt

File renamed without changes.

‎test/Microsoft.AspNet.FileProviders.Embedded.Tests/Microsoft.AspNet.FileProviders.Embedded.Tests.xproj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="__ToolsVersion__" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>6b6ba57a-b32d-430a-af39-09caa85308c2</ProjectGuid>
10+
</PropertyGroup>
11+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
12+
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
14+
</PropertyGroup>
15+
<PropertyGroup>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
</PropertyGroup>
18+
<ItemGroup>
19+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
20+
</ItemGroup>
21+
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
22+
</Project>

‎test/Microsoft.AspNet.FileProviders.Tests/Resources/File.txt renamed to ‎test/Microsoft.AspNet.FileProviders.Embedded.Tests/Resources/File.txt

File renamed without changes.

‎test/Microsoft.AspNet.FileProviders.Tests/Resources/ResourcesInSubdirectory/File3.txt renamed to ‎test/Microsoft.AspNet.FileProviders.Embedded.Tests/Resources/ResourcesInSubdirectory/File3.txt

File renamed without changes.

‎test/Microsoft.AspNet.FileProviders.Embedded.Tests/project.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"dependencies": {
3+
"Microsoft.AspNet.FileProviders.Embedded": "1.0.0-*",
4+
"Microsoft.AspNet.Testing": "1.0.0-*",
5+
"Shouldly": "1.1.1.1",
6+
"xunit.runner.aspnet": "2.0.0-aspnet-*"
7+
},
8+
"commands": {
9+
"test": "xunit.runner.aspnet"
10+
},
11+
"resource": "File.txt;sub/**;Resources/**",
12+
"frameworks": {
13+
"dnx451": { }
14+
}
15+
}

‎test/Microsoft.AspNet.FileProviders.Tests/sub/File2.txt renamed to ‎test/Microsoft.AspNet.FileProviders.Embedded.Tests/sub/File2.txt

File renamed without changes.

‎test/Microsoft.AspNet.FileProviders.Tests/sub/dir/File3.txt renamed to ‎test/Microsoft.AspNet.FileProviders.Embedded.Tests/sub/dir/File3.txt

File renamed without changes.

‎test/Microsoft.AspNet.FileProviders.Physical.Tests/File.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Hello

‎test/Microsoft.AspNet.FileProviders.Tests/Microsoft.AspNet.FileProviders.Tests.xproj renamed to ‎test/Microsoft.AspNet.FileProviders.Physical.Tests/Microsoft.AspNet.FileProviders.Physical.Tests.xproj

File renamed without changes.

0 commit comments

Comments
 (0)