Skip to content

Commit

Permalink
updating naming conventions to move from DNX to DotNetCore to reflect…
Browse files Browse the repository at this point in the history
… sunset of DNX tooling in favor of DotNet
  • Loading branch information
sbohlen committed Apr 25, 2016
1 parent 78c3b1b commit 2d4eaf0
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Common.Logging.2015.sln
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.ApplicationI
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Logging.ApplicationInsights0170.Tests.2013-net45", "test\Common.Logging.ApplicationInsights0170.Tests\Common.Logging.ApplicationInsights0170.Tests.2013-net45.csproj", "{9202E384-BA52-4AE8-8D1A-9059E3BCA2EC}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Common.Logging.Core.Dnx", "src\Common.Logging.Core.Dnx\Common.Logging.Core.Dnx.xproj", "{B7A3507B-7346-4FCA-8B6F-9405E50A6BD4}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Common.Logging.Core.DotNetCore", "src\Common.Logging.Core.DotNetCore\Common.Logging.Core.DotNetCore.xproj", "{B7A3507B-7346-4FCA-8B6F-9405E50A6BD4}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Common.Logging.Dnx", "src\Common.Logging.Dnx\Common.Logging.Dnx.xproj", "{62D1BD54-10D9-4F6A-BF5F-5447A55C987F}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Common.Logging.DotNetCore", "src\Common.Logging.DotNetCore\Common.Logging.DotNetCore.xproj", "{62D1BD54-10D9-4F6A-BF5F-5447A55C987F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0-rc1-update1"
},
"projects":[
"Common.Logging.Core.Dnx",
"Common.Logging.Dnx"
"Common.Logging.Core.DotNetCore",
"Common.Logging.DotNetCore"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "3.3.0-*",
"description": "Common.Logging.Core.Dnx",
"description": "Common.Logging.Core.DotNetCore",
"compilationOptions": {
"define": [ "PORTABLE", "DOTNETCORE" ]
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"version": "3.3.0-*",
"description": "Common.Logging.Dnx",
"description": "Common.Logging.DotNetCore",
"compilationOptions": {
"define": [ "PORTABLE", "DOTNETCORE" ]
},
"dependencies": {
"Common.Logging.Core.Dnx": "3.3.0-*",
"Common.Logging.Core.DotNetCore": "3.3.0-*",
"Microsoft.CSharp": "4.0.0",
"System.Collections": "4.0.10",
"System.Linq": "4.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down

0 comments on commit 2d4eaf0

Please sign in to comment.