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

add *.xproj.user to backup file types

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-11-16 01:10:55 -08:00
parent be61afcfa5
commit d39ee4a463
9 changed files with 66 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -296,3 +296,8 @@ test/PackagedCommands/Consumers/*/project.json
# VS generated files # VS generated files
launchSettings.json launchSettings.json
# user files used in tests
!TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj.user
!TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj.user
!TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj.user

18
TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj Normal file
View file

@ -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>

1
TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj.user Normal file
View file

@ -0,0 +1 @@
Ok, it's true. Didn't have an xproj user file handy and needed the file to exist so a test can show it gets moved to backup.

18
TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj Normal file
View file

@ -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>

1
TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj.user Normal file
View file

@ -0,0 +1 @@
Ok, it's true. Didn't have an xproj user file handy and needed the file to exist so a test can show it gets moved to backup.

18
TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj Normal file
View file

@ -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>

1
TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj.user Normal file
View file

@ -0,0 +1 @@
Ok, it's true. Didn't have an xproj user file handy and needed the file to exist so a test can show it gets moved to backup.

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

@ -149,7 +149,8 @@ namespace Microsoft.DotNet.Tools.Migrate
var movableFiles = new DirectoryInfo(projectDirectory) var movableFiles = new DirectoryInfo(projectDirectory)
.EnumerateFiles() .EnumerateFiles()
.Where(f => f.Name == Project.FileName || f.Extension == ".xproj"); .Where(f => f.Name == Project.FileName || f.Extension == ".xproj" ||
f.FullName.EndsWith(".xproj.user"));
foreach (var movableFile in movableFiles) 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 catalog = new Dictionary<string, string>();
var patterns = new [] { "global.json", "project.json", "*.xproj" }; var patterns = new [] { "global.json", "project.json", "*.xproj", "*.xproj.user" };
foreach (var pattern in patterns) foreach (var pattern in patterns)
{ {