Merge branch 'release' into dev

This commit is contained in:
John Luo 2016-04-11 10:22:54 -07:00
Родитель 66e8f21f1d ff46985cbd
Коммит 9818214c5c
4 изменённых файлов: 3 добавлений и 71 удалений

Просмотреть файл

@ -16,14 +16,12 @@
"compile": [
"../../shared/**/*.cs"
],
"tools": {
"dotnet-razor-tooling": "1.0.0-*"
},
"content": [
"Areas",
"Views",
"wwwroot",
"config.json"
"config.json",
"web.config"
],
"dependencies": {
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
@ -50,11 +48,6 @@
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"System.IO": "4.1.0-*",
"System.Runtime": "4.1.0-*"
},
"commands": {
"web": "MusicStore"
},
"frameworks": {
"net451": {},

Просмотреть файл

@ -1,9 +1,9 @@
<?xml version="1.0"?>
<configuration>
<system.webServer>
<aspNetCore forwardWindowsAuthToken="true" processPath="../MusicStore.exe" stdoutLogEnabled="true" stdoutLogFile="..\logs\stdout.log" />
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
</handlers>
<aspNetCore processPath=".\MusicStore.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="true" />
</system.webServer>
</configuration>

Просмотреть файл

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an attribute "name" that has a value of "MyDB".
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.
Note that because there is only one customErrors section under the
<system.web> node, there is no need to use the "xdt:Locator" attribute.
<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>

Просмотреть файл

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an attribute "name" that has a value of "MyDB".
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.
Note that because there is only one customErrors section under the
<system.web> node, there is no need to use the "xdt:Locator" attribute.
<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>