diff --git a/README.md b/README.md index f426ff043..8b62f921f 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ This project has adopted the code of conduct defined by the [Contributor Covenan Build Status ------------ -|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |macOS |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | Linux x64 | +|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8 |Windows x64 |Windows x86 |macOS |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | Linux x64 | |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][debian-8.2-build-badge]][debian-8.2-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][linux-build-badge]][linux-build]| +|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][debian-8-build-badge]][debian-8-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][linux-build-badge]][linux-build]| [win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5449/badge [win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5449 @@ -39,8 +39,8 @@ Build Status [ubuntu-16.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5448/badge [ubuntu-16.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5448 -[debian-8.2-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5442/badge -[debian-8.2-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5442 +[debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5442/badge +[debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5442 [osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5445/badge [osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5445 @@ -70,7 +70,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | | **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
[tar.gz][ubuntu-14.04-targz] - [Checksum][ubuntu-14.04-targz-checksum] | | **Ubuntu 16.04** | [tar.gz][ubuntu-16.04-targz] - [Checksum][ubuntu-16.04-targz-checksum] | -| **Debian 8.2** | [tar.gz][debian-8.2-targz] - [Checksum][debian-8.2-targz-checksum] | +| **Debian 8** | [tar.gz][debian-8-targz] - [Checksum][debian-8-targz-checksum] | | **macOS** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | | **CentOS 7.1 / Oracle Linux 7** | [tar.gz][centos-targz] - [Checksum][centos-targz-checksum] | | **RHEL 7.2** | [tar.gz][rhel-targz] - [Checksum][rhel-targz-checksum] | @@ -100,8 +100,8 @@ In order to download just the .NET Core runtime without the SDK, please visit ht [ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz [ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha -[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz -[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz.sha +[debian-8-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz +[debian-8-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-debian-x64.latest.tar.gz.sha [osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.pkg [osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-osx-x64.latest.pkg.sha diff --git a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/.noautobuild b/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/Program.cs b/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/Program.cs deleted file mode 100644 index 1bf340523..000000000 --- a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/Program.cs +++ /dev/null @@ -1,24 +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. - -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using Microsoft.CSharp.RuntimeBinder; - -namespace AutoAddDesktopReferencesDuringMigrate -{ - class Program - { - static void Main(string[] args) - { - var mscorlibRef = new List(new int[] { 4, 5, 6 }); - var systemCoreRef = mscorlibRef.ToArray().Average(); - Debug.Assert(systemCoreRef == 5, "Test System assembly reference"); - if (systemCoreRef != 5) - { - throw new RuntimeBinderException("Test Microsoft.CSharp assembly reference"); - } - } - } -} diff --git a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json b/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json deleted file mode 100644 index 5ef29e5bf..000000000 --- a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "frameworks": { - "net451": {} - }, - "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/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/Program.cs deleted file mode 100644 index 7937a9ba0..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/Program.cs +++ /dev/null @@ -1,16 +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. - -using System; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine(TestLibrary.Helper.GetMessage()); - return 0; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/TestApp.sln deleted file mode 100644 index 0935de81a..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/TestApp.sln +++ /dev/null @@ -1,25 +0,0 @@ - -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 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestLibrary", "..\TestLibrary\TestLibrary.csproj", "{DC0B35D0-8A36-4B52-8A11-B86739F055D2}" -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 - {DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/TestApp.xproj deleted file mode 100644 index d18702195..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/TestApp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json deleted file mode 100644 index 060460e39..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "TestLibrary": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": "1.1.1" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/Helper.cs deleted file mode 100644 index 6c3bc0e53..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class Helper - { - public static string GetMessage() - { - return "This string came from the test library!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/TestLibrary.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/TestLibrary.csproj deleted file mode 100644 index 2debc348d..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/TestLibrary.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard1.5 - TestLibrary - TestLibrary - - - - - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/TestLibrary.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/TestLibrary.xproj deleted file mode 100644 index dc8eb7060..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/TestLibrary.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - dc0b35d0-8a36-4b52-8a11-b86739f055d2 - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/project.json deleted file mode 100644 index 032754312..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestLibrary/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/NoSolutionItemsAfterMigration.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/NoSolutionItemsAfterMigration.sln deleted file mode 100644 index da0ae5935..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/NoSolutionItemsAfterMigration.sln +++ /dev/null @@ -1,39 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26006.2 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.xproj", "{D65E5A1F-719F-4F95-8835-88BDD67AD457}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FAACC4BE-31AE-4EB7-A4C8-5BB4617EB4AF}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|x64.ActiveCfg = Debug|x64 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|x64.Build.0 = Debug|x64 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|x86.ActiveCfg = Debug|x86 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|x86.Build.0 = Debug|x86 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|Any CPU.Build.0 = Release|Any CPU - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|x64.ActiveCfg = Release|x64 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|x64.Build.0 = Release|x64 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|x86.ActiveCfg = Release|x86 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/ReadmeSolutionItemAfterMigration.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/ReadmeSolutionItemAfterMigration.sln deleted file mode 100644 index 05aecb75d..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/ReadmeSolutionItemAfterMigration.sln +++ /dev/null @@ -1,40 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26006.2 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "TestApp\TestApp.xproj", "{D65E5A1F-719F-4F95-8835-88BDD67AD457}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FAACC4BE-31AE-4EB7-A4C8-5BB4617EB4AF}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - readme.txt = readme.txt - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|x64.ActiveCfg = Debug|x64 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|x64.Build.0 = Debug|x64 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|x86.ActiveCfg = Debug|x86 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Debug|x86.Build.0 = Debug|x86 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|Any CPU.Build.0 = Release|Any CPU - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|x64.ActiveCfg = Release|x64 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|x64.Build.0 = Release|x64 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|x86.ActiveCfg = Release|x86 - {D65E5A1F-719F-4F95-8835-88BDD67AD457}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/Program.cs deleted file mode 100644 index 2289ac741..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("Hello World!"); - return 0; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/TestApp.xproj deleted file mode 100644 index d18702195..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/TestApp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json deleted file mode 100644 index a42ae0bb0..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "Microsoft.NETCore.App": "1.1.1" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/global.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/global.json deleted file mode 100644 index 22936715c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": [ "." ] -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/readme.txt b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/readme.txt deleted file mode 100644 index 6e3eb33f4..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/readme.txt +++ /dev/null @@ -1 +0,0 @@ -This is just for our test to verify that we do not remove the readme.txt link from the solution. diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj deleted file mode 100644 index 2f78a7e02..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Existing.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard1.4 - - - - - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Program.cs deleted file mode 100644 index fa982665c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/Program.cs +++ /dev/null @@ -1,18 +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. - -using System; -using System.Diagnostics; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine(TestLibrary.Helper.GetMessage()); - Console.WriteLine(subdir.Helper.GetMessage()); - return 100; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.sln deleted file mode 100644 index 3dc27a305..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.sln +++ /dev/null @@ -1,34 +0,0 @@ - -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 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestLibrary", "..\TestLibrary\TestLibrary.xproj", "{DC0B35D0-8A36-4B52-8A11-B86739F055D2}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "subdir", "src\subdir\subdir.xproj", "{F8F96F4A-F10C-4C54-867C-A9EFF55494C8}" -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 - {DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC0B35D0-8A36-4B52-8A11-B86739F055D2}.Release|Any CPU.Build.0 = Release|Any CPU - {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8F96F4A-F10C-4C54-867C-A9EFF55494C8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.xproj deleted file mode 100644 index d18702195..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/TestApp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json deleted file mode 100644 index 788896dab..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "TestLibrary": { - "target": "project", - "version": "1.0.0-*" - }, - "subdir": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": "1.1.1" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/src/subdir/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/src/subdir/Helper.cs deleted file mode 100644 index 2d937c387..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/src/subdir/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace subdir -{ - public static class Helper - { - public static string GetMessage() - { - return "This string came from the subdir test library!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/src/subdir/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/src/subdir/project.json deleted file mode 100644 index bdf53dd6e..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/src/subdir/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "additionalArguments": [ - "-highentropyva+" - ] - },"dependencies": { - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/src/subdir/subdir.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/src/subdir/subdir.xproj deleted file mode 100644 index 8f183ae93..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/src/subdir/subdir.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - F8F96F4A-F10C-4C54-867C-A9EFF55494C8 - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/Helper.cs deleted file mode 100644 index 6c3bc0e53..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class Helper - { - public static string GetMessage() - { - return "This string came from the test library!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/TestLibrary.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/TestLibrary.xproj deleted file mode 100644 index dc8eb7060..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/TestLibrary.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - dc0b35d0-8a36-4b52-8a11-b86739f055d2 - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/project.json deleted file mode 100644 index 032754312..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestLibrary/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs deleted file mode 100644 index 3263737e1..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs +++ /dev/null @@ -1,20 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace TestApp -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello from main"); - Console.WriteLine(TestLibrary.Lib.GetMessage()); - Console.WriteLine(subdir.Helper.GetMessage()); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln deleted file mode 100644 index 8f43e30de..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln +++ /dev/null @@ -1,28 +0,0 @@ - -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", "{411BC0C0-497A-45C2-B6F7-0B428A6A9AEF}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestLibrary", "..\TestLibrary\TestLibrary.xproj", "{B2E306B6-B490-46AC-A421-AA3B7D38EDF0}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {411BC0C0-497A-45C2-B6F7-0B428A6A9AEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {411BC0C0-497A-45C2-B6F7-0B428A6A9AEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {411BC0C0-497A-45C2-B6F7-0B428A6A9AEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {411BC0C0-497A-45C2-B6F7-0B428A6A9AEF}.Release|Any CPU.Build.0 = Release|Any CPU - {B2E306B6-B490-46AC-A421-AA3B7D38EDF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B2E306B6-B490-46AC-A421-AA3B7D38EDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B2E306B6-B490-46AC-A421-AA3B7D38EDF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B2E306B6-B490-46AC-A421-AA3B7D38EDF0}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj deleted file mode 100644 index 4f40e62b2..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestApp - .\obj - .\bin\ - v4.5.2 - - - - - - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json deleted file mode 100644 index ade45a814..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.1" - }, - "TestLibrary": { - "target": "project", - "version": "1.0.0-*" - }, - "subdir": { - "target": "project", - "version": "1.0.0-*" - } - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs deleted file mode 100644 index 2d937c387..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace subdir -{ - public static class Helper - { - public static string GetMessage() - { - return "This string came from the subdir test library!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj deleted file mode 100644 index fd3e68501..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard1.5 - $(NoWarn);CS1591 - subdir - subdir - F8F96F4A-F10C-4C54-867C-A9EFF55494C8 - - - - - - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs deleted file mode 100644 index 46ad7bb9d..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs +++ /dev/null @@ -1,18 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace TestLibrary -{ - public static class Lib - { - public static string GetMessage() - { - return "Hello from TestLibrary.Lib"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj deleted file mode 100644 index b5cb449ca..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - dc0b35d0-8a36-4b52-8a11-b86739f055d2 - TestLibrary - .\obj - .\bin\ - v4.5.2 - - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json deleted file mode 100644 index 864b9a5f3..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/Program.cs deleted file mode 100644 index e901ebc5c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/Program.cs +++ /dev/null @@ -1,16 +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. - -using System; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("Hello world"); - return 0; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/TestApp.sln deleted file mode 100644 index 3adf30d78..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/TestApp.sln +++ /dev/null @@ -1,23 +0,0 @@ - -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 diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/TestApp.xproj deleted file mode 100644 index d18702195..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/TestApp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json deleted file mode 100644 index a42ae0bb0..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "Microsoft.NETCore.App": "1.1.1" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/Program.cs deleted file mode 100644 index e901ebc5c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/Program.cs +++ /dev/null @@ -1,16 +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. - -using System; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("Hello world"); - return 0; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/TestApp.sln deleted file mode 100644 index 88284045d..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/TestApp.sln +++ /dev/null @@ -1,23 +0,0 @@ - -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 diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/TestApp.xproj deleted file mode 100644 index d18702195..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/TestApp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json deleted file mode 100644 index a42ae0bb0..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "Microsoft.NETCore.App": "1.1.1" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/Program.cs deleted file mode 100644 index e901ebc5c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/Program.cs +++ /dev/null @@ -1,16 +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. - -using System; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("Hello world"); - return 0; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/TestApp.sln deleted file mode 100644 index 60722b8f3..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/TestApp.sln +++ /dev/null @@ -1,23 +0,0 @@ - -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 diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/TestApp.xproj deleted file mode 100644 index d18702195..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/TestApp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json deleted file mode 100644 index a42ae0bb0..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "Microsoft.NETCore.App": "1.1.1" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/FolderHasDifferentName.sln b/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/FolderHasDifferentName.sln deleted file mode 100644 index 5fe171b9d..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/FolderHasDifferentName.sln +++ /dev/null @@ -1,22 +0,0 @@ - -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}") = "FolderHasDifferentName", "FolderHasDifferentName.xproj", "{0138CB8F-4AA9-4029-A21E-C07C30F425BA}" -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 diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/FolderHasDifferentName.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/FolderHasDifferentName.xproj deleted file mode 100644 index d18702195..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/FolderHasDifferentName.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/Program.cs deleted file mode 100644 index f6b060a91..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/Program.cs +++ /dev/null @@ -1,16 +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. - -using System; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("Hello World"); - return 0; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/project.json deleted file mode 100644 index 166d41c2b..000000000 --- a/TestAssets/NonRestoredTestProjects/PJAppWithXprojNameDifferentThanDirName/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "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": {} - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/Program.cs deleted file mode 100644 index 2130cd0a7..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json deleted file mode 100644 index 48cc4461c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "compilerName": "csc", - "compilationOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper1.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper1.cs deleted file mode 100644 index cead047c5..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper1.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class Helper1 - { - public static string GetMessage() - { - return "Hello from Helper1 class!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper2.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper2.cs deleted file mode 100644 index 15f4cd39a..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper2.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class Helper2 - { - public static string GetMessage() - { - return "Hello from Helper2 class!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/IncludeThis.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/IncludeThis.cs deleted file mode 100644 index 74b1d71d1..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/IncludeThis.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class IncludeThis - { - public static string GetMessage() - { - return "Hello from IncludeThis class!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/Program.cs deleted file mode 100644 index e3e9eebc3..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/Program.cs +++ /dev/null @@ -1,17 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine(IncludeThis.GetMessage()); - Console.WriteLine(Helper1.GetMessage()); - Console.WriteLine(Helper2.GetMessage()); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json deleted file mode 100644 index abe2d6127..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "compile": "../Helper1.cs", - "compileFiles": "../Helper2.cs", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn1.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn1.cs deleted file mode 100644 index 99421a7a7..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn1.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class HelperBuiltIn1 - { - public static string GetMessage() - { - return "Hello from HelperBuiltIn1 class!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn2.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn2.cs deleted file mode 100644 index d80d2f47d..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn2.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class HelperBuiltIn2 - { - public static string GetMessage() - { - return "Hello from HelperBuiltIn2 class!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/IncludeThis.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/IncludeThis.cs deleted file mode 100644 index 74b1d71d1..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/IncludeThis.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class IncludeThis - { - public static string GetMessage() - { - return "Hello from IncludeThis class!"; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/Program.cs deleted file mode 100644 index ab14e18ba..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/Program.cs +++ /dev/null @@ -1,17 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine(IncludeThis.GetMessage()); - Console.WriteLine(HelperBuiltIn1.GetMessage()); - Console.WriteLine(HelperBuiltIn2.GetMessage()); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json deleted file mode 100644 index ce76b170c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "compileBuiltIn": [ "Program.cs", "IncludeThis.cs", "../HelperBuiltIn1.cs", "../HelperBuiltIn2.cs" ], - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis1.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis1.cs deleted file mode 100644 index b4c0e60fb..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis1.cs +++ /dev/null @@ -1,4 +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. - -This does not compile but is used to test compile exclusion. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis2.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis2.cs deleted file mode 100644 index b4c0e60fb..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis2.cs +++ /dev/null @@ -1,4 +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. - -This does not compile but is used to test compile exclusion. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/Program.cs deleted file mode 100644 index 2130cd0a7..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json deleted file mode 100644 index caa91e887..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "compileExclude": "ExcludeThis1.cs", - "exclude": [ "ExcludeThis2.cs" ], - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFile1.txt1 b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFile1.txt1 deleted file mode 100644 index 49852374c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFile1.txt1 +++ /dev/null @@ -1 +0,0 @@ -Test content file that should be included. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFile2.txt1 b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFile2.txt1 deleted file mode 100644 index 49852374c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFile2.txt1 +++ /dev/null @@ -1 +0,0 @@ -Test content file that should be included. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFileBuiltIn1.txt1 b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFileBuiltIn1.txt1 deleted file mode 100644 index 49852374c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFileBuiltIn1.txt1 +++ /dev/null @@ -1 +0,0 @@ -Test content file that should be included. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFileBuiltIn2.txt1 b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFileBuiltIn2.txt1 deleted file mode 100644 index 49852374c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFileBuiltIn2.txt1 +++ /dev/null @@ -1 +0,0 @@ -Test content file that should be included. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ExcludeThis1.txt b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ExcludeThis1.txt deleted file mode 100644 index 949ca7b7c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ExcludeThis1.txt +++ /dev/null @@ -1 +0,0 @@ -Test content file that should be excluded. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ExcludeThis2.txt b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ExcludeThis2.txt deleted file mode 100644 index 949ca7b7c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ExcludeThis2.txt +++ /dev/null @@ -1 +0,0 @@ -Test content file that should be excluded. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/IncludeThis.txt b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/IncludeThis.txt deleted file mode 100644 index 49852374c..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/IncludeThis.txt +++ /dev/null @@ -1 +0,0 @@ -Test content file that should be included. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/Program.cs deleted file mode 100644 index 2130cd0a7..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json deleted file mode 100644 index 721775e7f..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "content": "*.txt", - "contentExclude": "ExcludeThis1.txt", - "contentFiles": [ "ContentFile1.txt1", "ContentFile2.txt1" ], - "contentBuiltIn": [ "ContentFileBuiltIn1.txt1", "ContentFileBuiltIn2.txt1" ], - "publishExclude": "ExcludeThis2.txt", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Content1.txt b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Content1.txt deleted file mode 100644 index a36501f3f..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Content1.txt +++ /dev/null @@ -1 +0,0 @@ -Test pack content file. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Content2.txt b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Content2.txt deleted file mode 100644 index a36501f3f..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Content2.txt +++ /dev/null @@ -1 +0,0 @@ -Test pack content file. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Program.cs deleted file mode 100644 index 2130cd0a7..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json deleted file mode 100644 index 9590efb93..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "1.0.0-*", - "projectUrl": "http://projecturl/", - "licenseUrl": "http://licenseurl/", - "iconUrl": "http://iconurl/", - "owners": [ "owner1", "owner2" ], - "tags": [ "tag1", "tag2" ], - "releaseNotes": "releaseNotes", - "requireLicenseAcceptance": true, - "summary": "summary", - "repository": { - "type": "git", - "url": "http://url/" - }, - "packInclude": [ "Content1.txt", "Content2.txt" ], - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/Strings1.resx b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/Strings1.resx deleted file mode 100644 index 1f24a372f..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/Strings1.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Hello World! - - \ No newline at end of file diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/Strings2.resx b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/Strings2.resx deleted file mode 100644 index 1f24a372f..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/Strings2.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Hello World! - - \ No newline at end of file diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Program.cs deleted file mode 100644 index b0df821a7..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Program.cs +++ /dev/null @@ -1,22 +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. - -using System; -using System.Linq; -using System.Reflection; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - var thisAssembly = typeof(Program).GetTypeInfo().Assembly; - var resources = from resourceName in thisAssembly.GetManifestResourceNames() - select resourceName; - - var resourceNames = string.Join(",", resources); - Console.WriteLine($"{resources.Count()} Resources Found: {resourceNames}"); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Resources/Strings.resx b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Resources/Strings.resx deleted file mode 100644 index 1f24a372f..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Resources/Strings.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Hello World! - - \ No newline at end of file diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json deleted file mode 100644 index 4851a858d..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "resource": "../Strings1.resx", - "resourceFiles": [ "../Strings2.resx" ], - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/Strings1.resx b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/Strings1.resx deleted file mode 100644 index 1f24a372f..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/Strings1.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Hello World! - - \ No newline at end of file diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/Strings2.resx b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/Strings2.resx deleted file mode 100644 index 1f24a372f..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/Strings2.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Hello World! - - \ No newline at end of file diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Program.cs deleted file mode 100644 index b0df821a7..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Program.cs +++ /dev/null @@ -1,22 +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. - -using System; -using System.Linq; -using System.Reflection; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - var thisAssembly = typeof(Program).GetTypeInfo().Assembly; - var resources = from resourceName in thisAssembly.GetManifestResourceNames() - select resourceName; - - var resourceNames = string.Join(",", resources); - Console.WriteLine($"{resources.Count()} Resources Found: {resourceNames}"); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Resources/Strings.resx b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Resources/Strings.resx deleted file mode 100644 index 1f24a372f..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Resources/Strings.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Hello World! - - \ No newline at end of file diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json deleted file mode 100644 index 5bf7fe5f7..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "resourceBuiltIn": [ "../Strings1.resx", "../Strings2.resx" ], - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Exclude1.resx b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Exclude1.resx deleted file mode 100644 index a82c91ddd..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Exclude1.resx +++ /dev/null @@ -1 +0,0 @@ -This is not a resource file but is used to test resource exclusion. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Exclude2.resx b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Exclude2.resx deleted file mode 100644 index a82c91ddd..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Exclude2.resx +++ /dev/null @@ -1 +0,0 @@ -This is not a resource file but is used to test resource exclusion. diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Program.cs deleted file mode 100644 index b0df821a7..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Program.cs +++ /dev/null @@ -1,22 +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. - -using System; -using System.Linq; -using System.Reflection; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - var thisAssembly = typeof(Program).GetTypeInfo().Assembly; - var resources = from resourceName in thisAssembly.GetManifestResourceNames() - select resourceName; - - var resourceNames = string.Join(",", resources); - Console.WriteLine($"{resources.Count()} Resources Found: {resourceNames}"); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json deleted file mode 100644 index 87e1d0675..000000000 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "exclude": "Exclude1.resx", - "resourceExclude": [ "Exclude2.resx" ], - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/.noautobuild b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/Program.cs deleted file mode 100644 index ac3163a58..000000000 --- a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/Program.cs +++ /dev/null @@ -1,17 +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. - -using System; -using System.Diagnostics; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine(TestLibrary.Helper.GetMessage()); - return 100; - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json deleted file mode 100644 index 8edb9fd32..000000000 --- a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "TestLibrary": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": "1.1.0" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestLibrary/.noautobuild b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestLibrary/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestLibrary/Helper.cs b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestLibrary/Helper.cs deleted file mode 100644 index 8c643796b..000000000 --- a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestLibrary/Helper.cs +++ /dev/null @@ -1,24 +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. - -using System; - -namespace TestLibrary -{ - public static class Helper - { - /// - /// Gets the message from the helper. This comment is here to help test XML documentation file generation, please do not remove it. - /// - /// A message - public static string GetMessage() - { - return "This string came from the test library!"; - } - - public static void SayHi() - { - Console.WriteLine("Hello there!"); - } - } -} diff --git a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestLibrary/project.json b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestLibrary/project.json deleted file mode 100644 index 2470e823b..000000000 --- a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestLibrary/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "MissingP2PDependency": { - "target": "project", - "version": "1.0.0-*" - }, - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/global.json b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/global.json deleted file mode 100644 index 3a4684c26..000000000 --- a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": [ "."] -} \ No newline at end of file diff --git a/TestAssets/TestProjects/AppWith2Tfm0Rid/.noautobuild b/TestAssets/TestProjects/AppWith2Tfm0Rid/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs b/TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs deleted file mode 100644 index 1b3eb2ea9..000000000 --- a/TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs +++ /dev/null @@ -1,20 +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. - -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/AppWith2Tfm0Rid/project.json b/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json deleted file mode 100644 index 068194430..000000000 --- a/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "net461": { - "frameworkAssemblies": { - "System.Xml": {} - } - }, - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NetCore.App": { - "version": "1.1.0", - "type": "platform" - } - } - } - } -} diff --git a/TestAssets/TestProjects/AppWith4netTfm0Rid/.noautobuild b/TestAssets/TestProjects/AppWith4netTfm0Rid/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs b/TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs deleted file mode 100644 index 1b3eb2ea9..000000000 --- a/TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs +++ /dev/null @@ -1,20 +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. - -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/AppWith4netTfm0Rid/project.json b/TestAssets/TestProjects/AppWith4netTfm0Rid/project.json deleted file mode 100644 index 6324ec95a..000000000 --- a/TestAssets/TestProjects/AppWith4netTfm0Rid/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "net20": { - "frameworkAssemblies": { - "System.Xml": {} - } - }, - "net35": { - "frameworkAssemblies": { - "System.Xml": {} - } - }, - "net40": { - "frameworkAssemblies": { - "System.Xml": {} - } - }, - "net461": { - "frameworkAssemblies": { - "System.Xml": {} - } - } - } -} diff --git a/TestAssets/TestProjects/AppWithAssemblyInfo/Program.cs b/TestAssets/TestProjects/AppWithAssemblyInfo/Program.cs deleted file mode 100644 index 003e251ce..000000000 --- a/TestAssets/TestProjects/AppWithAssemblyInfo/Program.cs +++ /dev/null @@ -1,17 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace ConsoleApp1 -{ - public class Program - { - public static void Main(string[] args) - { - } - } -} diff --git a/TestAssets/TestProjects/AppWithAssemblyInfo/Properties/AssemblyInfo.cs b/TestAssets/TestProjects/AppWithAssemblyInfo/Properties/AssemblyInfo.cs deleted file mode 100644 index 5f2a0822d..000000000 --- a/TestAssets/TestProjects/AppWithAssemblyInfo/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,28 +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. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompanyAttribute("")] -[assembly: System.Reflection.AssemblyProduct("ConsoleApp1")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyFileVersion("")] -[assembly: AssemblyInformationalVersion("")] -[assembly: System.Reflection.AssemblyTitleAttribute("")] -[assembly: AssemblyVersion("1.0.0"), System.Resources.NeutralResourcesLanguageAttribute("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ab699746-eb43-467d-ab46-6095b4de9722")] diff --git a/TestAssets/TestProjects/AppWithAssemblyInfo/project.json b/TestAssets/TestProjects/AppWithAssemblyInfo/project.json deleted file mode 100644 index dff934e8b..000000000 --- a/TestAssets/TestProjects/AppWithAssemblyInfo/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/Program.cs b/TestAssets/TestProjects/AppWithOutputAssemblyName/Program.cs deleted file mode 100644 index b56f8e0b0..000000000 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/Program.cs +++ /dev/null @@ -1,13 +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 AppWithOutputAssemblyName -{ - public class MyApp - { - public static void Main() - { - System.Console.WriteLine("Hello, World!"); - } - } -} diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json deleted file mode 100644 index 33eacba13..000000000 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "buildOptions": { - "outputName": "MyApp", - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.NETCore.App": "1.1.0" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/.noautobuild b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/Program.cs b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/Program.cs deleted file mode 100644 index 21cf5b1d3..000000000 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace App.Tests -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World from Test asset!"); - } - } -} diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json deleted file mode 100644 index be38f2878..000000000 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "portable-net451+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - } - } - } - } -} \ No newline at end of file diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/global.json b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/global.json deleted file mode 100644 index 3427cd57d..000000000 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ - "src", - "test" - ] -} diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/src/App/.noautobuild b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/src/App/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/src/App/project.json b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/src/App/project.json deleted file mode 100644 index b51c38f5f..000000000 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/src/App/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "frameworks": { - "net40": { - "frameworkAssemblies": { - "System.Configuration": "4.0.0.0", - "System.Data": "4.0.0.0", - "System.Data.Linq": "4.0.0.0", - "System.Xml": "4.0.0.0" - }, - "dependencies": { - "EntityFramework": "6.1.3", - "Microsoft.SqlServer.Types": "11.0.2" - } - }, - "net45": { - "buildOptions": { - "define": [ "ASYNC" ] - }, - "frameworkAssemblies": { - "System.Configuration": "4.0.0.0", - "System.Data": "4.0.0.0", - "System.Data.Linq": "4.0.0.0", - "System.Xml": "4.0.0.0" - }, - "dependencies": { - "EntityFramework": "6.1.3", - "Microsoft.SqlServer.Types": "11.0.2" - } - } - } -} \ No newline at end of file diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/.noautobuild b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/EntityFramework/Program.cs b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/EntityFramework/Program.cs deleted file mode 100644 index c436bf19d..000000000 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/EntityFramework/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace App.Tests -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json deleted file mode 100644 index 510857461..000000000 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "portable-net451+win8", - "dnxcore50" - ], - "buildOptions": { - "define": [ "ASYNC", "COREFX", "XUNIT2", "SQLITE" ] - }, - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - } - } - } - } -} \ No newline at end of file diff --git a/TestAssets/TestProjects/LibraryWithNetStandardLibRef/.noautobuild b/TestAssets/TestProjects/LibraryWithNetStandardLibRef/.noautobuild deleted file mode 100644 index 8f7edc4ac..000000000 --- a/TestAssets/TestProjects/LibraryWithNetStandardLibRef/.noautobuild +++ /dev/null @@ -1 +0,0 @@ -noautobuild \ No newline at end of file diff --git a/TestAssets/TestProjects/LibraryWithNetStandardLibRef/Program.cs b/TestAssets/TestProjects/LibraryWithNetStandardLibRef/Program.cs deleted file mode 100644 index 334a639db..000000000 --- a/TestAssets/TestProjects/LibraryWithNetStandardLibRef/Program.cs +++ /dev/null @@ -1,8 +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. - -using System; - -class Program -{ -} diff --git a/TestAssets/TestProjects/LibraryWithNetStandardLibRef/project.json b/TestAssets/TestProjects/LibraryWithNetStandardLibRef/project.json deleted file mode 100644 index 519b9beee..000000000 --- a/TestAssets/TestProjects/LibraryWithNetStandardLibRef/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.AppContext": "4.1.0", - "NETStandard.Library": "1.5.0" - } - } - } -} diff --git a/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/.noautobuild b/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/.noautobuild deleted file mode 100644 index 8f7edc4ac..000000000 --- a/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/.noautobuild +++ /dev/null @@ -1 +0,0 @@ -noautobuild \ No newline at end of file diff --git a/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/Program.cs b/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/Program.cs deleted file mode 100644 index 334a639db..000000000 --- a/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/Program.cs +++ /dev/null @@ -1,8 +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. - -using System; - -class Program -{ -} diff --git a/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/project.json b/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/project.json deleted file mode 100644 index 2ef2a4a2c..000000000 --- a/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "netstandard1.3": { - "dependencies": { - "System.AppContext": "4.1.0" - } - } - } -} diff --git a/TestAssets/TestProjects/PJLibWithMultipleFrameworks/.noautobuild b/TestAssets/TestProjects/PJLibWithMultipleFrameworks/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/PJLibWithMultipleFrameworks/Program.cs b/TestAssets/TestProjects/PJLibWithMultipleFrameworks/Program.cs deleted file mode 100644 index 235f81584..000000000 --- a/TestAssets/TestProjects/PJLibWithMultipleFrameworks/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace Library -{ - public class TestLib - { - public static void Test() - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/TestProjects/PJLibWithMultipleFrameworks/project.json b/TestAssets/TestProjects/PJLibWithMultipleFrameworks/project.json deleted file mode 100644 index 99c97f5a8..000000000 --- a/TestAssets/TestProjects/PJLibWithMultipleFrameworks/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "1.0.0-*", - "frameworks": { - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6" - } - }, - "netstandard1.3": { - "dependencies": { - "NETStandard.Library": "1.3" - } - }, - "net451": {} - } -} diff --git a/TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj b/TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj deleted file mode 100644 index 53f0c8b7a..000000000 --- a/TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - \ No newline at end of file diff --git a/TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj.user b/TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj.user deleted file mode 100644 index efbe88aa6..000000000 --- a/TestAssets/TestProjects/PJTestAppSimple/PJTestAppSimple.xproj.user +++ /dev/null @@ -1 +0,0 @@ -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. \ No newline at end of file diff --git a/TestAssets/TestProjects/PJTestAppSimple/Program.cs b/TestAssets/TestProjects/PJTestAppSimple/Program.cs deleted file mode 100644 index 2130cd0a7..000000000 --- a/TestAssets/TestProjects/PJTestAppSimple/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/TestProjects/PJTestAppSimple/project.json b/TestAssets/TestProjects/PJTestAppSimple/project.json deleted file mode 100755 index 1797b91c4..000000000 --- a/TestAssets/TestProjects/PJTestAppSimple/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.NETCore.App": "1.1.0" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "runtimes": { - "win7-x64": {}, - "win7-x86": {}, - "osx.10.10-x64": {}, - "osx.10.11-x64": {}, - "osx.10.12-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/TestAssets/TestProjects/PJTestLibraryWithConfiguration/.noautobuild b/TestAssets/TestProjects/PJTestLibraryWithConfiguration/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/PJTestLibraryWithConfiguration/Helper.cs b/TestAssets/TestProjects/PJTestLibraryWithConfiguration/Helper.cs deleted file mode 100644 index 8c643796b..000000000 --- a/TestAssets/TestProjects/PJTestLibraryWithConfiguration/Helper.cs +++ /dev/null @@ -1,24 +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. - -using System; - -namespace TestLibrary -{ - public static class Helper - { - /// - /// Gets the message from the helper. This comment is here to help test XML documentation file generation, please do not remove it. - /// - /// A message - public static string GetMessage() - { - return "This string came from the test library!"; - } - - public static void SayHi() - { - Console.WriteLine("Hello there!"); - } - } -} diff --git a/TestAssets/TestProjects/PJTestLibraryWithConfiguration/contentitem.txt b/TestAssets/TestProjects/PJTestLibraryWithConfiguration/contentitem.txt deleted file mode 100644 index 37ba8a3c3..000000000 --- a/TestAssets/TestProjects/PJTestLibraryWithConfiguration/contentitem.txt +++ /dev/null @@ -1 +0,0 @@ -Random content. \ No newline at end of file diff --git a/TestAssets/TestProjects/PJTestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/PJTestLibraryWithConfiguration/project.json deleted file mode 100755 index e558ee487..000000000 --- a/TestAssets/TestProjects/PJTestLibraryWithConfiguration/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - "configurations": { - "Test": {} - }, - "frameworks": { - "netstandard1.5": {} - }, - "packOptions": { - "files": { - "include": ["contentitem.txt"], - "mappings": { - "dir/contentitem.txt": "contentitem.txt" - } - } - } -} \ No newline at end of file diff --git a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/Program.cs b/TestAssets/TestProjects/ProjectJsonConsoleTemplate/Program.cs deleted file mode 100644 index 7e52efa0e..000000000 --- a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/Program.cs +++ /dev/null @@ -1,12 +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. - -using System; - -class Program -{ - static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } -} diff --git a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json b/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json deleted file mode 100644 index 71dcdd6ed..000000000 --- a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/.bowerrc b/TestAssets/TestProjects/ProjectJsonWebTemplate/.bowerrc deleted file mode 100644 index 6406626ab..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "wwwroot/lib" -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/.gitignore b/TestAssets/TestProjects/ProjectJsonWebTemplate/.gitignore deleted file mode 100644 index 0ca27f04e..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/.gitignore +++ /dev/null @@ -1,234 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ -[Bb]in/ -[Oo]bj/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Microsoft Azure ApplicationInsights config file -ApplicationInsights.config - -# Windows Store app package directory -AppPackages/ -BundleArtifacts/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe - -# FAKE - F# Make -.fake/ diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/AccountController.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/AccountController.cs deleted file mode 100644 index a6b81482d..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/AccountController.cs +++ /dev/null @@ -1,471 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Claims; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.Extensions.Logging; -using WebApplication.Models; -using WebApplication.Models.AccountViewModels; -using WebApplication.Services; - -namespace WebApplication.Controllers -{ - [Authorize] - public class AccountController : Controller - { - private readonly UserManager _userManager; - private readonly SignInManager _signInManager; - private readonly IEmailSender _emailSender; - private readonly ISmsSender _smsSender; - private readonly ILogger _logger; - - public AccountController( - UserManager userManager, - SignInManager signInManager, - IEmailSender emailSender, - ISmsSender smsSender, - ILoggerFactory loggerFactory) - { - _userManager = userManager; - _signInManager = signInManager; - _emailSender = emailSender; - _smsSender = smsSender; - _logger = loggerFactory.CreateLogger(); - } - - // - // GET: /Account/Login - [HttpGet] - [AllowAnonymous] - public IActionResult Login(string returnUrl = null) - { - ViewData["ReturnUrl"] = returnUrl; - return View(); - } - - // - // POST: /Account/Login - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task Login(LoginViewModel model, string returnUrl = null) - { - ViewData["ReturnUrl"] = returnUrl; - if (ModelState.IsValid) - { - // This doesn't count login failures towards account lockout - // To enable password failures to trigger account lockout, set lockoutOnFailure: true - var result = await _signInManager.PasswordSignInAsync(model.Email, model.Password, model.RememberMe, lockoutOnFailure: false); - if (result.Succeeded) - { - _logger.LogInformation(1, "User logged in."); - return RedirectToLocal(returnUrl); - } - if (result.RequiresTwoFactor) - { - return RedirectToAction(nameof(SendCode), new { ReturnUrl = returnUrl, RememberMe = model.RememberMe }); - } - if (result.IsLockedOut) - { - _logger.LogWarning(2, "User account locked out."); - return View("Lockout"); - } - else - { - ModelState.AddModelError(string.Empty, "Invalid login attempt."); - return View(model); - } - } - - // If we got this far, something failed, redisplay form - return View(model); - } - - // - // GET: /Account/Register - [HttpGet] - [AllowAnonymous] - public IActionResult Register(string returnUrl = null) - { - ViewData["ReturnUrl"] = returnUrl; - return View(); - } - - // - // POST: /Account/Register - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task Register(RegisterViewModel model, string returnUrl = null) - { - ViewData["ReturnUrl"] = returnUrl; - if (ModelState.IsValid) - { - var user = new ApplicationUser { UserName = model.Email, Email = model.Email }; - var result = await _userManager.CreateAsync(user, model.Password); - if (result.Succeeded) - { - // For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=532713 - // Send an email with this link - //var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); - //var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); - //await _emailSender.SendEmailAsync(model.Email, "Confirm your account", - // $"Please confirm your account by clicking this link: link"); - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(3, "User created a new account with password."); - return RedirectToLocal(returnUrl); - } - AddErrors(result); - } - - // If we got this far, something failed, redisplay form - return View(model); - } - - // - // POST: /Account/LogOff - [HttpPost] - [ValidateAntiForgeryToken] - public async Task LogOff() - { - await _signInManager.SignOutAsync(); - _logger.LogInformation(4, "User logged out."); - return RedirectToAction(nameof(HomeController.Index), "Home"); - } - - // - // POST: /Account/ExternalLogin - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public IActionResult ExternalLogin(string provider, string returnUrl = null) - { - // Request a redirect to the external login provider. - var redirectUrl = Url.Action("ExternalLoginCallback", "Account", new { ReturnUrl = returnUrl }); - var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl); - return Challenge(properties, provider); - } - - // - // GET: /Account/ExternalLoginCallback - [HttpGet] - [AllowAnonymous] - public async Task ExternalLoginCallback(string returnUrl = null, string remoteError = null) - { - if (remoteError != null) - { - ModelState.AddModelError(string.Empty, $"Error from external provider: {remoteError}"); - return View(nameof(Login)); - } - var info = await _signInManager.GetExternalLoginInfoAsync(); - if (info == null) - { - return RedirectToAction(nameof(Login)); - } - - // Sign in the user with this external login provider if the user already has a login. - var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false); - if (result.Succeeded) - { - _logger.LogInformation(5, "User logged in with {Name} provider.", info.LoginProvider); - return RedirectToLocal(returnUrl); - } - if (result.RequiresTwoFactor) - { - return RedirectToAction(nameof(SendCode), new { ReturnUrl = returnUrl }); - } - if (result.IsLockedOut) - { - return View("Lockout"); - } - else - { - // If the user does not have an account, then ask the user to create an account. - ViewData["ReturnUrl"] = returnUrl; - ViewData["LoginProvider"] = info.LoginProvider; - var email = info.Principal.FindFirstValue(ClaimTypes.Email); - return View("ExternalLoginConfirmation", new ExternalLoginConfirmationViewModel { Email = email }); - } - } - - // - // POST: /Account/ExternalLoginConfirmation - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task ExternalLoginConfirmation(ExternalLoginConfirmationViewModel model, string returnUrl = null) - { - if (ModelState.IsValid) - { - // Get the information about the user from the external login provider - var info = await _signInManager.GetExternalLoginInfoAsync(); - if (info == null) - { - return View("ExternalLoginFailure"); - } - var user = new ApplicationUser { UserName = model.Email, Email = model.Email }; - var result = await _userManager.CreateAsync(user); - if (result.Succeeded) - { - result = await _userManager.AddLoginAsync(user, info); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(6, "User created an account using {Name} provider.", info.LoginProvider); - return RedirectToLocal(returnUrl); - } - } - AddErrors(result); - } - - ViewData["ReturnUrl"] = returnUrl; - return View(model); - } - - // GET: /Account/ConfirmEmail - [HttpGet] - [AllowAnonymous] - public async Task ConfirmEmail(string userId, string code) - { - if (userId == null || code == null) - { - return View("Error"); - } - var user = await _userManager.FindByIdAsync(userId); - if (user == null) - { - return View("Error"); - } - var result = await _userManager.ConfirmEmailAsync(user, code); - return View(result.Succeeded ? "ConfirmEmail" : "Error"); - } - - // - // GET: /Account/ForgotPassword - [HttpGet] - [AllowAnonymous] - public IActionResult ForgotPassword() - { - return View(); - } - - // - // POST: /Account/ForgotPassword - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task ForgotPassword(ForgotPasswordViewModel model) - { - if (ModelState.IsValid) - { - var user = await _userManager.FindByNameAsync(model.Email); - if (user == null || !(await _userManager.IsEmailConfirmedAsync(user))) - { - // Don't reveal that the user does not exist or is not confirmed - return View("ForgotPasswordConfirmation"); - } - - // For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=532713 - // Send an email with this link - //var code = await _userManager.GeneratePasswordResetTokenAsync(user); - //var callbackUrl = Url.Action("ResetPassword", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); - //await _emailSender.SendEmailAsync(model.Email, "Reset Password", - // $"Please reset your password by clicking here: link"); - //return View("ForgotPasswordConfirmation"); - } - - // If we got this far, something failed, redisplay form - return View(model); - } - - // - // GET: /Account/ForgotPasswordConfirmation - [HttpGet] - [AllowAnonymous] - public IActionResult ForgotPasswordConfirmation() - { - return View(); - } - - // - // GET: /Account/ResetPassword - [HttpGet] - [AllowAnonymous] - public IActionResult ResetPassword(string code = null) - { - return code == null ? View("Error") : View(); - } - - // - // POST: /Account/ResetPassword - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task ResetPassword(ResetPasswordViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - var user = await _userManager.FindByNameAsync(model.Email); - if (user == null) - { - // Don't reveal that the user does not exist - return RedirectToAction(nameof(AccountController.ResetPasswordConfirmation), "Account"); - } - var result = await _userManager.ResetPasswordAsync(user, model.Code, model.Password); - if (result.Succeeded) - { - return RedirectToAction(nameof(AccountController.ResetPasswordConfirmation), "Account"); - } - AddErrors(result); - return View(); - } - - // - // GET: /Account/ResetPasswordConfirmation - [HttpGet] - [AllowAnonymous] - public IActionResult ResetPasswordConfirmation() - { - return View(); - } - - // - // GET: /Account/SendCode - [HttpGet] - [AllowAnonymous] - public async Task SendCode(string returnUrl = null, bool rememberMe = false) - { - var user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); - if (user == null) - { - return View("Error"); - } - var userFactors = await _userManager.GetValidTwoFactorProvidersAsync(user); - var factorOptions = userFactors.Select(purpose => new SelectListItem { Text = purpose, Value = purpose }).ToList(); - return View(new SendCodeViewModel { Providers = factorOptions, ReturnUrl = returnUrl, RememberMe = rememberMe }); - } - - // - // POST: /Account/SendCode - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task SendCode(SendCodeViewModel model) - { - if (!ModelState.IsValid) - { - return View(); - } - - var user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); - if (user == null) - { - return View("Error"); - } - - // Generate the token and send it - var code = await _userManager.GenerateTwoFactorTokenAsync(user, model.SelectedProvider); - if (string.IsNullOrWhiteSpace(code)) - { - return View("Error"); - } - - var message = "Your security code is: " + code; - if (model.SelectedProvider == "Email") - { - await _emailSender.SendEmailAsync(await _userManager.GetEmailAsync(user), "Security Code", message); - } - else if (model.SelectedProvider == "Phone") - { - await _smsSender.SendSmsAsync(await _userManager.GetPhoneNumberAsync(user), message); - } - - return RedirectToAction(nameof(VerifyCode), new { Provider = model.SelectedProvider, ReturnUrl = model.ReturnUrl, RememberMe = model.RememberMe }); - } - - // - // GET: /Account/VerifyCode - [HttpGet] - [AllowAnonymous] - public async Task VerifyCode(string provider, bool rememberMe, string returnUrl = null) - { - // Require that the user has already logged in via username/password or external login - var user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); - if (user == null) - { - return View("Error"); - } - return View(new VerifyCodeViewModel { Provider = provider, ReturnUrl = returnUrl, RememberMe = rememberMe }); - } - - // - // POST: /Account/VerifyCode - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task VerifyCode(VerifyCodeViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - - // The following code protects for brute force attacks against the two factor codes. - // If a user enters incorrect codes for a specified amount of time then the user account - // will be locked out for a specified amount of time. - var result = await _signInManager.TwoFactorSignInAsync(model.Provider, model.Code, model.RememberMe, model.RememberBrowser); - if (result.Succeeded) - { - return RedirectToLocal(model.ReturnUrl); - } - if (result.IsLockedOut) - { - _logger.LogWarning(7, "User account locked out."); - return View("Lockout"); - } - else - { - ModelState.AddModelError(string.Empty, "Invalid code."); - return View(model); - } - } - - #region Helpers - - private void AddErrors(IdentityResult result) - { - foreach (var error in result.Errors) - { - ModelState.AddModelError(string.Empty, error.Description); - } - } - - private Task GetCurrentUserAsync() - { - return _userManager.GetUserAsync(HttpContext.User); - } - - private IActionResult RedirectToLocal(string returnUrl) - { - if (Url.IsLocalUrl(returnUrl)) - { - return Redirect(returnUrl); - } - else - { - return RedirectToAction(nameof(HomeController.Index), "Home"); - } - } - - #endregion - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/HomeController.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/HomeController.cs deleted file mode 100644 index 67d139496..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/HomeController.cs +++ /dev/null @@ -1,38 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace WebApplication.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View(); - } - - public IActionResult About() - { - ViewData["Message"] = "Your application description page."; - - return View(); - } - - public IActionResult Contact() - { - ViewData["Message"] = "Your contact page."; - - return View(); - } - - public IActionResult Error() - { - return View(); - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/ManageController.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/ManageController.cs deleted file mode 100644 index f7ff98504..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/ManageController.cs +++ /dev/null @@ -1,350 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; -using WebApplication.Models; -using WebApplication.Models.ManageViewModels; -using WebApplication.Services; - -namespace WebApplication.Controllers -{ - [Authorize] - public class ManageController : Controller - { - private readonly UserManager _userManager; - private readonly SignInManager _signInManager; - private readonly IEmailSender _emailSender; - private readonly ISmsSender _smsSender; - private readonly ILogger _logger; - - public ManageController( - UserManager userManager, - SignInManager signInManager, - IEmailSender emailSender, - ISmsSender smsSender, - ILoggerFactory loggerFactory) - { - _userManager = userManager; - _signInManager = signInManager; - _emailSender = emailSender; - _smsSender = smsSender; - _logger = loggerFactory.CreateLogger(); - } - - // - // GET: /Manage/Index - [HttpGet] - public async Task Index(ManageMessageId? message = null) - { - ViewData["StatusMessage"] = - message == ManageMessageId.ChangePasswordSuccess ? "Your password has been changed." - : message == ManageMessageId.SetPasswordSuccess ? "Your password has been set." - : message == ManageMessageId.SetTwoFactorSuccess ? "Your two-factor authentication provider has been set." - : message == ManageMessageId.Error ? "An error has occurred." - : message == ManageMessageId.AddPhoneSuccess ? "Your phone number was added." - : message == ManageMessageId.RemovePhoneSuccess ? "Your phone number was removed." - : ""; - - var user = await GetCurrentUserAsync(); - var model = new IndexViewModel - { - HasPassword = await _userManager.HasPasswordAsync(user), - PhoneNumber = await _userManager.GetPhoneNumberAsync(user), - TwoFactor = await _userManager.GetTwoFactorEnabledAsync(user), - Logins = await _userManager.GetLoginsAsync(user), - BrowserRemembered = await _signInManager.IsTwoFactorClientRememberedAsync(user) - }; - return View(model); - } - - // - // POST: /Manage/RemoveLogin - [HttpPost] - [ValidateAntiForgeryToken] - public async Task RemoveLogin(RemoveLoginViewModel account) - { - ManageMessageId? message = ManageMessageId.Error; - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.RemoveLoginAsync(user, account.LoginProvider, account.ProviderKey); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - message = ManageMessageId.RemoveLoginSuccess; - } - } - return RedirectToAction(nameof(ManageLogins), new { Message = message }); - } - - // - // GET: /Manage/AddPhoneNumber - public IActionResult AddPhoneNumber() - { - return View(); - } - - // - // POST: /Manage/AddPhoneNumber - [HttpPost] - [ValidateAntiForgeryToken] - public async Task AddPhoneNumber(AddPhoneNumberViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - // Generate the token and send it - var user = await GetCurrentUserAsync(); - var code = await _userManager.GenerateChangePhoneNumberTokenAsync(user, model.PhoneNumber); - await _smsSender.SendSmsAsync(model.PhoneNumber, "Your security code is: " + code); - return RedirectToAction(nameof(VerifyPhoneNumber), new { PhoneNumber = model.PhoneNumber }); - } - - // - // POST: /Manage/EnableTwoFactorAuthentication - [HttpPost] - [ValidateAntiForgeryToken] - public async Task EnableTwoFactorAuthentication() - { - var user = await GetCurrentUserAsync(); - if (user != null) - { - await _userManager.SetTwoFactorEnabledAsync(user, true); - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(1, "User enabled two-factor authentication."); - } - return RedirectToAction(nameof(Index), "Manage"); - } - - // - // POST: /Manage/DisableTwoFactorAuthentication - [HttpPost] - [ValidateAntiForgeryToken] - public async Task DisableTwoFactorAuthentication() - { - var user = await GetCurrentUserAsync(); - if (user != null) - { - await _userManager.SetTwoFactorEnabledAsync(user, false); - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(2, "User disabled two-factor authentication."); - } - return RedirectToAction(nameof(Index), "Manage"); - } - - // - // GET: /Manage/VerifyPhoneNumber - [HttpGet] - public async Task VerifyPhoneNumber(string phoneNumber) - { - var code = await _userManager.GenerateChangePhoneNumberTokenAsync(await GetCurrentUserAsync(), phoneNumber); - // Send an SMS to verify the phone number - return phoneNumber == null ? View("Error") : View(new VerifyPhoneNumberViewModel { PhoneNumber = phoneNumber }); - } - - // - // POST: /Manage/VerifyPhoneNumber - [HttpPost] - [ValidateAntiForgeryToken] - public async Task VerifyPhoneNumber(VerifyPhoneNumberViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.ChangePhoneNumberAsync(user, model.PhoneNumber, model.Code); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.AddPhoneSuccess }); - } - } - // If we got this far, something failed, redisplay the form - ModelState.AddModelError(string.Empty, "Failed to verify phone number"); - return View(model); - } - - // - // POST: /Manage/RemovePhoneNumber - [HttpPost] - [ValidateAntiForgeryToken] - public async Task RemovePhoneNumber() - { - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.SetPhoneNumberAsync(user, null); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.RemovePhoneSuccess }); - } - } - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error }); - } - - // - // GET: /Manage/ChangePassword - [HttpGet] - public IActionResult ChangePassword() - { - return View(); - } - - // - // POST: /Manage/ChangePassword - [HttpPost] - [ValidateAntiForgeryToken] - public async Task ChangePassword(ChangePasswordViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.ChangePasswordAsync(user, model.OldPassword, model.NewPassword); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(3, "User changed their password successfully."); - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.ChangePasswordSuccess }); - } - AddErrors(result); - return View(model); - } - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error }); - } - - // - // GET: /Manage/SetPassword - [HttpGet] - public IActionResult SetPassword() - { - return View(); - } - - // - // POST: /Manage/SetPassword - [HttpPost] - [ValidateAntiForgeryToken] - public async Task SetPassword(SetPasswordViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.AddPasswordAsync(user, model.NewPassword); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.SetPasswordSuccess }); - } - AddErrors(result); - return View(model); - } - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error }); - } - - //GET: /Manage/ManageLogins - [HttpGet] - public async Task ManageLogins(ManageMessageId? message = null) - { - ViewData["StatusMessage"] = - message == ManageMessageId.RemoveLoginSuccess ? "The external login was removed." - : message == ManageMessageId.AddLoginSuccess ? "The external login was added." - : message == ManageMessageId.Error ? "An error has occurred." - : ""; - var user = await GetCurrentUserAsync(); - if (user == null) - { - return View("Error"); - } - var userLogins = await _userManager.GetLoginsAsync(user); - var otherLogins = _signInManager.GetExternalAuthenticationSchemes().Where(auth => userLogins.All(ul => auth.AuthenticationScheme != ul.LoginProvider)).ToList(); - ViewData["ShowRemoveButton"] = user.PasswordHash != null || userLogins.Count > 1; - return View(new ManageLoginsViewModel - { - CurrentLogins = userLogins, - OtherLogins = otherLogins - }); - } - - // - // POST: /Manage/LinkLogin - [HttpPost] - [ValidateAntiForgeryToken] - public IActionResult LinkLogin(string provider) - { - // Request a redirect to the external login provider to link a login for the current user - var redirectUrl = Url.Action("LinkLoginCallback", "Manage"); - var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, _userManager.GetUserId(User)); - return Challenge(properties, provider); - } - - // - // GET: /Manage/LinkLoginCallback - [HttpGet] - public async Task LinkLoginCallback() - { - var user = await GetCurrentUserAsync(); - if (user == null) - { - return View("Error"); - } - var info = await _signInManager.GetExternalLoginInfoAsync(await _userManager.GetUserIdAsync(user)); - if (info == null) - { - return RedirectToAction(nameof(ManageLogins), new { Message = ManageMessageId.Error }); - } - var result = await _userManager.AddLoginAsync(user, info); - var message = result.Succeeded ? ManageMessageId.AddLoginSuccess : ManageMessageId.Error; - return RedirectToAction(nameof(ManageLogins), new { Message = message }); - } - - #region Helpers - - private void AddErrors(IdentityResult result) - { - foreach (var error in result.Errors) - { - ModelState.AddModelError(string.Empty, error.Description); - } - } - - public enum ManageMessageId - { - AddPhoneSuccess, - AddLoginSuccess, - ChangePasswordSuccess, - SetTwoFactorSuccess, - SetPasswordSuccess, - RemoveLoginSuccess, - RemovePhoneSuccess, - Error - } - - private Task GetCurrentUserAsync() - { - return _userManager.GetUserAsync(HttpContext.User); - } - - #endregion - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/ApplicationDbContext.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/ApplicationDbContext.cs deleted file mode 100644 index 329199667..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/ApplicationDbContext.cs +++ /dev/null @@ -1,29 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using WebApplication.Models; - -namespace WebApplication.Data -{ - public class ApplicationDbContext : IdentityDbContext - { - public ApplicationDbContext(DbContextOptions options) - : base(options) - { - } - - protected override void OnModelCreating(ModelBuilder builder) - { - base.OnModelCreating(builder); - // Customize the ASP.NET Identity model and override the defaults if needed. - // For example, you can rename the ASP.NET Identity table names and more. - // Add your customizations after calling base.OnModelCreating(builder); - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs deleted file mode 100644 index 5262b9296..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs +++ /dev/null @@ -1,215 +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. - -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using WebApplication.Data; - -namespace WebApplication.Data.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("00000000000000_CreateIdentitySchema")] - partial class CreateIdentitySchema - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { - modelBuilder - .HasAnnotation("ProductVersion", "1.0.0-rc2-20901"); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole", b => - { - b.Property("Id"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Name") - .HasAnnotation("MaxLength", 256); - - b.Property("NormalizedName") - .HasAnnotation("MaxLength", 256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .HasName("RoleNameIndex"); - - b.ToTable("AspNetRoles"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("RoleId") - .IsRequired(); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("UserId") - .IsRequired(); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => - { - b.Property("LoginProvider"); - - b.Property("ProviderKey"); - - b.Property("ProviderDisplayName"); - - b.Property("UserId") - .IsRequired(); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserRoles"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider"); - - b.Property("Name"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens"); - }); - - modelBuilder.Entity("WebApplication.Models.ApplicationUser", b => - { - b.Property("Id"); - - b.Property("AccessFailedCount"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Email") - .HasAnnotation("MaxLength", 256); - - b.Property("EmailConfirmed"); - - b.Property("LockoutEnabled"); - - b.Property("LockoutEnd"); - - b.Property("NormalizedEmail") - .HasAnnotation("MaxLength", 256); - - b.Property("NormalizedUserName") - .HasAnnotation("MaxLength", 256); - - b.Property("PasswordHash"); - - b.Property("PhoneNumber"); - - b.Property("PhoneNumberConfirmed"); - - b.Property("SecurityStamp"); - - b.Property("TwoFactorEnabled"); - - b.Property("UserName") - .HasAnnotation("MaxLength", 256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .HasName("UserNameIndex"); - - b.ToTable("AspNetUsers"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => - { - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => - { - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.cs deleted file mode 100644 index 751316b28..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.cs +++ /dev/null @@ -1,218 +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. - -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace WebApplication.Data.Migrations -{ - public partial class CreateIdentitySchema : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "AspNetRoles", - columns: table => new - { - Id = table.Column(nullable: false), - ConcurrencyStamp = table.Column(nullable: true), - Name = table.Column(nullable: true), - NormalizedName = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoles", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserTokens", - columns: table => new - { - UserId = table.Column(nullable: false), - LoginProvider = table.Column(nullable: false), - Name = table.Column(nullable: false), - Value = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); - }); - - migrationBuilder.CreateTable( - name: "AspNetUsers", - columns: table => new - { - Id = table.Column(nullable: false), - AccessFailedCount = table.Column(nullable: false), - ConcurrencyStamp = table.Column(nullable: true), - Email = table.Column(nullable: true), - EmailConfirmed = table.Column(nullable: false), - LockoutEnabled = table.Column(nullable: false), - LockoutEnd = table.Column(nullable: true), - NormalizedEmail = table.Column(nullable: true), - NormalizedUserName = table.Column(nullable: true), - PasswordHash = table.Column(nullable: true), - PhoneNumber = table.Column(nullable: true), - PhoneNumberConfirmed = table.Column(nullable: false), - SecurityStamp = table.Column(nullable: true), - TwoFactorEnabled = table.Column(nullable: false), - UserName = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUsers", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetRoleClaims", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Autoincrement", true), - ClaimType = table.Column(nullable: true), - ClaimValue = table.Column(nullable: true), - RoleId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); - table.ForeignKey( - name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserClaims", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Autoincrement", true), - ClaimType = table.Column(nullable: true), - ClaimValue = table.Column(nullable: true), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); - table.ForeignKey( - name: "FK_AspNetUserClaims_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserLogins", - columns: table => new - { - LoginProvider = table.Column(nullable: false), - ProviderKey = table.Column(nullable: false), - ProviderDisplayName = table.Column(nullable: true), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); - table.ForeignKey( - name: "FK_AspNetUserLogins_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserRoles", - columns: table => new - { - UserId = table.Column(nullable: false), - RoleId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); - table.ForeignKey( - name: "FK_AspNetUserRoles_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_AspNetUserRoles_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "RoleNameIndex", - table: "AspNetRoles", - column: "NormalizedName"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetRoleClaims_RoleId", - table: "AspNetRoleClaims", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserClaims_UserId", - table: "AspNetUserClaims", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserLogins_UserId", - table: "AspNetUserLogins", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserRoles_RoleId", - table: "AspNetUserRoles", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserRoles_UserId", - table: "AspNetUserRoles", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "EmailIndex", - table: "AspNetUsers", - column: "NormalizedEmail"); - - migrationBuilder.CreateIndex( - name: "UserNameIndex", - table: "AspNetUsers", - column: "NormalizedUserName"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "AspNetRoleClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserLogins"); - - migrationBuilder.DropTable( - name: "AspNetUserRoles"); - - migrationBuilder.DropTable( - name: "AspNetUserTokens"); - - migrationBuilder.DropTable( - name: "AspNetRoles"); - - migrationBuilder.DropTable( - name: "AspNetUsers"); - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/ApplicationDbContextModelSnapshot.cs deleted file mode 100644 index 54608c041..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ /dev/null @@ -1,214 +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. - -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using WebApplication.Data; - -namespace WebApplication.Data.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - partial class ApplicationDbContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { - modelBuilder - .HasAnnotation("ProductVersion", "1.0.0-rc2-20901"); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole", b => - { - b.Property("Id"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Name") - .HasAnnotation("MaxLength", 256); - - b.Property("NormalizedName") - .HasAnnotation("MaxLength", 256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .HasName("RoleNameIndex"); - - b.ToTable("AspNetRoles"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("RoleId") - .IsRequired(); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("UserId") - .IsRequired(); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => - { - b.Property("LoginProvider"); - - b.Property("ProviderKey"); - - b.Property("ProviderDisplayName"); - - b.Property("UserId") - .IsRequired(); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserRoles"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider"); - - b.Property("Name"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens"); - }); - - modelBuilder.Entity("WebApplication.Models.ApplicationUser", b => - { - b.Property("Id"); - - b.Property("AccessFailedCount"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Email") - .HasAnnotation("MaxLength", 256); - - b.Property("EmailConfirmed"); - - b.Property("LockoutEnabled"); - - b.Property("LockoutEnd"); - - b.Property("NormalizedEmail") - .HasAnnotation("MaxLength", 256); - - b.Property("NormalizedUserName") - .HasAnnotation("MaxLength", 256); - - b.Property("PasswordHash"); - - b.Property("PhoneNumber"); - - b.Property("PhoneNumberConfirmed"); - - b.Property("SecurityStamp"); - - b.Property("TwoFactorEnabled"); - - b.Property("UserName") - .HasAnnotation("MaxLength", 256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .HasName("UserNameIndex"); - - b.ToTable("AspNetUsers"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => - { - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => - { - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs deleted file mode 100644 index 033c4b789..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs +++ /dev/null @@ -1,18 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class ExternalLoginConfirmationViewModel - { - [Required] - [EmailAddress] - public string Email { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ForgotPasswordViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ForgotPasswordViewModel.cs deleted file mode 100644 index 5b026a9f3..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ForgotPasswordViewModel.cs +++ /dev/null @@ -1,18 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class ForgotPasswordViewModel - { - [Required] - [EmailAddress] - public string Email { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/LoginViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/LoginViewModel.cs deleted file mode 100644 index ae17051ab..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/LoginViewModel.cs +++ /dev/null @@ -1,25 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class LoginViewModel - { - [Required] - [EmailAddress] - public string Email { get; set; } - - [Required] - [DataType(DataType.Password)] - public string Password { get; set; } - - [Display(Name = "Remember me?")] - public bool RememberMe { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/RegisterViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/RegisterViewModel.cs deleted file mode 100644 index a6d5f1a96..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/RegisterViewModel.cs +++ /dev/null @@ -1,30 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class RegisterViewModel - { - [Required] - [EmailAddress] - [Display(Name = "Email")] - public string Email { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "Password")] - public string Password { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm password")] - [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ResetPasswordViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ResetPasswordViewModel.cs deleted file mode 100644 index 15c2967f1..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ResetPasswordViewModel.cs +++ /dev/null @@ -1,30 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class ResetPasswordViewModel - { - [Required] - [EmailAddress] - public string Email { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - public string Password { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm password")] - [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - - public string Code { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/SendCodeViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/SendCodeViewModel.cs deleted file mode 100644 index 2f44b9951..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/SendCodeViewModel.cs +++ /dev/null @@ -1,22 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.Rendering; - -namespace WebApplication.Models.AccountViewModels -{ - public class SendCodeViewModel - { - public string SelectedProvider { get; set; } - - public ICollection Providers { get; set; } - - public string ReturnUrl { get; set; } - - public bool RememberMe { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/VerifyCodeViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/VerifyCodeViewModel.cs deleted file mode 100644 index c1016c143..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/VerifyCodeViewModel.cs +++ /dev/null @@ -1,28 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class VerifyCodeViewModel - { - [Required] - public string Provider { get; set; } - - [Required] - public string Code { get; set; } - - public string ReturnUrl { get; set; } - - [Display(Name = "Remember this browser?")] - public bool RememberBrowser { get; set; } - - [Display(Name = "Remember me?")] - public bool RememberMe { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ApplicationUser.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ApplicationUser.cs deleted file mode 100644 index 047cfadd5..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ApplicationUser.cs +++ /dev/null @@ -1,16 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; - -namespace WebApplication.Models -{ - // Add profile data for application users by adding properties to the ApplicationUser class - public class ApplicationUser : IdentityUser - { - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/AddPhoneNumberViewModel.cs deleted file mode 100644 index 0648e6f44..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/AddPhoneNumberViewModel.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class AddPhoneNumberViewModel - { - [Required] - [Phone] - [Display(Name = "Phone number")] - public string PhoneNumber { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ChangePasswordViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ChangePasswordViewModel.cs deleted file mode 100644 index 51093e9b1..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ChangePasswordViewModel.cs +++ /dev/null @@ -1,30 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class ChangePasswordViewModel - { - [Required] - [DataType(DataType.Password)] - [Display(Name = "Current password")] - public string OldPassword { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "New password")] - public string NewPassword { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm new password")] - [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs deleted file mode 100644 index e56af0ec0..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs +++ /dev/null @@ -1,18 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.Rendering; - -namespace WebApplication.Models.ManageViewModels -{ - public class ConfigureTwoFactorViewModel - { - public string SelectedProvider { get; set; } - - public ICollection Providers { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/FactorViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/FactorViewModel.cs deleted file mode 100644 index 1b74bc14b..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/FactorViewModel.cs +++ /dev/null @@ -1,15 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class FactorViewModel - { - public string Purpose { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/IndexViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/IndexViewModel.cs deleted file mode 100644 index f97ce4cf4..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/IndexViewModel.cs +++ /dev/null @@ -1,24 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity; - -namespace WebApplication.Models.ManageViewModels -{ - public class IndexViewModel - { - public bool HasPassword { get; set; } - - public IList Logins { get; set; } - - public string PhoneNumber { get; set; } - - public bool TwoFactor { get; set; } - - public bool BrowserRemembered { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ManageLoginsViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ManageLoginsViewModel.cs deleted file mode 100644 index e2474b126..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ManageLoginsViewModel.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Authentication; -using Microsoft.AspNetCore.Identity; - -namespace WebApplication.Models.ManageViewModels -{ - public class ManageLoginsViewModel - { - public IList CurrentLogins { get; set; } - - public IList OtherLogins { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/RemoveLoginViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/RemoveLoginViewModel.cs deleted file mode 100644 index 031d5421b..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/RemoveLoginViewModel.cs +++ /dev/null @@ -1,17 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class RemoveLoginViewModel - { - public string LoginProvider { get; set; } - public string ProviderKey { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/SetPasswordViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/SetPasswordViewModel.cs deleted file mode 100644 index 861834531..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/SetPasswordViewModel.cs +++ /dev/null @@ -1,25 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class SetPasswordViewModel - { - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "New password")] - public string NewPassword { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm new password")] - [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs deleted file mode 100644 index 13ee9834e..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs +++ /dev/null @@ -1,22 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class VerifyPhoneNumberViewModel - { - [Required] - public string Code { get; set; } - - [Required] - [Phone] - [Display(Name = "Phone number")] - public string PhoneNumber { get; set; } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Program.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Program.cs deleted file mode 100644 index de237aae7..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Program.cs +++ /dev/null @@ -1,27 +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. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; - -namespace WebApplication -{ - public class Program - { - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseStartup() - .Build(); - - host.Run(); - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/README.md b/TestAssets/TestProjects/ProjectJsonWebTemplate/README.md deleted file mode 100644 index d8ba0b382..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Welcome to ASP.NET Core - -We've made some big updates in this release, so it’s **important** that you spend a few minutes to learn what’s new. - -You've created a new ASP.NET Core project. [Learn what's new](https://go.microsoft.com/fwlink/?LinkId=518016) - -## This application consists of: - -* Sample pages using ASP.NET Core MVC -* [Gulp](https://go.microsoft.com/fwlink/?LinkId=518007) and [Bower](https://go.microsoft.com/fwlink/?LinkId=518004) for managing client-side libraries -* Theming using [Bootstrap](https://go.microsoft.com/fwlink/?LinkID=398939) - -## How to - -* [Add a Controller and View](https://go.microsoft.com/fwlink/?LinkID=398600) -* [Add an appsetting in config and access it in app.](https://go.microsoft.com/fwlink/?LinkID=699562) -* [Manage User Secrets using Secret Manager.](https://go.microsoft.com/fwlink/?LinkId=699315) -* [Use logging to log a message.](https://go.microsoft.com/fwlink/?LinkId=699316) -* [Add packages using NuGet.](https://go.microsoft.com/fwlink/?LinkId=699317) -* [Add client packages using Bower.](https://go.microsoft.com/fwlink/?LinkId=699318) -* [Target development, staging or production environment.](https://go.microsoft.com/fwlink/?LinkId=699319) - -## Overview - -* [Conceptual overview of what is ASP.NET Core](https://go.microsoft.com/fwlink/?LinkId=518008) -* [Fundamentals of ASP.NET Core such as Startup and middleware.](https://go.microsoft.com/fwlink/?LinkId=699320) -* [Working with Data](https://go.microsoft.com/fwlink/?LinkId=398602) -* [Security](https://go.microsoft.com/fwlink/?LinkId=398603) -* [Client side development](https://go.microsoft.com/fwlink/?LinkID=699321) -* [Develop on different platforms](https://go.microsoft.com/fwlink/?LinkID=699322) -* [Read more on the documentation site](https://go.microsoft.com/fwlink/?LinkID=699323) - -## Run & Deploy - -* [Run your app](https://go.microsoft.com/fwlink/?LinkID=517851) -* [Run tools such as EF migrations and more](https://go.microsoft.com/fwlink/?LinkID=517853) -* [Publish to Microsoft Azure Web Apps](https://go.microsoft.com/fwlink/?LinkID=398609) - -We would love to hear your [feedback](https://go.microsoft.com/fwlink/?LinkId=518015) diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/IEmailSender.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/IEmailSender.cs deleted file mode 100644 index 8010a870c..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/IEmailSender.cs +++ /dev/null @@ -1,15 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Services -{ - public interface IEmailSender - { - Task SendEmailAsync(string email, string subject, string message); - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/ISmsSender.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/ISmsSender.cs deleted file mode 100644 index b887b6113..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/ISmsSender.cs +++ /dev/null @@ -1,15 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Services -{ - public interface ISmsSender - { - Task SendSmsAsync(string number, string message); - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/MessageServices.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/MessageServices.cs deleted file mode 100644 index c3ee43128..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/MessageServices.cs +++ /dev/null @@ -1,28 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Services -{ - // This class is used by the application to send Email and SMS - // when you turn on two-factor authentication in ASP.NET Identity. - // For more details see this link https://go.microsoft.com/fwlink/?LinkID=532713 - public class AuthMessageSender : IEmailSender, ISmsSender - { - public Task SendEmailAsync(string email, string subject, string message) - { - // Plug in your email service here to send an email. - return Task.FromResult(0); - } - - public Task SendSmsAsync(string number, string message) - { - // Plug in your SMS service here to send a text message. - return Task.FromResult(0); - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Startup.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Startup.cs deleted file mode 100644 index 9280e73f0..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Startup.cs +++ /dev/null @@ -1,91 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using WebApplication.Data; -using WebApplication.Models; -using WebApplication.Services; - -namespace WebApplication -{ - public class Startup - { - public Startup(IHostingEnvironment env) - { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true); - - if (env.IsDevelopment()) - { - // For more details on using the user secret store see https://go.microsoft.com/fwlink/?LinkID=532709 - builder.AddUserSecrets(); - } - - builder.AddEnvironmentVariables(); - Configuration = builder.Build(); - } - - public IConfigurationRoot Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - // Add framework services. - services.AddDbContext(options => - options.UseSqlite(Configuration.GetConnectionString("DefaultConnection"))); - - services.AddIdentity() - .AddEntityFrameworkStores() - .AddDefaultTokenProviders(); - - services.AddMvc(); - - // Add application services. - services.AddTransient(); - services.AddTransient(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) - { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - app.UseDatabaseErrorPage(); - app.UseBrowserLink(); - } - else - { - app.UseExceptionHandler("/Home/Error"); - } - - app.UseStaticFiles(); - - app.UseIdentity(); - - // Add external authentication middleware below. To configure them please see https://go.microsoft.com/fwlink/?LinkID=532715 - - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ConfirmEmail.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ConfirmEmail.cshtml deleted file mode 100644 index 8e8088d44..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ConfirmEmail.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -@{ - ViewData["Title"] = "Confirm Email"; -} - -

@ViewData["Title"].

-
-

- Thank you for confirming your email. Please Click here to Log in. -

-
diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ExternalLoginConfirmation.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ExternalLoginConfirmation.cshtml deleted file mode 100644 index eb3612b55..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ExternalLoginConfirmation.cshtml +++ /dev/null @@ -1,35 +0,0 @@ -@model ExternalLoginConfirmationViewModel -@{ - ViewData["Title"] = "Register"; -} - -

@ViewData["Title"].

-

Associate your @ViewData["LoginProvider"] account.

- -
-

Association Form

-
-
- -

- You've successfully authenticated with @ViewData["LoginProvider"]. - Please enter an email address for this site below and click the Register button to finish - logging in. -

-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ExternalLoginFailure.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ExternalLoginFailure.cshtml deleted file mode 100644 index 2509746be..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ExternalLoginFailure.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Login Failure"; -} - -
-

@ViewData["Title"].

-

Unsuccessful login with service.

-
diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ForgotPassword.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ForgotPassword.cshtml deleted file mode 100644 index 9d748023f..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ForgotPassword.cshtml +++ /dev/null @@ -1,31 +0,0 @@ -@model ForgotPasswordViewModel -@{ - ViewData["Title"] = "Forgot your password?"; -} - -

@ViewData["Title"]

-

- For more information on how to enable reset password please see this article. -

- -@*
-

Enter your email.

-
-
-
- -
- - -
-
-
-
- -
-
-
*@ - -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ForgotPasswordConfirmation.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ForgotPasswordConfirmation.cshtml deleted file mode 100644 index 4877fc83a..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ForgotPasswordConfirmation.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Forgot Password Confirmation"; -} - -

@ViewData["Title"].

-

- Please check your email to reset your password. -

diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/Lockout.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/Lockout.cshtml deleted file mode 100644 index 34ac56ff3..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/Lockout.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Locked out"; -} - -
-

Locked out.

-

This account has been locked out, please try again later.

-
diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/Login.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/Login.cshtml deleted file mode 100644 index 95430a12e..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/Login.cshtml +++ /dev/null @@ -1,92 +0,0 @@ -@using System.Collections.Generic -@using Microsoft.AspNetCore.Http -@using Microsoft.AspNetCore.Http.Authentication -@model LoginViewModel -@inject SignInManager SignInManager - -@{ - ViewData["Title"] = "Log in"; -} - -

@ViewData["Title"].

-
-
-
-
-

Use a local account to log in.

-
-
-
- -
- - -
-
-
- -
- - -
-
-
-
-
- -
-
-
-
-
- -
-
-

- Register as a new user? -

-

- Forgot your password? -

-
-
-
-
-
-

Use another service to log in.

-
- @{ - var loginProviders = SignInManager.GetExternalAuthenticationSchemes().ToList(); - if (loginProviders.Count == 0) - { -
-

- There are no external authentication services configured. See this article - for details on setting up this ASP.NET application to support logging in via external services. -

-
- } - else - { -
-
-

- @foreach (var provider in loginProviders) - { - - } -

-
-
- } - } -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/Register.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/Register.cshtml deleted file mode 100644 index 2090f900e..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/Register.cshtml +++ /dev/null @@ -1,42 +0,0 @@ -@model RegisterViewModel -@{ - ViewData["Title"] = "Register"; -} - -

@ViewData["Title"].

- -
-

Create a new account.

-
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ResetPassword.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ResetPassword.cshtml deleted file mode 100644 index dd716d735..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ResetPassword.cshtml +++ /dev/null @@ -1,43 +0,0 @@ -@model ResetPasswordViewModel -@{ - ViewData["Title"] = "Reset password"; -} - -

@ViewData["Title"].

- -
-

Reset your password.

-
-
- -
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ResetPasswordConfirmation.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ResetPasswordConfirmation.cshtml deleted file mode 100644 index 6321d858e..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/ResetPasswordConfirmation.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Reset password confirmation"; -} - -

@ViewData["Title"].

-

- Your password has been reset. Please Click here to log in. -

diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/SendCode.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/SendCode.cshtml deleted file mode 100644 index e85ca3c2b..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/SendCode.cshtml +++ /dev/null @@ -1,21 +0,0 @@ -@model SendCodeViewModel -@{ - ViewData["Title"] = "Send Verification Code"; -} - -

@ViewData["Title"].

- -
- -
-
- Select Two-Factor Authentication Provider: - - -
-
-
- -@section Scripts { - @{await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/VerifyCode.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/VerifyCode.cshtml deleted file mode 100644 index 60afb361d..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Account/VerifyCode.cshtml +++ /dev/null @@ -1,38 +0,0 @@ -@model VerifyCodeViewModel -@{ - ViewData["Title"] = "Verify"; -} - -

@ViewData["Title"].

- -
-
- - -

@ViewData["Status"]

-
-
- -
- - -
-
-
-
-
- - -
-
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Home/About.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Home/About.cshtml deleted file mode 100644 index b653a26f1..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Home/About.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@{ - ViewData["Title"] = "About"; -} -

@ViewData["Title"].

-

@ViewData["Message"]

- -

Use this area to provide additional information.

diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Home/Contact.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Home/Contact.cshtml deleted file mode 100644 index f953aa63d..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Home/Contact.cshtml +++ /dev/null @@ -1,17 +0,0 @@ -@{ - ViewData["Title"] = "Contact"; -} -

@ViewData["Title"].

-

@ViewData["Message"]

- -
- One Microsoft Way
- Redmond, WA 98052-6399
- P: - 425.555.0100 -
- -
- Support: Support@example.com
- Marketing: Marketing@example.com -
diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Home/Index.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Home/Index.cshtml deleted file mode 100644 index 957b8c1da..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Home/Index.cshtml +++ /dev/null @@ -1,109 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - - - -
-
-

Application uses

-
    -
  • Sample pages using ASP.NET Core MVC
    • -
  • Gulp and Bower for managing client-side libraries
    • -
  • Theming using Bootstrap
    • -
-
-
-

How to

- -
-
-

Overview

- -
-
-

Run & Deploy

- -
-
diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/AddPhoneNumber.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/AddPhoneNumber.cshtml deleted file mode 100644 index 2feb93b22..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/AddPhoneNumber.cshtml +++ /dev/null @@ -1,27 +0,0 @@ -@model AddPhoneNumberViewModel -@{ - ViewData["Title"] = "Add Phone Number"; -} - -

@ViewData["Title"].

-
-

Add a phone number.

-
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/ChangePassword.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/ChangePassword.cshtml deleted file mode 100644 index 41c7960c8..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/ChangePassword.cshtml +++ /dev/null @@ -1,42 +0,0 @@ -@model ChangePasswordViewModel -@{ - ViewData["Title"] = "Change Password"; -} - -

@ViewData["Title"].

- -
-

Change Password Form

-
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/Index.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/Index.cshtml deleted file mode 100644 index 8419b2429..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/Index.cshtml +++ /dev/null @@ -1,71 +0,0 @@ -@model IndexViewModel -@{ - ViewData["Title"] = "Manage your account"; -} - -

@ViewData["Title"].

-

@ViewData["StatusMessage"]

- -
-

Change your account settings

-
-
-
Password:
-
- @if (Model.HasPassword) - { - Change - } - else - { - Create - } -
-
External Logins:
-
- - @Model.Logins.Count Manage -
-
Phone Number:
-
-

- Phone Numbers can used as a second factor of verification in two-factor authentication. - See this article - for details on setting up this ASP.NET application to support two-factor authentication using SMS. -

- @*@(Model.PhoneNumber ?? "None") - @if (Model.PhoneNumber != null) - { -
- Change -
- [] -
- } - else - { - Add - }*@ -
- -
Two-Factor Authentication:
-
-

- There are no two-factor authentication providers configured. See this article - for setting up this application to support two-factor authentication. -

- @*@if (Model.TwoFactor) - { -
- Enabled -
- } - else - { -
- Disabled -
- }*@ -
-
-
diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/ManageLogins.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/ManageLogins.cshtml deleted file mode 100644 index 35e12da68..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/ManageLogins.cshtml +++ /dev/null @@ -1,54 +0,0 @@ -@model ManageLoginsViewModel -@using Microsoft.AspNetCore.Http.Authentication -@{ - ViewData["Title"] = "Manage your external logins"; -} - -

@ViewData["Title"].

- -

@ViewData["StatusMessage"]

-@if (Model.CurrentLogins.Count > 0) -{ -

Registered Logins

- - - @for (var index = 0; index < Model.CurrentLogins.Count; index++) - { - - - - - } - -
@Model.CurrentLogins[index].LoginProvider - @if ((bool)ViewData["ShowRemoveButton"]) - { -
-
- - - -
-
- } - else - { - @:   - } -
-} -@if (Model.OtherLogins.Count > 0) -{ -

Add another service to log in.

-
-
-
-

- @foreach (var provider in Model.OtherLogins) - { - - } -

-
-
-} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/SetPassword.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/SetPassword.cshtml deleted file mode 100644 index cfa779160..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/SetPassword.cshtml +++ /dev/null @@ -1,38 +0,0 @@ -@model SetPasswordViewModel -@{ - ViewData["Title"] = "Set Password"; -} - -

- You do not have a local username/password for this site. Add a local - account so you can log in without an external login. -

- -
-

Set your password

-
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/VerifyPhoneNumber.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/VerifyPhoneNumber.cshtml deleted file mode 100644 index af7cd0b1f..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Manage/VerifyPhoneNumber.cshtml +++ /dev/null @@ -1,30 +0,0 @@ -@model VerifyPhoneNumberViewModel -@{ - ViewData["Title"] = "Verify Phone Number"; -} - -

@ViewData["Title"].

- -
- -

Add a phone number.

-
@ViewData["Status"]
-
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/Error.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/Error.cshtml deleted file mode 100644 index 229c2dead..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/Error.cshtml +++ /dev/null @@ -1,14 +0,0 @@ -@{ - ViewData["Title"] = "Error"; -} - -

Error.

-

An error occurred while processing your request.

- -

Development Mode

-

- Swapping to Development environment will display more detailed information about the error that occurred. -

-

- Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. -

diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/_Layout.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/_Layout.cshtml deleted file mode 100644 index 56827ca52..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - @ViewData["Title"] - WebApplication - - - - - - - - - - - -
-
-
- - WebApplication -
-
- - @await Html.PartialAsync("_LoginPartial") -
-
-
-
- @RenderBody() -
-
-

© 2016 - WebApplication

-
-
- - - - - - - - - - - - - @RenderSection("scripts", required: false) - - diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/_LoginPartial.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/_LoginPartial.cshtml deleted file mode 100644 index f50d5e89e..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/_LoginPartial.cshtml +++ /dev/null @@ -1,26 +0,0 @@ -@using Microsoft.AspNetCore.Identity -@using WebApplication.Models - -@inject SignInManager SignInManager -@inject UserManager UserManager - -@if (SignInManager.IsSignedIn(User)) -{ - -} -else -{ - -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/_ValidationScriptsPartial.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/_ValidationScriptsPartial.cshtml deleted file mode 100644 index 289b22064..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/Shared/_ValidationScriptsPartial.cshtml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/_ViewImports.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/_ViewImports.cshtml deleted file mode 100644 index dcca16cb0..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/_ViewImports.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@using WebApplication -@using WebApplication.Models -@using WebApplication.Models.AccountViewModels -@using WebApplication.Models.ManageViewModels -@using Microsoft.AspNetCore.Identity -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/_ViewStart.cshtml b/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/_ViewStart.cshtml deleted file mode 100644 index 820a2f6e0..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/appsettings.json b/TestAssets/TestProjects/ProjectJsonWebTemplate/appsettings.json deleted file mode 100644 index 53b17ae04..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/appsettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Data Source=WebApplication.db" - }, - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/bower.json b/TestAssets/TestProjects/ProjectJsonWebTemplate/bower.json deleted file mode 100644 index 3891fce13..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/bower.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "webapplication", - "private": true, - "dependencies": { - "bootstrap": "3.3.6", - "jquery": "2.2.3", - "jquery-validation": "1.15.0", - "jquery-validation-unobtrusive": "3.2.6" - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/gulpfile.js b/TestAssets/TestProjects/ProjectJsonWebTemplate/gulpfile.js deleted file mode 100644 index faf295540..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/gulpfile.js +++ /dev/null @@ -1,45 +0,0 @@ -/// -"use strict"; - -var gulp = require("gulp"), - rimraf = require("rimraf"), - concat = require("gulp-concat"), - cssmin = require("gulp-cssmin"), - uglify = require("gulp-uglify"); - -var webroot = "./wwwroot/"; - -var paths = { - js: webroot + "js/**/*.js", - minJs: webroot + "js/**/*.min.js", - css: webroot + "css/**/*.css", - minCss: webroot + "css/**/*.min.css", - concatJsDest: webroot + "js/site.min.js", - concatCssDest: webroot + "css/site.min.css" -}; - -gulp.task("clean:js", function (cb) { - rimraf(paths.concatJsDest, cb); -}); - -gulp.task("clean:css", function (cb) { - rimraf(paths.concatCssDest, cb); -}); - -gulp.task("clean", ["clean:js", "clean:css"]); - -gulp.task("min:js", function () { - return gulp.src([paths.js, "!" + paths.minJs], { base: "." }) - .pipe(concat(paths.concatJsDest)) - .pipe(uglify()) - .pipe(gulp.dest(".")); -}); - -gulp.task("min:css", function () { - return gulp.src([paths.css, "!" + paths.minCss]) - .pipe(concat(paths.concatCssDest)) - .pipe(cssmin()) - .pipe(gulp.dest(".")); -}); - -gulp.task("min", ["min:js", "min:css"]); diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/package.json b/TestAssets/TestProjects/ProjectJsonWebTemplate/package.json deleted file mode 100644 index 4bb6c884c..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "webapplication", - "version": "0.0.0", - "private": true, - "devDependencies": { - "gulp": "3.9.1", - "gulp-concat": "2.6.0", - "gulp-cssmin": "0.1.7", - "gulp-uglify": "1.5.3", - "rimraf": "2.5.2" - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json b/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json deleted file mode 100644 index e82212642..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "userSecretsId": "aspnet-WebApplication-0799fe3e-6eaf-4c5f-b40e-7c6bfd5dfa9a", - - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Routing": "1.0.1", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.EntityFrameworkCore.Sqlite": "1.0.1", - "Microsoft.EntityFrameworkCore.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-update1", - "type": "build" - }, - "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { - "version": "1.0.0-preview2-update1", - "type": "build" - } - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - }, - "Microsoft.AspNetCore.Server.IISIntegration.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - }, - "Microsoft.EntityFrameworkCore.Tools": { - "version": "1.0.0-preview2-final", - "imports": [ - "portable-net45+win8+dnxcore50", - "portable-net45+win8" - ] - }, - "Microsoft.Extensions.SecretManager.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - }, - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", - "imports": [ - "portable-net45+win8+dnxcore50", - "portable-net45+win8" - ] - } - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "dnxcore50", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "**/*.cshtml", - "appsettings.json", - "web.config", - "README.md" - ] - }, - - "scripts": { - "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ], - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "tooling": { - "defaultNamespace": "WebApplication" - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/web.config b/TestAssets/TestProjects/ProjectJsonWebTemplate/web.config deleted file mode 100644 index a8d667275..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/web.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/css/site.css b/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/css/site.css deleted file mode 100644 index 6baa84da1..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/css/site.css +++ /dev/null @@ -1,44 +0,0 @@ -body { - padding-top: 50px; - padding-bottom: 20px; -} - -/* Wrapping element */ -/* Set some basic padding to keep content from hitting the edges */ -.body-content { - padding-left: 15px; - padding-right: 15px; -} - -/* Set widths on the form inputs since otherwise they're 100% wide */ -input, -select, -textarea { - max-width: 280px; -} - -/* Carousel */ -.carousel-caption p { - font-size: 20px; - line-height: 1.4; -} - -/* buttons and links extension to use brackets: [ click me ] */ -.btn-bracketed::before { - display:inline-block; - content: "["; - padding-right: 0.5em; -} -.btn-bracketed::after { - display:inline-block; - content: "]"; - padding-left: 0.5em; -} - -/* Hide/rearrange for smaller screens */ -@media screen and (max-width: 767px) { - /* Hide captions */ - .carousel-caption { - display: none - } -} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/css/site.min.css b/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/css/site.min.css deleted file mode 100644 index c8f600ac5..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/css/site.min.css +++ /dev/null @@ -1 +0,0 @@ -body{padding-top:50px;padding-bottom:20px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.carousel-caption p{font-size:20px;line-height:1.4}.btn-bracketed::before{display:inline-block;content:"[";padding-right:.5em}.btn-bracketed::after{display:inline-block;content:"]";padding-left:.5em}@media screen and (max-width:767px){.carousel-caption{display:none}} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/favicon.ico b/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/favicon.ico deleted file mode 100644 index a3a799985..000000000 Binary files a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/favicon.ico and /dev/null differ diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner1.svg b/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner1.svg deleted file mode 100644 index 1ab32b60b..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner2.svg b/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner2.svg deleted file mode 100644 index 9679c604d..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner3.svg b/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner3.svg deleted file mode 100644 index 9be2c2503..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner3.svg +++ /dev/null @@ -1 +0,0 @@ -banner3b \ No newline at end of file diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner4.svg b/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner4.svg deleted file mode 100644 index 38b3d7cd1..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/images/banner4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/js/site.js b/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/js/site.js deleted file mode 100644 index e069226a1..000000000 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/js/site.js +++ /dev/null @@ -1 +0,0 @@ -// Write your Javascript code. diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/js/site.min.js b/TestAssets/TestProjects/ProjectJsonWebTemplate/wwwroot/js/site.min.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/global.json b/TestAssets/TestProjects/ProjectsWithGlobalJson/global.json deleted file mode 100644 index 2b2293b26..000000000 --- a/TestAssets/TestProjects/ProjectsWithGlobalJson/global.json +++ /dev/null @@ -1,4 +0,0 @@ - -{ - "projects": [ "src", "src with spaces", "src without projects" ] -} \ No newline at end of file diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/.noautobuild b/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/Program.cs b/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/Program.cs deleted file mode 100644 index db2c801fd..000000000 --- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/Program.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Diagnostics; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("This string came from ProjectJ"); - string helperStr = TestLibrary.ProjectI.GetMessage(); - Console.WriteLine(helperStr); - return 0; - } - } -} diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json b/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json deleted file mode 100644 index 89299337a..000000000 --- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "ProjectI": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.1" - } - }, - "frameworks": { - "netcoreapp1.1": {} - } -} diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/.noautobuild b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/Program.cs b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/Program.cs deleted file mode 100644 index 27e455e98..000000000 --- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/Program.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Diagnostics; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("This string came from ProjectH"); - string helperStr = TestLibrary.ProjectI.GetMessage(); - Console.WriteLine(helperStr); - return 0; - } - } -} diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json deleted file mode 100644 index 003e499f1..000000000 --- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "ProjectI": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "frameworks": { - "netcoreapp1.1": {} - } -} diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectI/.noautobuild b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectI/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectI/Helper.cs b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectI/Helper.cs deleted file mode 100644 index d92100c45..000000000 --- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectI/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectI - { - public static string GetMessage() - { - return "This string came from ProjectI"; - } - } -} diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectI/project.json b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectI/project.json deleted file mode 100644 index 48bc772d8..000000000 --- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectI/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj deleted file mode 100644 index cb6b4e876..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Library - netstandard1.5 - - - - - - - - - - diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/Helper.cs deleted file mode 100644 index a9734c078..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectC - { - public static string GetMessage() - { - return "This string came from CsprojLibrary1"; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json deleted file mode 100644 index bc57c51ff..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": {}, - "frameworks": { - "netstandard1.5": { - "dependencies": { - "Microsoft.NET.Sdk": "1.0.0-alpha-20161104-2", - "NETStandard.Library": "1.6.0" - } - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj deleted file mode 100644 index cb6b4e876..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Library - netstandard1.5 - - - - - - - - - - diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/Helper.cs deleted file mode 100644 index d32ed6e6b..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectC - { - public static string GetMessage() - { - return "This string came from CsprojLibrary2"; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json deleted file mode 100644 index bc57c51ff..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": {}, - "frameworks": { - "netstandard1.5": { - "dependencies": { - "Microsoft.NET.Sdk": "1.0.0-alpha-20161104-2", - "NETStandard.Library": "1.6.0" - } - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj deleted file mode 100644 index cb6b4e876..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Library - netstandard1.5 - - - - - - - - - - diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/Helper.cs deleted file mode 100644 index d7784a65d..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectC - { - public static string GetMessage() - { - return "This string came from CsprojLibrary3"; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json deleted file mode 100644 index bc57c51ff..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": {}, - "frameworks": { - "netstandard1.5": { - "dependencies": { - "Microsoft.NET.Sdk": "1.0.0-alpha-20161104-2", - "NETStandard.Library": "1.6.0" - } - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/Program.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/Program.cs deleted file mode 100644 index 1d1f78b84..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/Program.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Diagnostics; -using TestLibrary; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("This string came from ProjectA"); - Console.WriteLine($"{ProjectD.GetMessage()}"); - return 0; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json deleted file mode 100644 index ab0e331eb..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "ProjectB": { - "target": "project", - "version": "1.0.0-*" - }, - "ProjectC": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": "1.1.0" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/Helper.cs deleted file mode 100644 index 5a986d891..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectB - { - public static string GetMessage() - { - return "This string came from ProjectB"; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/project.json deleted file mode 100644 index 1eb055cca..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectB/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "ProjectC": { - "target": "project", - "version": "1.0.0-*" - }, - "ProjectD": { - "target": "project", - "version": "1.0.0-*" - }, - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/Helper.cs deleted file mode 100644 index 317f57fc2..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectC - { - public static string GetMessage() - { - return "This string came from ProjectC"; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/ProjectC.xproj b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/ProjectC.xproj deleted file mode 100644 index 47fef9e1d..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/ProjectC.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 084222f1-7909-48f4-81e8-a97398b26b1c - ProjectC - obj - bin - v4.6 - - - 2.0 - - - - - - - \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/project.json deleted file mode 100644 index 3dab0b9a6..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectC/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "ProjectD": { - "target": "project", - "version": "1.0.0-*" - }, - "ProjectE": { - "target": "project", - "version": "1.0.0-*" - }, - "CsprojLibrary1": { - "target": "project" - }, - "CsprojLibrary2": { - "target": "project" - }, - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/Helper.cs deleted file mode 100644 index 0c0422913..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectD - { - public static string GetMessage() - { - return "This string came from ProjectD"; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/project.json deleted file mode 100644 index 48bc772d8..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectD/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/Helper.cs deleted file mode 100644 index b91a23164..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectE - { - public static string GetMessage() - { - return "This string came from ProjectE"; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/ProjectE.xproj b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/ProjectE.xproj deleted file mode 100644 index 3cd98ff52..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/ProjectE.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7fb8f138-ffb0-4eec-af9e-2e6ff9979593 - ProjectE - obj - bin - v4.6 - - - 2.0 - - - - - - - \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/project.json deleted file mode 100644 index f21f103f3..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectE/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "CsprojLibrary2": { - "target": "project" - }, - "CsprojLibrary3": { - "target": "project" - }, - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/Program.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/Program.cs deleted file mode 100644 index 5f68b57d5..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/Program.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Diagnostics; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("This string came from ProjectF"); - string helperStr = TestLibrary.ProjectG.GetMessage(); - Console.WriteLine(helperStr); - return 0; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json deleted file mode 100644 index 585da58f6..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "ProjectG": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "frameworks": { - "netcoreapp1.1": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/Helper.cs deleted file mode 100644 index 055698989..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectG - { - public static string GetMessage() - { - return "This string came from ProjectG"; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/project.json deleted file mode 100644 index 48bc772d8..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectG/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/global.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/global.json deleted file mode 100644 index 2b2293b26..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/global.json +++ /dev/null @@ -1,4 +0,0 @@ - -{ - "projects": [ "src", "src with spaces", "src without projects" ] -} \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/Program.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/Program.cs deleted file mode 100644 index db2c801fd..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/Program.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Diagnostics; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("This string came from ProjectJ"); - string helperStr = TestLibrary.ProjectI.GetMessage(); - Console.WriteLine(helperStr); - return 0; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json deleted file mode 100644 index 003e499f1..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "ProjectI": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "frameworks": { - "netcoreapp1.1": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/Program.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/Program.cs deleted file mode 100644 index 27e455e98..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/Program.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Diagnostics; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("This string came from ProjectH"); - string helperStr = TestLibrary.ProjectI.GetMessage(); - Console.WriteLine(helperStr); - return 0; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json deleted file mode 100644 index 003e499f1..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "ProjectI": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "frameworks": { - "netcoreapp1.1": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/.noautobuild b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/Helper.cs b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/Helper.cs deleted file mode 100644 index d92100c45..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/Helper.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace TestLibrary -{ - public static class ProjectI - { - public static string GetMessage() - { - return "This string came from ProjectI"; - } - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/project.json deleted file mode 100644 index 48bc772d8..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectI/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/global.json b/TestAssets/TestProjects/TestAppDependencyGraph/global.json deleted file mode 100644 index 9e26dfeeb..000000000 --- a/TestAssets/TestProjects/TestAppDependencyGraph/global.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithContents/Program.cs b/TestAssets/TestProjects/TestAppWithContents/Program.cs deleted file mode 100644 index dc54ad2be..000000000 --- a/TestAssets/TestProjects/TestAppWithContents/Program.cs +++ /dev/null @@ -1,16 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine("Hello World!"); - return 0; - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithContents/TestAppWithContents.xproj b/TestAssets/TestProjects/TestAppWithContents/TestAppWithContents.xproj deleted file mode 100644 index fa06ff0b3..000000000 --- a/TestAssets/TestProjects/TestAppWithContents/TestAppWithContents.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json deleted file mode 100644 index b23cbdc8b..000000000 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": { - "include": "testcontentfile.txt", - "mappings": { - "dir/mappingfile.txt":{ - "include": "testcontentfile2.txt" - }, - "out/": { - "include": ["Program.cs"], - "exclude": ["Program.cs"], - "includeFiles": ["Program.cs"], - "excludeFiles": ["Program.cs"] - } - } - } - }, - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - } - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "publishOptions": { - "include": "testcontentfile.txt" - } -} diff --git a/TestAssets/TestProjects/TestAppWithContents/testcontentfile.txt b/TestAssets/TestProjects/TestAppWithContents/testcontentfile.txt deleted file mode 100644 index 9a1cc0232..000000000 --- a/TestAssets/TestProjects/TestAppWithContents/testcontentfile.txt +++ /dev/null @@ -1 +0,0 @@ -This is to test if contents are copied correctly by the dotnet tools \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithContents/testcontentfile2.txt b/TestAssets/TestProjects/TestAppWithContents/testcontentfile2.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppWithEmbeddedResources/Program.cs b/TestAssets/TestProjects/TestAppWithEmbeddedResources/Program.cs deleted file mode 100755 index 9d31ed2c9..000000000 --- a/TestAssets/TestProjects/TestAppWithEmbeddedResources/Program.cs +++ /dev/null @@ -1,27 +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. - -using System; -using System.Linq; -using System.Reflection; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - var thisAssembly = typeof(Program).GetTypeInfo().Assembly; - var resources = from resourceName in thisAssembly.GetManifestResourceNames() - select resourceName; - - if (resources.Count() > 1) - { - throw new Exception($"{resources.Count()} found in the assembly. Was expecting only 1."); - } - - var resourceNames = string.Join(",", resources); - Console.WriteLine($"{resources.Count()} Resources Found: {resourceNames}"); - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithEmbeddedResources/Resources/Strings.resx b/TestAssets/TestProjects/TestAppWithEmbeddedResources/Resources/Strings.resx deleted file mode 100644 index 1f24a372f..000000000 --- a/TestAssets/TestProjects/TestAppWithEmbeddedResources/Resources/Strings.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Hello World! - - \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json b/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json deleted file mode 100755 index 4f97537d9..000000000 --- a/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "embed": [ "Resources/*.resx" ] - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithExplicitInclude/Program.cs b/TestAssets/TestProjects/TestAppWithExplicitInclude/Program.cs deleted file mode 100644 index 7e52efa0e..000000000 --- a/TestAssets/TestProjects/TestAppWithExplicitInclude/Program.cs +++ /dev/null @@ -1,12 +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. - -using System; - -class Program -{ - static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } -} diff --git a/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json b/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json deleted file mode 100644 index bd75d882b..000000000 --- a/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "compile": { - "include": [ - "Program.cs" - ] - } - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/Program.cs b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/Program.cs deleted file mode 100644 index 7e52efa0e..000000000 --- a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/Program.cs +++ /dev/null @@ -1,12 +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. - -using System; - -class Program -{ - static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } -} diff --git a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json deleted file mode 100644 index 56f3433fc..000000000 --- a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "compile": { - "include": [ - "**/*.cs" - ] - } - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/Program.cs b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/Program.cs deleted file mode 100644 index ac3163a58..000000000 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/Program.cs +++ /dev/null @@ -1,17 +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. - -using System; -using System.Diagnostics; - -namespace TestApp -{ - public class Program - { - public static int Main(string[] args) - { - Console.WriteLine(TestLibrary.Helper.GetMessage()); - return 100; - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj deleted file mode 100644 index 53f0c8b7a..000000000 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj.user b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj.user deleted file mode 100644 index efbe88aa6..000000000 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/TestApp.xproj.user +++ /dev/null @@ -1 +0,0 @@ -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. \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json deleted file mode 100644 index 8edb9fd32..000000000 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - "dependencies": { - "TestLibrary": { - "target": "project", - "version": "1.0.0-*" - }, - "Microsoft.NETCore.App": "1.1.0" - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "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/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/.noautobuild b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/Helper.cs b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/Helper.cs deleted file mode 100644 index 8c643796b..000000000 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/Helper.cs +++ /dev/null @@ -1,24 +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. - -using System; - -namespace TestLibrary -{ - public static class Helper - { - /// - /// Gets the message from the helper. This comment is here to help test XML documentation file generation, please do not remove it. - /// - /// A message - public static string GetMessage() - { - return "This string came from the test library!"; - } - - public static void SayHi() - { - Console.WriteLine("Hello there!"); - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj deleted file mode 100644 index 53f0c8b7a..000000000 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.23107 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0138cb8f-4aa9-4029-a21e-c07c30f425ba - TestAppWithContents - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - - - 2.0 - - - \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj.user b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj.user deleted file mode 100644 index efbe88aa6..000000000 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/TestLibrary.xproj.user +++ /dev/null @@ -1 +0,0 @@ -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. \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json deleted file mode 100644 index 48bc772d8..000000000 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "nowarn": [ - "CS1591" - ], - "xmlDoc": true, - "additionalArguments": [ - "-highentropyva+" - ] - }, - "dependencies": { - "NETStandard.Library": "1.6.0" - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/global.json b/TestAssets/TestProjects/TestAppWithLibrary/global.json deleted file mode 100644 index 3a4684c26..000000000 --- a/TestAssets/TestProjects/TestAppWithLibrary/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": [ "."] -} \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithRuntimeOptions/Program.cs b/TestAssets/TestProjects/TestAppWithRuntimeOptions/Program.cs deleted file mode 100644 index 2130cd0a7..000000000 --- a/TestAssets/TestProjects/TestAppWithRuntimeOptions/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json b/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json deleted file mode 100644 index 3727b2ece..000000000 --- a/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - } - }, - "frameworks": { - "netcoreapp1.1": {} - }, - "runtimeOptions": { - "somethingString": "anything", - "somethingBoolean": true, - "someArray": [ - "one", - "two" - ], - "someObject": { - "someProperty": "someValue" - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithSigning/Program.cs b/TestAssets/TestProjects/TestAppWithSigning/Program.cs deleted file mode 100644 index 2130cd0a7..000000000 --- a/TestAssets/TestProjects/TestAppWithSigning/Program.cs +++ /dev/null @@ -1,15 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/TestProjects/TestAppWithSigning/key.snk b/TestAssets/TestProjects/TestAppWithSigning/key.snk deleted file mode 100644 index fe413a523..000000000 Binary files a/TestAssets/TestProjects/TestAppWithSigning/key.snk and /dev/null differ diff --git a/TestAssets/TestProjects/TestAppWithSigning/project.json b/TestAssets/TestProjects/TestAppWithSigning/project.json deleted file mode 100644 index fa84e6e50..000000000 --- a/TestAssets/TestProjects/TestAppWithSigning/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "keyFile": "./key.snk" - }, - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - }, - "frameworks": { - "netcoreapp1.1": {} - } -} diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/.noautobuild b/TestAssets/TestProjects/TestLibraryWithAnalyzer/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/Program.cs b/TestAssets/TestProjects/TestLibraryWithAnalyzer/Program.cs deleted file mode 100644 index 0eeb0eb96..000000000 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/Program.cs +++ /dev/null @@ -1,18 +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. - -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } - - public class TT : Attribute - {} -} diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json deleted file mode 100644 index 73a907775..000000000 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Runtime.Analyzers": { - "version": "1.1.0", - "type": "build" - } - }, - "frameworks": { - "netstandard1.5": {} - } -} diff --git a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/.noautobuild b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/.noautobuild deleted file mode 100644 index e69de29bb..000000000 diff --git a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs deleted file mode 100644 index 4582f6761..000000000 --- a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs +++ /dev/null @@ -1,16 +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. - -using System; -using System.Xml; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main() - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/project.json deleted file mode 100644 index 33104dede..000000000 --- a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": false - }, - "dependencies": {}, - "frameworks": { - "netcoreapp1.0": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.6.0" - } - }, - "netstandard1.5": { - "imports": "dnxcore50", - "dependencies": { - "NETStandard.Library": "1.6.0" - } - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/.bowerrc b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/.bowerrc deleted file mode 100755 index 6406626ab..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "wwwroot/lib" -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/.gitignore b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/.gitignore deleted file mode 100755 index 0ca27f04e..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/.gitignore +++ /dev/null @@ -1,234 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ -[Bb]in/ -[Oo]bj/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Microsoft Azure ApplicationInsights config file -ApplicationInsights.config - -# Windows Store app package directory -AppPackages/ -BundleArtifacts/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe - -# FAKE - F# Make -.fake/ diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/AccountController.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/AccountController.cs deleted file mode 100755 index a6b81482d..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/AccountController.cs +++ /dev/null @@ -1,471 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Claims; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.Extensions.Logging; -using WebApplication.Models; -using WebApplication.Models.AccountViewModels; -using WebApplication.Services; - -namespace WebApplication.Controllers -{ - [Authorize] - public class AccountController : Controller - { - private readonly UserManager _userManager; - private readonly SignInManager _signInManager; - private readonly IEmailSender _emailSender; - private readonly ISmsSender _smsSender; - private readonly ILogger _logger; - - public AccountController( - UserManager userManager, - SignInManager signInManager, - IEmailSender emailSender, - ISmsSender smsSender, - ILoggerFactory loggerFactory) - { - _userManager = userManager; - _signInManager = signInManager; - _emailSender = emailSender; - _smsSender = smsSender; - _logger = loggerFactory.CreateLogger(); - } - - // - // GET: /Account/Login - [HttpGet] - [AllowAnonymous] - public IActionResult Login(string returnUrl = null) - { - ViewData["ReturnUrl"] = returnUrl; - return View(); - } - - // - // POST: /Account/Login - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task Login(LoginViewModel model, string returnUrl = null) - { - ViewData["ReturnUrl"] = returnUrl; - if (ModelState.IsValid) - { - // This doesn't count login failures towards account lockout - // To enable password failures to trigger account lockout, set lockoutOnFailure: true - var result = await _signInManager.PasswordSignInAsync(model.Email, model.Password, model.RememberMe, lockoutOnFailure: false); - if (result.Succeeded) - { - _logger.LogInformation(1, "User logged in."); - return RedirectToLocal(returnUrl); - } - if (result.RequiresTwoFactor) - { - return RedirectToAction(nameof(SendCode), new { ReturnUrl = returnUrl, RememberMe = model.RememberMe }); - } - if (result.IsLockedOut) - { - _logger.LogWarning(2, "User account locked out."); - return View("Lockout"); - } - else - { - ModelState.AddModelError(string.Empty, "Invalid login attempt."); - return View(model); - } - } - - // If we got this far, something failed, redisplay form - return View(model); - } - - // - // GET: /Account/Register - [HttpGet] - [AllowAnonymous] - public IActionResult Register(string returnUrl = null) - { - ViewData["ReturnUrl"] = returnUrl; - return View(); - } - - // - // POST: /Account/Register - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task Register(RegisterViewModel model, string returnUrl = null) - { - ViewData["ReturnUrl"] = returnUrl; - if (ModelState.IsValid) - { - var user = new ApplicationUser { UserName = model.Email, Email = model.Email }; - var result = await _userManager.CreateAsync(user, model.Password); - if (result.Succeeded) - { - // For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=532713 - // Send an email with this link - //var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); - //var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); - //await _emailSender.SendEmailAsync(model.Email, "Confirm your account", - // $"Please confirm your account by clicking this link: link"); - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(3, "User created a new account with password."); - return RedirectToLocal(returnUrl); - } - AddErrors(result); - } - - // If we got this far, something failed, redisplay form - return View(model); - } - - // - // POST: /Account/LogOff - [HttpPost] - [ValidateAntiForgeryToken] - public async Task LogOff() - { - await _signInManager.SignOutAsync(); - _logger.LogInformation(4, "User logged out."); - return RedirectToAction(nameof(HomeController.Index), "Home"); - } - - // - // POST: /Account/ExternalLogin - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public IActionResult ExternalLogin(string provider, string returnUrl = null) - { - // Request a redirect to the external login provider. - var redirectUrl = Url.Action("ExternalLoginCallback", "Account", new { ReturnUrl = returnUrl }); - var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl); - return Challenge(properties, provider); - } - - // - // GET: /Account/ExternalLoginCallback - [HttpGet] - [AllowAnonymous] - public async Task ExternalLoginCallback(string returnUrl = null, string remoteError = null) - { - if (remoteError != null) - { - ModelState.AddModelError(string.Empty, $"Error from external provider: {remoteError}"); - return View(nameof(Login)); - } - var info = await _signInManager.GetExternalLoginInfoAsync(); - if (info == null) - { - return RedirectToAction(nameof(Login)); - } - - // Sign in the user with this external login provider if the user already has a login. - var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false); - if (result.Succeeded) - { - _logger.LogInformation(5, "User logged in with {Name} provider.", info.LoginProvider); - return RedirectToLocal(returnUrl); - } - if (result.RequiresTwoFactor) - { - return RedirectToAction(nameof(SendCode), new { ReturnUrl = returnUrl }); - } - if (result.IsLockedOut) - { - return View("Lockout"); - } - else - { - // If the user does not have an account, then ask the user to create an account. - ViewData["ReturnUrl"] = returnUrl; - ViewData["LoginProvider"] = info.LoginProvider; - var email = info.Principal.FindFirstValue(ClaimTypes.Email); - return View("ExternalLoginConfirmation", new ExternalLoginConfirmationViewModel { Email = email }); - } - } - - // - // POST: /Account/ExternalLoginConfirmation - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task ExternalLoginConfirmation(ExternalLoginConfirmationViewModel model, string returnUrl = null) - { - if (ModelState.IsValid) - { - // Get the information about the user from the external login provider - var info = await _signInManager.GetExternalLoginInfoAsync(); - if (info == null) - { - return View("ExternalLoginFailure"); - } - var user = new ApplicationUser { UserName = model.Email, Email = model.Email }; - var result = await _userManager.CreateAsync(user); - if (result.Succeeded) - { - result = await _userManager.AddLoginAsync(user, info); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(6, "User created an account using {Name} provider.", info.LoginProvider); - return RedirectToLocal(returnUrl); - } - } - AddErrors(result); - } - - ViewData["ReturnUrl"] = returnUrl; - return View(model); - } - - // GET: /Account/ConfirmEmail - [HttpGet] - [AllowAnonymous] - public async Task ConfirmEmail(string userId, string code) - { - if (userId == null || code == null) - { - return View("Error"); - } - var user = await _userManager.FindByIdAsync(userId); - if (user == null) - { - return View("Error"); - } - var result = await _userManager.ConfirmEmailAsync(user, code); - return View(result.Succeeded ? "ConfirmEmail" : "Error"); - } - - // - // GET: /Account/ForgotPassword - [HttpGet] - [AllowAnonymous] - public IActionResult ForgotPassword() - { - return View(); - } - - // - // POST: /Account/ForgotPassword - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task ForgotPassword(ForgotPasswordViewModel model) - { - if (ModelState.IsValid) - { - var user = await _userManager.FindByNameAsync(model.Email); - if (user == null || !(await _userManager.IsEmailConfirmedAsync(user))) - { - // Don't reveal that the user does not exist or is not confirmed - return View("ForgotPasswordConfirmation"); - } - - // For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=532713 - // Send an email with this link - //var code = await _userManager.GeneratePasswordResetTokenAsync(user); - //var callbackUrl = Url.Action("ResetPassword", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); - //await _emailSender.SendEmailAsync(model.Email, "Reset Password", - // $"Please reset your password by clicking here: link"); - //return View("ForgotPasswordConfirmation"); - } - - // If we got this far, something failed, redisplay form - return View(model); - } - - // - // GET: /Account/ForgotPasswordConfirmation - [HttpGet] - [AllowAnonymous] - public IActionResult ForgotPasswordConfirmation() - { - return View(); - } - - // - // GET: /Account/ResetPassword - [HttpGet] - [AllowAnonymous] - public IActionResult ResetPassword(string code = null) - { - return code == null ? View("Error") : View(); - } - - // - // POST: /Account/ResetPassword - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task ResetPassword(ResetPasswordViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - var user = await _userManager.FindByNameAsync(model.Email); - if (user == null) - { - // Don't reveal that the user does not exist - return RedirectToAction(nameof(AccountController.ResetPasswordConfirmation), "Account"); - } - var result = await _userManager.ResetPasswordAsync(user, model.Code, model.Password); - if (result.Succeeded) - { - return RedirectToAction(nameof(AccountController.ResetPasswordConfirmation), "Account"); - } - AddErrors(result); - return View(); - } - - // - // GET: /Account/ResetPasswordConfirmation - [HttpGet] - [AllowAnonymous] - public IActionResult ResetPasswordConfirmation() - { - return View(); - } - - // - // GET: /Account/SendCode - [HttpGet] - [AllowAnonymous] - public async Task SendCode(string returnUrl = null, bool rememberMe = false) - { - var user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); - if (user == null) - { - return View("Error"); - } - var userFactors = await _userManager.GetValidTwoFactorProvidersAsync(user); - var factorOptions = userFactors.Select(purpose => new SelectListItem { Text = purpose, Value = purpose }).ToList(); - return View(new SendCodeViewModel { Providers = factorOptions, ReturnUrl = returnUrl, RememberMe = rememberMe }); - } - - // - // POST: /Account/SendCode - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task SendCode(SendCodeViewModel model) - { - if (!ModelState.IsValid) - { - return View(); - } - - var user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); - if (user == null) - { - return View("Error"); - } - - // Generate the token and send it - var code = await _userManager.GenerateTwoFactorTokenAsync(user, model.SelectedProvider); - if (string.IsNullOrWhiteSpace(code)) - { - return View("Error"); - } - - var message = "Your security code is: " + code; - if (model.SelectedProvider == "Email") - { - await _emailSender.SendEmailAsync(await _userManager.GetEmailAsync(user), "Security Code", message); - } - else if (model.SelectedProvider == "Phone") - { - await _smsSender.SendSmsAsync(await _userManager.GetPhoneNumberAsync(user), message); - } - - return RedirectToAction(nameof(VerifyCode), new { Provider = model.SelectedProvider, ReturnUrl = model.ReturnUrl, RememberMe = model.RememberMe }); - } - - // - // GET: /Account/VerifyCode - [HttpGet] - [AllowAnonymous] - public async Task VerifyCode(string provider, bool rememberMe, string returnUrl = null) - { - // Require that the user has already logged in via username/password or external login - var user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); - if (user == null) - { - return View("Error"); - } - return View(new VerifyCodeViewModel { Provider = provider, ReturnUrl = returnUrl, RememberMe = rememberMe }); - } - - // - // POST: /Account/VerifyCode - [HttpPost] - [AllowAnonymous] - [ValidateAntiForgeryToken] - public async Task VerifyCode(VerifyCodeViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - - // The following code protects for brute force attacks against the two factor codes. - // If a user enters incorrect codes for a specified amount of time then the user account - // will be locked out for a specified amount of time. - var result = await _signInManager.TwoFactorSignInAsync(model.Provider, model.Code, model.RememberMe, model.RememberBrowser); - if (result.Succeeded) - { - return RedirectToLocal(model.ReturnUrl); - } - if (result.IsLockedOut) - { - _logger.LogWarning(7, "User account locked out."); - return View("Lockout"); - } - else - { - ModelState.AddModelError(string.Empty, "Invalid code."); - return View(model); - } - } - - #region Helpers - - private void AddErrors(IdentityResult result) - { - foreach (var error in result.Errors) - { - ModelState.AddModelError(string.Empty, error.Description); - } - } - - private Task GetCurrentUserAsync() - { - return _userManager.GetUserAsync(HttpContext.User); - } - - private IActionResult RedirectToLocal(string returnUrl) - { - if (Url.IsLocalUrl(returnUrl)) - { - return Redirect(returnUrl); - } - else - { - return RedirectToAction(nameof(HomeController.Index), "Home"); - } - } - - #endregion - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/HomeController.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/HomeController.cs deleted file mode 100755 index 67d139496..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/HomeController.cs +++ /dev/null @@ -1,38 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -namespace WebApplication.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View(); - } - - public IActionResult About() - { - ViewData["Message"] = "Your application description page."; - - return View(); - } - - public IActionResult Contact() - { - ViewData["Message"] = "Your contact page."; - - return View(); - } - - public IActionResult Error() - { - return View(); - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/ManageController.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/ManageController.cs deleted file mode 100755 index f7ff98504..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/ManageController.cs +++ /dev/null @@ -1,350 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; -using WebApplication.Models; -using WebApplication.Models.ManageViewModels; -using WebApplication.Services; - -namespace WebApplication.Controllers -{ - [Authorize] - public class ManageController : Controller - { - private readonly UserManager _userManager; - private readonly SignInManager _signInManager; - private readonly IEmailSender _emailSender; - private readonly ISmsSender _smsSender; - private readonly ILogger _logger; - - public ManageController( - UserManager userManager, - SignInManager signInManager, - IEmailSender emailSender, - ISmsSender smsSender, - ILoggerFactory loggerFactory) - { - _userManager = userManager; - _signInManager = signInManager; - _emailSender = emailSender; - _smsSender = smsSender; - _logger = loggerFactory.CreateLogger(); - } - - // - // GET: /Manage/Index - [HttpGet] - public async Task Index(ManageMessageId? message = null) - { - ViewData["StatusMessage"] = - message == ManageMessageId.ChangePasswordSuccess ? "Your password has been changed." - : message == ManageMessageId.SetPasswordSuccess ? "Your password has been set." - : message == ManageMessageId.SetTwoFactorSuccess ? "Your two-factor authentication provider has been set." - : message == ManageMessageId.Error ? "An error has occurred." - : message == ManageMessageId.AddPhoneSuccess ? "Your phone number was added." - : message == ManageMessageId.RemovePhoneSuccess ? "Your phone number was removed." - : ""; - - var user = await GetCurrentUserAsync(); - var model = new IndexViewModel - { - HasPassword = await _userManager.HasPasswordAsync(user), - PhoneNumber = await _userManager.GetPhoneNumberAsync(user), - TwoFactor = await _userManager.GetTwoFactorEnabledAsync(user), - Logins = await _userManager.GetLoginsAsync(user), - BrowserRemembered = await _signInManager.IsTwoFactorClientRememberedAsync(user) - }; - return View(model); - } - - // - // POST: /Manage/RemoveLogin - [HttpPost] - [ValidateAntiForgeryToken] - public async Task RemoveLogin(RemoveLoginViewModel account) - { - ManageMessageId? message = ManageMessageId.Error; - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.RemoveLoginAsync(user, account.LoginProvider, account.ProviderKey); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - message = ManageMessageId.RemoveLoginSuccess; - } - } - return RedirectToAction(nameof(ManageLogins), new { Message = message }); - } - - // - // GET: /Manage/AddPhoneNumber - public IActionResult AddPhoneNumber() - { - return View(); - } - - // - // POST: /Manage/AddPhoneNumber - [HttpPost] - [ValidateAntiForgeryToken] - public async Task AddPhoneNumber(AddPhoneNumberViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - // Generate the token and send it - var user = await GetCurrentUserAsync(); - var code = await _userManager.GenerateChangePhoneNumberTokenAsync(user, model.PhoneNumber); - await _smsSender.SendSmsAsync(model.PhoneNumber, "Your security code is: " + code); - return RedirectToAction(nameof(VerifyPhoneNumber), new { PhoneNumber = model.PhoneNumber }); - } - - // - // POST: /Manage/EnableTwoFactorAuthentication - [HttpPost] - [ValidateAntiForgeryToken] - public async Task EnableTwoFactorAuthentication() - { - var user = await GetCurrentUserAsync(); - if (user != null) - { - await _userManager.SetTwoFactorEnabledAsync(user, true); - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(1, "User enabled two-factor authentication."); - } - return RedirectToAction(nameof(Index), "Manage"); - } - - // - // POST: /Manage/DisableTwoFactorAuthentication - [HttpPost] - [ValidateAntiForgeryToken] - public async Task DisableTwoFactorAuthentication() - { - var user = await GetCurrentUserAsync(); - if (user != null) - { - await _userManager.SetTwoFactorEnabledAsync(user, false); - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(2, "User disabled two-factor authentication."); - } - return RedirectToAction(nameof(Index), "Manage"); - } - - // - // GET: /Manage/VerifyPhoneNumber - [HttpGet] - public async Task VerifyPhoneNumber(string phoneNumber) - { - var code = await _userManager.GenerateChangePhoneNumberTokenAsync(await GetCurrentUserAsync(), phoneNumber); - // Send an SMS to verify the phone number - return phoneNumber == null ? View("Error") : View(new VerifyPhoneNumberViewModel { PhoneNumber = phoneNumber }); - } - - // - // POST: /Manage/VerifyPhoneNumber - [HttpPost] - [ValidateAntiForgeryToken] - public async Task VerifyPhoneNumber(VerifyPhoneNumberViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.ChangePhoneNumberAsync(user, model.PhoneNumber, model.Code); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.AddPhoneSuccess }); - } - } - // If we got this far, something failed, redisplay the form - ModelState.AddModelError(string.Empty, "Failed to verify phone number"); - return View(model); - } - - // - // POST: /Manage/RemovePhoneNumber - [HttpPost] - [ValidateAntiForgeryToken] - public async Task RemovePhoneNumber() - { - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.SetPhoneNumberAsync(user, null); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.RemovePhoneSuccess }); - } - } - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error }); - } - - // - // GET: /Manage/ChangePassword - [HttpGet] - public IActionResult ChangePassword() - { - return View(); - } - - // - // POST: /Manage/ChangePassword - [HttpPost] - [ValidateAntiForgeryToken] - public async Task ChangePassword(ChangePasswordViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.ChangePasswordAsync(user, model.OldPassword, model.NewPassword); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - _logger.LogInformation(3, "User changed their password successfully."); - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.ChangePasswordSuccess }); - } - AddErrors(result); - return View(model); - } - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error }); - } - - // - // GET: /Manage/SetPassword - [HttpGet] - public IActionResult SetPassword() - { - return View(); - } - - // - // POST: /Manage/SetPassword - [HttpPost] - [ValidateAntiForgeryToken] - public async Task SetPassword(SetPasswordViewModel model) - { - if (!ModelState.IsValid) - { - return View(model); - } - - var user = await GetCurrentUserAsync(); - if (user != null) - { - var result = await _userManager.AddPasswordAsync(user, model.NewPassword); - if (result.Succeeded) - { - await _signInManager.SignInAsync(user, isPersistent: false); - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.SetPasswordSuccess }); - } - AddErrors(result); - return View(model); - } - return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error }); - } - - //GET: /Manage/ManageLogins - [HttpGet] - public async Task ManageLogins(ManageMessageId? message = null) - { - ViewData["StatusMessage"] = - message == ManageMessageId.RemoveLoginSuccess ? "The external login was removed." - : message == ManageMessageId.AddLoginSuccess ? "The external login was added." - : message == ManageMessageId.Error ? "An error has occurred." - : ""; - var user = await GetCurrentUserAsync(); - if (user == null) - { - return View("Error"); - } - var userLogins = await _userManager.GetLoginsAsync(user); - var otherLogins = _signInManager.GetExternalAuthenticationSchemes().Where(auth => userLogins.All(ul => auth.AuthenticationScheme != ul.LoginProvider)).ToList(); - ViewData["ShowRemoveButton"] = user.PasswordHash != null || userLogins.Count > 1; - return View(new ManageLoginsViewModel - { - CurrentLogins = userLogins, - OtherLogins = otherLogins - }); - } - - // - // POST: /Manage/LinkLogin - [HttpPost] - [ValidateAntiForgeryToken] - public IActionResult LinkLogin(string provider) - { - // Request a redirect to the external login provider to link a login for the current user - var redirectUrl = Url.Action("LinkLoginCallback", "Manage"); - var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, _userManager.GetUserId(User)); - return Challenge(properties, provider); - } - - // - // GET: /Manage/LinkLoginCallback - [HttpGet] - public async Task LinkLoginCallback() - { - var user = await GetCurrentUserAsync(); - if (user == null) - { - return View("Error"); - } - var info = await _signInManager.GetExternalLoginInfoAsync(await _userManager.GetUserIdAsync(user)); - if (info == null) - { - return RedirectToAction(nameof(ManageLogins), new { Message = ManageMessageId.Error }); - } - var result = await _userManager.AddLoginAsync(user, info); - var message = result.Succeeded ? ManageMessageId.AddLoginSuccess : ManageMessageId.Error; - return RedirectToAction(nameof(ManageLogins), new { Message = message }); - } - - #region Helpers - - private void AddErrors(IdentityResult result) - { - foreach (var error in result.Errors) - { - ModelState.AddModelError(string.Empty, error.Description); - } - } - - public enum ManageMessageId - { - AddPhoneSuccess, - AddLoginSuccess, - ChangePasswordSuccess, - SetTwoFactorSuccess, - SetPasswordSuccess, - RemoveLoginSuccess, - RemovePhoneSuccess, - Error - } - - private Task GetCurrentUserAsync() - { - return _userManager.GetUserAsync(HttpContext.User); - } - - #endregion - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/ApplicationDbContext.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/ApplicationDbContext.cs deleted file mode 100755 index 329199667..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/ApplicationDbContext.cs +++ /dev/null @@ -1,29 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using WebApplication.Models; - -namespace WebApplication.Data -{ - public class ApplicationDbContext : IdentityDbContext - { - public ApplicationDbContext(DbContextOptions options) - : base(options) - { - } - - protected override void OnModelCreating(ModelBuilder builder) - { - base.OnModelCreating(builder); - // Customize the ASP.NET Identity model and override the defaults if needed. - // For example, you can rename the ASP.NET Identity table names and more. - // Add your customizations after calling base.OnModelCreating(builder); - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs deleted file mode 100755 index 5262b9296..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs +++ /dev/null @@ -1,215 +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. - -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using WebApplication.Data; - -namespace WebApplication.Data.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("00000000000000_CreateIdentitySchema")] - partial class CreateIdentitySchema - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { - modelBuilder - .HasAnnotation("ProductVersion", "1.0.0-rc2-20901"); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole", b => - { - b.Property("Id"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Name") - .HasAnnotation("MaxLength", 256); - - b.Property("NormalizedName") - .HasAnnotation("MaxLength", 256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .HasName("RoleNameIndex"); - - b.ToTable("AspNetRoles"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("RoleId") - .IsRequired(); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("UserId") - .IsRequired(); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => - { - b.Property("LoginProvider"); - - b.Property("ProviderKey"); - - b.Property("ProviderDisplayName"); - - b.Property("UserId") - .IsRequired(); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserRoles"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider"); - - b.Property("Name"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens"); - }); - - modelBuilder.Entity("WebApplication.Models.ApplicationUser", b => - { - b.Property("Id"); - - b.Property("AccessFailedCount"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Email") - .HasAnnotation("MaxLength", 256); - - b.Property("EmailConfirmed"); - - b.Property("LockoutEnabled"); - - b.Property("LockoutEnd"); - - b.Property("NormalizedEmail") - .HasAnnotation("MaxLength", 256); - - b.Property("NormalizedUserName") - .HasAnnotation("MaxLength", 256); - - b.Property("PasswordHash"); - - b.Property("PhoneNumber"); - - b.Property("PhoneNumberConfirmed"); - - b.Property("SecurityStamp"); - - b.Property("TwoFactorEnabled"); - - b.Property("UserName") - .HasAnnotation("MaxLength", 256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .HasName("UserNameIndex"); - - b.ToTable("AspNetUsers"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => - { - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => - { - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.cs deleted file mode 100755 index 751316b28..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.cs +++ /dev/null @@ -1,218 +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. - -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace WebApplication.Data.Migrations -{ - public partial class CreateIdentitySchema : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "AspNetRoles", - columns: table => new - { - Id = table.Column(nullable: false), - ConcurrencyStamp = table.Column(nullable: true), - Name = table.Column(nullable: true), - NormalizedName = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoles", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserTokens", - columns: table => new - { - UserId = table.Column(nullable: false), - LoginProvider = table.Column(nullable: false), - Name = table.Column(nullable: false), - Value = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); - }); - - migrationBuilder.CreateTable( - name: "AspNetUsers", - columns: table => new - { - Id = table.Column(nullable: false), - AccessFailedCount = table.Column(nullable: false), - ConcurrencyStamp = table.Column(nullable: true), - Email = table.Column(nullable: true), - EmailConfirmed = table.Column(nullable: false), - LockoutEnabled = table.Column(nullable: false), - LockoutEnd = table.Column(nullable: true), - NormalizedEmail = table.Column(nullable: true), - NormalizedUserName = table.Column(nullable: true), - PasswordHash = table.Column(nullable: true), - PhoneNumber = table.Column(nullable: true), - PhoneNumberConfirmed = table.Column(nullable: false), - SecurityStamp = table.Column(nullable: true), - TwoFactorEnabled = table.Column(nullable: false), - UserName = table.Column(nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUsers", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "AspNetRoleClaims", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Autoincrement", true), - ClaimType = table.Column(nullable: true), - ClaimValue = table.Column(nullable: true), - RoleId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); - table.ForeignKey( - name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserClaims", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("Autoincrement", true), - ClaimType = table.Column(nullable: true), - ClaimValue = table.Column(nullable: true), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); - table.ForeignKey( - name: "FK_AspNetUserClaims_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserLogins", - columns: table => new - { - LoginProvider = table.Column(nullable: false), - ProviderKey = table.Column(nullable: false), - ProviderDisplayName = table.Column(nullable: true), - UserId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); - table.ForeignKey( - name: "FK_AspNetUserLogins_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "AspNetUserRoles", - columns: table => new - { - UserId = table.Column(nullable: false), - RoleId = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); - table.ForeignKey( - name: "FK_AspNetUserRoles_AspNetRoles_RoleId", - column: x => x.RoleId, - principalTable: "AspNetRoles", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_AspNetUserRoles_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "RoleNameIndex", - table: "AspNetRoles", - column: "NormalizedName"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetRoleClaims_RoleId", - table: "AspNetRoleClaims", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserClaims_UserId", - table: "AspNetUserClaims", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserLogins_UserId", - table: "AspNetUserLogins", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserRoles_RoleId", - table: "AspNetUserRoles", - column: "RoleId"); - - migrationBuilder.CreateIndex( - name: "IX_AspNetUserRoles_UserId", - table: "AspNetUserRoles", - column: "UserId"); - - migrationBuilder.CreateIndex( - name: "EmailIndex", - table: "AspNetUsers", - column: "NormalizedEmail"); - - migrationBuilder.CreateIndex( - name: "UserNameIndex", - table: "AspNetUsers", - column: "NormalizedUserName"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "AspNetRoleClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserClaims"); - - migrationBuilder.DropTable( - name: "AspNetUserLogins"); - - migrationBuilder.DropTable( - name: "AspNetUserRoles"); - - migrationBuilder.DropTable( - name: "AspNetUserTokens"); - - migrationBuilder.DropTable( - name: "AspNetRoles"); - - migrationBuilder.DropTable( - name: "AspNetUsers"); - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/ApplicationDbContextModelSnapshot.cs deleted file mode 100755 index 54608c041..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ /dev/null @@ -1,214 +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. - -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using WebApplication.Data; - -namespace WebApplication.Data.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - partial class ApplicationDbContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { - modelBuilder - .HasAnnotation("ProductVersion", "1.0.0-rc2-20901"); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole", b => - { - b.Property("Id"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Name") - .HasAnnotation("MaxLength", 256); - - b.Property("NormalizedName") - .HasAnnotation("MaxLength", 256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .HasName("RoleNameIndex"); - - b.ToTable("AspNetRoles"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("RoleId") - .IsRequired(); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType"); - - b.Property("ClaimValue"); - - b.Property("UserId") - .IsRequired(); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => - { - b.Property("LoginProvider"); - - b.Property("ProviderKey"); - - b.Property("ProviderDisplayName"); - - b.Property("UserId") - .IsRequired(); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserRoles"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider"); - - b.Property("Name"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens"); - }); - - modelBuilder.Entity("WebApplication.Models.ApplicationUser", b => - { - b.Property("Id"); - - b.Property("AccessFailedCount"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Email") - .HasAnnotation("MaxLength", 256); - - b.Property("EmailConfirmed"); - - b.Property("LockoutEnabled"); - - b.Property("LockoutEnd"); - - b.Property("NormalizedEmail") - .HasAnnotation("MaxLength", 256); - - b.Property("NormalizedUserName") - .HasAnnotation("MaxLength", 256); - - b.Property("PasswordHash"); - - b.Property("PhoneNumber"); - - b.Property("PhoneNumberConfirmed"); - - b.Property("SecurityStamp"); - - b.Property("TwoFactorEnabled"); - - b.Property("UserName") - .HasAnnotation("MaxLength", 256); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .HasName("UserNameIndex"); - - b.ToTable("AspNetUsers"); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => - { - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => - { - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("WebApplication.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs deleted file mode 100755 index 033c4b789..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs +++ /dev/null @@ -1,18 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class ExternalLoginConfirmationViewModel - { - [Required] - [EmailAddress] - public string Email { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ForgotPasswordViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ForgotPasswordViewModel.cs deleted file mode 100755 index 5b026a9f3..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ForgotPasswordViewModel.cs +++ /dev/null @@ -1,18 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class ForgotPasswordViewModel - { - [Required] - [EmailAddress] - public string Email { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/LoginViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/LoginViewModel.cs deleted file mode 100755 index ae17051ab..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/LoginViewModel.cs +++ /dev/null @@ -1,25 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class LoginViewModel - { - [Required] - [EmailAddress] - public string Email { get; set; } - - [Required] - [DataType(DataType.Password)] - public string Password { get; set; } - - [Display(Name = "Remember me?")] - public bool RememberMe { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/RegisterViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/RegisterViewModel.cs deleted file mode 100755 index a6d5f1a96..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/RegisterViewModel.cs +++ /dev/null @@ -1,30 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class RegisterViewModel - { - [Required] - [EmailAddress] - [Display(Name = "Email")] - public string Email { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "Password")] - public string Password { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm password")] - [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ResetPasswordViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ResetPasswordViewModel.cs deleted file mode 100755 index 15c2967f1..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ResetPasswordViewModel.cs +++ /dev/null @@ -1,30 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class ResetPasswordViewModel - { - [Required] - [EmailAddress] - public string Email { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - public string Password { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm password")] - [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - - public string Code { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/SendCodeViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/SendCodeViewModel.cs deleted file mode 100755 index 2f44b9951..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/SendCodeViewModel.cs +++ /dev/null @@ -1,22 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.Rendering; - -namespace WebApplication.Models.AccountViewModels -{ - public class SendCodeViewModel - { - public string SelectedProvider { get; set; } - - public ICollection Providers { get; set; } - - public string ReturnUrl { get; set; } - - public bool RememberMe { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/VerifyCodeViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/VerifyCodeViewModel.cs deleted file mode 100755 index c1016c143..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/VerifyCodeViewModel.cs +++ /dev/null @@ -1,28 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.AccountViewModels -{ - public class VerifyCodeViewModel - { - [Required] - public string Provider { get; set; } - - [Required] - public string Code { get; set; } - - public string ReturnUrl { get; set; } - - [Display(Name = "Remember this browser?")] - public bool RememberBrowser { get; set; } - - [Display(Name = "Remember me?")] - public bool RememberMe { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ApplicationUser.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ApplicationUser.cs deleted file mode 100755 index 047cfadd5..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ApplicationUser.cs +++ /dev/null @@ -1,16 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; - -namespace WebApplication.Models -{ - // Add profile data for application users by adding properties to the ApplicationUser class - public class ApplicationUser : IdentityUser - { - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/AddPhoneNumberViewModel.cs deleted file mode 100755 index 0648e6f44..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/AddPhoneNumberViewModel.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class AddPhoneNumberViewModel - { - [Required] - [Phone] - [Display(Name = "Phone number")] - public string PhoneNumber { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ChangePasswordViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ChangePasswordViewModel.cs deleted file mode 100755 index 51093e9b1..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ChangePasswordViewModel.cs +++ /dev/null @@ -1,30 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class ChangePasswordViewModel - { - [Required] - [DataType(DataType.Password)] - [Display(Name = "Current password")] - public string OldPassword { get; set; } - - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "New password")] - public string NewPassword { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm new password")] - [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs deleted file mode 100755 index e56af0ec0..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs +++ /dev/null @@ -1,18 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.Rendering; - -namespace WebApplication.Models.ManageViewModels -{ - public class ConfigureTwoFactorViewModel - { - public string SelectedProvider { get; set; } - - public ICollection Providers { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/FactorViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/FactorViewModel.cs deleted file mode 100755 index 1b74bc14b..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/FactorViewModel.cs +++ /dev/null @@ -1,15 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class FactorViewModel - { - public string Purpose { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/IndexViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/IndexViewModel.cs deleted file mode 100755 index f97ce4cf4..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/IndexViewModel.cs +++ /dev/null @@ -1,24 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity; - -namespace WebApplication.Models.ManageViewModels -{ - public class IndexViewModel - { - public bool HasPassword { get; set; } - - public IList Logins { get; set; } - - public string PhoneNumber { get; set; } - - public bool TwoFactor { get; set; } - - public bool BrowserRemembered { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ManageLoginsViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ManageLoginsViewModel.cs deleted file mode 100755 index e2474b126..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ManageLoginsViewModel.cs +++ /dev/null @@ -1,19 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Authentication; -using Microsoft.AspNetCore.Identity; - -namespace WebApplication.Models.ManageViewModels -{ - public class ManageLoginsViewModel - { - public IList CurrentLogins { get; set; } - - public IList OtherLogins { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/RemoveLoginViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/RemoveLoginViewModel.cs deleted file mode 100755 index 031d5421b..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/RemoveLoginViewModel.cs +++ /dev/null @@ -1,17 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class RemoveLoginViewModel - { - public string LoginProvider { get; set; } - public string ProviderKey { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/SetPasswordViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/SetPasswordViewModel.cs deleted file mode 100755 index 861834531..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/SetPasswordViewModel.cs +++ /dev/null @@ -1,25 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class SetPasswordViewModel - { - [Required] - [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] - [DataType(DataType.Password)] - [Display(Name = "New password")] - public string NewPassword { get; set; } - - [DataType(DataType.Password)] - [Display(Name = "Confirm new password")] - [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] - public string ConfirmPassword { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs deleted file mode 100755 index 13ee9834e..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs +++ /dev/null @@ -1,22 +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. - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Models.ManageViewModels -{ - public class VerifyPhoneNumberViewModel - { - [Required] - public string Code { get; set; } - - [Required] - [Phone] - [Display(Name = "Phone number")] - public string PhoneNumber { get; set; } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Program.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Program.cs deleted file mode 100755 index de237aae7..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Program.cs +++ /dev/null @@ -1,27 +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. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; - -namespace WebApplication -{ - public class Program - { - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseStartup() - .Build(); - - host.Run(); - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/README.md b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/README.md deleted file mode 100755 index d8ba0b382..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Welcome to ASP.NET Core - -We've made some big updates in this release, so it’s **important** that you spend a few minutes to learn what’s new. - -You've created a new ASP.NET Core project. [Learn what's new](https://go.microsoft.com/fwlink/?LinkId=518016) - -## This application consists of: - -* Sample pages using ASP.NET Core MVC -* [Gulp](https://go.microsoft.com/fwlink/?LinkId=518007) and [Bower](https://go.microsoft.com/fwlink/?LinkId=518004) for managing client-side libraries -* Theming using [Bootstrap](https://go.microsoft.com/fwlink/?LinkID=398939) - -## How to - -* [Add a Controller and View](https://go.microsoft.com/fwlink/?LinkID=398600) -* [Add an appsetting in config and access it in app.](https://go.microsoft.com/fwlink/?LinkID=699562) -* [Manage User Secrets using Secret Manager.](https://go.microsoft.com/fwlink/?LinkId=699315) -* [Use logging to log a message.](https://go.microsoft.com/fwlink/?LinkId=699316) -* [Add packages using NuGet.](https://go.microsoft.com/fwlink/?LinkId=699317) -* [Add client packages using Bower.](https://go.microsoft.com/fwlink/?LinkId=699318) -* [Target development, staging or production environment.](https://go.microsoft.com/fwlink/?LinkId=699319) - -## Overview - -* [Conceptual overview of what is ASP.NET Core](https://go.microsoft.com/fwlink/?LinkId=518008) -* [Fundamentals of ASP.NET Core such as Startup and middleware.](https://go.microsoft.com/fwlink/?LinkId=699320) -* [Working with Data](https://go.microsoft.com/fwlink/?LinkId=398602) -* [Security](https://go.microsoft.com/fwlink/?LinkId=398603) -* [Client side development](https://go.microsoft.com/fwlink/?LinkID=699321) -* [Develop on different platforms](https://go.microsoft.com/fwlink/?LinkID=699322) -* [Read more on the documentation site](https://go.microsoft.com/fwlink/?LinkID=699323) - -## Run & Deploy - -* [Run your app](https://go.microsoft.com/fwlink/?LinkID=517851) -* [Run tools such as EF migrations and more](https://go.microsoft.com/fwlink/?LinkID=517853) -* [Publish to Microsoft Azure Web Apps](https://go.microsoft.com/fwlink/?LinkID=398609) - -We would love to hear your [feedback](https://go.microsoft.com/fwlink/?LinkId=518015) diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/IEmailSender.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/IEmailSender.cs deleted file mode 100755 index 8010a870c..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/IEmailSender.cs +++ /dev/null @@ -1,15 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Services -{ - public interface IEmailSender - { - Task SendEmailAsync(string email, string subject, string message); - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/ISmsSender.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/ISmsSender.cs deleted file mode 100755 index b887b6113..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/ISmsSender.cs +++ /dev/null @@ -1,15 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Services -{ - public interface ISmsSender - { - Task SendSmsAsync(string number, string message); - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/MessageServices.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/MessageServices.cs deleted file mode 100755 index c3ee43128..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/MessageServices.cs +++ /dev/null @@ -1,28 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace WebApplication.Services -{ - // This class is used by the application to send Email and SMS - // when you turn on two-factor authentication in ASP.NET Identity. - // For more details see this link https://go.microsoft.com/fwlink/?LinkID=532713 - public class AuthMessageSender : IEmailSender, ISmsSender - { - public Task SendEmailAsync(string email, string subject, string message) - { - // Plug in your email service here to send an email. - return Task.FromResult(0); - } - - public Task SendSmsAsync(string number, string message) - { - // Plug in your SMS service here to send a text message. - return Task.FromResult(0); - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Startup.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Startup.cs deleted file mode 100755 index 9280e73f0..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Startup.cs +++ /dev/null @@ -1,91 +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. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using WebApplication.Data; -using WebApplication.Models; -using WebApplication.Services; - -namespace WebApplication -{ - public class Startup - { - public Startup(IHostingEnvironment env) - { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true); - - if (env.IsDevelopment()) - { - // For more details on using the user secret store see https://go.microsoft.com/fwlink/?LinkID=532709 - builder.AddUserSecrets(); - } - - builder.AddEnvironmentVariables(); - Configuration = builder.Build(); - } - - public IConfigurationRoot Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - // Add framework services. - services.AddDbContext(options => - options.UseSqlite(Configuration.GetConnectionString("DefaultConnection"))); - - services.AddIdentity() - .AddEntityFrameworkStores() - .AddDefaultTokenProviders(); - - services.AddMvc(); - - // Add application services. - services.AddTransient(); - services.AddTransient(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) - { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - app.UseDatabaseErrorPage(); - app.UseBrowserLink(); - } - else - { - app.UseExceptionHandler("/Home/Error"); - } - - app.UseStaticFiles(); - - app.UseIdentity(); - - // Add external authentication middleware below. To configure them please see https://go.microsoft.com/fwlink/?LinkID=532715 - - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ConfirmEmail.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ConfirmEmail.cshtml deleted file mode 100755 index 8e8088d44..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ConfirmEmail.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -@{ - ViewData["Title"] = "Confirm Email"; -} - -

@ViewData["Title"].

-
-

- Thank you for confirming your email. Please Click here to Log in. -

-
diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ExternalLoginConfirmation.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ExternalLoginConfirmation.cshtml deleted file mode 100755 index eb3612b55..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ExternalLoginConfirmation.cshtml +++ /dev/null @@ -1,35 +0,0 @@ -@model ExternalLoginConfirmationViewModel -@{ - ViewData["Title"] = "Register"; -} - -

@ViewData["Title"].

-

Associate your @ViewData["LoginProvider"] account.

- -
-

Association Form

-
-
- -

- You've successfully authenticated with @ViewData["LoginProvider"]. - Please enter an email address for this site below and click the Register button to finish - logging in. -

-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ExternalLoginFailure.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ExternalLoginFailure.cshtml deleted file mode 100755 index 2509746be..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ExternalLoginFailure.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Login Failure"; -} - -
-

@ViewData["Title"].

-

Unsuccessful login with service.

-
diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ForgotPassword.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ForgotPassword.cshtml deleted file mode 100755 index 9d748023f..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ForgotPassword.cshtml +++ /dev/null @@ -1,31 +0,0 @@ -@model ForgotPasswordViewModel -@{ - ViewData["Title"] = "Forgot your password?"; -} - -

@ViewData["Title"]

-

- For more information on how to enable reset password please see this article. -

- -@*
-

Enter your email.

-
-
-
- -
- - -
-
-
-
- -
-
-
*@ - -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ForgotPasswordConfirmation.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ForgotPasswordConfirmation.cshtml deleted file mode 100755 index 4877fc83a..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ForgotPasswordConfirmation.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Forgot Password Confirmation"; -} - -

@ViewData["Title"].

-

- Please check your email to reset your password. -

diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/Lockout.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/Lockout.cshtml deleted file mode 100755 index 34ac56ff3..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/Lockout.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Locked out"; -} - -
-

Locked out.

-

This account has been locked out, please try again later.

-
diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/Login.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/Login.cshtml deleted file mode 100755 index 95430a12e..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/Login.cshtml +++ /dev/null @@ -1,92 +0,0 @@ -@using System.Collections.Generic -@using Microsoft.AspNetCore.Http -@using Microsoft.AspNetCore.Http.Authentication -@model LoginViewModel -@inject SignInManager SignInManager - -@{ - ViewData["Title"] = "Log in"; -} - -

@ViewData["Title"].

-
-
-
-
-

Use a local account to log in.

-
-
-
- -
- - -
-
-
- -
- - -
-
-
-
-
- -
-
-
-
-
- -
-
-

- Register as a new user? -

-

- Forgot your password? -

-
-
-
-
-
-

Use another service to log in.

-
- @{ - var loginProviders = SignInManager.GetExternalAuthenticationSchemes().ToList(); - if (loginProviders.Count == 0) - { -
-

- There are no external authentication services configured. See this article - for details on setting up this ASP.NET application to support logging in via external services. -

-
- } - else - { -
-
-

- @foreach (var provider in loginProviders) - { - - } -

-
-
- } - } -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/Register.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/Register.cshtml deleted file mode 100755 index 2090f900e..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/Register.cshtml +++ /dev/null @@ -1,42 +0,0 @@ -@model RegisterViewModel -@{ - ViewData["Title"] = "Register"; -} - -

@ViewData["Title"].

- -
-

Create a new account.

-
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ResetPassword.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ResetPassword.cshtml deleted file mode 100755 index dd716d735..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ResetPassword.cshtml +++ /dev/null @@ -1,43 +0,0 @@ -@model ResetPasswordViewModel -@{ - ViewData["Title"] = "Reset password"; -} - -

@ViewData["Title"].

- -
-

Reset your password.

-
-
- -
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ResetPasswordConfirmation.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ResetPasswordConfirmation.cshtml deleted file mode 100755 index 6321d858e..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/ResetPasswordConfirmation.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Reset password confirmation"; -} - -

@ViewData["Title"].

-

- Your password has been reset. Please Click here to log in. -

diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/SendCode.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/SendCode.cshtml deleted file mode 100755 index e85ca3c2b..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/SendCode.cshtml +++ /dev/null @@ -1,21 +0,0 @@ -@model SendCodeViewModel -@{ - ViewData["Title"] = "Send Verification Code"; -} - -

@ViewData["Title"].

- -
- -
-
- Select Two-Factor Authentication Provider: - - -
-
-
- -@section Scripts { - @{await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/VerifyCode.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/VerifyCode.cshtml deleted file mode 100755 index 60afb361d..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Account/VerifyCode.cshtml +++ /dev/null @@ -1,38 +0,0 @@ -@model VerifyCodeViewModel -@{ - ViewData["Title"] = "Verify"; -} - -

@ViewData["Title"].

- -
-
- - -

@ViewData["Status"]

-
-
- -
- - -
-
-
-
-
- - -
-
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Home/About.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Home/About.cshtml deleted file mode 100755 index b653a26f1..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Home/About.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@{ - ViewData["Title"] = "About"; -} -

@ViewData["Title"].

-

@ViewData["Message"]

- -

Use this area to provide additional information.

diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Home/Contact.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Home/Contact.cshtml deleted file mode 100755 index f953aa63d..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Home/Contact.cshtml +++ /dev/null @@ -1,17 +0,0 @@ -@{ - ViewData["Title"] = "Contact"; -} -

@ViewData["Title"].

-

@ViewData["Message"]

- -
- One Microsoft Way
- Redmond, WA 98052-6399
- P: - 425.555.0100 -
- -
- Support: Support@example.com
- Marketing: Marketing@example.com -
diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Home/Index.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Home/Index.cshtml deleted file mode 100755 index 957b8c1da..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Home/Index.cshtml +++ /dev/null @@ -1,109 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - - - -
-
-

Application uses

-
    -
  • Sample pages using ASP.NET Core MVC
    • -
  • Gulp and Bower for managing client-side libraries
    • -
  • Theming using Bootstrap
    • -
-
-
-

How to

- -
-
-

Overview

- -
-
-

Run & Deploy

- -
-
diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/AddPhoneNumber.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/AddPhoneNumber.cshtml deleted file mode 100755 index 2feb93b22..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/AddPhoneNumber.cshtml +++ /dev/null @@ -1,27 +0,0 @@ -@model AddPhoneNumberViewModel -@{ - ViewData["Title"] = "Add Phone Number"; -} - -

@ViewData["Title"].

-
-

Add a phone number.

-
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/ChangePassword.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/ChangePassword.cshtml deleted file mode 100755 index 41c7960c8..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/ChangePassword.cshtml +++ /dev/null @@ -1,42 +0,0 @@ -@model ChangePasswordViewModel -@{ - ViewData["Title"] = "Change Password"; -} - -

@ViewData["Title"].

- -
-

Change Password Form

-
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/Index.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/Index.cshtml deleted file mode 100755 index 8419b2429..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/Index.cshtml +++ /dev/null @@ -1,71 +0,0 @@ -@model IndexViewModel -@{ - ViewData["Title"] = "Manage your account"; -} - -

@ViewData["Title"].

-

@ViewData["StatusMessage"]

- -
-

Change your account settings

-
-
-
Password:
-
- @if (Model.HasPassword) - { - Change - } - else - { - Create - } -
-
External Logins:
-
- - @Model.Logins.Count Manage -
-
Phone Number:
-
-

- Phone Numbers can used as a second factor of verification in two-factor authentication. - See this article - for details on setting up this ASP.NET application to support two-factor authentication using SMS. -

- @*@(Model.PhoneNumber ?? "None") - @if (Model.PhoneNumber != null) - { -
- Change -
- [] -
- } - else - { - Add - }*@ -
- -
Two-Factor Authentication:
-
-

- There are no two-factor authentication providers configured. See this article - for setting up this application to support two-factor authentication. -

- @*@if (Model.TwoFactor) - { -
- Enabled -
- } - else - { -
- Disabled -
- }*@ -
-
-
diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/ManageLogins.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/ManageLogins.cshtml deleted file mode 100755 index 35e12da68..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/ManageLogins.cshtml +++ /dev/null @@ -1,54 +0,0 @@ -@model ManageLoginsViewModel -@using Microsoft.AspNetCore.Http.Authentication -@{ - ViewData["Title"] = "Manage your external logins"; -} - -

@ViewData["Title"].

- -

@ViewData["StatusMessage"]

-@if (Model.CurrentLogins.Count > 0) -{ -

Registered Logins

- - - @for (var index = 0; index < Model.CurrentLogins.Count; index++) - { - - - - - } - -
@Model.CurrentLogins[index].LoginProvider - @if ((bool)ViewData["ShowRemoveButton"]) - { -
-
- - - -
-
- } - else - { - @:   - } -
-} -@if (Model.OtherLogins.Count > 0) -{ -

Add another service to log in.

-
-
-
-

- @foreach (var provider in Model.OtherLogins) - { - - } -

-
-
-} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/SetPassword.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/SetPassword.cshtml deleted file mode 100755 index cfa779160..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/SetPassword.cshtml +++ /dev/null @@ -1,38 +0,0 @@ -@model SetPasswordViewModel -@{ - ViewData["Title"] = "Set Password"; -} - -

- You do not have a local username/password for this site. Add a local - account so you can log in without an external login. -

- -
-

Set your password

-
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/VerifyPhoneNumber.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/VerifyPhoneNumber.cshtml deleted file mode 100755 index af7cd0b1f..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Manage/VerifyPhoneNumber.cshtml +++ /dev/null @@ -1,30 +0,0 @@ -@model VerifyPhoneNumberViewModel -@{ - ViewData["Title"] = "Verify Phone Number"; -} - -

@ViewData["Title"].

- -
- -

Add a phone number.

-
@ViewData["Status"]
-
-
-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/Error.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/Error.cshtml deleted file mode 100755 index 229c2dead..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/Error.cshtml +++ /dev/null @@ -1,14 +0,0 @@ -@{ - ViewData["Title"] = "Error"; -} - -

Error.

-

An error occurred while processing your request.

- -

Development Mode

-

- Swapping to Development environment will display more detailed information about the error that occurred. -

-

- Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. -

diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/_Layout.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/_Layout.cshtml deleted file mode 100755 index 56827ca52..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - @ViewData["Title"] - WebApplication - - - - - - - - - - - -
-
-
- - WebApplication -
-
- - @await Html.PartialAsync("_LoginPartial") -
-
-
-
- @RenderBody() -
-
-

© 2016 - WebApplication

-
-
- - - - - - - - - - - - - @RenderSection("scripts", required: false) - - diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/_LoginPartial.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/_LoginPartial.cshtml deleted file mode 100755 index f50d5e89e..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/_LoginPartial.cshtml +++ /dev/null @@ -1,26 +0,0 @@ -@using Microsoft.AspNetCore.Identity -@using WebApplication.Models - -@inject SignInManager SignInManager -@inject UserManager UserManager - -@if (SignInManager.IsSignedIn(User)) -{ - -} -else -{ - -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/_ValidationScriptsPartial.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/_ValidationScriptsPartial.cshtml deleted file mode 100755 index 289b22064..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/Shared/_ValidationScriptsPartial.cshtml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/_ViewImports.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/_ViewImports.cshtml deleted file mode 100755 index dcca16cb0..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/_ViewImports.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@using WebApplication -@using WebApplication.Models -@using WebApplication.Models.AccountViewModels -@using WebApplication.Models.ManageViewModels -@using Microsoft.AspNetCore.Identity -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/_ViewStart.cshtml b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/_ViewStart.cshtml deleted file mode 100755 index 820a2f6e0..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "_Layout"; -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/appsettings.json b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/appsettings.json deleted file mode 100755 index 53b17ae04..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/appsettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ConnectionStrings": { - "DefaultConnection": "Data Source=WebApplication.db" - }, - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/bower.json b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/bower.json deleted file mode 100755 index 3891fce13..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/bower.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "webapplication", - "private": true, - "dependencies": { - "bootstrap": "3.3.6", - "jquery": "2.2.3", - "jquery-validation": "1.15.0", - "jquery-validation-unobtrusive": "3.2.6" - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/gulpfile.js b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/gulpfile.js deleted file mode 100755 index faf295540..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/gulpfile.js +++ /dev/null @@ -1,45 +0,0 @@ -/// -"use strict"; - -var gulp = require("gulp"), - rimraf = require("rimraf"), - concat = require("gulp-concat"), - cssmin = require("gulp-cssmin"), - uglify = require("gulp-uglify"); - -var webroot = "./wwwroot/"; - -var paths = { - js: webroot + "js/**/*.js", - minJs: webroot + "js/**/*.min.js", - css: webroot + "css/**/*.css", - minCss: webroot + "css/**/*.min.css", - concatJsDest: webroot + "js/site.min.js", - concatCssDest: webroot + "css/site.min.css" -}; - -gulp.task("clean:js", function (cb) { - rimraf(paths.concatJsDest, cb); -}); - -gulp.task("clean:css", function (cb) { - rimraf(paths.concatCssDest, cb); -}); - -gulp.task("clean", ["clean:js", "clean:css"]); - -gulp.task("min:js", function () { - return gulp.src([paths.js, "!" + paths.minJs], { base: "." }) - .pipe(concat(paths.concatJsDest)) - .pipe(uglify()) - .pipe(gulp.dest(".")); -}); - -gulp.task("min:css", function () { - return gulp.src([paths.css, "!" + paths.minCss]) - .pipe(concat(paths.concatCssDest)) - .pipe(cssmin()) - .pipe(gulp.dest(".")); -}); - -gulp.task("min", ["min:js", "min:css"]); diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/package.json b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/package.json deleted file mode 100755 index 4bb6c884c..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "webapplication", - "version": "0.0.0", - "private": true, - "devDependencies": { - "gulp": "3.9.1", - "gulp-concat": "2.6.0", - "gulp-cssmin": "0.1.7", - "gulp-uglify": "1.5.3", - "rimraf": "2.5.2" - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json deleted file mode 100755 index f8e6d7db9..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "userSecretsId": "aspnet-WebApplication-0799fe3e-6eaf-4c5f-b40e-7c6bfd5dfa9a", - - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.0", - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.EntityFrameworkCore.Sqlite": "1.0.0", - "Microsoft.EntityFrameworkCore.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", - "type": "build" - }, - "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { - "version": "1.0.0-preview2-final", - "type": "build" - } - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - }, - "Microsoft.AspNetCore.Server.IISIntegration.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - }, - "Microsoft.EntityFrameworkCore.Tools": { - "version": "1.0.0-preview2-final", - "imports": [ - "portable-net45+win8+dnxcore50", - "portable-net45+win8" - ] - }, - "Microsoft.Extensions.SecretManager.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" - }, - "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { - "version": "1.0.0-preview2-final", - "imports": [ - "portable-net45+win8+dnxcore50", - "portable-net45+win8" - ] - } - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "dnxcore50", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "appsettings.json", - "web.config", - "nonExistingFile.config" - ] - }, - - "tooling": { - "defaultNamespace": "WebApplication" - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/web.config b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/web.config deleted file mode 100755 index a8d667275..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/web.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/css/site.css b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/css/site.css deleted file mode 100755 index 6baa84da1..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/css/site.css +++ /dev/null @@ -1,44 +0,0 @@ -body { - padding-top: 50px; - padding-bottom: 20px; -} - -/* Wrapping element */ -/* Set some basic padding to keep content from hitting the edges */ -.body-content { - padding-left: 15px; - padding-right: 15px; -} - -/* Set widths on the form inputs since otherwise they're 100% wide */ -input, -select, -textarea { - max-width: 280px; -} - -/* Carousel */ -.carousel-caption p { - font-size: 20px; - line-height: 1.4; -} - -/* buttons and links extension to use brackets: [ click me ] */ -.btn-bracketed::before { - display:inline-block; - content: "["; - padding-right: 0.5em; -} -.btn-bracketed::after { - display:inline-block; - content: "]"; - padding-left: 0.5em; -} - -/* Hide/rearrange for smaller screens */ -@media screen and (max-width: 767px) { - /* Hide captions */ - .carousel-caption { - display: none - } -} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/css/site.min.css b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/css/site.min.css deleted file mode 100755 index c8f600ac5..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/css/site.min.css +++ /dev/null @@ -1 +0,0 @@ -body{padding-top:50px;padding-bottom:20px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.carousel-caption p{font-size:20px;line-height:1.4}.btn-bracketed::before{display:inline-block;content:"[";padding-right:.5em}.btn-bracketed::after{display:inline-block;content:"]";padding-left:.5em}@media screen and (max-width:767px){.carousel-caption{display:none}} diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/favicon.ico b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/favicon.ico deleted file mode 100755 index a3a799985..000000000 Binary files a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/favicon.ico and /dev/null differ diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner1.svg b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner1.svg deleted file mode 100755 index 1ab32b60b..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner2.svg b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner2.svg deleted file mode 100755 index 9679c604d..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner3.svg b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner3.svg deleted file mode 100755 index 9be2c2503..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner3.svg +++ /dev/null @@ -1 +0,0 @@ -banner3b \ No newline at end of file diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner4.svg b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner4.svg deleted file mode 100755 index 38b3d7cd1..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/images/banner4.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/js/site.js b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/js/site.js deleted file mode 100755 index e069226a1..000000000 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/js/site.js +++ /dev/null @@ -1 +0,0 @@ -// Write your Javascript code. diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/js/site.min.js b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/wwwroot/js/site.min.js deleted file mode 100755 index e69de29bb..000000000 diff --git a/build/BackwardsCompatibilityRuntimes.props b/build/BackwardsCompatibilityRuntimes.props index 6805d4377..72eddd70d 100644 --- a/build/BackwardsCompatibilityRuntimes.props +++ b/build/BackwardsCompatibilityRuntimes.props @@ -1,7 +1,7 @@ release/1.1.0 - 1.1.1 + 1.1.2 1.1.0 1.1.0 diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props index 32ae1dfac..64eddcfd4 100644 --- a/build/BuildDefaults.props +++ b/build/BuildDefaults.props @@ -4,8 +4,7 @@ Debug true false - true - true + true true true diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 9179f91da..56e0a9c11 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -1,23 +1,23 @@ - -portable - -portable + $(Rid) + $(ProductMonikerRid) - dotnet-host-$(ProductMonikerRid).$(SharedHostVersion)$(InstallerPortableSuffix)$(InstallerExtension) + dotnet-host-$(CoreSetupRid).$(SharedHostVersion)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) - dotnet-hostfxr-$(ProductMonikerRid).$(HostFxrVersion)$(InstallerPortableSuffix)$(InstallerExtension) + dotnet-hostfxr-$(CoreSetupRid).$(HostFxrVersion)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName) - dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerPortableSuffix)$(InstallerExtension) + dotnet-sharedframework-$(CoreSetupRid).$(SharedFrameworkVersion)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName) - $(ProductMonikerRid) + $(CoreSetupRid) linux-x64 - dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchivePortableSuffix)$(ArchiveExtension) + dotnet-$(SharedFrameworkRid).$(SharedFrameworkVersion)$(ArchiveExtension) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 461d70e84..ea9624f6f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview2-002093-00 + 2.0.0-preview2-25309-07 15.3.0-preview-000117-01 2.0.0-rc4-61325-08 2.0.0-preview2-20170506-1 @@ -12,15 +12,15 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170503-217 - 1.0.0-beta2-20170504-221 - 1.0.0-beta2-20170504-221 - 2.0.0-preview2-002093 - 2.0.0-preview2-002093 + 1.0.0-beta2-20170505-222 + 1.0.0-beta2-20170505-222 + 2.0.0-preview2-25309-07 + 2.0.0-preview2-25309-07 0.1.0-alpha-142 1.2.1-alpha-002130 - 2.0.0-preview1-65 + 2.0.0-preview1-92 0.2.0 - + notimestamp diff --git a/test/dotnet-migrate.Tests/GivenThatAnAppWasMigrated.cs b/test/dotnet-migrate.Tests/GivenThatAnAppWasMigrated.cs deleted file mode 100644 index 4611ef0b1..000000000 --- a/test/dotnet-migrate.Tests/GivenThatAnAppWasMigrated.cs +++ /dev/null @@ -1,146 +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. - -using FluentAssertions; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Common; -using Microsoft.DotNet.Tools.Test.Utilities; -using System; -using System.Collections.Generic; -using System.IO; -using Xunit; - -namespace Microsoft.DotNet.Migration.Tests -{ - public class GivenThatAnAppWasMigrated : TestBase - { - [Theory] - [InlineData("TestAppWithLibrary")] - public void WhenProjectMigrationSucceedsThenProjectJsonArtifactsGetMovedToBackup(string testProjectName) - { - var testRoot = TestAssets - .GetProjectJson(testProjectName) - .CreateInstance() - .WithSourceFiles() - .Root; - - var backupRoot = testRoot.GetDirectory("backup"); - - var migratableArtifacts = GetProjectJsonArtifacts(testRoot); - - new MigrateCommand() - .WithWorkingDirectory(testRoot) - .Execute() - .Should().Pass(); - - var backupArtifacts = GetProjectJsonArtifacts(backupRoot); - - backupArtifacts.Should().Equal(migratableArtifacts, "Because all of and only these artifacts should have been moved"); - - testRoot.Should().NotHaveFiles(backupArtifacts.Keys); - - backupRoot.Should().HaveTextFiles(backupArtifacts); - } - - [Theory] - [InlineData("PJTestAppSimple")] - public void WhenFolderMigrationSucceedsThenProjectJsonArtifactsGetMovedToBackup(string testProjectName) - { - var testRoot = TestAssets - .GetProjectJson(testProjectName) - .CreateInstance() - .WithSourceFiles() - .Root; - - var backupRoot = testRoot.GetDirectory("backup"); - - var migratableArtifacts = GetProjectJsonArtifacts(testRoot); - - new MigrateCommand() - .WithWorkingDirectory(testRoot) - .Execute() - .Should().Pass(); - - var backupArtifacts = GetProjectJsonArtifacts(backupRoot); - - backupArtifacts.Should().Equal(migratableArtifacts, "Because all of and only these artifacts should have been moved"); - - testRoot.Should().NotHaveFiles(backupArtifacts.Keys); - - backupRoot.Should().HaveTextFiles(backupArtifacts); - } - - [Theory] - [InlineData("TestAppWithLibraryAndMissingP2P")] - public void WhenMigrationFailsThenProjectJsonArtifactsDoNotGetMovedToBackup(string testProjectName) - { - var testRoot = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, testProjectName) - .CreateInstance(identifier: testProjectName) - .WithSourceFiles() - .Root; - - var backupRoot = testRoot.GetDirectory("backup"); - - var migratableArtifacts = GetProjectJsonArtifacts(testRoot); - - new MigrateCommand() - .WithWorkingDirectory(testRoot) - .Execute() - .Should().Fail(); - - backupRoot.Should().NotExist("Because migration failed and therefore no backup is needed."); - - testRoot.Should().HaveTextFiles(migratableArtifacts, "Because migration failed so nothing was moved to backup."); - } - - [Theory] - [InlineData("PJTestAppSimple")] - public void WhenSkipbackupSpecifiedThenProjectJsonArtifactsDoNotGetMovedToBackup(string testProjectName) - { - var testRoot = TestAssets - .GetProjectJson(testProjectName) - .CreateInstance(identifier: testProjectName) - .WithSourceFiles() - .Root; - - var backupRoot = testRoot.GetDirectory("backup"); - - var migratableArtifacts = GetProjectJsonArtifacts(testRoot); - - new MigrateCommand() - .WithWorkingDirectory(testRoot) - .Execute("--skip-backup") - .Should().Pass(); - - backupRoot.Should().NotExist("Because --skip-backup was specified."); - - testRoot.Should().HaveTextFiles(migratableArtifacts, "Because --skip-backup was specified."); - } - - private Dictionary GetProjectJsonArtifacts(DirectoryInfo root) - { - var catalog = new Dictionary(); - - var patterns = new[] { "global.json", "project.json", "project.lock.json", "*.xproj", "*.xproj.user" }; - - foreach (var pattern in patterns) - { - AddArtifactsToCatalog(catalog, root, pattern); - } - - return catalog; - } - - private void AddArtifactsToCatalog(Dictionary catalog, DirectoryInfo root, string pattern) - { - var files = root.GetFiles(pattern, SearchOption.AllDirectories); - - foreach (var file in files) - { - var key = PathUtility.GetRelativePath(root, file); - catalog.Add(key, File.ReadAllText(file.FullName)); - } - } - } -} diff --git a/test/dotnet-migrate.Tests/GivenThatIWantMigratedAppsToBinplaceContent.cs b/test/dotnet-migrate.Tests/GivenThatIWantMigratedAppsToBinplaceContent.cs deleted file mode 100644 index cd4ef5105..000000000 --- a/test/dotnet-migrate.Tests/GivenThatIWantMigratedAppsToBinplaceContent.cs +++ /dev/null @@ -1,125 +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. - -using Microsoft.Build.Construction; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Common; -using Microsoft.DotNet.Tools.Test.Utilities; -using System; -using System.Collections.Generic; -using System.Linq; -using Xunit; -using FluentAssertions; -using System.IO; -using Microsoft.DotNet.Tools.Migrate; -using BuildCommand = Microsoft.DotNet.Tools.Test.Utilities.BuildCommand; -using System.Runtime.Loader; -using Newtonsoft.Json.Linq; - -namespace Microsoft.DotNet.Migration.Tests -{ - public class GivenThatIWantMigratedAppsToBinplaceContent : TestBase - { - [Fact(Skip="Unblocking CI")] - public void ItBinplacesContentOnBuildForConsoleApps() - { - var projectDirectory = TestAssets - .GetProjectJson("TestAppWithContents") - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - new TestCommand("dotnet") - .WithForwardingToConsole() - .Execute($"migrate {projectDirectory.FullName}") - .Should() - .Pass(); - - var command = new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should() - .Pass(); - - var result = new BuildCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput() - .Should() - .Pass(); - - var outputDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.0"); - outputDir.Should().Exist().And.HaveFile("testcontentfile.txt"); - outputDir.GetDirectory("dir").Should().Exist().And.HaveFile("mappingfile.txt"); - } - - [Fact(Skip="Unblocking CI")] - public void ItBinplacesContentOnPublishForConsoleApps() - { - var projectDirectory = TestAssets - .GetProjectJson("TestAppWithContents") - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - new TestCommand("dotnet") - .WithForwardingToConsole() - .Execute($"migrate {projectDirectory.FullName}") - .Should() - .Pass(); - - var command = new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should() - .Pass(); - - var result = new PublishCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput() - .Should() - .Pass(); - - var publishDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.0", "publish"); - publishDir.Should().Exist().And.HaveFile("testcontentfile.txt"); - publishDir.GetDirectory("dir").Should().Exist().And.HaveFile("mappingfile.txt"); - } - - [Fact(Skip="CI does not have NPM, which is required for the publish of this app.")] - public void ItBinplacesContentOnPublishForWebApps() - { - var projectDirectory = TestAssets - .GetProjectJson("ProjectJsonWebTemplate") - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - new TestCommand("dotnet") - .WithForwardingToConsole() - .Execute($"migrate {projectDirectory.FullName}") - .Should() - .Pass(); - - var command = new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should() - .Pass(); - - var result = new PublishCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput() - .Should() - .Pass(); - - var publishDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.0", "publish"); - publishDir.Should().Exist().And.HaveFile("README.md"); - publishDir.GetDirectory("wwwroot").Should().Exist(); - } - } -} \ No newline at end of file diff --git a/test/dotnet-migrate.Tests/GivenThatIWantMigratedAppsToPackContent.cs b/test/dotnet-migrate.Tests/GivenThatIWantMigratedAppsToPackContent.cs deleted file mode 100644 index f27f5a6b8..000000000 --- a/test/dotnet-migrate.Tests/GivenThatIWantMigratedAppsToPackContent.cs +++ /dev/null @@ -1,60 +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. - -using Microsoft.Build.Construction; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Common; -using Microsoft.DotNet.Tools.Test.Utilities; -using System; -using System.Collections.Generic; -using System.Linq; -using Xunit; -using FluentAssertions; -using System.IO; -using System.IO.Compression; -using Microsoft.DotNet.Tools.Migrate; -using BuildCommand = Microsoft.DotNet.Tools.Test.Utilities.BuildCommand; -using System.Runtime.Loader; -using Newtonsoft.Json.Linq; - -namespace Microsoft.DotNet.Migration.Tests -{ - public class GivenThatIWantMigratedAppsToPackContent : TestBase - { - [Fact(Skip="Unblocking CI")] - public void ItPacksContentForLibraries() - { - var projectDirectory = TestAssets - .GetProjectJson("PJTestLibraryWithConfiguration") - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - new TestCommand("dotnet") - .WithForwardingToConsole() - .Execute($"migrate {projectDirectory.FullName}") - .Should() - .Pass(); - - var command = new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .Execute() - .Should() - .Pass(); - - var result = new PackCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput() - .Should() - .Pass(); - - using (var archive = ZipFile.OpenRead( - Path.Combine(projectDirectory.FullName, "bin", "debug", "PJTestLibraryWithConfiguration.1.0.0.nupkg"))) - { - archive.Entries.Select(e => e.FullName).Should().Contain("dir/contentitem.txt"); - } - } - } -} \ No newline at end of file diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateAppsUsingGlobalJson.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateAppsUsingGlobalJson.cs deleted file mode 100644 index d4072691a..000000000 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateAppsUsingGlobalJson.cs +++ /dev/null @@ -1,80 +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. - -using FluentAssertions; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Test.Utilities; -using System.IO; -using Xunit; - -namespace Microsoft.DotNet.Migration.Tests -{ - public class GivenThatIWantToMigrateAppsUsingGlobalJson : TestBase - { - [Fact] - public void ItMigratesWhenBeingPassedAFullPathToGlobalJson() - { - var solutionDirectory = TestAssets - .GetProjectJson("AppWithPackageNamedAfterFolder") - .CreateInstance() - .WithSourceFiles() - .Root; - - var globalJsonPath = solutionDirectory.GetFile("global.json"); - - new TestCommand("dotnet") - .WithForwardingToConsole() - .Execute($"migrate {globalJsonPath.FullName}") - .Should() - .Pass(); - } - - [Fact] - public void WhenUsingGlobalJsonItOnlyMigratesProjectsInTheGlobalJsonNode() - { - var solutionDirectory = TestAssets - .GetProjectJson("AppWithPackageNamedAfterFolder") - .CreateInstance() - .WithSourceFiles() - .Root; - - var globalJsonPath = solutionDirectory.GetFile("global.json"); - - new TestCommand("dotnet") - .WithForwardingToConsole() - .Execute($"migrate {globalJsonPath.FullName}") - .Should() - .Pass(); - - solutionDirectory - .Should().HaveFiles(new [] - { - Path.Combine("src", "App", "App.csproj"), - Path.Combine("test", "App.Tests", "App.Tests.csproj"), - Path.Combine("TestAssets", "TestAsset", "project.json") - }); - - solutionDirectory - .Should().NotHaveFile(Path.Combine("TestAssets", "TestAsset", "TestAsset.csproj")); - } - - [Fact] - public void ItMigratesWhenBeingPassedJustGlobalJson() - { - var solutionDirectory = TestAssets - .GetProjectJson("AppWithPackageNamedAfterFolder") - .CreateInstance() - .WithSourceFiles() - .Root; - - var globalJsonPath = solutionDirectory.GetFile("global.json"); - - new TestCommand("dotnet") - .WithWorkingDirectory(solutionDirectory) - .WithForwardingToConsole() - .Execute($"migrate global.json") - .Should() - .Pass(); - } - } -} diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs deleted file mode 100644 index 506d36aed..000000000 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs +++ /dev/null @@ -1,562 +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. - -using FluentAssertions; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Test.Utilities; -using System.IO; -using System.IO.Compression; -using System.Linq; -using System.Xml.Linq; -using Xunit; - -namespace Microsoft.DotNet.Migration.Tests -{ - public class GivenThatIWantToMigrateDeprecatedProjects : TestBase - { - [Fact] - public void WhenMigratingDeprecatedPackOptionsWarningsArePrinted() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedPack") - .CreateInstance() - .WithSourceFiles() - .Root; - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("migrate"); - - cmd.Should().Pass(); - - cmd.StdOut.Should().Contain( - "The 'repository' option in the root is deprecated. Use it in 'packOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'projectUrl' option in the root is deprecated. Use it in 'packOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'licenseUrl' option in the root is deprecated. Use it in 'packOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'iconUrl' option in the root is deprecated. Use it in 'packOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'owners' option in the root is deprecated. Use it in 'packOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'tags' option in the root is deprecated. Use it in 'packOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'releaseNotes' option in the root is deprecated. Use it in 'packOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'requireLicenseAcceptance' option in the root is deprecated. Use it in 'packOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'summary' option in the root is deprecated. Use it in 'packOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'packInclude' option is deprecated. Use 'files' in 'packOptions' instead."); - } - - [Fact] - public void MigrateDeprecatedPack() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedPack") - .CreateInstance() - .WithSourceFiles() - .Root; - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("migrate") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("restore") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("build -c Debug") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("pack -c Debug") - .Should().Pass(); - - var outputDir = projectDirectory.GetDirectory("bin", "Debug"); - outputDir.Should().Exist() - .And.HaveFile("PJDeprecatedPack.1.0.0.nupkg"); - - var outputPackage = outputDir.GetFile("PJDeprecatedPack.1.0.0.nupkg"); - - var zip = ZipFile.Open(outputPackage.FullName, ZipArchiveMode.Read); - zip.Entries.Should().Contain(e => e.FullName == "PJDeprecatedPack.nuspec") - .And.Contain(e => e.FullName == "content/Content1.txt") - .And.Contain(e => e.FullName == "content/Content2.txt"); - - var manifestReader = new StreamReader( - zip.Entries.First(e => e.FullName == "PJDeprecatedPack.nuspec").Open()); - - // NOTE: Commented out those that are not migrated. - // https://microsoft.sharepoint.com/teams/netfx/corefx/_layouts/15/WopiFrame.aspx?sourcedoc=%7B0cfbc196-0645-4781-84c6-5dffabd76bee%7D&action=edit&wd=target%28Planning%2FMSBuild%20CLI%20integration%2Eone%7C41D470DD-CF44-4595-8E05-0CE238864B55%2FProject%2Ejson%20Migration%7CA553D979-EBC6-484B-A12E-036E0730864A%2F%29 - var nuspecXml = XDocument.Parse(manifestReader.ReadToEnd()); - nuspecXml.Descendants().Single(e => e.Name.LocalName == "projectUrl").Value - .Should().Be("http://projecturl/"); - nuspecXml.Descendants().Single(e => e.Name.LocalName == "licenseUrl").Value - .Should().Be("http://licenseurl/"); - nuspecXml.Descendants().Single(e => e.Name.LocalName == "iconUrl").Value - .Should().Be("http://iconurl/"); - //nuspecXml.Descendants().Single(e => e.Name.LocalName == "owners").Value - // .Should().Be("owner1,owner2"); - nuspecXml.Descendants().Single(e => e.Name.LocalName == "tags").Value - .Should().Be("tag1 tag2"); - nuspecXml.Descendants().Single(e => e.Name.LocalName == "releaseNotes").Value - .Should().Be("releaseNotes"); - nuspecXml.Descendants().Single(e => e.Name.LocalName == "requireLicenseAcceptance").Value - .Should().Be("true"); - //nuspecXml.Descendants().Single(e => e.Name.LocalName == "summary").Value - // .Should().Be("summary"); - - var repositoryNode = nuspecXml.Descendants().Single(e => e.Name.LocalName == "repository"); - repositoryNode.Attributes("type").Single().Value.Should().Be("git"); - repositoryNode.Attributes("url").Single().Value.Should().Be("http://url/"); - } - - [Fact] - public void WhenMigratingDeprecatedCompilationOptionsWarningsArePrinted() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedCompilation") - .CreateInstance() - .WithSourceFiles() - .Root; - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("migrate"); - - cmd.Should().Pass(); - - cmd.StdOut.Should().Contain( - "The 'compilerName' option in the root is deprecated. Use it in 'buildOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'compilationOptions' option is deprecated. Use 'buildOptions' instead."); - } - - [Fact] - public void MigratingDeprecatedCompilation() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedCompilation") - .CreateInstance() - .WithSourceFiles() - .Root; - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("migrate") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("restore") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("build -c Debug") - .Should().Pass(); - } - - [Fact] - public void WhenMigratingDeprecatedContentOptionsWarningsArePrinted() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedContent") - .CreateInstance() - .WithSourceFiles() - .Root; - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("migrate"); - - cmd.Should().Pass(); - - cmd.StdOut.Should().Contain( - "The 'content' option is deprecated. Use 'publishOptions' to publish or 'copyToOutput' in 'buildOptions' to copy to build output instead."); - cmd.StdOut.Should().Contain( - "The 'contentExclude' option is deprecated. Use 'publishOptions' to publish or 'copyToOutput' in 'buildOptions' to copy to build output instead."); - cmd.StdOut.Should().Contain( - "The 'contentFiles' option is deprecated. Use 'publishOptions' to publish or 'copyToOutput' in 'buildOptions' to copy to build output instead."); - cmd.StdOut.Should().Contain( - "The 'contentBuiltIn' option is deprecated. Use 'publishOptions' to publish or 'copyToOutput' in 'buildOptions' to copy to build output instead."); - } - - [Fact] - public void MigratingDeprecatedContent() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedContent") - .CreateInstance() - .WithSourceFiles() - .Root - .GetDirectory("project"); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("migrate") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("restore") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("build -c Debug") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("publish -c Debug") - .Should().Pass(); - - var outputDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.1"); - outputDir.Should().Exist() - .And.HaveFiles(new[] - { - "ContentFile1.txt1", - "ContentFile2.txt1", - "ContentFileBuiltIn1.txt1", - "ContentFileBuiltIn2.txt1", - "IncludeThis.txt", - }); - Directory.Exists(Path.Combine(outputDir.FullName, "ExcludeThis1.txt")).Should().BeFalse(); - Directory.Exists(Path.Combine(outputDir.FullName, "ExcludeThis2.txt")).Should().BeFalse(); - - var publishDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.1", "publish"); - publishDir.Should().Exist() - .And.HaveFiles(new[] - { - "ContentFile1.txt1", - "ContentFile2.txt1", - "ContentFileBuiltIn1.txt1", - "ContentFileBuiltIn2.txt1", - "IncludeThis.txt", - }); - Directory.Exists(Path.Combine(publishDir.FullName, "ExcludeThis1.txt")).Should().BeFalse(); - Directory.Exists(Path.Combine(publishDir.FullName, "ExcludeThis2.txt")).Should().BeFalse(); - } - - [Fact] - public void WhenMigratingDeprecatedCompileOptionsWarningsArePrinted() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedCompile") - .CreateInstance() - .WithSourceFiles() - .Root; - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("migrate"); - - cmd.Should().Pass(); - - cmd.StdOut.Should().Contain( - "The 'compile' option is deprecated. Use 'compile' in 'buildOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'compileFiles' option is deprecated. Use 'compile' in 'buildOptions' instead."); - } - - [Fact] - public void MigratingDeprecatedCompile() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedCompile") - .CreateInstance() - .WithSourceFiles() - .Root - .GetDirectory("project"); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("migrate") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("restore") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("build -c Debug") - .Should().Pass(); - } - - [Fact] - public void WhenMigratingDeprecatedCompileBuiltInOptionsWarningsArePrinted() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedCompileBuiltIn") - .CreateInstance() - .WithSourceFiles() - .Root; - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("migrate"); - - cmd.Should().Pass(); - - cmd.StdOut.Should().Contain( - "The 'compileBuiltIn' option is deprecated. Use 'compile' in 'buildOptions' instead."); - } - - [Fact] - public void MigratingDeprecatedCompileBuiltIn() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedCompileBuiltIn") - .CreateInstance() - .WithSourceFiles() - .Root - .GetDirectory("project"); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("migrate") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("restore") - .Should().Pass(); - - //Issue: https://github.com/dotnet/cli/issues/5467 - //new DotnetCommand() - // .WithWorkingDirectory(projectDirectory) - // .Execute("build -c Debug") - // .Should().Pass(); - } - - [Fact] - public void WhenMigratingDeprecatedCompileExcludeOptionsWarningsArePrinted() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedCompileExclude") - .CreateInstance() - .WithSourceFiles() - .Root; - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("migrate"); - - cmd.Should().Pass(); - - cmd.StdOut.Should().Contain( - "The 'compileExclude' option is deprecated. Use 'compile' in 'buildOptions' instead."); - } - - [Fact] - public void MigratingDeprecatedCompileExclude() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedCompileExclude") - .CreateInstance() - .WithSourceFiles() - .Root; - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("migrate") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("restore") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("build -c Debug") - .Should().Pass(); - } - - [Fact] - public void WhenMigratingDeprecatedResourceOptionsWarningsArePrinted() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedResource") - .CreateInstance() - .WithSourceFiles() - .Root - .GetDirectory("project"); - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("migrate"); - - cmd.Should().Pass(); - - cmd.StdOut.Should().Contain( - "The 'resource' option is deprecated. Use 'embed' in 'buildOptions' instead."); - cmd.StdOut.Should().Contain( - "The 'resourceFiles' option is deprecated. Use 'embed' in 'buildOptions' instead."); - } - - [Fact] - public void MigratingDeprecatedResource() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedResource") - .CreateInstance() - .WithSourceFiles() - .Root - .GetDirectory("project"); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("migrate") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("restore") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("build -c Debug") - .Should().Pass(); - - if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1")) - { - // running the app requires netcoreapp1.1 - return; - } - - var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("run -c Debug"); - cmd.Should().Pass(); - cmd.StdOut.Should().Contain("3 Resources Found:"); - } - - [Fact] - public void WhenMigratingDeprecatedResourceBuiltInOptionsWarningsArePrinted() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedResourceBuiltIn") - .CreateInstance() - .WithSourceFiles() - .Root - .GetDirectory("project"); - - var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("migrate"); - - cmd.Should().Pass(); - - cmd.StdOut.Should().Contain( - "The 'resourceBuiltIn' option is deprecated. Use 'embed' in 'buildOptions' instead."); - } - - [Fact] - public void MigratingDeprecatedResourceBuiltIn() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedResourceBuiltIn") - .CreateInstance() - .WithSourceFiles() - .Root - .GetDirectory("project"); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("migrate") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("restore") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("build -c Debug") - .Should().Pass(); - - if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1")) - { - // running the app requires netcoreapp1.1 - return; - } - - var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("run -c Debug"); - cmd.Should().Pass(); - // Issue: https://github.com/dotnet/cli/issues/5467 - //cmd.StdOut.Should().Contain("2 Resources Found:"); - } - - [Fact] - public void WhenMigratingDeprecatedResourceExcludeOptionsWarningsArePrinted() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedResourceExclude") - .CreateInstance() - .WithSourceFiles() - .Root; - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("migrate"); - - cmd.Should().Pass(); - - cmd.StdOut.Should().Contain( - "The 'resourceExclude' option is deprecated. Use 'embed' in 'buildOptions' instead."); - } - - [Fact] - public void MigratingDeprecatedResourceExclude() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJDeprecatedResourceExclude") - .CreateInstance() - .WithSourceFiles() - .Root; - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("migrate") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("restore") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute("build -c Debug") - .Should().Pass(); - - if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1")) - { - // running the app requires netcoreapp1.1 - return; - } - - var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput("run -c Debug"); - cmd.Should().Pass(); - cmd.StdOut.Should().Contain("0 Resources Found:"); - } - } -} diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs index b3c679a86..af96bd2a2 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs @@ -14,36 +14,6 @@ namespace Microsoft.DotNet.Migration.Tests { 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 - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, projectName) - .CreateInstance(identifier: projectName) - .WithSourceFiles() - .WithEmptyGlobalJson() - .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] public void ItMigratesAndBuildsSln() { @@ -52,208 +22,6 @@ namespace Microsoft.DotNet.Migration.Tests "PJAppWithSlnAndXprojRefs"); } - [Fact] - public void ItOnlyMigratesProjectsInTheSlnFile() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJAppWithSlnAndXprojRefs") - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - var solutionRelPath = Path.Combine("TestApp", "TestApp.sln"); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute($"migrate \"{solutionRelPath}\"") - .Should().Pass(); - - projectDirectory - .Should().HaveFiles(new [] - { - Path.Combine("TestApp", "TestApp.csproj"), - Path.Combine("TestLibrary", "TestLibrary.csproj"), - Path.Combine("TestApp", "src", "subdir", "subdir.csproj"), - Path.Combine("TestApp", "TestAssets", "TestAsset", "project.json") - }); - - projectDirectory - .Should().NotHaveFile(Path.Combine("TestApp", "TestAssets", "TestAsset", "TestAsset.csproj")); - } - - [Fact] - public void WhenDirectoryAlreadyContainsCsprojFileItMigratesAndBuildsSln() - { - MigrateAndBuild( - "NonRestoredTestProjects", - "PJAppWithSlnAndXprojRefsAndUnrelatedCsproj"); - } - - [Fact] - public void WhenXprojReferencesCsprojAndSlnDoesNotItMigratesAndBuildsSln() - { - MigrateAndBuild( - "NonRestoredTestProjects", - "PJAppWithSlnThatDoesNotRefCsproj"); - } - - [Fact] - public void WhenSolutionContainsACsprojFileItGetsMovedToBackup() - { - var projectDirectory = TestAssets - .GetProjectJson("NonRestoredTestProjects", "PJAppWithSlnAndOneAlreadyMigratedCsproj") - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - var solutionRelPath = Path.Combine("TestApp", "TestApp.sln"); - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput($"migrate \"{solutionRelPath}\""); - - cmd.Should().Pass(); - - projectDirectory - .GetDirectory("TestLibrary") - .GetFile("TestLibrary.csproj") - .Should().Exist(); - - projectDirectory - .GetDirectory("TestLibrary") - .GetFile("TestLibrary.csproj.migration_in_place_backup") - .Should().NotExist(); - - projectDirectory - .GetDirectory("backup", "TestLibrary") - .GetFile("TestLibrary.csproj") - .Should().Exist(); - } - - [Fact] - public void WhenSolutionContainsACsprojFileItDoesNotTryToAddItAgain() - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJAppWithSlnAndOneAlreadyMigratedCsproj") - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - var solutionRelPath = Path.Combine("TestApp", "TestApp.sln"); - - var cmd = new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput($"migrate \"{solutionRelPath}\""); - - cmd.Should().Pass(); - cmd.StdOut.Should().NotContain("already contains project"); - cmd.StdErr.Should().BeEmpty(); - } - - [Theory] - [InlineData("NoSolutionItemsAfterMigration.sln", false)] - [InlineData("ReadmeSolutionItemAfterMigration.sln", true)] - public void WhenMigratingAnSlnLinksReferencingItemsMovedToBackupAreRemoved( - string slnFileName, - bool solutionItemsContainsReadme) - { - var projectDirectory = TestAssets - .GetProjectJson(TestAssetKinds.NonRestoredTestProjects, "PJAppWithSlnAndSolutionItemsToMoveToBackup") - .CreateInstance(Path.GetFileNameWithoutExtension(slnFileName)) - .WithSourceFiles() - .Root - .FullName; - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute($"migrate \"{slnFileName}\"") - .Should().Pass(); - - var slnFile = SlnFile.Read(Path.Combine(projectDirectory, slnFileName)); - var solutionFolders = slnFile.Projects.Where(p => p.TypeGuid == ProjectTypeGuids.SolutionFolderGuid); - if (solutionItemsContainsReadme) - { - solutionFolders.Count().Should().Be(1); - var solutionItems = solutionFolders.Single().Sections.GetSection("SolutionItems"); - solutionItems.Should().NotBeNull(); - solutionItems.Properties.Count().Should().Be(1); - solutionItems.Properties["readme.txt"].Should().Be("readme.txt"); - } - else - { - solutionFolders.Count().Should().Be(0); - } - } - - [Fact] - public void ItMigratesSolutionInTheFolderWhenWeRunMigrationInThatFolder() - { - var projectDirectory = TestAssets - .Get("NonRestoredTestProjects", "PJAppWithSlnAndXprojRefs") - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - var workingDirectory = new DirectoryInfo(Path.Combine(projectDirectory.FullName, "TestApp")); - var solutionRelPath = Path.Combine("TestApp", "TestApp.sln"); - - new DotnetCommand() - .WithWorkingDirectory(workingDirectory) - .Execute($"migrate") - .Should().Pass(); - - SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath)); - - var nonSolutionFolderProjects = slnFile.Projects - .Where(p => p.TypeGuid != ProjectTypeGuids.SolutionFolderGuid); - - nonSolutionFolderProjects.Count().Should().Be(4); - - var slnProject = nonSolutionFolderProjects.Where((p) => p.Name == "TestApp").Single(); - slnProject.TypeGuid.Should().Be(ProjectTypeGuids.CSharpProjectTypeGuid); - slnProject.FilePath.Should().Be("TestApp.csproj"); - - slnProject = nonSolutionFolderProjects.Where((p) => p.Name == "TestLibrary").Single(); - slnProject.TypeGuid.Should().Be(ProjectTypeGuids.CSharpProjectTypeGuid); - slnProject.FilePath.Should().Be(Path.Combine("..", "TestLibrary", "TestLibrary.csproj")); - - slnProject = nonSolutionFolderProjects.Where((p) => p.Name == "subdir").Single(); - slnProject.FilePath.Should().Be(Path.Combine("src", "subdir", "subdir.csproj")); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute($"restore \"{solutionRelPath}\"") - .Should().Pass(); - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute($"build \"{solutionRelPath}\"") - .Should().Pass(); - } - - [Fact] - public void WhenXprojNameIsDifferentThanDirNameItGetsRemovedFromSln() - { - var projectDirectory = TestAssets - .Get("NonRestoredTestProjects", "PJAppWithXprojNameDifferentThanDirName") - .CreateInstance() - .WithSourceFiles() - .Root; - - new DotnetCommand() - .WithWorkingDirectory(projectDirectory) - .Execute($"migrate") - .Should().Pass(); - - var slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, "FolderHasDifferentName.sln")); - slnFile.Projects.Count.Should().Be(1); - slnFile.Projects[0].FilePath.Should().Be("PJAppWithXprojNameDifferentThanDirName.csproj"); - } - private void MigrateAndBuild(string groupName, string projectName, [CallerMemberName] string callingMethod = "", string identifier = "") { var projectDirectory = TestAssets diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs deleted file mode 100644 index 97633e23f..000000000 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateTestApps.cs +++ /dev/null @@ -1,1016 +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. - -using Microsoft.Build.Construction; -using Microsoft.DotNet.TestFramework; -using Microsoft.DotNet.Tools.Common; -using Microsoft.DotNet.Tools.Test.Utilities; -using System; -using System.Collections.Generic; -using System.Linq; -using Xunit; -using FluentAssertions; -using System.IO; -using Microsoft.DotNet.Tools.Migrate; -using BuildCommand = Microsoft.DotNet.Tools.Test.Utilities.BuildCommand; -using System.Runtime.Loader; -using Newtonsoft.Json.Linq; - -[assembly: CollectionBehavior(DisableTestParallelization = true)] - -namespace Microsoft.DotNet.Migration.Tests -{ - public class GivenThatIWantToMigrateTestApps : TestBase - { - [Theory] - [InlineData("TestAppWithRuntimeOptions")] - [InlineData("TestAppWithContents")] - [InlineData("AppWithAssemblyInfo")] - [InlineData("TestAppWithEmbeddedResources")] - public void ItMigratesApps(string projectName) - { - var projectDirectory = TestAssets - .GetProjectJson(projectName) - .CreateInstance(identifier: projectName) - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - CleanBinObj(projectDirectory); - - var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, projectName); - - var outputsIdentical = - outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs); - - if (!outputsIdentical) - { - OutputDiagnostics(outputComparisonData); - } - - outputsIdentical.Should().BeTrue(); - - VerifyAllMSBuildOutputsRunnable(projectDirectory); - - var outputCsProj = projectDirectory.GetFile(projectName + ".csproj"); - - outputCsProj.ReadAllText() - .Should().EndWith("\n"); - } - - [WindowsOnlyTheory] - [InlineData("AppWith2Tfm0Rid", null)] - [InlineData("AppWith4netTfm0Rid", "net461")] - public void ItMigratesAppsWithFullFramework(string projectName, string framework) - { - var projectDirectory = TestAssets - .GetProjectJson(projectName) - .CreateInstance(identifier: projectName) - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - CleanBinObj(projectDirectory); - - MigrateProject(new [] { projectDirectory.FullName }); - - Restore(projectDirectory); - - BuildMSBuild(projectDirectory, projectName, framework: framework); - } - - [Fact] - public void ItMigratesSignedApps() - { - var projectDirectory = TestAssets - .GetProjectJson("TestAppWithSigning") - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - CleanBinObj(projectDirectory); - - var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, "TestAppWithSigning"); - - var outputsIdentical = - outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs); - - if (!outputsIdentical) - { - OutputDiagnostics(outputComparisonData); - } - - outputsIdentical.Should().BeTrue(); - - VerifyAllMSBuildOutputsRunnable(projectDirectory); - - VerifyAllMSBuildOutputsAreSigned(projectDirectory); - } - - [Fact] - public void ItMigratesDotnetNewConsoleWithIdenticalOutputs() - { - var projectDirectory = TestAssets - .GetProjectJson("ProjectJsonConsoleTemplate") - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - var outputComparisonData = GetComparisonData(projectDirectory); - - var outputsIdentical = - outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs); - - if (!outputsIdentical) - { - OutputDiagnostics(outputComparisonData); - } - - outputsIdentical.Should().BeTrue(); - - VerifyAllMSBuildOutputsRunnable(projectDirectory); - } - - [Fact] - public void ItMigratesOldDotnetNewWebWithoutToolsWithOutputsContainingProjectJsonOutputs() - { - var projectDirectory = TestAssets - .GetProjectJson("ProjectJsonWebTemplate") - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - var globalDirectory = projectDirectory.Parent; - - WriteGlobalJson(globalDirectory); - - var outputComparisonData = GetComparisonData(projectDirectory); - - var outputsIdentical = - outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs); - - if (!outputsIdentical) - { - OutputDiagnostics(outputComparisonData); - } - - outputsIdentical.Should().BeTrue(); - } - - [Fact] - public void ItMigratesAndPublishesWebApp() - { - var projectName = "WebAppWithMissingFileInPublishOptions"; - - var projectDirectory = TestAssets - .GetProjectJson(projectName) - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - File.Copy("NuGet.tempaspnetpatch.config", projectDirectory.GetFile("NuGet.Config").FullName); - - MigrateProject(new [] { projectDirectory.FullName }); - - Restore(projectDirectory); - PublishMSBuild(projectDirectory, projectName); - } - - [Fact] - public void ItMigratesAPackageReferenceAsSuchEvenIfAFolderWithTheSameNameExistsInTheRepo() - { - var solutionDirectory = TestAssets - .GetProjectJson("AppWithPackageNamedAfterFolder") - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - var appProject = solutionDirectory - .GetDirectory("src", "App") - .GetFile("App.csproj"); - - MigrateProject(solutionDirectory.FullName); - - var projectRootElement = ProjectRootElement.Open(appProject.FullName); - - projectRootElement.Items.Where( - i => i.Include == "EntityFramework" && i.ItemType == "PackageReference") - .Should().HaveCount(2); - } - [Fact] - public void ItMigratesAProjectThatDependsOnAMigratedProjectWithTheSkipProjectReferenceFlag() - { - const string dependentProject = "ProjectA"; - const string dependencyProject = "ProjectB"; - - var projectDirectory = TestAssets - .GetProjectJson("TestAppDependencyGraph") - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - MigrateProject(projectDirectory.GetDirectory(dependencyProject).FullName); - - MigrateProject("--skip-project-references", projectDirectory.GetDirectory(dependentProject).FullName); - } - - [Fact] - public void ItAddsMicrosoftNetWebSdkToTheSdkAttributeOfAWebApp() - { - var projectDirectory = TestAssets - .Get("ProjectJsonWebTemplate") - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - var globalDirectory = projectDirectory.Parent; - var projectJsonFile = projectDirectory.GetFile("project.json"); - - MigrateProject(new [] { projectDirectory.FullName }); - - var csProj = projectDirectory.GetFile($"{projectDirectory.Name}.csproj"); - - csProj.ReadAllText().Should().Contain(@"Sdk=""Microsoft.NET.Sdk.Web"""); - } - - [Theory] - [InlineData("TestLibraryWithTwoFrameworks")] - public void ItMigratesProjectsWithMultipleTFMs(string projectName) - { - var projectDirectory = TestAssets - .GetProjectJson(projectName) - .CreateInstance(identifier: projectName) - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, projectName); - - var outputsIdentical = - outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs); - - if (!outputsIdentical) - { - OutputDiagnostics(outputComparisonData); - } - - outputsIdentical.Should().BeTrue(); - } - - [WindowsOnlyFact] - public void ItMigratesLibraryWithMultipleTFMsAndFullFramework() - { - var projectName = "PJLibWithMultipleFrameworks"; - - var projectDirectory = TestAssets - .GetProjectJson(projectName) - .CreateInstance(identifier: projectName) - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, projectName); - - var outputsIdentical = - outputComparisonData.ProjectJsonBuildOutputs.SetEquals(outputComparisonData.MSBuildBuildOutputs); - - if (!outputsIdentical) - { - OutputDiagnostics(outputComparisonData); - } - - outputsIdentical.Should().BeTrue(); - } - - [Theory] - [InlineData("TestAppWithLibrary/TestLibrary")] - [InlineData("TestLibraryWithAnalyzer")] - [InlineData("PJTestLibraryWithConfiguration")] - public void ItMigratesALibrary(string projectName) - { - var projectDirectory = TestAssets - .GetProjectJson(projectName) - .CreateInstance(identifier: projectName) - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild( - projectDirectory, - Path.GetFileNameWithoutExtension(projectName)); - - var outputsIdentical = outputComparisonData - .ProjectJsonBuildOutputs - .SetEquals(outputComparisonData.MSBuildBuildOutputs); - - if (!outputsIdentical) - { - OutputDiagnostics(outputComparisonData); - } - - outputsIdentical.Should().BeTrue(); - } - - [Theory] - [InlineData("ProjectA", "ProjectA,ProjectB,ProjectC,ProjectD,ProjectE")] - [InlineData("ProjectB", "ProjectB,ProjectC,ProjectD,ProjectE")] - [InlineData("ProjectC", "ProjectC,ProjectD,ProjectE")] - [InlineData("ProjectD", "ProjectD")] - [InlineData("ProjectE", "ProjectE")] - public void ItMigratesRootProjectAndReferences(string projectName, string expectedProjects) - { - var projectDirectory = TestAssets - .GetProjectJson("TestAppDependencyGraph") - .CreateInstance(identifier: $"{projectName}.RefsTest") - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - MigrateProject(new [] { projectDirectory.GetDirectory(projectName).FullName }); - - string[] migratedProjects = expectedProjects.Split(new char[] { ',' }); - - VerifyMigration(migratedProjects, projectDirectory); - } - - [Theory] - [InlineData("ProjectA")] - [InlineData("ProjectB")] - [InlineData("ProjectC")] - [InlineData("ProjectD")] - [InlineData("ProjectE")] - public void ItMigratesRootProjectAndSkipsReferences(string projectName) - { - var projectDirectory = TestAssets - .GetProjectJson("TestAppDependencyGraph") - .CreateInstance($"{projectName}.SkipRefsTest") - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - MigrateProject(new [] { projectDirectory.GetDirectory(projectName).FullName, "--skip-project-references" }); - - VerifyMigration(Enumerable.Repeat(projectName, 1), projectDirectory); - } - - [Theory] - [InlineData(true)] - [InlineData(false)] - public void ItMigratesAllProjectsInGivenDirectory(bool skipRefs) - { - var projectDirectory = TestAssets - .GetProjectJson("TestAppDependencyGraph") - .CreateInstance(callingMethod: $"MigrateDirectory.SkipRefs.{skipRefs}") - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - if (skipRefs) - { - MigrateProject(new [] { projectDirectory.FullName, "--skip-project-references" }); - } - else - { - MigrateProject(new [] { projectDirectory.FullName }); - } - - string[] migratedProjects = new string[] { "ProjectA", "ProjectB", "ProjectC", "ProjectD", "ProjectE", "ProjectF", "ProjectG", "ProjectH", "ProjectI", "ProjectJ" }; - - VerifyMigration(migratedProjects, projectDirectory); - } - - [Fact] - public void ItMigratesGivenProjectJson() - { - var projectDirectory = TestAssets - .GetProjectJson("TestAppDependencyGraph") - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - var project = projectDirectory - .GetDirectory("ProjectA") - .GetFile("project.json"); - - MigrateProject(new [] { project.FullName }); - - string[] migratedProjects = new string[] { "ProjectA", "ProjectB", "ProjectC", "ProjectD", "ProjectE" }; - - VerifyMigration(migratedProjects, projectDirectory); - } - - [Fact] - // regression test for https://github.com/dotnet/cli/issues/4269 - public void ItMigratesAndBuildsP2PReferences() - { - var assetsDir = TestAssets - .GetProjectJson("TestAppDependencyGraph") - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - var projectDirectory = assetsDir.GetDirectory("ProjectF"); - - var restoreDirectories = new DirectoryInfo[] - { - projectDirectory, - assetsDir.GetDirectory("ProjectG") - }; - - var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, "ProjectF", new [] { projectDirectory.FullName }, restoreDirectories); - - var outputsIdentical = outputComparisonData.ProjectJsonBuildOutputs - .SetEquals(outputComparisonData.MSBuildBuildOutputs); - - if (!outputsIdentical) - { - OutputDiagnostics(outputComparisonData); - } - - outputsIdentical.Should().BeTrue(); - - VerifyAllMSBuildOutputsRunnable(projectDirectory); - } - - [Theory] - [InlineData("src", "H")] - [InlineData("src with spaces", "J")] - public void ItMigratesAndBuildsProjectsInGlobalJson(string path, string projectNameSuffix) - { - var assetsDir = TestAssets - .GetProjectJson("ProjectsWithGlobalJson") - .CreateInstance(identifier: projectNameSuffix) - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - var projectName = $"Project{projectNameSuffix}"; - - var globalJson = assetsDir.GetFile("global.json"); - - var restoreDirectories = new DirectoryInfo[] - { - assetsDir.GetDirectory("src", "ProjectH"), - assetsDir.GetDirectory("src", "ProjectI"), - assetsDir.GetDirectory("src with spaces", "ProjectJ") - }; - - var projectDirectory = assetsDir.GetDirectory(path, projectName); - - var outputComparisonData = BuildProjectJsonMigrateBuildMSBuild(projectDirectory, - projectName, - new [] { globalJson.FullName }, - restoreDirectories); - - var outputsIdentical = outputComparisonData.ProjectJsonBuildOutputs - .SetEquals(outputComparisonData.MSBuildBuildOutputs); - - if (!outputsIdentical) - { - OutputDiagnostics(outputComparisonData); - } - - outputsIdentical.Should().BeTrue(); - - VerifyAllMSBuildOutputsRunnable(projectDirectory); - } - - [Theory] - [InlineData(true)] - [InlineData(false)] - public void MigrationOutputsErrorWhenNoProjectsFound(bool useGlobalJson) - { - var projectDirectory = TestAssets.CreateTestDirectory("Migration_outputs_error_when_no_projects_found"); - - string argstr = string.Empty; - - string errorMessage = string.Empty; - - if (useGlobalJson) - { - var globalJson = projectDirectory.GetFile("global.json"); - - using (StreamWriter sw = globalJson.CreateText()) - { - sw.WriteLine("{"); - sw.WriteLine("\"projects\": [ \".\" ]"); - sw.WriteLine("}"); - } - - argstr = globalJson.FullName; - - errorMessage = "Unable to find any projects in global.json"; - } - else - { - argstr = projectDirectory.FullName; - - errorMessage = $"No project.json file found in '{projectDirectory.FullName}'"; - } - - var result = new TestCommand("dotnet") - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput($"migrate {argstr}"); - - // Expecting an error exit code. - result.ExitCode.Should().Be(1); - - // Verify the error messages. Note that debug builds also show the call stack, so we search - // for the error strings that should be present (rather than an exact match). - result.StdErr - .Should().Contain(errorMessage) - .And.Contain("Migration failed."); - } - - [RequiresSpecificFrameworkFact("netcoreapp1.0")] - public void ItMigratesAndPublishesProjectsWithRuntimes() - { - var projectName = "PJTestAppSimple"; - var projectDirectory = TestAssets - .GetProjectJson(projectName) - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - CleanBinObj(projectDirectory); - BuildProjectJsonMigrateBuildMSBuild(projectDirectory, projectName); - PublishMSBuild(projectDirectory, projectName, "win7-x64"); - } - - [WindowsOnlyTheory] - [InlineData("DesktopTestProjects", "AutoAddDesktopReferencesDuringMigrate", true)] - [InlineData("TestProjects", "PJTestAppSimple", false)] - public void ItAutoAddDesktopReferencesDuringMigrate(string testGroup, string projectName, bool isDesktopApp) - { - var runtime = DotnetLegacyRuntimeIdentifiers.InferLegacyRestoreRuntimeIdentifier(); - - var projectDirectory = TestAssets - .GetProjectJson(testGroup, projectName) - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - CleanBinObj(projectDirectory); - MigrateProject(new string[] { projectDirectory.FullName }); - Restore(projectDirectory, runtime: runtime); - BuildMSBuild(projectDirectory, projectName, runtime:runtime); - VerifyAutoInjectedDesktopReferences(projectDirectory, projectName, isDesktopApp); - VerifyAllMSBuildOutputsRunnable(projectDirectory); - } - - [Fact] - public void ItBuildsAMigratedAppWithAnIndirectDependency() - { - const string projectName = "ProjectA"; - - var solutionDirectory = TestAssets - .GetProjectJson("TestAppDependencyGraph") - .CreateInstance() - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - var projectDirectory = solutionDirectory.GetDirectory(projectName); - - MigrateProject(new string[] { projectDirectory.FullName }); - - Restore(projectDirectory); - - BuildMSBuild(projectDirectory, projectName); - - VerifyAllMSBuildOutputsRunnable(projectDirectory); - } - - [Fact] - public void ItMigratesProjectWithOutputName() - { - var projectName = "AppWithOutputAssemblyName"; - var expectedOutputName = "MyApp"; - - var projectDirectory = TestAssets - .GetProjectJson(projectName) - .CreateInstance() - .WithSourceFiles() - .WithRestoreFiles() - .WithEmptyGlobalJson() - .Root; - - var expectedCsprojPath = projectDirectory.GetFile($"{projectName}.csproj"); - - if (expectedCsprojPath.Exists) - { - expectedCsprojPath.Delete(); - } - - CleanBinObj(projectDirectory); - MigrateProject(projectDirectory.FullName); - - expectedCsprojPath.Refresh(); - - expectedCsprojPath.Should().Exist(); - - Restore(projectDirectory, projectName); - BuildMSBuild(projectDirectory, projectName); - projectDirectory - .GetDirectory("bin") - .EnumerateFiles($"{expectedOutputName}.pdb", SearchOption.AllDirectories) - .Count().Should().Be(1); - - PackMSBuild(projectDirectory, projectName); - - projectDirectory - .GetDirectory("bin") - .EnumerateFiles($"{projectName}.1.0.0.nupkg", SearchOption.AllDirectories) - .Count().Should().Be(1); - } - - [Theory] - [InlineData("LibraryWithoutNetStandardLibRef")] - [InlineData("LibraryWithNetStandardLibRef")] - public void ItMigratesAndBuildsLibrary(string projectName) - { - var projectDirectory = TestAssets - .GetProjectJson(projectName) - .CreateInstance(identifier: projectName) - .WithSourceFiles() - .WithEmptyGlobalJson() - .Root; - - MigrateProject(projectDirectory.FullName); - Restore(projectDirectory, projectName); - BuildMSBuild(projectDirectory, projectName); - } - - [Fact] - public void ItMigratesAndBuildsAppWithExplicitInclude() - { - const string projectName = "TestAppWithExplicitInclude"; - var projectDirectory = TestAssets.Get(projectName) - .CreateInstance() - .WithSourceFiles() - .Root; - - MigrateProject(projectDirectory.FullName); - Restore(projectDirectory, projectName); - BuildMSBuild(projectDirectory, projectName); - } - - [Fact] - public void ItMigratesAndBuildsAppWithExplicitIncludeGlob() - { - const string projectName = "TestAppWithExplicitIncludeGlob"; - var projectDirectory = TestAssets.Get(projectName) - .CreateInstance() - .WithSourceFiles() - .Root; - - MigrateProject(projectDirectory.FullName); - Restore(projectDirectory, projectName); - BuildMSBuild(projectDirectory, projectName); - } - - private void VerifyAutoInjectedDesktopReferences(DirectoryInfo projectDirectory, string projectName, bool shouldBePresent) - { - if (projectName != null) - { - projectName = projectName + ".csproj"; - } - - var root = ProjectRootElement.Open(projectDirectory.GetFile(projectName).FullName); - - var autoInjectedReferences = root - .Items - .Where(i => i.ItemType == "Reference" - && (i.Include == "System" || i.Include == "Microsoft.CSharp")); - - if (shouldBePresent) - { - autoInjectedReferences.Should().HaveCount(2); - } - else - { - autoInjectedReferences.Should().BeEmpty(); - } - } - - private void VerifyMigration(IEnumerable expectedProjects, DirectoryInfo rootDir) - { - var backupDir = rootDir.GetDirectory("backup"); - - var migratedProjects = rootDir.EnumerateFiles("*.csproj", SearchOption.AllDirectories) - .Where(s => !PathUtility.IsChildOfDirectory(backupDir.FullName, s.FullName)) - .Where(s => Directory.EnumerateFiles(Path.GetDirectoryName(s.FullName), "*.csproj").Count() == 1) - .Where(s => Path.GetFileName(Path.GetDirectoryName(s.FullName)).Contains("Project")) - .Select(s => Path.GetFileName(Path.GetDirectoryName(s.FullName))); - - migratedProjects.Should().BeEquivalentTo(expectedProjects); - } - - private MigratedBuildComparisonData GetComparisonData(DirectoryInfo projectDirectory) - { - File.Copy("NuGet.tempaspnetpatch.config", projectDirectory.GetFile("NuGet.Config").FullName); - - RestoreProjectJson(projectDirectory); - - var outputComparisonData = - BuildProjectJsonMigrateBuildMSBuild(projectDirectory, Path.GetFileNameWithoutExtension(projectDirectory.FullName)); - - return outputComparisonData; - } - - private void VerifyAllMSBuildOutputsRunnable(DirectoryInfo projectDirectory) - { - if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0")) - { - // running the apps requires netcoreapp1.0 - return; - } - - var dllFileName = Path.GetFileName(projectDirectory.FullName) + ".dll"; - - var runnableDlls = projectDirectory - .GetDirectory("bin") - .GetFiles(dllFileName, SearchOption.AllDirectories); - - foreach (var dll in runnableDlls) - { - new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes).ExecuteWithCapturedOutput($"\"{dll.FullName}\"").Should().Pass(); - } - } - - private void VerifyAllMSBuildOutputsAreSigned(DirectoryInfo projectDirectory) - { - var dllFileName = Path.GetFileName(projectDirectory.FullName) + ".dll"; - - var runnableDlls = projectDirectory - .GetDirectory("bin") - .EnumerateFiles(dllFileName, SearchOption.AllDirectories); - - foreach (var dll in runnableDlls) - { - var assemblyName = AssemblyLoadContext.GetAssemblyName(dll.FullName); - - var token = assemblyName.GetPublicKeyToken(); - - token.Should().NotBeNullOrEmpty(); - } - } - - private MigratedBuildComparisonData BuildProjectJsonMigrateBuildMSBuild(DirectoryInfo projectDirectory, - string projectName) - { - return BuildProjectJsonMigrateBuildMSBuild(projectDirectory, - projectName, - new [] { projectDirectory.FullName }, - new [] { projectDirectory }); - } - - private MigratedBuildComparisonData BuildProjectJsonMigrateBuildMSBuild(DirectoryInfo projectDirectory, - string projectName, - string[] migrateArgs, - DirectoryInfo[] restoreDirectories) - { - BuildProjectJson(projectDirectory); - - var projectJsonBuildOutputs = new HashSet(CollectBuildOutputs(projectDirectory.FullName)); - - CleanBinObj(projectDirectory); - - // Remove lock file for migration - foreach(var dir in restoreDirectories) - { - dir.GetFile("project.lock.json").Delete(); - } - - MigrateProject(migrateArgs); - - DeleteXproj(projectDirectory); - - foreach(var dir in restoreDirectories) - { - Restore(dir); - } - - BuildMSBuild(projectDirectory, projectName); - - var msbuildBuildOutputs = new HashSet(CollectBuildOutputs(projectDirectory.FullName)); - - return new MigratedBuildComparisonData(projectJsonBuildOutputs, msbuildBuildOutputs); - } - - private IEnumerable CollectBuildOutputs(string projectDirectory) - { - var fullBinPath = Path.GetFullPath(Path.Combine(projectDirectory, "bin")); - - return Directory.EnumerateFiles(fullBinPath, "*", SearchOption.AllDirectories) - .Select(p => Path.GetFullPath(p).Substring(fullBinPath.Length)); - } - - private void CleanBinObj(DirectoryInfo projectDirectory) - { - var dirs = new DirectoryInfo[] { projectDirectory.GetDirectory("bin"), projectDirectory.GetDirectory("obj") }; - - foreach (var dir in dirs) - { - if(dir.Exists) - { - dir.Delete(true); - } - } - } - - private void BuildProjectJson(DirectoryInfo projectDirectory) - { - Console.WriteLine(projectDirectory); - - var projectFile = $"\"{projectDirectory.GetFile("project.json").FullName}\""; - - var result = new BuildPJCommand() - .WithCapturedOutput() - .WithForwardingToConsole() - .Execute(projectFile); - - result.Should().Pass(); - } - - private void MigrateProject(params string[] migrateArgs) - { - new TestCommand("dotnet") - .WithForwardingToConsole() - .Execute($"migrate {string.Join(" ", migrateArgs)}") - .Should() - .Pass(); - } - - private void RestoreProjectJson(DirectoryInfo projectDirectory) - { - var projectFile = $"\"{projectDirectory.GetFile("project.json").FullName}\""; - new RestoreProjectJsonCommand() - .Execute(projectFile) - .Should().Pass(); - } - - private void Restore(DirectoryInfo projectDirectory, string projectName=null, string runtime=null) - { - var command = new RestoreCommand() - .WithWorkingDirectory(projectDirectory) - .WithRuntime(runtime); - - if (projectName != null) - { - if (!Path.HasExtension(projectName)) - { - projectName += ".csproj"; - } - command.Execute($"{projectName} /p:SkipInvalidConfigurations=true;_InvalidConfigurationWarning=false") - .Should().Pass(); - } - else - { - command.Execute("/p:SkipInvalidConfigurations=true;_InvalidConfigurationWarning=false") - .Should().Pass(); - } - } - - private string BuildMSBuild( - DirectoryInfo projectDirectory, - string projectName, - string configuration="Debug", - string runtime=null, - string framework=null) - { - if (projectName != null && !Path.HasExtension(projectName)) - { - projectName = projectName + ".csproj"; - } - - DeleteXproj(projectDirectory); - - var result = new BuildCommand() - .WithWorkingDirectory(projectDirectory) - .WithRuntime(runtime) - .WithFramework(framework) - .ExecuteWithCapturedOutput($"{projectName} /p:Configuration={configuration}"); - - result - .Should().Pass(); - - return result.StdOut; - } - - private string PublishMSBuild( - DirectoryInfo projectDirectory, - string projectName, - string runtime = null, - string configuration = "Debug") - { - if (projectName != null) - { - projectName = projectName + ".csproj"; - } - - DeleteXproj(projectDirectory); - - var result = new PublishCommand() - .WithRuntime(runtime) - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput($"{projectName} /p:Configuration={configuration}"); - - result.Should().Pass(); - - return result.StdOut; - } - - private string PackMSBuild(DirectoryInfo projectDirectory, string projectName) - { - if (projectName != null && !Path.HasExtension(projectName)) - { - projectName = projectName + ".csproj"; - } - - var result = new PackCommand() - .WithWorkingDirectory(projectDirectory) - .ExecuteWithCapturedOutput($"{projectName}"); - - result.Should().Pass(); - - return result.StdOut; - } - - private void DeleteXproj(DirectoryInfo projectDirectory) - { - var xprojFiles = projectDirectory.EnumerateFiles("*.xproj"); - - foreach (var xprojFile in xprojFiles) - { - xprojFile.Delete(); - } - } - - private void OutputDiagnostics(MigratedBuildComparisonData comparisonData) - { - OutputDiagnostics(comparisonData.MSBuildBuildOutputs, comparisonData.ProjectJsonBuildOutputs); - } - - private void OutputDiagnostics(HashSet msbuildBuildOutputs, HashSet projectJsonBuildOutputs) - { - Console.WriteLine("Project.json Outputs:"); - - Console.WriteLine(string.Join("\n", projectJsonBuildOutputs)); - - Console.WriteLine(""); - - Console.WriteLine("MSBuild Outputs:"); - - Console.WriteLine(string.Join("\n", msbuildBuildOutputs)); - } - - private class MigratedBuildComparisonData - { - public HashSet ProjectJsonBuildOutputs { get; } - - public HashSet MSBuildBuildOutputs { get; } - - public MigratedBuildComparisonData(HashSet projectJsonBuildOutputs, - HashSet msBuildBuildOutputs) - { - ProjectJsonBuildOutputs = projectJsonBuildOutputs; - - MSBuildBuildOutputs = msBuildBuildOutputs; - } - } - - private void WriteGlobalJson(DirectoryInfo globalDirectory) - { - var file = globalDirectory.GetFile("global.json"); - - File.WriteAllText(file.FullName, @" - { - ""projects"": [ ] - }"); - } - } -} diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 5c120645e..31f271f50 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -118,7 +118,7 @@ namespace Microsoft.DotNet.New.Tests var context = reader.Read(stream); var dependency = context .RuntimeLibraries - .Single(library => library.Name == packageName); + .Single(library => string.Equals(library.Name, packageName, StringComparison.OrdinalIgnoreCase)); return dependency.Version; } diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index d5c83d97a..a4eff285b 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -162,7 +162,7 @@ namespace Microsoft.DotNet.Tests .Execute(toolPrefersCLIRuntime ? "portable-v1-prefercli" : "portable-v1"); result.Should().Pass() - .And.HaveStdOutContaining("I'm running on shared framework version 1.1.1!"); + .And.HaveStdOutContaining("I'm running on shared framework version 1.1.2!"); } @@ -215,7 +215,7 @@ namespace Microsoft.DotNet.Tests .Execute("portable-v1"); result.Should().Pass() - .And.HaveStdOutContaining("I'm running on shared framework version 1.1.1!"); + .And.HaveStdOutContaining("I'm running on shared framework version 1.1.2!"); } [Fact]