huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up samples

This commit is contained in:
Chris R 2016-05-17 13:36:18 -07:00
parent 962a74c488
commit 8b4b99b168
22 changed files with 254 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
samples/CookieSample/Program.cs Normal file
View File

@ -0,0 +1,24 @@
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
namespace CookieSample
{
public static class Program
{
public static void Main(string[] args)
{
var config = new ConfigurationBuilder().AddEnvironmentVariables("ASPNETCORE_").Build();
var host = new WebHostBuilder()
.UseKestrel()
.UseConfiguration(config)
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

9
samples/CookieSample/Properties/launchSettings.json
View File

@ -12,15 +12,16 @@
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNET_ENV": "Development"
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"web": {
"commandName": "web",
"CookieSample": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:12345",
"environmentVariables": {
"Hosting:Environment": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_SERVER.URLS": "http://localhost:12345"
}
}
}

11
samples/CookieSample/Startup.cs
View File

@ -41,16 +41,5 @@ namespace CookieSample
await context.Response.WriteAsync("Hello old timer");
});
}
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseKestrel()
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

1
samples/CookieSample/project.json
View File

@ -5,6 +5,7 @@
"Microsoft.AspNetCore.DataProtection": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
},
"buildOptions": {

24
samples/CookieSessionSample/Program.cs Normal file
View File

@ -0,0 +1,24 @@
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
namespace CookieSessionSample
{
public static class Program
{
public static void Main(string[] args)
{
var config = new ConfigurationBuilder().AddEnvironmentVariables("ASPNETCORE_").Build();
var host = new WebHostBuilder()
.UseKestrel()
.UseConfiguration(config)
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

9
samples/CookieSessionSample/Properties/launchSettings.json
View File

@ -12,15 +12,16 @@
"commandName": "IISExpress",
"launchBrowser": true,
"environmentVariables": {
"ASPNET_ENV": "Development"
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"web": {
"commandName": "web",
"CookieSessionSample": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:12345",
"environmentVariables": {
"Hosting:Environment": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_SERVER.URLS": "http://localhost:12345"
}
}
}

11
samples/CookieSessionSample/Startup.cs
View File

@ -51,16 +51,5 @@ namespace CookieSessionSample
await context.Response.WriteAsync("Hello old timer");
});
}
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseKestrel()
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

1
samples/CookieSessionSample/project.json
View File

@ -6,6 +6,7 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.Extensions.Caching.Memory": "1.0.0-*",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
},
"buildOptions": {

24
samples/JwtBearerSample/Program.cs Normal file
View File

@ -0,0 +1,24 @@
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
namespace JwtBearerSample
{
public static class Program
{
public static void Main(string[] args)
{
var config = new ConfigurationBuilder().AddEnvironmentVariables("ASPNETCORE_").Build();
var host = new WebHostBuilder()
.UseKestrel()
.UseConfiguration(config)
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

9
samples/JwtBearerSample/Properties/launchSettings.json
View File

@ -15,10 +15,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"web": {
"commandName": "web",
"JwtBearer": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:42023",
"environmentVariables": {
"Hosting:Environment": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_SERVER.URLS": "http://localhost:42023"
}
}
}

29
samples/JwtBearerSample/Startup.cs
View File

@ -13,12 +13,19 @@ namespace JwtBearerSample
{
public class Startup
{
public Startup()
public Startup(IHostingEnvironment env)
{
Configuration = new ConfigurationBuilder()
.AddEnvironmentVariables()
.AddUserSecrets()
.Build();
var builder = new ConfigurationBuilder()
.SetBasePath(env.ContentRootPath);
if (env.IsDevelopment())
{
// For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709
builder.AddUserSecrets();
}
builder.AddEnvironmentVariables();
Configuration = builder.Build();
}
public IConfiguration Configuration { get; set; }
@ -106,18 +113,6 @@ namespace JwtBearerSample
});
});
}
// Entry point for the application.
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseKestrel()
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

24
samples/OpenIdConnect.AzureAdSample/Program.cs Normal file
View File

@ -0,0 +1,24 @@
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
namespace OpenIdConnect.AzureAdSample
{
public static class Program
{
public static void Main(string[] args)
{
var config = new ConfigurationBuilder().AddEnvironmentVariables("ASPNETCORE_").Build();
var host = new WebHostBuilder()
.UseKestrel()
.UseConfiguration(config)
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

9
samples/OpenIdConnect.AzureAdSample/Properties/launchSettings.json
View File

@ -15,10 +15,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"web": {
"commandName": "web",
"OpenIdConnect": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:42023",
"environmentVariables": {
"Hosting:Environment": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_SERVER.URLS": "http://localhost:42023"
}
}
}

28
samples/OpenIdConnect.AzureAdSample/Startup.cs
View File

@ -20,12 +20,19 @@ namespace OpenIdConnect.AzureAdSample
{
private const string GraphResourceID = "https://graph.windows.net";
public Startup()
public Startup(IHostingEnvironment env)
{
Configuration = new ConfigurationBuilder()
.AddEnvironmentVariables()
.AddUserSecrets()
.Build();
var builder = new ConfigurationBuilder()
.SetBasePath(env.ContentRootPath);
if (env.IsDevelopment())
{
// For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709
builder.AddUserSecrets();
}
builder.AddEnvironmentVariables();
Configuration = builder.Build();
}
public IConfiguration Configuration { get; set; }
@ -150,17 +157,6 @@ namespace OpenIdConnect.AzureAdSample
await context.Response.WriteAsync($"</body></html>");
});
}
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseKestrel()
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

24
samples/OpenIdConnectSample/Program.cs Normal file
View File

@ -0,0 +1,24 @@
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
namespace OpenIdConnectSample
{
public static class Program
{
public static void Main(string[] args)
{
var config = new ConfigurationBuilder().AddEnvironmentVariables("ASPNETCORE_").Build();
var host = new WebHostBuilder()
.UseKestrel()
.UseConfiguration(config)
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

8
samples/OpenIdConnectSample/Properties/launchSettings.json
View File

@ -15,13 +15,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"web": {
"commandName": "web",
"OpenIdConnectSample": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:42023",
"environmentVariables": {
"Hosting:Environment": "Development",
"ASPNET_server.urls": "http://localhost:42023"
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_SERVER.URLS": "http://localhost:42023"
}
}
}

28
samples/OpenIdConnectSample/Startup.cs
View File

@ -15,12 +15,19 @@ namespace OpenIdConnectSample
{
public class Startup
{
public Startup()
public Startup(IHostingEnvironment env)
{
Configuration = new ConfigurationBuilder()
.AddEnvironmentVariables()
.AddUserSecrets()
.Build();
var builder = new ConfigurationBuilder()
.SetBasePath(env.ContentRootPath);
if (env.IsDevelopment())
{
// For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709
builder.AddUserSecrets();
}
builder.AddEnvironmentVariables();
Configuration = builder.Build();
}
public IConfiguration Configuration { get; set; }
@ -96,17 +103,6 @@ namespace OpenIdConnectSample
await context.Response.WriteAsync($"</body></html>");
});
}
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseKestrel()
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
}
}

50
samples/SocialSample/Program.cs Normal file
View File

@ -0,0 +1,50 @@
using System.IO;
using System.Reflection;
using System.Security.Cryptography.X509Certificates;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.FileProviders;
namespace SocialSample
{
public static class Program
{
public static void Main(string[] args)
{
var config = new ConfigurationBuilder().AddEnvironmentVariables("ASPNETCORE_").Build();
var host = new WebHostBuilder()
.UseKestrel(options =>
{
//Configure SSL
var serverCertificate = LoadCertificate();
options.UseHttps(serverCertificate);
})
.UseConfiguration(config)
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
private static X509Certificate2 LoadCertificate()
{
var socialSampleAssembly = typeof(Startup).GetTypeInfo().Assembly;
var embeddedFileProvider = new EmbeddedFileProvider(socialSampleAssembly, "SocialSample");
var certificateFileInfo = embeddedFileProvider.GetFileInfo("compiler/resources/cert.pfx");
using (var certificateStream = certificateFileInfo.CreateReadStream())
{
byte[] certificatePayload;
using (var memoryStream = new MemoryStream())
{
certificateStream.CopyTo(memoryStream);
certificatePayload = memoryStream.ToArray();
}
return new X509Certificate2(certificatePayload, "testPassword");
}
}
}
}

9
samples/SocialSample/Properties/launchSettings.json
View File

@ -13,15 +13,16 @@
"launchBrowser": true,
"launchUrl": "https://localhost:44318/",
"environmentVariables": {
"ASPNET_ENV": "Development"
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"web": {
"commandName": "web",
"SocialSample": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "https://localhost:54541/",
"environmentVariables": {
"Hosting:Environment": "Development"
"ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_SERVER.URLS": "https://localhost:54541/"
}
}
}

57
samples/SocialSample/Startup.cs
View File

@ -1,11 +1,8 @@
using System;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Reflection;
using System.Security.Claims;
using System.Security.Cryptography.X509Certificates;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
@ -20,7 +17,6 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Authentication;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
@ -29,13 +25,20 @@ namespace SocialSample
/* Note all servers must use the same address and port because these are pre-registered with the various providers. */
public class Startup
{
public Startup()
public Startup(IHostingEnvironment env)
{
Configuration = new ConfigurationBuilder()
.AddEnvironmentVariables()
.AddJsonFile("config.json")
.AddUserSecrets()
.Build();
var builder = new ConfigurationBuilder()
.SetBasePath(env.ContentRootPath)
.AddJsonFile("appsettings.json");
if (env.IsDevelopment())
{
// For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709
builder.AddUserSecrets();
}
builder.AddEnvironmentVariables();
Configuration = builder.Build();
}
public IConfiguration Configuration { get; set; }
@ -343,40 +346,6 @@ namespace SocialSample
await context.Response.WriteAsync("</body></html>");
});
}
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseKestrel(options =>
{
//Configure SSL
var serverCertificate = LoadCertificate();
options.UseHttps(serverCertificate);
})
.UseIISIntegration()
.UseStartup<Startup>()
.Build();
host.Run();
}
private static X509Certificate2 LoadCertificate()
{
var socialSampleAssembly = typeof(Startup).GetTypeInfo().Assembly;
var embeddedFileProvider = new EmbeddedFileProvider(socialSampleAssembly, "SocialSample");
var certificateFileInfo = embeddedFileProvider.GetFileInfo("compiler/resources/cert.pfx");
using (var certificateStream = certificateFileInfo.CreateReadStream())
{
byte[] certificatePayload;
using (var memoryStream = new MemoryStream())
{
certificateStream.CopyTo(memoryStream);
certificatePayload = memoryStream.ToArray();
}
return new X509Certificate2(certificatePayload, "testPassword");
}
}
}
}

0
samples/SocialSample/config.json → samples/SocialSample/appsettings.json
View File

4
samples/SocialSample/project.json
View File

@ -19,7 +19,7 @@
"emitEntryPoint": true
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50"
@ -35,7 +35,7 @@
"userSecretsId": "aspnet5-SocialSample-20151210111056",
"publishOptions": {
"include": [
"config.json",
"appsettings.json",
"project.json",
"web.config"
]