diff options
author | Eric St. John <ericstj@microsoft.com> | 2016-05-25 01:44:07 +0300 |
---|---|---|
committer | Eric St. John <ericstj@microsoft.com> | 2016-05-25 07:49:18 +0300 |
commit | 263c907228200e96b6a83841c9b9d4f65b0d5507 (patch) | |
tree | 0bf5258d8c66e79cb71e05fca04eebb098d25d91 /Documentation/coding-guidelines | |
parent | 7ba4d296e3e0a2445ffa708c1e918d90d2bac69c (diff) |
Clean up references to DNXCore50.
Clean up all non-essential references to DNXCore50.
Diffstat (limited to 'Documentation/coding-guidelines')
-rw-r--r-- | Documentation/coding-guidelines/package-projects.md | 10 | ||||
-rw-r--r-- | Documentation/coding-guidelines/project-guidelines.md | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/coding-guidelines/package-projects.md b/Documentation/coding-guidelines/package-projects.md index f586f71b67..5319dd3723 100644 --- a/Documentation/coding-guidelines/package-projects.md +++ b/Documentation/coding-guidelines/package-projects.md @@ -20,7 +20,7 @@ Sample `System.Text.Encodings.Web.pkgproj` <ItemGroup> <ProjectReference Include="..\src\System.Text.Encodings.Web.csproj"> - <SupportedFramework>net45;netcore45;wp8;wpa81;dnxcore50</SupportedFramework> + <SupportedFramework>net45;netcore45;wp8;wpa81;netcoreapp1.0</SupportedFramework> </ProjectReference> </ItemGroup> @@ -41,7 +41,7 @@ Sample `System.Collections.Concurrent.pkgproj` <SupportedFramework>net45;netcore45;wpa81</SupportedFramework> </ProjectReference> <ProjectReference Include="..\ref\System.Collections.Concurrent.csproj"> - <SupportedFramework>net46;netcore50;dnxcore50</SupportedFramework> + <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\System.Collections.Concurrent.csproj"/> @@ -70,7 +70,7 @@ Sample `System.IO.FileSystem.pkgproj` <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <ItemGroup> <ProjectReference Include="..\ref\System.IO.FileSystem.csproj"> - <SupportedFramework>net46;netcore50;dnxcore50</SupportedFramework> + <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework> </ProjectReference> <ProjectReference Include="..\src\Facade\System.IO.FileSystem.csproj" /> <ProjectReference Include="win\System.IO.FileSystem.pkgproj" /> @@ -171,14 +171,14 @@ Part of package build is to ensure that a package is applicable on all platforms <SupportedFramework>net45;netcore45;wpa81</SupportedFramework> </ProjectReference> <ProjectReference Include="..\ref\System.Collections.Concurrent.csproj"> - <SupportedFramework>net46;netcore50;dnxcore50</SupportedFramework> + <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework> </ProjectReference> ``` 2. Through SupportedFramework items with Version metdata. ``` <!-- no version indicates latest is supported --> - <SupportedFramework Include="net46;netcore50;dnxcore50" /> + <SupportedFramework Include="net46;netcore50;netcoreapp1.0" /> <!-- specific version indicates that version is supported --> <SupportedFramework Include="net45;netcore45;wpa81"> <Version>4.0.0.0</Version> diff --git a/Documentation/coding-guidelines/project-guidelines.md b/Documentation/coding-guidelines/project-guidelines.md index 4255f0e5ac..a0958a3a45 100644 --- a/Documentation/coding-guidelines/project-guidelines.md +++ b/Documentation/coding-guidelines/project-guidelines.md @@ -19,7 +19,7 @@ Below is a list of all the various options we pivot the project builds on. - **Flavor:** Debug, Release - **OS:** Windows_NT, Linux, OSX, FreeBSD - **Platform Runtimes:** NetFx (aka CLR/Desktop), CoreCLR, NetNative (aka MRT/AOT) -- **Target Frameworks:** NetFx (aka Desktop), .NETCore (aka Store/UWP), DNXCore (aka ASP.NET vNext), netstandard(aka dotnet/Portable) +- **Target Frameworks:** NetFx (aka Desktop), .NETCore (aka Store/UWP), NETCoreApp (aka .NET Core), netstandard(aka dotnet/Portable) - **Version:** Potentially multiple versions at the same time. ##Full Repo build pass @@ -38,7 +38,7 @@ For each unique configuration needed for a given library project a configuration - `$(Configuration) -> $(OSGroup)_$(TargetGroup)_$(ConfigurationGroup)` - `$(OSGroup) -> [Empty]/AnyOS* | Windows | Linux | OSX | FreeBSD` - `$(TargetGroup) -> [Empty]* | <PackageTargetFramework> | <PackageTargetRuntime> | <Version> | <PackageTargetFramework><PackageTargetRuntime>` - - `$(PackageTargetFramework) -> netstandard1.x/(currently dotnet5.x) | netcore50 | net46 | dnxcore50` + - `$(PackageTargetFramework) -> netstandard1.x/(currently dotnet5.x) | netcore50 | net46 | netcoreapp1.0` - `$(PackageTargetRuntime) -> aot` - For more information on various targets see also [.NET Platform Standard](https://github.com/dotnet/corefx/blob/master/Documentation/architecture/net-platform-standard.md) - `$(ConfigurationGroup) -> Debug* | Release` |