Merge remote-tracking branch 'github/rel/1.0.0-rc3' into rel/1.0.0
This commit is contained in:
commit
1a20d7f82c
22 changed files with 326 additions and 23 deletions
|
@ -0,0 +1,16 @@
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace TestApp
|
||||||
|
{
|
||||||
|
public class Program
|
||||||
|
{
|
||||||
|
public static int Main(string[] args)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Hello world");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,23 @@
|
||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio 14
|
||||||
|
VisualStudioVersion = 14.0.25420.1
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestApp", "TestApp.xproj", "{0138CB8F-4AA9-4029-A21E-C07C30F425BA}"
|
||||||
|
EndProject
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
|
@ -0,0 +1,18 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="14.0.23107" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.23107</VisualStudioVersion>
|
||||||
|
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>0138cb8f-4aa9-4029-a21e-c07c30f425ba</ProjectGuid>
|
||||||
|
<RootNamespace>TestAppWithContents</RootNamespace>
|
||||||
|
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
||||||
|
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
|
||||||
|
</Project>
|
|
@ -0,0 +1,26 @@
|
||||||
|
{
|
||||||
|
"version": "1.0.0-*",
|
||||||
|
"buildOptions": {
|
||||||
|
"emitEntryPoint": true,
|
||||||
|
"preserveCompilationContext": true
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"Microsoft.NETCore.App": "1.0.1"
|
||||||
|
},
|
||||||
|
"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": {}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace TestApp
|
||||||
|
{
|
||||||
|
public class Program
|
||||||
|
{
|
||||||
|
public static int Main(string[] args)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Hello world");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,23 @@
|
||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio 15 Custom
|
||||||
|
VisualStudioVersion = 15.9.12345.4
|
||||||
|
MinimumVisualStudioVersion = 10.9.1234.5
|
||||||
|
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestApp", "TestApp.xproj", "{0138CB8F-4AA9-4029-A21E-C07C30F425BA}"
|
||||||
|
EndProject
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
|
@ -0,0 +1,18 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="14.0.23107" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.23107</VisualStudioVersion>
|
||||||
|
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>0138cb8f-4aa9-4029-a21e-c07c30f425ba</ProjectGuid>
|
||||||
|
<RootNamespace>TestAppWithContents</RootNamespace>
|
||||||
|
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
||||||
|
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
|
||||||
|
</Project>
|
|
@ -0,0 +1,26 @@
|
||||||
|
{
|
||||||
|
"version": "1.0.0-*",
|
||||||
|
"buildOptions": {
|
||||||
|
"emitEntryPoint": true,
|
||||||
|
"preserveCompilationContext": true
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"Microsoft.NETCore.App": "1.0.1"
|
||||||
|
},
|
||||||
|
"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": {}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
// 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.
|
||||||
|
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace TestApp
|
||||||
|
{
|
||||||
|
public class Program
|
||||||
|
{
|
||||||
|
public static int Main(string[] args)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Hello world");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,23 @@
|
||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio 16
|
||||||
|
VisualStudioVersion = 14.0.unknown.1
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestApp", "TestApp.xproj", "{0138CB8F-4AA9-4029-A21E-C07C30F425BA}"
|
||||||
|
EndProject
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{0138CB8F-4AA9-4029-A21E-C07C30F425BA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
|
@ -0,0 +1,18 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="14.0.23107" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.23107</VisualStudioVersion>
|
||||||
|
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>0138cb8f-4aa9-4029-a21e-c07c30f425ba</ProjectGuid>
|
||||||
|
<RootNamespace>TestAppWithContents</RootNamespace>
|
||||||
|
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
||||||
|
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
|
||||||
|
</Project>
|
|
@ -0,0 +1,26 @@
|
||||||
|
{
|
||||||
|
"version": "1.0.0-*",
|
||||||
|
"buildOptions": {
|
||||||
|
"emitEntryPoint": true,
|
||||||
|
"preserveCompilationContext": true
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"Microsoft.NETCore.App": "1.0.1"
|
||||||
|
},
|
||||||
|
"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": {}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,11 +1,11 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<CLI_MSBuild_Version>15.1.0-preview-000522-02</CLI_MSBuild_Version>
|
<CLI_MSBuild_Version>15.1.0-preview-000523-01</CLI_MSBuild_Version>
|
||||||
<CLI_Roslyn_Version>2.0.0-rc3-61212-03</CLI_Roslyn_Version>
|
<CLI_Roslyn_Version>2.0.0-rc3-61212-03</CLI_Roslyn_Version>
|
||||||
<CLI_NETSDK_Version>1.0.0-alpha-20170111-1</CLI_NETSDK_Version>
|
<CLI_NETSDK_Version>1.0.0-alpha-20170117-4</CLI_NETSDK_Version>
|
||||||
<CLI_NuGet_Version>4.0.0-rc3</CLI_NuGet_Version>
|
<CLI_NuGet_Version>4.0.0-rc3</CLI_NuGet_Version>
|
||||||
<CLI_WEBSDK_Version>1.0.0-alpha-20170106-1-203</CLI_WEBSDK_Version>
|
<CLI_WEBSDK_Version>1.0.0-alpha-20170114-1-223</CLI_WEBSDK_Version>
|
||||||
<CLI_TestPlatform_Version>15.0.0-preview-20170106-08</CLI_TestPlatform_Version>
|
<CLI_TestPlatform_Version>15.0.0-preview-20170106-08</CLI_TestPlatform_Version>
|
||||||
<TemplateEngineVersion>1.0.0-beta1-20170108-83</TemplateEngineVersion>
|
<TemplateEngineVersion>1.0.0-beta1-20170108-83</TemplateEngineVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -10,8 +10,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration
|
||||||
public const string AspNetLTSPackagesVersion = "1.0.2";
|
public const string AspNetLTSPackagesVersion = "1.0.2";
|
||||||
public const string EntityFrameworkLTSPackagesVersion = "1.0.2";
|
public const string EntityFrameworkLTSPackagesVersion = "1.0.2";
|
||||||
public const string TestSdkPackageVersion = "15.0.0-preview-20170106-08";
|
public const string TestSdkPackageVersion = "15.0.0-preview-20170106-08";
|
||||||
public const string XUnitPackageVersion = "2.2.0-beta4-build3444";
|
public const string XUnitPackageVersion = "2.2.0-beta5-build3474";
|
||||||
public const string XUnitRunnerPackageVersion = "2.2.0-beta4-build1194";
|
public const string XUnitRunnerPackageVersion = "2.2.0-beta5-build1225";
|
||||||
public const string MstestTestAdapterVersion = "1.1.8-rc";
|
public const string MstestTestAdapterVersion = "1.1.8-rc";
|
||||||
public const string MstestTestFrameworkVersion = "1.0.8-rc";
|
public const string MstestTestFrameworkVersion = "1.0.8-rc";
|
||||||
public const string BundleMinifierToolVersion = "2.2.301";
|
public const string BundleMinifierToolVersion = "2.2.301";
|
||||||
|
|
|
@ -14,8 +14,9 @@ namespace Microsoft.DotNet.ProjectJsonMigration
|
||||||
{
|
{
|
||||||
public static string GetProjectName(this ProjectContext projectContext)
|
public static string GetProjectName(this ProjectContext projectContext)
|
||||||
{
|
{
|
||||||
// _ here is just an arbitrary configuration value so we can obtain the output name
|
var projectDirectory = projectContext.ProjectDirectory;
|
||||||
return Path.GetFileNameWithoutExtension(projectContext.GetOutputPaths("_").CompilationFiles.Assembly);
|
|
||||||
|
return Path.GetFileName(projectDirectory);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool HasRuntimes(this IEnumerable<ProjectContext> projectContexts)
|
public static bool HasRuntimes(this IEnumerable<ProjectContext> projectContexts)
|
||||||
|
|
|
@ -38,12 +38,20 @@ namespace Microsoft.DotNet.ProjectJsonMigration
|
||||||
// Try to read the project dependencies, ignore an unresolved exception for now
|
// Try to read the project dependencies, ignore an unresolved exception for now
|
||||||
MigrationRuleInputs rootInputs = ComputeMigrationRuleInputs(rootSettings);
|
MigrationRuleInputs rootInputs = ComputeMigrationRuleInputs(rootSettings);
|
||||||
IEnumerable<ProjectDependency> projectDependencies = null;
|
IEnumerable<ProjectDependency> projectDependencies = null;
|
||||||
|
var projectMigrationReports = new List<ProjectMigrationReport>();
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Verify up front so we can prefer these errors over an unresolved project dependency
|
// Verify up front so we can prefer these errors over an unresolved project dependency
|
||||||
VerifyInputs(rootInputs, rootSettings);
|
VerifyInputs(rootInputs, rootSettings);
|
||||||
|
|
||||||
|
projectMigrationReports.Add(MigrateProject(rootSettings));
|
||||||
|
|
||||||
|
if (skipProjectReferences)
|
||||||
|
{
|
||||||
|
return new MigrationReport(projectMigrationReports);
|
||||||
|
}
|
||||||
|
|
||||||
projectDependencies = ResolveTransitiveClosureProjectDependencies(
|
projectDependencies = ResolveTransitiveClosureProjectDependencies(
|
||||||
rootSettings.ProjectDirectory,
|
rootSettings.ProjectDirectory,
|
||||||
rootSettings.ProjectXProjFilePath,
|
rootSettings.ProjectXProjFilePath,
|
||||||
|
@ -62,14 +70,6 @@ namespace Microsoft.DotNet.ProjectJsonMigration
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
var projectMigrationReports = new List<ProjectMigrationReport>();
|
|
||||||
projectMigrationReports.Add(MigrateProject(rootSettings));
|
|
||||||
|
|
||||||
if (skipProjectReferences)
|
|
||||||
{
|
|
||||||
return new MigrationReport(projectMigrationReports);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach(var project in projectDependencies)
|
foreach(var project in projectDependencies)
|
||||||
{
|
{
|
||||||
var projectDir = Path.GetDirectoryName(project.ProjectFilePath);
|
var projectDir = Path.GetDirectoryName(project.ProjectFilePath);
|
||||||
|
|
|
@ -20,6 +20,10 @@ namespace Microsoft.DotNet.Tools.Migrate
|
||||||
{
|
{
|
||||||
public partial class MigrateCommand
|
public partial class MigrateCommand
|
||||||
{
|
{
|
||||||
|
private const string ProductDescription = "Visual Studio 15";
|
||||||
|
private const string VisualStudioVersion = "15.0.26114.2";
|
||||||
|
private const string MinimumVisualStudioVersion = "10.0.40219.1";
|
||||||
|
|
||||||
private SlnFile _slnFile;
|
private SlnFile _slnFile;
|
||||||
private readonly DirectoryInfo _workspaceDirectory;
|
private readonly DirectoryInfo _workspaceDirectory;
|
||||||
private readonly string _templateFile;
|
private readonly string _templateFile;
|
||||||
|
@ -141,6 +145,14 @@ namespace Microsoft.DotNet.Tools.Migrate
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Version version;
|
||||||
|
if (!Version.TryParse(_slnFile.VisualStudioVersion, out version) || version.Major < 15)
|
||||||
|
{
|
||||||
|
_slnFile.ProductDescription = ProductDescription;
|
||||||
|
_slnFile.VisualStudioVersion = VisualStudioVersion;
|
||||||
|
_slnFile.MinimumVisualStudioVersion = MinimumVisualStudioVersion;
|
||||||
|
}
|
||||||
|
|
||||||
_slnFile.Write();
|
_slnFile.Write();
|
||||||
|
|
||||||
foreach (var csprojFile in csprojFilesToAdd)
|
foreach (var csprojFile in csprojFilesToAdd)
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
|
||||||
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
|
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -15,8 +15,8 @@
|
||||||
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-beta-*" PrivateAssets="All" />
|
<PackageReference Include="FSharp.NET.Sdk" Version="1.0.0-beta-*" PrivateAssets="All" />
|
||||||
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
|
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
|
||||||
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
|
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -309,13 +309,13 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
|
||||||
mockProj.Items.Should().ContainSingle(
|
mockProj.Items.Should().ContainSingle(
|
||||||
i => (i.Include == "xunit" &&
|
i => (i.Include == "xunit" &&
|
||||||
i.ItemType == "PackageReference" &&
|
i.ItemType == "PackageReference" &&
|
||||||
i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build3444" &&
|
i.GetMetadataWithName("Version").Value == "2.2.0-beta5-build3474" &&
|
||||||
i.GetMetadataWithName("Version").ExpressedAsAttribute));
|
i.GetMetadataWithName("Version").ExpressedAsAttribute));
|
||||||
|
|
||||||
mockProj.Items.Should().ContainSingle(
|
mockProj.Items.Should().ContainSingle(
|
||||||
i => (i.Include == "xunit.runner.visualstudio" &&
|
i => (i.Include == "xunit.runner.visualstudio" &&
|
||||||
i.ItemType == "PackageReference" &&
|
i.ItemType == "PackageReference" &&
|
||||||
i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build1194" &&
|
i.GetMetadataWithName("Version").Value == "2.2.0-beta5-build1225" &&
|
||||||
i.GetMetadataWithName("Version").ExpressedAsAttribute));
|
i.GetMetadataWithName("Version").ExpressedAsAttribute));
|
||||||
|
|
||||||
mockProj.Items.Should().NotContain(
|
mockProj.Items.Should().NotContain(
|
||||||
|
@ -351,13 +351,13 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
|
||||||
mockProj.Items.Should().ContainSingle(
|
mockProj.Items.Should().ContainSingle(
|
||||||
i => (i.Include == "xunit" &&
|
i => (i.Include == "xunit" &&
|
||||||
i.ItemType == "PackageReference" &&
|
i.ItemType == "PackageReference" &&
|
||||||
i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build3444" &&
|
i.GetMetadataWithName("Version").Value == "2.2.0-beta5-build3474" &&
|
||||||
i.GetMetadataWithName("Version").ExpressedAsAttribute));
|
i.GetMetadataWithName("Version").ExpressedAsAttribute));
|
||||||
|
|
||||||
mockProj.Items.Should().ContainSingle(
|
mockProj.Items.Should().ContainSingle(
|
||||||
i => (i.Include == "xunit.runner.visualstudio" &&
|
i => (i.Include == "xunit.runner.visualstudio" &&
|
||||||
i.ItemType == "PackageReference" &&
|
i.ItemType == "PackageReference" &&
|
||||||
i.GetMetadataWithName("Version").Value == "2.2.0-beta4-build1194" &&
|
i.GetMetadataWithName("Version").Value == "2.2.0-beta5-build1225" &&
|
||||||
i.GetMetadataWithName("Version").ExpressedAsAttribute));
|
i.GetMetadataWithName("Version").ExpressedAsAttribute));
|
||||||
|
|
||||||
mockProj.Items.Should().NotContain(
|
mockProj.Items.Should().NotContain(
|
||||||
|
|
|
@ -14,6 +14,35 @@ namespace Microsoft.DotNet.Migration.Tests
|
||||||
{
|
{
|
||||||
public class GivenThatIWantToMigrateSolutions : TestBase
|
public class GivenThatIWantToMigrateSolutions : TestBase
|
||||||
{
|
{
|
||||||
|
[Theory]
|
||||||
|
[InlineData("PJAppWithSlnVersion14", "Visual Studio 15", "15.0.26114.2", "10.0.40219.1")]
|
||||||
|
[InlineData("PJAppWithSlnVersion15", "Visual Studio 15 Custom", "15.9.12345.4", "10.9.1234.5")]
|
||||||
|
[InlineData("PJAppWithSlnVersionUnknown", "Visual Studio 15", "15.0.26114.2", "10.0.40219.1")]
|
||||||
|
public void ItMigratesSlnAndEnsuresAtLeastVS15(
|
||||||
|
string projectName,
|
||||||
|
string productDescription,
|
||||||
|
string visualStudioVersion,
|
||||||
|
string minVisualStudioVersion)
|
||||||
|
{
|
||||||
|
var projectDirectory = TestAssets
|
||||||
|
.Get("NonRestoredTestProjects", projectName)
|
||||||
|
.CreateInstance()
|
||||||
|
.WithSourceFiles()
|
||||||
|
.Root;
|
||||||
|
|
||||||
|
var solutionRelPath = "TestApp.sln";
|
||||||
|
|
||||||
|
new DotnetCommand()
|
||||||
|
.WithWorkingDirectory(projectDirectory)
|
||||||
|
.Execute($"migrate \"{solutionRelPath}\"")
|
||||||
|
.Should().Pass();
|
||||||
|
|
||||||
|
SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath));
|
||||||
|
slnFile.ProductDescription.Should().Be(productDescription);
|
||||||
|
slnFile.VisualStudioVersion.Should().Be(visualStudioVersion);
|
||||||
|
slnFile.MinimumVisualStudioVersion.Should().Be(minVisualStudioVersion);
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void ItMigratesAndBuildsSln()
|
public void ItMigratesAndBuildsSln()
|
||||||
{
|
{
|
||||||
|
|
|
@ -177,6 +177,18 @@ namespace Microsoft.DotNet.Migration.Tests
|
||||||
i => i.Include == "EntityFramework" && i.ItemType == "PackageReference")
|
i => i.Include == "EntityFramework" && i.ItemType == "PackageReference")
|
||||||
.Should().HaveCount(2);
|
.Should().HaveCount(2);
|
||||||
}
|
}
|
||||||
|
[Fact]
|
||||||
|
public void ItMigratesAProjectThatDependsOnAMigratedProjectWithTheSkipProjectReferenceFlag()
|
||||||
|
{
|
||||||
|
const string dependentProject = "ProjectA";
|
||||||
|
const string dependencyProject = "ProjectB";
|
||||||
|
|
||||||
|
var projectDirectory = TestAssetsManager.CreateTestInstance("TestAppDependencyGraph").Path;
|
||||||
|
|
||||||
|
MigrateProject(Path.Combine(projectDirectory, dependencyProject));
|
||||||
|
|
||||||
|
MigrateProject("--skip-project-references", Path.Combine(projectDirectory, dependentProject));
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void ItAddsMicrosoftNetWebSdkToTheSdkAttributeOfAWebApp()
|
public void ItAddsMicrosoftNetWebSdkToTheSdkAttributeOfAWebApp()
|
||||||
|
|
Loading…
Reference in a new issue