diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 51da728ce..737fc9677 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -149,8 +149,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FF498306-2 EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Core.Build.Tasks", "src\Microsoft.DotNet.Core.Build.Tasks\Microsoft.DotNet.Core.Build.Tasks.xproj", "{E8E7D24B-4830-4662-80A8-255D6FE3B0BE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Core.Sdk", "src\Microsoft.DotNet.Core.Sdk\Microsoft.DotNet.Core.Sdk.xproj", "{556554CA-6EC9-4007-A2C3-AB03DCF8F741}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -915,22 +913,6 @@ Global {E8E7D24B-4830-4662-80A8-255D6FE3B0BE}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {E8E7D24B-4830-4662-80A8-255D6FE3B0BE}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {E8E7D24B-4830-4662-80A8-255D6FE3B0BE}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.Debug|Any CPU.Build.0 = Debug|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.Debug|x64.ActiveCfg = Debug|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.Debug|x64.Build.0 = Debug|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.Release|Any CPU.ActiveCfg = Release|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.Release|Any CPU.Build.0 = Release|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.Release|x64.ActiveCfg = Release|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.Release|x64.Build.0 = Release|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {556554CA-6EC9-4007-A2C3-AB03DCF8F741}.RelWithDebInfo|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -991,6 +973,5 @@ Global {8E3354BD-827F-41B7-9EE6-6BE1F1EDD8E9} = {89905EC4-BC0F-443B-8ADF-691321F10108} {FF498306-2DE2-47F6-8C35-3CF0589CF2B8} = {89905EC4-BC0F-443B-8ADF-691321F10108} {E8E7D24B-4830-4662-80A8-255D6FE3B0BE} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {556554CA-6EC9-4007-A2C3-AB03DCF8F741} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} EndGlobalSection EndGlobal diff --git a/src/Microsoft.DotNet.Core.Sdk/Microsoft.DotNet.Core.Sdk.xproj b/src/Microsoft.DotNet.Core.Sdk/Microsoft.DotNet.Core.Sdk.xproj deleted file mode 100644 index eac88f097..000000000 --- a/src/Microsoft.DotNet.Core.Sdk/Microsoft.DotNet.Core.Sdk.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 556554ca-6ec9-4007-a2c3-ab03dcf8f741 - Microsoft.DotNet.Core.Sdk - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Core.Sdk/project.json b/src/Microsoft.DotNet.Core.Sdk/project.json deleted file mode 100644 index e17fd8c6a..000000000 --- a/src/Microsoft.DotNet.Core.Sdk/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "1.0.0-preview3-*", - "packOptions": { - "files": { - "include": [ - "build/**/*", - "../../artifacts/bin/src/Microsoft.DotNet.Core.Build.Tasks/bin/Debug/netstandard1.6/*.dll", - "../../artifacts/bin/src/Microsoft.DotNet.Core.Build.Tasks/bin/Debug/net451/*.dll" - ], - "mappings": { - "lib/netstandard1.6/": "../../artifacts/bin/src/Microsoft.DotNet.Core.Build.Tasks/bin/Debug/netstandard1.6/*.dll", - "lib/net451/": "../../artifacts/bin/src/Microsoft.DotNet.Core.Build.Tasks/bin/Debug/net451/*.dll" - } - } - }, - "frameworks": { - "netstandard1.0": {} - } -} diff --git a/src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props b/src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props index 77f2e496a..8d4b59d14 100644 --- a/src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props +++ b/src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props @@ -11,7 +11,7 @@ Copyright (c) .NET Foundation. All rights reserved. --> - $(MSBuildExtensionsPath)\NETCore\Microsoft.DotNet.Core.Sdk.props + $(MSBuildExtensionsPath)\Microsoft.DotNet.Core.Sdk.props diff --git a/src/dotnet/14.1/Microsoft.Common.Targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets b/src/dotnet/14.1/Microsoft.Common.Targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets index 10dd74d67..7f2fab3de 100644 --- a/src/dotnet/14.1/Microsoft.Common.Targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets +++ b/src/dotnet/14.1/Microsoft.Common.Targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets @@ -11,7 +11,7 @@ Copyright (c) .NET Foundation. All rights reserved. --> - $(MSBuildExtensionsPath)\NETCore\Microsoft.DotNet.Core.Sdk.targets + $(MSBuildExtensionsPath)\Microsoft.DotNet.Core.Sdk.targets diff --git a/src/Microsoft.DotNet.Core.Sdk/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.props b/src/dotnet/Microsoft.DotNet.Core.Sdk.props similarity index 100% rename from src/Microsoft.DotNet.Core.Sdk/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.props rename to src/dotnet/Microsoft.DotNet.Core.Sdk.props diff --git a/src/Microsoft.DotNet.Core.Sdk/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.targets b/src/dotnet/Microsoft.DotNet.Core.Sdk.targets similarity index 100% rename from src/Microsoft.DotNet.Core.Sdk/build/netstandard1.0/Microsoft.DotNet.Core.Sdk.targets rename to src/dotnet/Microsoft.DotNet.Core.Sdk.targets diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 6d6866718..76898db1a 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -27,11 +27,10 @@ }, "publishOptions": { "include": [ - "14.1/**" - ], - "mappings": { - "NETCore/": "../Microsoft.DotNet.Core.Sdk/build/netstandard1.0/*" - } + "14.1/**", + "*.props", + "*.targets" + ] }, "dependencies": { "NuGet.Commands": {