diff --git a/build.proj b/build.proj index 0a3e7a050..e087c34c0 100644 --- a/build.proj +++ b/build.proj @@ -34,7 +34,6 @@ $(RepoRoot)/.dotnet_stage0/$(Architecture) $(RepoRoot)/.dotnet_stage0PJ/$(Architecture) $(Stage0Directory)/dotnet$(ExeExtension) - $(Stage0PjDirectory)/dotnet$(ExeExtension) $(RepoRoot)/build_projects/dotnet-cli-build $(RepoRoot)/.nuget diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 5f60ae415..ff70ae72a 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -4,7 +4,7 @@ + DependsOnTargets="Init;DownloadHostAndSharedFxArtifacts;RestoreSrcPackages;RestoreToolsPackages;ZipTemplates" /> True $(Stage0Directory) - $(Stage0PjDirectory) - $(RepoRoot)/artifacts/$(Rid) $(BaseOutputDirectory)/tools $(BaseOutputDirectory)/stage1 @@ -233,34 +231,6 @@ - - - - - - - - - - - - - - - - - - - - - - - <_DotNetNewFolder>$(RepoRoot)/src/dotnet/commands/dotnet-new diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks index 697489d28..8463bc1a0 100644 --- a/build/Microsoft.DotNet.Cli.tasks +++ b/build/Microsoft.DotNet.Cli.tasks @@ -11,9 +11,7 @@ - - diff --git a/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets b/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets index 1e6478021..e1f6ba617 100644 --- a/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets +++ b/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets @@ -144,7 +144,7 @@ + -DotnetDir '$(Stage0Directory)'" /> dotnet-desktop-binding-redirects dotnet-desktop-binding-redirects.csproj True - True + True $(DesktopAvailable) 1.0.0-rc- rc-$(TestPackageBuildVersionSuffix) diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj new file mode 100644 index 000000000..ac55a5272 --- /dev/null +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj @@ -0,0 +1,42 @@ + + + + + netstandard1.5 + true + true + Microsoft.DotNet.Cli.Build.Framework + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 4.1.0 + + + 4.1.0 + + + 1.0.1-beta-000933 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.xproj b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.xproj deleted file mode 100644 index d4c58d0e8..000000000 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 49beb486-ab5a-4416-91ea-8cd34abb0c9d - Microsoft.DotNet.Cli.Build.Framework - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - - 2.0 - - - \ No newline at end of file diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json deleted file mode 100644 index a16d387c5..000000000 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "warningsAsErrors": true, - "allowUnsafe": true - }, - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Diagnostics.Process": "4.1.0", - "System.Reflection.TypeExtensions": "4.1.0", - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" - }, - "frameworks": { - "netstandard1.5": { - "imports": "dnxcore50" - } - } -} diff --git a/build_projects/dotnet-cli-build/DotNetPackPJ.cs b/build_projects/dotnet-cli-build/DotNetPackPJ.cs deleted file mode 100644 index ff061c679..000000000 --- a/build_projects/dotnet-cli-build/DotNetPackPJ.cs +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Cli.Build -{ - public class DotNetPackPJ : DotNetTool - { - protected override string Command - { - get { return "pack"; } - } - - protected override string Args - { - get { return $"{GetProjectPath()} {GetConfiguration()} {GetNoBuild()} {GetBuildBasePath()} {GetOutput()} {GetVersionSuffix()}"; } - } - - public string Configuration { get; set; } - - public bool NoBuild { get; set; } - - public string BuildBasePath { get; set; } - - public string Output { get; set; } - - public string ProjectPath { get; set; } - - public string VersionSuffix { get; set; } - - private string GetConfiguration() - { - if (!string.IsNullOrEmpty(Configuration)) - { - return $"--configuration {Configuration}"; - } - - return null; - } - - private string GetNoBuild() - { - if (NoBuild) - { - return $"--no-build"; - } - - return null; - } - - private string GetBuildBasePath() - { - if (!string.IsNullOrEmpty(BuildBasePath)) - { - return $"--build-base-path {BuildBasePath}"; - } - - return null; - } - - private string GetOutput() - { - if (!string.IsNullOrEmpty(Output)) - { - return $"--output {Output}"; - } - - return null; - } - - private string GetProjectPath() - { - if (!string.IsNullOrEmpty(ProjectPath)) - { - return $"{ProjectPath}"; - } - - return null; - } - - private string GetVersionSuffix() - { - if (!string.IsNullOrEmpty(VersionSuffix)) - { - return $"--version-suffix {VersionSuffix}"; - } - - return null; - } - } -} diff --git a/build_projects/dotnet-cli-build/DotNetPublishPJ.cs b/build_projects/dotnet-cli-build/DotNetPublishPJ.cs deleted file mode 100644 index 0e09f4eea..000000000 --- a/build_projects/dotnet-cli-build/DotNetPublishPJ.cs +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -namespace Microsoft.DotNet.Cli.Build -{ - public class DotNetPublishPJ : DotNetTool - { - protected override string Command - { - get { return "publish"; } - } - - protected override string Args - { - get { return $"{GetProjectPath()} {GetConfiguration()} {GetFramework()} {GetNativeSubdirectory()} {GetBuildBasePath()} {GetOutput()} {GetVersionSuffix()} {GetRuntime()} {GetMSBuildArgs()}"; } - } - - public string BuildBasePath { get; set; } - - public string Configuration { get; set; } - - public string Framework { get; set; } - - public bool NativeSubDirectory { get; set; } - - public string MSBuildArgs { get; set; } - - public string Output { get; set; } - - public string ProjectPath { get; set; } - - public string Runtime { get; set; } - - public string VersionSuffix { get; set; } - - private string GetBuildBasePath() - { - if (!string.IsNullOrEmpty(BuildBasePath)) - { - return $"--build-base-path {BuildBasePath}"; - } - - return null; - } - - private string GetConfiguration() - { - if (!string.IsNullOrEmpty(Configuration)) - { - return $"--configuration {Configuration}"; - } - - return null; - } - - private string GetFramework() - { - if (!string.IsNullOrEmpty(Framework)) - { - return $"--framework {Framework}"; - } - - return null; - } - - private string GetNativeSubdirectory() - { - if (NativeSubDirectory) - { - return $"--native-subdirectory"; - } - - return null; - } - - private string GetMSBuildArgs() - { - if (!string.IsNullOrEmpty(MSBuildArgs)) - { - return $"-- {MSBuildArgs}"; - } - - return null; - } - - private string GetOutput() - { - if (!string.IsNullOrEmpty(Output)) - { - return $"--output {Output}"; - } - - return null; - } - - private string GetProjectPath() - { - if (!string.IsNullOrEmpty(ProjectPath)) - { - return $"{ProjectPath}"; - } - - return null; - } - - private string GetRuntime() - { - if (!string.IsNullOrEmpty(Runtime)) - { - return $"--runtime {Runtime}"; - } - - return null; - } - - private string GetVersionSuffix() - { - if (!string.IsNullOrEmpty(VersionSuffix)) - { - return $"--version-suffix {VersionSuffix}"; - } - - return null; - } - } -} diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json deleted file mode 100644 index 5c1c5701b..000000000 --- a/build_projects/shared-build-targets-utils/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "Build scripts for dotnet-cli", - "dependencies": { - "NETStandard.Library": "1.6.0", - "Microsoft.CSharp": "4.0.1", - "System.Dynamic.Runtime": "4.0.11", - "System.Reflection.Metadata": "1.4.1-beta-24410-02", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Xml.XmlSerializer": "4.0.11", - "WindowsAzure.Storage": "6.2.2-preview", - "Microsoft.DotNet.Cli.Build.Framework": { - "target": "project" - }, - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" - }, - "frameworks": { - "netstandard1.6": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj new file mode 100644 index 000000000..9f351bacc --- /dev/null +++ b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj @@ -0,0 +1,57 @@ + + + + + Build scripts for dotnet-cli + netstandard1.6 + shared-build-targets-utils + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 4.0.1 + + + 4.0.11 + + + 1.4.1-beta-24410-02 + + + 4.1.1 + + + 4.0.11 + + + 6.2.2-preview + + + 1.0.1-beta-000933 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/build_projects/shared-build-targets-utils/shared-build-targets-utils.xproj b/build_projects/shared-build-targets-utils/shared-build-targets-utils.xproj deleted file mode 100644 index 3711602b1..000000000 --- a/build_projects/shared-build-targets-utils/shared-build-targets-utils.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25123 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b768bd29-12bf-4c7c-b093-03193fe244d1 - Microsoft.DotNet.Cli.Build - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - - 2.0 - - - \ No newline at end of file diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json deleted file mode 100644 index 9ca036302..000000000 --- a/build_projects/update-dependencies/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "Updates the repos dependencies", - "buildOptions": { - "emitEntryPoint": true, - "compile": [ - "../../src/Microsoft.DotNet.Cli.Utils/DebugHelper.cs" - ] - }, - "dependencies": { - "Microsoft.NETCore.App": "1.0.0", - "Microsoft.DotNet.VersionTools": "1.0.26-prerelease-00615-07" - }, - "frameworks": { - "netcoreapp1.0": {} - }, - "runtimes": { - "win7-x64": {}, - "win7-x86": {}, - "osx.10.10-x64": {}, - "osx.10.11-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "centos.7-x64": {}, - "rhel.7.2-x64": {}, - "debian.8-x64": {}, - "fedora.23-x64": {}, - "opensuse.13.2-x64": {} - } -} diff --git a/build_projects/update-dependencies/update-dependencies.csproj b/build_projects/update-dependencies/update-dependencies.csproj new file mode 100644 index 000000000..76a1bb9b2 --- /dev/null +++ b/build_projects/update-dependencies/update-dependencies.csproj @@ -0,0 +1,37 @@ + + + + + Updates the repos dependencies + netcoreapp1.0 + update-dependencies + Exe + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 + + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.0.0 + + + 1.0.26-prerelease-00615-07 + + + + + $(DefineConstants);RELEASE + + + + diff --git a/build_projects/update-dependencies/update-dependencies.xproj b/build_projects/update-dependencies/update-dependencies.xproj deleted file mode 100644 index 07cff1695..000000000 --- a/build_projects/update-dependencies/update-dependencies.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a28bd8ac-df15-4f58-8299-98a9ae2b8726 - Microsoft.DotNet.Scripts - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.xproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.xproj deleted file mode 100644 index 775c85857..000000000 --- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 35b19f22-b8c0-4849-9c35-3f809b7588b8 - Microsoft.DotNet.Archive - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/project.json b/src/Microsoft.DotNet.Archive/project.json deleted file mode 100644 index 4fd121b88..000000000 --- a/src/Microsoft.DotNet.Archive/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": "1.0.0-preview4-*", - "buildOptions": { - "keyFile": "../../tools/Key.snk" - }, - "description": "Archive and compression types.", - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Linq.Parallel": "4.0.1" - }, - "frameworks": { - "netstandard1.3": {} - }, - "scripts": {} -} diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json deleted file mode 100644 index 5249922cf..000000000 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": "1.0.0-preview4-*", - "buildOptions": { - "keyFile": "../../tools/Key.snk", - "warningsAsErrors": true - }, - "dependencies": { - "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000933", - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933", - - "NuGet.Versioning": "4.0.0-rc-2048", - "NuGet.Packaging": "4.0.0-rc-2048", - "NuGet.Frameworks": "4.0.0-rc-2048", - "NuGet.ProjectModel": "4.0.0-rc-2048", - - "Microsoft.Build": "15.1.0-preview-000370-00", - "Microsoft.Build.Utilities.Core": "15.1.0-preview-000370-00" - }, - "frameworks": { - "netstandard1.5": { - "imports": [ - "portable-net45+wp80+win8+wpa81+dnxcore50" - ], - "dependencies": { - "System.Diagnostics.Process": "4.1.0" - } - }, - "net46": { - } - } -} diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.xproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.xproj deleted file mode 100644 index 223864b6b..000000000 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25123 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e5ed47ef-bf25-4da9-a7fe-290c642cbf0f - Microsoft.DotNet.Configurer - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/project.json b/src/Microsoft.DotNet.Configurer/project.json deleted file mode 100644 index 7c1046a89..000000000 --- a/src/Microsoft.DotNet.Configurer/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": "1.0.0-rc3-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - }, - "dependencies": { - "Microsoft.DotNet.InternalAbstractions": { - "target": "project" - }, - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "Microsoft.DotNet.Archive": { - "target": "project" - } - }, - "frameworks": { - "netstandard1.5": { - "imports": [ - "portable-net45+wp80+win8+wpa81+dnxcore50" - ] - } - }, - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/dotnet/cli" - } - } -} diff --git a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.xproj b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.xproj deleted file mode 100644 index 2f07cc659..000000000 --- a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.24720 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - bd4f0750-4e81-4ad2-90b5-e470881792c3 - Microsoft.DotNet.InternalAbstractions - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json deleted file mode 100644 index 63542a1b1..000000000 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "description": "Abstractions for making code that uses file system and environment testable.", - "version": "2.0.0-beta-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "allowUnsafe": true - }, - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.AppContext": "4.1.0", - "System.Collections": "4.0.11", - "System.IO": "4.1.0", - "System.IO.FileSystem": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" - } - } - }, - "scripts": {}, - "packOptions": { - "repository": { - "type": "git", - "url": "git://github.com/dotnet/cli" - } - } -} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Microsoft.DotNet.ProjectModel.xproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Microsoft.DotNet.ProjectModel.xproj deleted file mode 100644 index c33400887..000000000 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Microsoft.DotNet.ProjectModel.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 303677d5-7312-4c3f-baee-beb1a9bd9fe6 - Microsoft.DotNet.ProjectModel - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.xproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.xproj deleted file mode 100644 index 095a39599..000000000 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0E083818-2320-4388-8007-4F720FD5C634 - Microsoft.DotNet.ProjectJsonMigration - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/project.json b/src/Microsoft.DotNet.ProjectJsonMigration/project.json deleted file mode 100644 index 72ebbbfd7..000000000 --- a/src/Microsoft.DotNet.ProjectJsonMigration/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-preview4-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "embed" :{ - "include" : "sdkdefaults.json" - } - }, - "dependencies": { - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "Microsoft.Build": "15.1.0-preview-000370-00", - "Microsoft.CodeAnalysis.CSharp": "2.0.0-beta6-60922-08" - }, - "frameworks": { - "netcoreapp1.0": { } - } -} diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.xproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.xproj deleted file mode 100644 index e6f1e6339..000000000 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 0724ed7c-56e3-4604-9970-25e600611383 - Microsoft.DotNet.TestFramework - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - - 2.0 - - - diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json deleted file mode 100644 index 96055819d..000000000 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "1.0.0-preview4-*", - "description": "Microsoft.DotNet.TestFramework Class Library", - "buildOptions": { - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - } - }, - "frameworks": { - "netstandard1.5": { - "imports": [ - "portable-net45+wp80+win8+wpa81+dnxcore50" - ] - }, - "net46": { - } - }, - "packOptions": { - "projectUrl": "", - "licenseUrl": "", - "tags": [ - "" - ] - } -} \ No newline at end of file diff --git a/src/dotnet-archive/project.json b/src/dotnet-archive/project.json deleted file mode 100644 index e4734bd76..000000000 --- a/src/dotnet-archive/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "compile": { - "include": [ - "**/*.cs", - "../dotnet/CommandLine/*.cs" - ] - } - }, - "dependencies": { - "Microsoft.DotNet.Archive": { - "target": "project" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - }, - "frameworks": { - "netcoreapp1.0": {} - } -} diff --git a/src/dotnet/dotnet.xproj b/src/dotnet/dotnet.xproj deleted file mode 100644 index e28c05834..000000000 --- a/src/dotnet/dotnet.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 60cf7e6c-d6c8-439d-b7b7-d8a27e29be2c - Microsoft.DotNet.Cli - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - \ No newline at end of file diff --git a/src/dotnet/project.json b/src/dotnet/project.json deleted file mode 100644 index 6289f5518..000000000 --- a/src/dotnet/project.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "version": "1.0.0-preview4-*", - "buildOptions": { - "emitEntryPoint": true, - "keyFile": "../../tools/Key.snk", - "embed": { - "include": [ - "commands/dotnet-new/CSharp_Console.zip", - "commands/dotnet-new/CSharp_Lib.zip", - "commands/dotnet-new/CSharp_Mstest.zip", - "commands/dotnet-new/CSharp_Web.zip", - "commands/dotnet-new/CSharp_Xunittest.zip" - ] - }, - "compile": { - "exclude": [ - "commands/dotnet-new/CSharp_Console/**", - "commands/dotnet-new/CSharp_Lib/**", - "commands/dotnet-new/CSharp_Mstest/**", - "commands/dotnet-new/CSharp_Web/**", - "commands/dotnet-new/CSharp_Xunittest/**" - - ] - } - }, - "dependencies": { - "Newtonsoft.Json": "9.0.1", - "System.Text.Encoding.CodePages": "4.0.1", - "System.Diagnostics.FileVersionInfo": "4.0.0", - "Microsoft.ApplicationInsights": "2.0.0", - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "Microsoft.DotNet.Configurer": { - "target": "project" - }, - "Microsoft.DotNet.ProjectJsonMigration": { - "target": "project" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Diagnostics.TraceSource": "4.0.0", - "System.Diagnostics.TextWriterTraceListener": "4.0.0", - "System.Resources.Writer": "4.0.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Private.DataContractSerialization": "4.1.1", - "System.Text.RegularExpressions": "4.1.0", - "Microsoft.Win32.Registry": { - "version": "4.0.0", - "exclude": "compile" - }, - - "Microsoft.Build": "15.1.0-preview-000370-00", - "Microsoft.CodeAnalysis.CSharp": "2.0.0-beta6-60922-08", - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4" - ] - } - } -} diff --git a/src/redist/project.json b/src/redist/project.json deleted file mode 100644 index 922d57392..000000000 --- a/src/redist/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "version": "1.0.0-preview4-*", - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": { - "include": ["RunCsc.sh", "RunCsc.cmd"] - } - }, - "publishOptions": { - "include": ["RunCsc.sh", "RunCsc.cmd"] - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "tool_csc": "1.0.0-preview4-*", - "dotnet": "1.0.0-preview4-*", - "tool_nuget": "1.0.0-preview4-*", - "tool_msbuild": "1.0.0-preview4-*", - - "Microsoft.Build.Runtime": "15.1.0-preview-000370-00", - "Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08", - "System.Runtime.Serialization.Xml": "4.1.1", - "NuGet.Build.Tasks": "4.0.0-rc-2048", - "Microsoft.TestPlatform.CLI": "15.0.0-preview-20161028-03", - "Microsoft.TestPlatform.Build": "15.0.0-preview-20161028-03" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "netstandardapp1.5", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ] - } - } -} \ No newline at end of file diff --git a/src/tool_csc/project.json b/src/tool_csc/project.json deleted file mode 100644 index 758564295..000000000 --- a/src/tool_csc/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-preview4-*", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "Microsoft.CodeAnalysis.CSharp": "2.0.0-beta6-60922-08", - "Microsoft.Net.Compilers.netcore": "2.0.0-beta6-60922-08", - "Microsoft.DiaSymReader.Native": "1.4.0-rc2" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/src/tool_msbuild/project.json b/src/tool_msbuild/project.json deleted file mode 100644 index 044765d24..000000000 --- a/src/tool_msbuild/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "1.0.0-preview4-*", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "Microsoft.Build.Runtime": "15.1.0-preview-000370-00", - "Microsoft.Net.Compilers.netcore": "2.0.0-beta6-60922-08", - "Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08", - "Microsoft.Cci": "4.0.0-rc3-24128-00", - "Microsoft.Composition": "1.0.30" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - } -} diff --git a/src/tool_nuget/project.json b/src/tool_nuget/project.json deleted file mode 100644 index 105a4115f..000000000 --- a/src/tool_nuget/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": "1.0.0-preview4-*", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "NuGet.CommandLine.XPlat": "4.0.0-rc-2048" - }, - "frameworks": { - "netcoreapp1.0": { - } - } -} diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.xproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.xproj deleted file mode 100644 index 5b9cd4886..000000000 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.24720 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6973e08d-11ec-49dc-82ef-d5effec7c6e9 - Microsoft.DotNet.Tests.ArgumentForwarding - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - \ No newline at end of file diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json deleted file mode 100644 index ee7eff1f6..000000000 --- a/test/ArgumentForwardingTests/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit", - "scripts": { - "precompile": "dotnet publish ../ArgumentsReflector/project.json --framework netcoreapp1.0 --runtime %compile:RuntimeIdentifier% --output %compile:RuntimeOutputDir%" - } -} diff --git a/test/ArgumentsReflector/Reflector.xproj b/test/ArgumentsReflector/Reflector.xproj deleted file mode 100644 index 06cbe2be6..000000000 --- a/test/ArgumentsReflector/Reflector.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.24720 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6f2e6f25-b43b-495d-9ca5-7f207d1dd604 - Microsoft.DotNet.Tests.ArgumentForwarding - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - \ No newline at end of file diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json deleted file mode 100644 index 32e69eb25..000000000 --- a/test/ArgumentsReflector/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": { - "include": [ - "reflector_cmd.cmd" - ] - } - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - }, - "frameworks": { - "netcoreapp1.0": {} - }, - "publishOptions": { - "include": [ - "reflector_cmd.cmd" - ] - } -} diff --git a/test/EndToEnd/EndToEnd.xproj b/test/EndToEnd/EndToEnd.xproj deleted file mode 100644 index cfee5a0ea..000000000 --- a/test/EndToEnd/EndToEnd.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.24720 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 65741cb1-8aee-4c66-8198-10a7ea0e4258 - Microsoft.DotNet.Tests.EndToEnd - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json deleted file mode 100644 index 202f9045c..000000000 --- a/test/EndToEnd/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": { - "include": [ - "../../artifacts/*/stage2/sdk/*/.version" - ], - "mappings": { - ".version": "../../artifacts/*/stage2/sdk/*/.version" - } - } - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "xunit.netcore.extensions": "1.0.0-prerelease-00206", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.xproj b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.xproj deleted file mode 100644 index 00b0d9710..000000000 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0B31C336-149D-471A-B7B1-27B0F1E80F83 - Microsoft.DotNet.Cli.Msi.Tests - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - \ No newline at end of file diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/project.json b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/project.json deleted file mode 100644 index 4b2fac251..000000000 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta3-build3330", - "xunit.runner.console": "2.1.0", - "Microsoft.Deployment.WindowsInstaller": "1.0.0" - }, - "frameworks": { - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - } -} diff --git a/test/Installer/testmsi.ps1 b/test/Installer/testmsi.ps1 index 67200eed3..86692bc9f 100644 --- a/test/Installer/testmsi.ps1 +++ b/test/Installer/testmsi.ps1 @@ -36,16 +36,14 @@ if(!(Test-Path $inputMsi)) } $testName = "Microsoft.DotNet.Cli.Msi.Tests" -$testDir="$PSScriptRoot\$testName" +$testProj="$PSScriptRoot\$testName\$testName.csproj" $testBin="$RepoRoot\artifacts\tests\$testName" pushd "$DotnetDir" try { .\dotnet restore ` - --infer-runtimes ` - $testDir ` - -f https://www.myget.org/F/dotnet-buildtools/api/v3/index.json | Out-Host + $testProj | Out-Host if($LastExitCode -ne 0) { @@ -55,7 +53,7 @@ try { .\dotnet publish ` --framework net46 ` --output $testBin ` - $testDir | Out-Host + $testProj | Out-Host if($LastExitCode -ne 0) { diff --git a/test/Kestrel.Tests/Kestrel.Tests.xproj b/test/Kestrel.Tests/Kestrel.Tests.xproj deleted file mode 100644 index 70030f88d..000000000 --- a/test/Kestrel.Tests/Kestrel.Tests.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.24720 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 605AA1EE-82A4-477B-A711-5944BD7B04E0 - Kestrel.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - - 2.0 - - - \ No newline at end of file diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json deleted file mode 100644 index eed82fdc0..000000000 --- a/test/Kestrel.Tests/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.xproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.xproj deleted file mode 100644 index ac8ea2ac0..000000000 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 09c52f96-efdd-4448-95ec-6d362dd60baa - Microsoft.DotNet.Cli.Utils - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json deleted file mode 100644 index c9fa52d2e..000000000 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "keyFile": "../../tools/Key.snk", - "compile": { - "include": [ - "**/*.cs", - "../../src/dotnet/DotnetFiles.cs" - ] - }, - "copyToOutput": { - "include": [ - "../../TestAssets/TestProjects/OutputStandardOutputAndError/*", - "../../TestAssets/TestProjects/TestAppWithArgs/*", - "../../TestAssets/TestProjects/AppWithDirectAndToolDependency/**/*", - "../../TestAssets/TestProjects/AppWithDirectDependency/**/*", - "../../TestAssets/TestProjects/AppWithToolDependency/**/*", - "../../artifacts/*/stage2/sdk/*/.version" - ], - "mappings": { - ".version": "../../artifacts/*/stage2/sdk/*/.version" - } - } - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Diagnostics.TraceSource": "4.0.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "NuGet.Versioning": "4.0.0-rc-2048", - "NuGet.Packaging": "4.0.0-rc-2048", - "NuGet.Frameworks": "4.0.0-rc-2048", - "NuGet.ProjectModel": "4.0.0-rc-2048", - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "moq.netcore": "4.4.0-beta8", - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933", - "Microsoft.Build.Runtime": "15.1.0-preview-000370-00" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "netstandardapp1.5", - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit", - "publishOptions": { - "include": [ - "../../TestAssets/TestProjects/OutputStandardOutputAndError/*", - "../../TestAssets/TestProjects/TestAppWithArgs/*", - "../../TestAssets/TestProjects/AppWithDirectAndToolDependency/**/*", - "../../TestAssets/TestProjects/AppWithDirectDependency/**/*", - "../../TestAssets/TestProjects/AppWithToolDependency/**/*" - ] - } -} diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.xproj b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.xproj deleted file mode 100644 index 5616a9a19..000000000 --- a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4c3b06d5-b6d5-4e5b-a44f-3ebe52a1c759 - Microsoft.DotNet.Configurer.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - \ No newline at end of file diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/project.json b/test/Microsoft.DotNet.Configurer.UnitTests/project.json deleted file mode 100644 index e2595344c..000000000 --- a/test/Microsoft.DotNet.Configurer.UnitTests/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Diagnostics.TraceSource": "4.0.0", - "Microsoft.DotNet.Configurer": { - "target": "project" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "FluentAssertions": "4.0.0", - "moq.netcore": "4.4.0-beta8", - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.xproj b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.xproj deleted file mode 100644 index 4e2c370f6..000000000 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.25123 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 1F2EF070-AC5F-4078-AFB0-65745AC691B9 - Microsoft.DotNet.ProjectJsonMigration.Tests - ..\artifact\obj\$(RootNamespace) - ..\artifacts\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/project.json b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/project.json deleted file mode 100644 index 23015f91f..000000000 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/project.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "copyToOutput": ["MSBuild.exe", "MSBuild.exe.config"], - "keyFile": "../../tools/test_key.snk" - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "Microsoft.DotNet.ProjectJsonMigration": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "FluentAssertions": "4.0.0", - "moq.netcore": "4.4.0-beta8", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - } - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "netstandardapp1.5", - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.xproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.xproj deleted file mode 100644 index 52695e8cf..000000000 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - e4f46eab-b5a5-4e60-9b9d-40a1fadbf45c - Microsoft.DotNet.Tools.Tests.Utilities - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - - 2.0 - - - \ No newline at end of file diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json deleted file mode 100644 index f6bb9e68a..000000000 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library", - "buildOptions": { - "keyFile": "../../tools/Key.snk", - "compile": { - "include": [ - "**/*.cs", - "../../src/dotnet/DotnetFiles.cs" - ] - } - - }, - "dependencies": { - "FluentAssertions": "4.0.0", - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "Microsoft.DotNet.TestFramework": { "target": "project" }, - "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "Microsoft.DotNet.InternalAbstractions": { - "target": "project" - }, - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ], - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004306" - }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24022", - "System.Collections.Immutable": "1.2.0-rc2-24022", - "System.Net.NetworkInformation": "4.1.0-rc2-24022" - }, - "net46": { - "frameworkAssemblies": { - "System.Runtime": { - "type": "build" - } - } - } - } -} diff --git a/test/Performance/Performance.xproj b/test/Performance/Performance.xproj deleted file mode 100644 index e27a96a3d..000000000 --- a/test/Performance/Performance.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.24720 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6A3095FF-A7C5-4300-85A9-C025C384401D - Microsoft.DotNet.Tests.Performance - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Performance/project.json b/test/Performance/project.json deleted file mode 100644 index 6c2316bd1..000000000 --- a/test/Performance/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "xunit.netcore.extensions": "1.0.0-prerelease-00206", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/ScriptExecutorTests/ScriptExecutorTests.xproj b/test/ScriptExecutorTests/ScriptExecutorTests.xproj deleted file mode 100644 index e114297b9..000000000 --- a/test/ScriptExecutorTests/ScriptExecutorTests.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 833ffee1-7eed-4f51-8dfd-946d48833333 - Microsoft.DotNet.Cli.Utils.ScriptExecutorTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - - 2.0 - - - \ No newline at end of file diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json deleted file mode 100644 index e9919031e..000000000 --- a/test/ScriptExecutorTests/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit", - "publishOptions": { - "include": [ - "../../TestAssets/TestProjects/TestApp/**/*" - ] - }, - "buildOptions": { - "copyToOutput": { - "include": [ - "../../TestAssets/TestProjects/TestApp/**/*" - ] - } - } -} diff --git a/test/binding-redirects.Tests/binding-redirects.Tests.xproj b/test/binding-redirects.Tests/binding-redirects.Tests.xproj deleted file mode 100644 index f789a017e..000000000 --- a/test/binding-redirects.Tests/binding-redirects.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 27dbf851-f2e3-4fd5-bf4d-a73c81933283 - binding-redirects.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json deleted file mode 100644 index 44fae00f3..000000000 --- a/test/binding-redirects.Tests/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933", - "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } - }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "System.Console": "4.0.0" - }, - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "runtimes": { - "win7-x64": {}, - "win7-x86": {} - }, - "testRunner": "xunit" -} diff --git a/test/crossgen.Tests/crossgen.Tests.xproj b/test/crossgen.Tests/crossgen.Tests.xproj deleted file mode 100644 index 3f40f37bb..000000000 --- a/test/crossgen.Tests/crossgen.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 414afbf1-b501-40e5-bf68-8c7d921c4e5d - crossgen.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json deleted file mode 100644 index c1ce18951..000000000 --- a/test/crossgen.Tests/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.xproj b/test/dotnet-build.Tests/dotnet-build.Tests.xproj deleted file mode 100644 index eddb02bc1..000000000 --- a/test/dotnet-build.Tests/dotnet-build.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 49d7318e-d198-4e2b-bbea-3a24d805f88d - Microsoft.DotNet.Cli.Build3.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json deleted file mode 100644 index 3ee83c3ca..000000000 --- a/test/dotnet-build.Tests/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.xproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.xproj deleted file mode 100644 index b7d03b02b..000000000 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.25123 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a62edfbd-9e6d-458f-983e-1a86da52ae1e - Microsoft.DotNet.ProjectJsonMigration.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/dotnet-migrate.Tests/project.json b/test/dotnet-migrate.Tests/project.json deleted file mode 100644 index 58b3ac843..000000000 --- a/test/dotnet-migrate.Tests/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "copyToOutput": ["MSBuild.exe", "MSBuild.exe.config", "NuGet.tempaspnetpatch.config"] - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "Microsoft.DotNet.ProjectJsonMigration": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "FluentAssertions": "4.0.0", - "moq.netcore": "4.4.0-beta8", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "dotnet": { - "target":"project" - } - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "netstandardapp1.5", - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.xproj b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.xproj deleted file mode 100644 index 36fcd888c..000000000 --- a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2ffcbdf0-ba36-4393-8ddb-1ae04aea3cd6 - Microsoft.DotNet.Cli.MSBuild.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/dotnet-msbuild.Tests/project.json b/test/dotnet-msbuild.Tests/project.json deleted file mode 100644 index a66ec125d..000000000 --- a/test/dotnet-msbuild.Tests/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "dotnet": { - "target": "project" - } - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.xproj b/test/dotnet-new.Tests/dotnet-new.Tests.xproj deleted file mode 100644 index eddc88c4a..000000000 --- a/test/dotnet-new.Tests/dotnet-new.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 712a4aff-d758-49b0-ab46-b6dd2ffc9d26 - dotnet-new.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json deleted file mode 100644 index 063ebe274..000000000 --- a/test/dotnet-new.Tests/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "dotnet": { - "target": "project" - }, - "Microsoft.Build": "15.1.0-preview-000370-00", - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.xproj b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.xproj deleted file mode 100644 index 8ab83bd82..000000000 --- a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.24720 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2EC08501-CFC6-412F-9345-8D31D258A60E - Microsoft.DotNet.Tools.NuGet.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/dotnet-nuget.UnitTests/project.json b/test/dotnet-nuget.UnitTests/project.json deleted file mode 100644 index 443473e71..000000000 --- a/test/dotnet-nuget.UnitTests/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "dotnet": { - "target": "project" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "moq.netcore": "4.4.0-beta8" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.xproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.xproj deleted file mode 100644 index b0d2ba45f..000000000 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.24720 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 5fda6d37-3a3e-4333-ba5c-f0b28be316f4 - dotnet-pack.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - - 2.0 - - - \ No newline at end of file diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json deleted file mode 100644 index eaa30400c..000000000 --- a/test/dotnet-pack.Tests/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.IO.Compression.ZipFile": "4.0.1", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "Microsoft.DotNet.Cli.Utils": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit", - "publishOptions": { - "include": [ - "../../TestAssets/TestProjects/TestLibraryWithConfiguration/*" - ] - }, - "buildOptions": { - "copyToOutput": { - "include": [ - "../../TestAssets/TestProjects/TestLibraryWithConfiguration/*" - ] - } - } -} diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.xproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.xproj deleted file mode 100644 index 9fadfd0d3..000000000 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - fbe4f1d6-ba4c-46d9-8286-4ee4b032d01e - Microsoft.DotNet.Cli.Publish3.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json deleted file mode 100644 index 4938f6a74..000000000 --- a/test/dotnet-publish.Tests/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "copyToOutput": { - "include": [ - "../../artifacts/*/stage2/sdk/*/.version" - ], - "mappings": { - ".version": "../../artifacts/*/stage2/sdk/*/.version" - } - } - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json deleted file mode 100644 index 3ee83c3ca..000000000 --- a/test/dotnet-run.Tests/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-350904-49" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/dotnet-test.Tests/dotnet-test.Tests.xproj b/test/dotnet-test.Tests/dotnet-test.Tests.xproj deleted file mode 100644 index 6417b9f10..000000000 --- a/test/dotnet-test.Tests/dotnet-test.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 90236a80-4b84-41d3-a161-aa20709776b1 - Microsoft.DotNet.Cli.Test3.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json deleted file mode 100644 index 7b59006f9..000000000 --- a/test/dotnet-test.Tests/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-330423-54" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.xproj b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.xproj deleted file mode 100644 index 24fd898f5..000000000 --- a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9f5ae280-a040-4160-9799-6504d907742d - Microsoft.DotNet.Cli.VSTest.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/dotnet-vstest.Tests/project.json b/test/dotnet-vstest.Tests/project.json deleted file mode 100644 index c22afc681..000000000 --- a/test/dotnet-vstest.Tests/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-330423-54" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/test/dotnet.Tests/dotnet.Tests.xproj b/test/dotnet.Tests/dotnet.Tests.xproj deleted file mode 100644 index 35608f3d2..000000000 --- a/test/dotnet.Tests/dotnet.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - cb710268-4a82-48e4-9531-faf1c8f78f4b - Microsoft.DotNet.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json deleted file mode 100644 index 8c4ff5dec..000000000 --- a/test/dotnet.Tests/project.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "System.Runtime.Serialization.Primitives": "4.1.1", - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "dotnet": { - "target": "project" - }, - "Microsoft.DotNet.Cli.Utils": { - "target": "project", - "type": "build" - }, - "xunit": "2.2.0-beta3-build3330", - "xunit.netcore.extensions": "1.0.0-prerelease-00206", - "dotnet-test-xunit": "1.0.0-rc2-350904-49", - "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "netstandardapp1.5", - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit", - "publishOptions": { - "include": [ - "../../TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/**/*", - "../../TestAssets/TestProjects/AppWithDirectAndToolDependency/**/*", - "../../TestAssets/TestProjects/AppWithDirectDependency/**/*", - "../../TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/**/*", - "../../TestAssets/TestProjects/AppWithToolDependency/**/*", - "../../TestAssets/TestProjects/DependencyContextFromTool/**/*", - "../../TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/**/*", - "../../TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/**/*" - ] - }, - "buildOptions": { - "keyFile": "../../tools/Key.snk", - "copyToOutput": { - "include": [ - "../../TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/**/*", - "../../TestAssets/TestProjects/AppWithDirectAndToolDependency/**/*", - "../../TestAssets/TestProjects/AppWithDirectDependency/**/*", - "../../TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/**/*", - "../../TestAssets/TestProjects/AppWithToolDependency/**/*", - "../../TestAssets/TestProjects/DependencyContextFromTool/**/*", - "../../TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/**/*", - "../../TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/**/*" - ] - } - } -} diff --git a/test/msbuild.IntegrationTests/project.json b/test/msbuild.IntegrationTests/project.json deleted file mode 100644 index 44f670d53..000000000 --- a/test/msbuild.IntegrationTests/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "Microsoft.DotNet.Tools.Tests.Utilities": { - "target": "project" - }, - "xunit": "2.2.0-beta3-build3330", - "dotnet-test-xunit": "1.0.0-rc2-330423-54" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] - } - }, - "testRunner": "xunit" -} diff --git a/tools/Archiver/project.json b/tools/Archiver/project.json deleted file mode 100644 index d4fee0016..000000000 --- a/tools/Archiver/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "buildOptions": { - "emitEntryPoint": true, - "compile": { - "include": [ - "../../src/dotnet-archive/*.cs", - "../../src/dotnet/CommandLine/*.cs" - ] - } - }, - "dependencies": { - "Microsoft.DotNet.Archive": { - "target": "project" - }, - "Microsoft.NETCore.App": "1.0.1" - }, - "frameworks": { - "netcoreapp1.0": {} - }, - "runtimes": { - "win7-x64": {}, - "win7-x86": {}, - "osx.10.11-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "centos.7-x64": {}, - "rhel.7.2-x64": {}, - "debian.8-x64": {}, - "fedora.23-x64": {}, - "opensuse.13.2-x64": {} - } -} diff --git a/tools/MigrationDefaultsConstructor/project.json b/tools/MigrationDefaultsConstructor/project.json deleted file mode 100755 index 0636579e1..000000000 --- a/tools/MigrationDefaultsConstructor/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - }, - "dotnet": { - "target": "project" - }, - "Microsoft.Build.Runtime": "15.1.0-preview-000370-00" - }, - "imports": ["dnxcore50", "portable-net45+win8"] - } - } -}