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

Commit 7a976d0

Browse files
davidfowldavidfowl
committed
Updated to use new tooling
1 parent 3fa5f9c commit 7a976d0

File tree

6 files changed

+122
-97
lines changed

6 files changed

+122
-97
lines changed

‎StaticFiles.sln

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,51 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.21005.1
4+
VisualStudioVersion = 12.0.30327.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.StaticFiles.net45", "src\Microsoft.AspNet.StaticFiles\Microsoft.AspNet.StaticFiles.net45.csproj", "{49278B83-CC12-49EA-8F61-D143863DD21B}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.StaticFiles.k10", "src\Microsoft.AspNet.StaticFiles\Microsoft.AspNet.StaticFiles.k10.csproj", "{297551FE-7539-4E43-A6B8-165C7789F48D}"
9-
EndProject
106
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{40EE0889-960E-41B4-A3D3-9CE963EB0797}"
117
EndProject
128
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8B21A3A9-9CA6-4857-A6E0-1A3203404B60}"
139
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StaticFileSample.k10", "samples\StaticFileSample\StaticFileSample.k10.csproj", "{8C5384FC-24F3-47F2-897C-A151604F011C}"
10+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.StaticFiles", "src\Microsoft.AspNet.StaticFiles\Microsoft.AspNet.StaticFiles.kproj", "{8D7BC5A4-F19C-4184-8338-A6B42997218C}"
1511
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StaticFileSample.net45", "samples\StaticFileSample\StaticFileSample.net45.csproj", "{742E16CD-8217-4386-AAF0-5F116E62CD82}"
12+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StaticFileSample", "samples\StaticFileSample\StaticFileSample.kproj", "{092141D9-305A-4FC5-AE74-CB23982CA8D4}"
1713
EndProject
1814
Global
1915
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2016
Debug|Any CPU = Debug|Any CPU
17+
Debug|Mixed Platforms = Debug|Mixed Platforms
18+
Debug|x86 = Debug|x86
2119
Release|Any CPU = Release|Any CPU
20+
Release|Mixed Platforms = Release|Mixed Platforms
21+
Release|x86 = Release|x86
2222
EndGlobalSection
2323
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{49278B83-CC12-49EA-8F61-D143863DD21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{49278B83-CC12-49EA-8F61-D143863DD21B}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{49278B83-CC12-49EA-8F61-D143863DD21B}.Release|Any CPU.ActiveCfg = Release|Any CPU
27-
{49278B83-CC12-49EA-8F61-D143863DD21B}.Release|Any CPU.Build.0 = Release|Any CPU
28-
{297551FE-7539-4E43-A6B8-165C7789F48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29-
{297551FE-7539-4E43-A6B8-165C7789F48D}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{297551FE-7539-4E43-A6B8-165C7789F48D}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{297551FE-7539-4E43-A6B8-165C7789F48D}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{8C5384FC-24F3-47F2-897C-A151604F011C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{8C5384FC-24F3-47F2-897C-A151604F011C}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{8C5384FC-24F3-47F2-897C-A151604F011C}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{8C5384FC-24F3-47F2-897C-A151604F011C}.Release|Any CPU.Build.0 = Release|Any CPU
36-
{742E16CD-8217-4386-AAF0-5F116E62CD82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{742E16CD-8217-4386-AAF0-5F116E62CD82}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{742E16CD-8217-4386-AAF0-5F116E62CD82}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{742E16CD-8217-4386-AAF0-5F116E62CD82}.Release|Any CPU.Build.0 = Release|Any CPU
24+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Any CPU.ActiveCfg = Debug|x86
25+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
26+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|Mixed Platforms.Build.0 = Debug|x86
27+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|x86.ActiveCfg = Debug|x86
28+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Debug|x86.Build.0 = Debug|x86
29+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|Any CPU.ActiveCfg = Release|x86
30+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|Mixed Platforms.ActiveCfg = Release|x86
31+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|Mixed Platforms.Build.0 = Release|x86
32+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|x86.ActiveCfg = Release|x86
33+
{8D7BC5A4-F19C-4184-8338-A6B42997218C}.Release|x86.Build.0 = Release|x86
34+
{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|Any CPU.ActiveCfg = Debug|x86
35+
{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
36+
{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|x86.ActiveCfg = Debug|x86
37+
{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Debug|x86.Build.0 = Debug|x86
38+
{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|Any CPU.ActiveCfg = Release|x86
39+
{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|Mixed Platforms.ActiveCfg = Release|x86
40+
{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|Mixed Platforms.Build.0 = Release|x86
41+
{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|x86.ActiveCfg = Release|x86
42+
{092141D9-305A-4FC5-AE74-CB23982CA8D4}.Release|x86.Build.0 = Release|x86
4043
EndGlobalSection
4144
GlobalSection(SolutionProperties) = preSolution
4245
HideSolutionNode = FALSE
4346
EndGlobalSection
4447
GlobalSection(NestedProjects) = preSolution
45-
{297551FE-7539-4E43-A6B8-165C7789F48D} = {40EE0889-960E-41B4-A3D3-9CE963EB0797}
46-
{49278B83-CC12-49EA-8F61-D143863DD21B} = {40EE0889-960E-41B4-A3D3-9CE963EB0797}
47-
{8C5384FC-24F3-47F2-897C-A151604F011C} = {8B21A3A9-9CA6-4857-A6E0-1A3203404B60}
48-
{742E16CD-8217-4386-AAF0-5F116E62CD82} = {8B21A3A9-9CA6-4857-A6E0-1A3203404B60}
48+
{8D7BC5A4-F19C-4184-8338-A6B42997218C} = {40EE0889-960E-41B4-A3D3-9CE963EB0797}
49+
{092141D9-305A-4FC5-AE74-CB23982CA8D4} = {8B21A3A9-9CA6-4857-A6E0-1A3203404B60}
4950
EndGlobalSection
5051
EndGlobal

‎samples/StaticFileSample/Program.cs

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎samples/StaticFileSample/Startup.cs

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,21 @@
1-
#if NET45
2-
using System;
1+
using System;
32
using System.IO;
43
using Microsoft.AspNet;
54
using Microsoft.AspNet.Abstractions;
65
using Microsoft.AspNet.FileSystems;
76
using Microsoft.AspNet.StaticFiles;
8-
using Owin;
97

108
namespace StaticFilesSample
119
{
1210
public class Startup
1311
{
14-
public void Configuration(IAppBuilder app)
12+
public void Configuration(IBuilder app)
1513
{
16-
app.UseErrorPage();
17-
18-
// Temporary bridge from katana to Owin
19-
app.UseBuilder(ConfigurePK);
20-
}
21-
22-
private void ConfigurePK(IBuilder builder)
23-
{
24-
builder.UseFileServer(new FileServerOptions()
14+
app.UseFileServer(new FileServerOptions()
2515
{
2616
EnableDirectoryBrowsing = true,
2717
FileSystem = new PhysicalFileSystem(@"c:\temp")
2818
});
2919
}
3020
}
31-
}
32-
#endif
21+
}

‎samples/StaticFileSample/StaticFileSample.kproj

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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)' == ''">12.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>092141d9-305a-4fc5-ae74-cb23982ca8d4</ProjectGuid>
10+
<OutputType>Web</OutputType>
11+
<ActiveTargetFramework>net45</ActiveTargetFramework>
12+
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
14+
</PropertyGroup>
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
16+
</PropertyGroup>
17+
<PropertyGroup>
18+
<SchemaVersion>2.0</SchemaVersion>
19+
</PropertyGroup>
20+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
21+
<DevelopmentServerPort>47028</DevelopmentServerPort>
22+
</PropertyGroup>
23+
<ItemGroup>
24+
<Content Include="Project.json" />
25+
</ItemGroup>
26+
<ItemGroup>
27+
<Compile Include="Startup.cs" />
28+
</ItemGroup>
29+
<Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
30+
</Project>

‎samples/StaticFileSample/project.json

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,18 @@
11
{
2-
"version": "0.1-alpha-*",
32
"dependencies": {
3+
"Helios": "0.1-alpha-*",
44
"Microsoft.AspNet.FileSystems": "0.1-alpha-*",
55
"Microsoft.AspNet.StaticFiles": "",
66
"Microsoft.AspNet.Abstractions": "0.1-alpha-*"
77
},
88
"configurations": {
99
"net45": {
10-
"dependencies": {
11-
"Owin": "1.0",
12-
"Microsoft.Owin": "2.1.0",
13-
"Microsoft.Owin.Diagnostics": "2.1.0",
14-
"Microsoft.Owin.Hosting": "2.1.0",
15-
"Microsoft.Owin.Host.HttpListener": "2.1.0",
16-
"Microsoft.AspNet.AppBuilderSupport": "0.1-alpha-*"
17-
}
1810
},
1911
"k10": {
20-
"dependencies": {
21-
"System.Console": "4.0.0.0",
22-
"System.Collections": "4.0.0.0",
23-
"System.Diagnostics.Debug": "4.0.10.0",
24-
"System.Diagnostics.Tools": "4.0.0.0",
25-
"System.Globalization": "4.0.10.0",
26-
"System.IO": "4.0.0.0",
27-
"System.IO.FileSystem": "4.0.0.0",
28-
"System.IO.FileSystem.Primitives": "4.0.0.0",
29-
"System.Linq": "4.0.0.0",
30-
"System.Reflection": "4.0.10.0",
31-
"System.Resources.ResourceManager": "4.0.0.0",
32-
"System.Runtime": "4.0.20.0",
33-
"System.Runtime.Extensions": "4.0.10.0",
34-
"System.Runtime.InteropServices": "4.0.20.0",
35-
"System.Text.Encoding": "4.0.20.0",
36-
"System.Threading.Tasks": "4.0.10.0"
37-
}
12+
"dependencies": {
13+
"System.Diagnostics.Contracts": "4.0.0.0",
14+
"System.Security.Claims" : "0.1-alpha-*"
15+
}
3816
}
3917
}
4018
}

‎src/Microsoft.AspNet.StaticFiles/Microsoft.AspNet.StaticFiles.kproj

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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)' == ''">12.0</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>8d7bc5a4-f19c-4184-8338-a6b42997218c</ProjectGuid>
10+
<OutputType>Library</OutputType>
11+
</PropertyGroup>
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+
<ItemGroup>
20+
<Content Include="CustomDictionary.xml" />
21+
<Content Include="Project.json" />
22+
<Content Include="Resources.resx" />
23+
</ItemGroup>
24+
<ItemGroup>
25+
<Compile Include="Constants.cs" />
26+
<Compile Include="ContentTypes\FileExtensionContentTypeProvider.cs" />
27+
<Compile Include="ContentTypes\IContentTypeProvider.cs" />
28+
<Compile Include="DefaultFilesExtensions.cs" />
29+
<Compile Include="DefaultFilesMiddleware.cs" />
30+
<Compile Include="DefaultFilesOptions.cs" />
31+
<Compile Include="DirectoryBrowserExtensions.cs" />
32+
<Compile Include="DirectoryBrowserMiddleware.cs" />
33+
<Compile Include="DirectoryBrowserOptions.cs" />
34+
<Compile Include="DirectoryFormatters\HtmlDirectoryFormatter.cs" />
35+
<Compile Include="DirectoryFormatters\IDirectoryFormatter.cs" />
36+
<Compile Include="FileServerExtensions.cs" />
37+
<Compile Include="FileServerOptions.cs" />
38+
<Compile Include="Helpers.cs" />
39+
<Compile Include="Infrastructure\RangeHelpers.cs" />
40+
<Compile Include="Infrastructure\SharedOptions.cs" />
41+
<Compile Include="Infrastructure\SharedOptionsBase.cs" />
42+
<Compile Include="Properties\AssemblyInfo.cs" />
43+
<Compile Include="Resources.Designer.cs" />
44+
<Compile Include="SendFileExtensions.cs" />
45+
<Compile Include="SendFileMiddleware.cs" />
46+
<Compile Include="SendFileResponseExtensions.cs" />
47+
<Compile Include="StaticFileContext.cs" />
48+
<Compile Include="StaticFileExtensions.cs" />
49+
<Compile Include="StaticFileMiddleware.cs" />
50+
<Compile Include="StaticFileOptions.cs" />
51+
<Compile Include="StaticFileResponseContext.cs" />
52+
<Compile Include="StreamCopyOperation.cs" />
53+
</ItemGroup>
54+
<Import Project="$(VSToolsPath)\ProjectK\Microsoft.Web.ProjectK.targets" Condition="'$(VSToolsPath)' != ''" />
55+
</Project>

0 commit comments

Comments
 (0)