diff --git a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/.noautobuild b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/.noautobuild new file mode 100644 index 000000000..e69de29bb diff --git a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs new file mode 100644 index 000000000..bb536dcc4 --- /dev/null +++ b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs @@ -0,0 +1,17 @@ +using System; +using System.Xml; + +namespace ConsoleApplication +{ + public class Program + { + public static void Main() + { + Console.WriteLine("Hello World!"); +#if NET20 || NET35 || NET45 || NET461 + // Force XmlDocument to be used + var doc = new XmlDocument(); +#endif + } + } +} diff --git a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/project.json new file mode 100644 index 000000000..048f15513 --- /dev/null +++ b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/project.json @@ -0,0 +1,20 @@ +{ + "version": "1.0.0-*", + "buildOptions": { + "emitEntryPoint": false + }, + "dependencies": {}, + "frameworks": { + "net461": { + "frameworkAssemblies": { + "System.Xml": {} + } + }, + "netstandard1.5": { + "imports": "dnxcore50", + "dependencies": { + "NETStandard.Library": "1.6.0" + } + } + } +} diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs index f88ba5f55..4fa8d93e3 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs @@ -19,8 +19,6 @@ namespace Microsoft.DotNet.Migration.Tests public class GivenThatIWantToMigrateTestApps : TestBase { [Theory] - // TODO: Standalone apps [InlineData("TestAppSimple", false)] - // https://github.com/dotnet/sdk/issues/73 [InlineData("TestAppWithLibrary/TestApp", false)] [InlineData("TestAppWithRuntimeOptions")] [InlineData("TestAppWithContents")] public void It_migrates_apps(string projectName) @@ -123,7 +121,7 @@ namespace Microsoft.DotNet.Migration.Tests } [Theory] - [InlineData("TestLibraryWithMultipleFrameworks")] + [InlineData("TestLibraryWithTwoFrameworks")] public void It_migrates_projects_with_multiple_TFMs(string projectName) { var projectDirectory =