diff --git a/MetaPackages.sln b/MetaPackages.sln index cfcc774203..2528f60958 100644 --- a/MetaPackages.sln +++ b/MetaPackages.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26412.1 +VisualStudioVersion = 15.0.26424.2 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}" EndProject @@ -24,8 +24,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{192F EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{AF5BB04E-92F7-4737-8B98-F86F6244FAB2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppSettings", "samples\AppSettings\AppSettings.csproj", "{5009D7C8-6061-49CF-9A30-23B309BBEFB0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9E49B5B9-9E72-42FB-B684-90CA1B1BCF9C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.FunctionalTests", "test\Microsoft.AspNetCore.FunctionalTests\Microsoft.AspNetCore.FunctionalTests.csproj", "{C72A756A-D29D-44C7-83D4-821DBE82DBCA}" @@ -64,10 +62,6 @@ Global {AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU {AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU {AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Release|Any CPU.Build.0 = Release|Any CPU - {5009D7C8-6061-49CF-9A30-23B309BBEFB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5009D7C8-6061-49CF-9A30-23B309BBEFB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5009D7C8-6061-49CF-9A30-23B309BBEFB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5009D7C8-6061-49CF-9A30-23B309BBEFB0}.Release|Any CPU.Build.0 = Release|Any CPU {C72A756A-D29D-44C7-83D4-821DBE82DBCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C72A756A-D29D-44C7-83D4-821DBE82DBCA}.Debug|Any CPU.Build.0 = Debug|Any CPU {C72A756A-D29D-44C7-83D4-821DBE82DBCA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -109,7 +103,6 @@ Global {CC8F551E-213A-45E8-AECA-507C4DB4F164} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09} {F92CB7A1-C38E-408C-A7EC-A5C040D041E1} = {97D53BEB-A511-4FBE-B784-AB407D9A219F} {AF5BB04E-92F7-4737-8B98-F86F6244FAB2} = {192F583C-C4CA-43E5-B31C-D21B7806E274} - {5009D7C8-6061-49CF-9A30-23B309BBEFB0} = {192F583C-C4CA-43E5-B31C-D21B7806E274} {C72A756A-D29D-44C7-83D4-821DBE82DBCA} = {9E49B5B9-9E72-42FB-B684-90CA1B1BCF9C} {EC22261D-0DE1-47DE-8F7C-072675D6F5B4} = {9E49B5B9-9E72-42FB-B684-90CA1B1BCF9C} {AB42054B-1801-4FEE-B5C3-8529C6D7BFDA} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4} diff --git a/samples/AppSettings/AppSettings.csproj b/samples/AppSettings/AppSettings.csproj deleted file mode 100644 index 621da3c9ca..0000000000 --- a/samples/AppSettings/AppSettings.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - netcoreapp2.0 - aspnetcore-MetaPackagesAppSettings-20170421155031 - - - - - - - - - - - - - - - - diff --git a/samples/AppSettings/Program.cs b/samples/AppSettings/Program.cs deleted file mode 100644 index 13fbeebae0..0000000000 --- a/samples/AppSettings/Program.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Http; - -namespace AppSettings -{ - public class Program - { - public static void Main(string[] args) - { - using (WebHost.Start(context => context.Response.WriteAsync("Hello, World!"))) - { - Console.WriteLine("Running application: Press any key to shutdown."); - Console.ReadKey(); - } - } - } -} diff --git a/samples/AppSettings/Properties/launchSettings.json b/samples/AppSettings/Properties/launchSettings.json deleted file mode 100644 index fe806c5dc4..0000000000 --- a/samples/AppSettings/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:53434/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "AppSettings": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:53435" - } - } -} diff --git a/samples/AppSettings/appsettings.json b/samples/AppSettings/appsettings.json deleted file mode 100644 index ab315a0242..0000000000 --- a/samples/AppSettings/appsettings.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "Kestrel": { - "EndPoints": { - "Http": { - "Address": "127.0.0.1", - "Port": 8081 - }, - "HttpV6": { - "Address": "::1", - "Port": 8081 - }, - // Add testCert.pfx to the current user's certificate store to enable this scenario. - //"HttpsInlineCertStore": { - // "Address": "127.0.0.1", - // "Port": 8082, - // "Certificate": { - // "Source": "Store", - // "Subject": "cn=localhost", - // "StoreName": "My", - // "StoreLocation": "CurrentUser", - // "AllowInvalid": "True" - // } - //}, - "HttpsInlineCertFile": { - "Address": "127.0.0.1", - "Port": 8083, - "Certificate": { - "Source": "File", - "Path": "testCert.pfx", - } - }, - // Add testCert.pfx to the current user's certificate store to enable this scenario. - //"HttpsCertStore": { - // "Address": "127.0.0.1", - // "Port": 8084, - // "Certificate": "TestCertInStore" - //}, - "HttpsCertFile": { - "Address": "127.0.0.1", - "Port": 8085, - "Certificate": "TestCert" - } - } - }, - "Certificates": { - "TestCert": { - "Source": "File", - "Path": "testCert.pfx", - }, - // Add testCert.pfx to the current user's certificate store to enable this scenario. - //"TestCertInStore": { - // "Source": "Store", - // "Subject": "cn=localhost", - // "StoreName": "My", - // "StoreLocation": "CurrentUser", - // "AllowInvalid": "True" - //} - } -} diff --git a/samples/AppSettings/testCert.pfx b/samples/AppSettings/testCert.pfx deleted file mode 100644 index 7118908c2d..0000000000 Binary files a/samples/AppSettings/testCert.pfx and /dev/null differ diff --git a/samples/SampleApp/appsettings.json b/samples/SampleApp/appsettings.json new file mode 100644 index 0000000000..2c651a7765 --- /dev/null +++ b/samples/SampleApp/appsettings.json @@ -0,0 +1,63 @@ +{ + "Kestrel": { + "EndPoints": { + "Http": { + "Address": "127.0.0.1", + "Port": 5000 + }, + + // To enable HTTPS using a certificate file, set the path to a .pfx file in + // the "Path" property below and configure the password in user secrets. + // The "Password" property should be set in user secrets. + //"HttpsInlineCertFile": { + // "Address": "127.0.0.1", + // "Port": 5001, + // "Certificate": { + // "Source": "File", + // "Path": "" + // } + //}, + + //"HttpsInlineCertStore": { + // "Address": "127.0.0.1", + // "Port": 5002, + // "Certificate": { + // "Source": "Store", + // "Subject": "", + // "StoreName": "", + // "StoreLocation": "", + // "AllowInvalid": "" // Set to "true" to allow invalid certificates (e.g. expired) + // } + //}, + + // To enable this endpoint, set the path to a .pfx file in the "Path" property + // of the "TestCert" certificate defined under the "Certificates" section. + // Configure the password in user secrets. + //"HttpsCertFile": { + // "Address": "127.0.0.1", + // "Port": 5003, + // "Certificate": "TestCert" + //} + + //"HttpsCertStore": { + // "Address": "127.0.0.1", + // "Port": 5004, + // "Certificate": "TestCertInStore" + //}, + } + }, + "Certificates": { + //"TestCert": { + // "Source": "File", + // "Path": "" + //}, + + //"TestCertInStore": { + // "Source": "Store", + // "Subject": "", + // "StoreName": "", + // "StoreLocation": "", + // "AllowInvalid": "" // Set to "true" to allow invalid certificates (e.g. expired certificates) + //} + } +}