daohualiuxiang
/
AspNetCore.Docs
mirror of https://github.com/dotnet/AspNetCore.Docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0.0-beta8' into 1.0.0-rc1

pull/583/head
danroth27 2015-10-15 22:49:13 -07:00
parent c84fed7fcb e083212858
commit cdd400e84d
5 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/samples/ConsoleApp1/ConsoleApp1.sln
View File

@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F25AAA4C-5436-4435-886E-8675DEA167CA}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DAF53384-D542-4EA5-9DCF-7A631FF507D2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B3BB47BB-193C-45C3-9B61-41DB4DD2AA3F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4B2F7A76-8B0B-498D-8BA2-99B564E97123}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConsoleApp1", "src\ConsoleApp1\ConsoleApp1.xproj", "{A254ECA9-BD76-45D5-AE62-7D2E99EDDB20}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConsoleApp1", "src\ConsoleApp1\ConsoleApp1.xproj", "{B800FE1D-4432-4A09-921C-0FCD56705381}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -19,15 +19,15 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A254ECA9-BD76-45D5-AE62-7D2E99EDDB20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A254ECA9-BD76-45D5-AE62-7D2E99EDDB20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A254ECA9-BD76-45D5-AE62-7D2E99EDDB20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A254ECA9-BD76-45D5-AE62-7D2E99EDDB20}.Release|Any CPU.Build.0 = Release|Any CPU
{B800FE1D-4432-4A09-921C-0FCD56705381}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B800FE1D-4432-4A09-921C-0FCD56705381}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B800FE1D-4432-4A09-921C-0FCD56705381}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B800FE1D-4432-4A09-921C-0FCD56705381}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A254ECA9-BD76-45D5-AE62-7D2E99EDDB20} = {F25AAA4C-5436-4435-886E-8675DEA167CA}
{B800FE1D-4432-4A09-921C-0FCD56705381} = {DAF53384-D542-4EA5-9DCF-7A631FF507D2}
EndGlobalSection
EndGlobal

2
common/samples/ConsoleApp1/global.json
View File

@ -1,6 +1,6 @@
{
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-beta7"
"version": "1.0.0-beta8"
}
}

2
common/samples/ConsoleApp1/src/ConsoleApp1/ConsoleApp1.xproj
View File

@ -7,7 +7,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>a254eca9-bd76-45d5-ae62-7d2e99eddb20</ProjectGuid>
<ProjectGuid>b800fe1d-4432-4a09-921c-0fcd56705381</ProjectGuid>
<RootNamespace>ConsoleApp1</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>

23
common/samples/ConsoleApp1/src/ConsoleApp1/Properties/AssemblyInfo.cs 100644
View File

@ -0,0 +1,23 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("ConsoleApp1")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ConsoleApp1")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b800fe1d-4432-4a09-921c-0fcd56705381")]

12
common/samples/ConsoleApp1/src/ConsoleApp1/project.json
View File

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"description": "ConsoleApp1 Console Application",
"authors": [ "daroth" ],
"authors": [ "tarcher" ],
"tags": [ "" ],
"projectUrl": "",
"licenseUrl": "",
@ -17,11 +17,11 @@
"dnx451": { },
"dnxcore50": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23225",
"System.Collections": "4.0.11-beta-23225",
"System.Console": "4.0.0-beta-23225",
"System.Linq": "4.0.1-beta-23225",
"System.Threading": "4.0.11-beta-23225"
"Microsoft.CSharp": "4.0.1-beta-23409",
"System.Collections": "4.0.11-beta-23409",
"System.Console": "4.0.0-beta-23409",
"System.Linq": "4.0.1-beta-23409",
"System.Threading": "4.0.11-beta-23409"
}
}
}