mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #4829 from jeffkl/4753

Browse source 
Move project.lock.json during migration
This commit is contained in:
Livar 2016-11-23 14:02:35 -08:00 committed by GitHub
commit 923320b66b
5 changed files with 67352 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31880
TestAssets/TestProjects/PJTestAppSimple/project.lock.json Normal file
View file

File diff suppressed because it is too large Load diff

32042
TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.lock.json Normal file
View file

File diff suppressed because it is too large Load diff

3425
TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.lock.json Normal file
View file

File diff suppressed because it is too large Load diff

6
src/dotnet/commands/dotnet-migrate/MigrateCommand.cs
View file

@ -149,8 +149,10 @@ namespace Microsoft.DotNet.Tools.Migrate
var movableFiles = new DirectoryInfo(projectDirectory)
.EnumerateFiles()
.Where(f => f.Name == Project.FileName || f.Extension == ".xproj" ||
f.FullName.EndsWith(".xproj.user"));
.Where(f => f.Name == Project.FileName
|| f.Extension == ".xproj"
|| f.FullName.EndsWith(".xproj.user")
|| f.FullName.EndsWith(".lock.json"));
foreach (var movableFile in movableFiles)
{

2
test/dotnet-migrate.Tests/GivenThatAnAppWasMigrated.cs
View file

@ -84,7 +84,7 @@ namespace Microsoft.DotNet.Migration.Tests
{
var catalog = new Dictionary<string, string>();
var patterns = new [] { "global.json", "project.json", "*.xproj", "*.xproj.user" };
var patterns = new [] { "global.json", "project.json", "project.lock.json", "*.xproj", "*.xproj.user" };
foreach (var pattern in patterns)
{