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:52:00 -07:00
parent cdd400e84d 7b80556871
commit 543d81b164
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/ClassLibrary1/ClassLibrary1.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", "{DB348ABF-99A8-4ECF-AD3A-5A5FD8F788CF}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{78D4EA4B-8641-4842-A847-5A832A3BB42D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{87C589E4-A849-4F3C-8D22-B26BCC173EFA}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5B0F8567-F005-4D41-907A-F3EEB032E4CB}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClassLibrary1", "src\ClassLibrary1\ClassLibrary1.xproj", "{DA0C4BE8-CCFD-452C-ADB8-5C3576212ADD}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClassLibrary1", "src\ClassLibrary1\ClassLibrary1.xproj", "{EB535171-59C2-4639-8564-657E0ECABBFE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -19,15 +19,15 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DA0C4BE8-CCFD-452C-ADB8-5C3576212ADD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA0C4BE8-CCFD-452C-ADB8-5C3576212ADD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA0C4BE8-CCFD-452C-ADB8-5C3576212ADD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA0C4BE8-CCFD-452C-ADB8-5C3576212ADD}.Release|Any CPU.Build.0 = Release|Any CPU
{EB535171-59C2-4639-8564-657E0ECABBFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB535171-59C2-4639-8564-657E0ECABBFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB535171-59C2-4639-8564-657E0ECABBFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB535171-59C2-4639-8564-657E0ECABBFE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{DA0C4BE8-CCFD-452C-ADB8-5C3576212ADD} = {DB348ABF-99A8-4ECF-AD3A-5A5FD8F788CF}
{EB535171-59C2-4639-8564-657E0ECABBFE} = {78D4EA4B-8641-4842-A847-5A832A3BB42D}
EndGlobalSection
EndGlobal

2
common/samples/ClassLibrary1/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/ClassLibrary1/src/ClassLibrary1/ClassLibrary1.xproj
View File

@ -7,7 +7,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>da0c4be8-ccfd-452c-adb8-5c3576212add</ProjectGuid>
<ProjectGuid>eb535171-59c2-4639-8564-657e0ecabbfe</ProjectGuid>
<RootNamespace>ClassLibrary1</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>

23
common/samples/ClassLibrary1/src/ClassLibrary1/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("ClassLibrary1")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ClassLibrary1")]
[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("eb535171-59c2-4639-8564-657e0ecabbfe")]

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

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"description": "ClassLibrary1 Class Library",
"authors": [ "daroth" ],
"authors": [ "tarcher" ],
"tags": [ "" ],
"projectUrl": "",
"licenseUrl": "",
@ -10,11 +10,11 @@
"dnx451": { },
"dnxcore50": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23225",
"System.Collections": "4.0.11-beta-23225",
"System.Linq": "4.0.1-beta-23225",
"System.Runtime": "4.0.21-beta-23225",
"System.Threading": "4.0.11-beta-23225"
"Microsoft.CSharp": "4.0.1-beta-23409",
"System.Collections": "4.0.11-beta-23409",
"System.Linq": "4.0.1-beta-23409",
"System.Runtime": "4.0.21-beta-23409",
"System.Threading": "4.0.11-beta-23409"
}
}
}