diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 227cdc110..fa47e7ccf 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26206.0 +VisualStudioVersion = 15.0.26228.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject @@ -25,8 +24,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4-BC0F-443B-8ADF-691321F10108}" ProjectSection(SolutionItems) = preProject build\AzureInfo.props = build\AzureInfo.props - build\Branding.props = build\Branding.props build\BranchInfo.props = build\BranchInfo.props + build\Branding.props = build\Branding.props build\BuildDefaults.props = build\BuildDefaults.props build\BundledRuntimes.props = build\BundledRuntimes.props build\BundledSdks.proj = build\BundledSdks.proj @@ -45,10 +44,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4 build\InputDirectories.props = build\InputDirectories.props build\InstallerInfo.props = build\InstallerInfo.props build\MSBuildExtensions.props = build\MSBuildExtensions.props - build\ProjectsToPublish.props = build\ProjectsToPublish.props build\OutputDirectories.props = build\OutputDirectories.props build\Package.targets = build\Package.targets build\Prepare.targets = build\Prepare.targets + build\ProjectsToPublish.props = build\ProjectsToPublish.props build\Publish.targets = build\Publish.targets build\Run.targets = build\Run.targets build\Signing.proj = build\Signing.proj @@ -85,14 +84,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FF498306-2 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B12960-ABB0-4903-9C60-5E9157E659C8}" ProjectSection(SolutionItems) = preProject - build\publish\FinishBuild.targets = build\publish\FinishBuild.targets build\publish\Badge.targets = build\publish\Badge.targets build\publish\Checksum.targets = build\publish\Checksum.targets + build\publish\FinishBuild.targets = build\publish\FinishBuild.targets build\publish\PublishContent.targets = build\publish\PublishContent.targets build\publish\PublishDebian.targets = build\publish\PublishDebian.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC1BC2-867E-47C0-BAD0-ADE897F07F78}" ProjectSection(SolutionItems) = preProject @@ -102,113 +101,111 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC build\prepare\UbuntuCoreclrAndCoreFxDependencies.props = build\prepare\UbuntuCoreclrAndCoreFxDependencies.props EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-dependency-context-test", "TestAssets\TestPackages\dotnet-dependency-context-test\dotnet-dependency-context-test.csproj", "{48A62BA4-D798-46A2-AB49-8A8471CF8165}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dependency-context-test", "TestAssets\TestPackages\dotnet-dependency-context-test\dotnet-dependency-context-test.csproj", "{48A62BA4-D798-46A2-AB49-8A8471CF8165}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-dependency-tool-invoker", "TestAssets\TestPackages\dotnet-dependency-tool-invoker\dotnet-dependency-tool-invoker.csproj", "{7C3D62C6-1D71-4C45-872F-7583F2AB304A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dependency-tool-invoker", "TestAssets\TestPackages\dotnet-dependency-tool-invoker\dotnet-dependency-tool-invoker.csproj", "{7C3D62C6-1D71-4C45-872F-7583F2AB304A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-desktop-and-portable", "TestAssets\TestPackages\dotnet-desktop-and-portable\dotnet-desktop-and-portable.csproj", "{79B4932C-3D57-494B-95AF-E5624F9D2F01}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-desktop-and-portable", "TestAssets\TestPackages\dotnet-desktop-and-portable\dotnet-desktop-and-portable.csproj", "{79B4932C-3D57-494B-95AF-E5624F9D2F01}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-desktop-binding-redirects", "TestAssets\TestPackages\dotnet-desktop-binding-redirects\dotnet-desktop-binding-redirects.csproj", "{1FC7922B-489D-42BF-81CD-31A37DD17E5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-desktop-binding-redirects", "TestAssets\TestPackages\dotnet-desktop-binding-redirects\dotnet-desktop-binding-redirects.csproj", "{1FC7922B-489D-42BF-81CD-31A37DD17E5D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v1", "v1", "{6BC1E4BF-7291-478A-ACF7-A0ED6F5A26D6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v2", "v2", "{590CF173-498A-4687-82FD-2649AA87274B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v1\dotnet-hello\dotnet-hello.csproj", "{AA831686-C4EB-4250-9EC3-D252303B36A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v1\dotnet-hello\dotnet-hello.csproj", "{AA831686-C4EB-4250-9EC3-D252303B36A2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v2\dotnet-hello\dotnet-hello.csproj", "{DED9654E-74A5-4BCB-83A4-05D4B78D7833}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v2\dotnet-hello\dotnet-hello.csproj", "{DED9654E-74A5-4BCB-83A4-05D4B78D7833}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-portable", "TestAssets\TestPackages\dotnet-portable\dotnet-portable.csproj", "{2E852476-0B95-4A5B-9C29-53A950D1278F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-portable", "TestAssets\TestPackages\dotnet-portable\dotnet-portable.csproj", "{2E852476-0B95-4A5B-9C29-53A950D1278F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-prefercliruntime", "TestAssets\TestPackages\dotnet-prefercliruntime\dotnet-prefercliruntime.csproj", "{736BF068-7389-41B9-BF63-D4E49B9BC833}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-prefercliruntime", "TestAssets\TestPackages\dotnet-prefercliruntime\dotnet-prefercliruntime.csproj", "{736BF068-7389-41B9-BF63-D4E49B9BC833}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageWithFakeNativeDep", "TestAssets\TestPackages\PackageWithFakeNativeDep\PackageWithFakeNativeDep.csproj", "{48408A19-CCC5-4C85-990B-0A9F827BF29A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageWithFakeNativeDep", "TestAssets\TestPackages\PackageWithFakeNativeDep\PackageWithFakeNativeDep.csproj", "{48408A19-CCC5-4C85-990B-0A9F827BF29A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToolWithOutputName", "TestAssets\TestPackages\ToolWithOutputName\ToolWithOutputName.csproj", "{8FB83810-5A4C-4097-9A79-8E687E4981CB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToolWithOutputName", "TestAssets\TestPackages\ToolWithOutputName\ToolWithOutputName.csproj", "{8FB83810-5A4C-4097-9A79-8E687E4981CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-archive", "src\dotnet-archive\dotnet-archive.csproj", "{F0CB08B6-2809-4D37-B1DD-A9B7F1B0D95D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-archive", "src\dotnet-archive\dotnet-archive.csproj", "{F0CB08B6-2809-4D37-B1DD-A9B7F1B0D95D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet", "src\dotnet\dotnet.csproj", "{203F0362-DAFC-4679-A01E-7FBC331D8647}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet", "src\dotnet\dotnet.csproj", "{203F0362-DAFC-4679-A01E-7FBC331D8647}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Archive", "src\Microsoft.DotNet.Archive\Microsoft.DotNet.Archive.csproj", "{F8C66E8A-FC59-40B3-AC0F-58CA22526F76}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Archive", "src\Microsoft.DotNet.Archive\Microsoft.DotNet.Archive.csproj", "{F8C66E8A-FC59-40B3-AC0F-58CA22526F76}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Utils", "src\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj", "{73ACEB34-D22C-43EA-87BE-EFC0E83D0126}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Utils", "src\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.csproj", "{73ACEB34-D22C-43EA-87BE-EFC0E83D0126}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Configurer", "src\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.csproj", "{ABB81DAE-0D26-483C-BE3B-0F9ACD812A62}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Configurer", "src\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.csproj", "{ABB81DAE-0D26-483C-BE3B-0F9ACD812A62}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.InternalAbstractions", "src\Microsoft.DotNet.InternalAbstractions\Microsoft.DotNet.InternalAbstractions.csproj", "{570950AD-A080-4F32-980C-F50E312910DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.InternalAbstractions", "src\Microsoft.DotNet.InternalAbstractions\Microsoft.DotNet.InternalAbstractions.csproj", "{570950AD-A080-4F32-980C-F50E312910DF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ProjectJsonMigration", "src\Microsoft.DotNet.ProjectJsonMigration\Microsoft.DotNet.ProjectJsonMigration.csproj", "{A8E6EFEB-027A-4C4B-A73C-C193A0F00569}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ProjectJsonMigration", "src\Microsoft.DotNet.ProjectJsonMigration\Microsoft.DotNet.ProjectJsonMigration.csproj", "{A8E6EFEB-027A-4C4B-A73C-C193A0F00569}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.TestFramework", "src\Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{6592A22C-2386-4E83-A4D3-FC08075C723A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.TestFramework", "src\Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{6592A22C-2386-4E83-A4D3-FC08075C723A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_nuget", "src\tool_nuget\tool_nuget.csproj", "{BE4C655A-DC54-4408-B739-743456D34111}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\tool_nuget\tool_nuget.csproj", "{BE4C655A-DC54-4408-B739-743456D34111}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "binding-redirects.Tests", "test\binding-redirects.Tests\binding-redirects.Tests.csproj", "{4EF497BF-D717-4E03-90B1-932C7F51B918}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "binding-redirects.Tests", "test\binding-redirects.Tests\binding-redirects.Tests.csproj", "{4EF497BF-D717-4E03-90B1-932C7F51B918}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "crossgen.Tests", "test\crossgen.Tests\crossgen.Tests.csproj", "{18B43540-346F-4AFF-8868-A82CF098FAFD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crossgen.Tests", "test\crossgen.Tests\crossgen.Tests.csproj", "{18B43540-346F-4AFF-8868-A82CF098FAFD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet.Tests", "test\dotnet.Tests\dotnet.Tests.csproj", "{C3845C85-1F59-4552-BE52-32F513CE795F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet.Tests", "test\dotnet.Tests\dotnet.Tests.csproj", "{C3845C85-1F59-4552-BE52-32F513CE795F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-build.Tests", "test\dotnet-build.Tests\dotnet-build.Tests.csproj", "{BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-build.Tests", "test\dotnet-build.Tests\dotnet-build.Tests.csproj", "{BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-migrate.Tests", "test\dotnet-migrate.Tests\dotnet-migrate.Tests.csproj", "{726D2CB9-80E5-4496-9C86-910AC452C45E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-migrate.Tests", "test\dotnet-migrate.Tests\dotnet-migrate.Tests.csproj", "{726D2CB9-80E5-4496-9C86-910AC452C45E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-msbuild.Tests", "test\dotnet-msbuild.Tests\dotnet-msbuild.Tests.csproj", "{EF745C56-0350-4C42-AA22-86D592E1D8D5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-msbuild.Tests", "test\dotnet-msbuild.Tests\dotnet-msbuild.Tests.csproj", "{EF745C56-0350-4C42-AA22-86D592E1D8D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-new.Tests", "test\dotnet-new.Tests\dotnet-new.Tests.csproj", "{87063BA1-454D-4433-ADF9-89C667275D62}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-new.Tests", "test\dotnet-new.Tests\dotnet-new.Tests.csproj", "{87063BA1-454D-4433-ADF9-89C667275D62}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-nuget.UnitTests", "test\dotnet-nuget.UnitTests\dotnet-nuget.UnitTests.csproj", "{07DD4AE1-5CF6-4EDB-AB29-31EB532F950F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-nuget.UnitTests", "test\dotnet-nuget.UnitTests\dotnet-nuget.UnitTests.csproj", "{07DD4AE1-5CF6-4EDB-AB29-31EB532F950F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-pack.Tests", "test\dotnet-pack.Tests\dotnet-pack.Tests.csproj", "{7256EEBC-814D-42CF-821B-58CB61F3E070}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-pack.Tests", "test\dotnet-pack.Tests\dotnet-pack.Tests.csproj", "{7256EEBC-814D-42CF-821B-58CB61F3E070}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.csproj", "{448F6884-B613-440E-82A6-07E6BB54794C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.csproj", "{448F6884-B613-440E-82A6-07E6BB54794C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-run.Tests", "test\dotnet-run.Tests\dotnet-run.Tests.csproj", "{526D7B7A-0485-48A3-A43F-F03A0DBC9897}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-run.Tests", "test\dotnet-run.Tests\dotnet-run.Tests.csproj", "{526D7B7A-0485-48A3-A43F-F03A0DBC9897}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-test.Tests", "test\dotnet-test.Tests\dotnet-test.Tests.csproj", "{C8D98389-E3CF-4BEF-A9EF-D78672E51866}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-test.Tests", "test\dotnet-test.Tests\dotnet-test.Tests.csproj", "{C8D98389-E3CF-4BEF-A9EF-D78672E51866}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-vstest.Tests", "test\dotnet-vstest.Tests\dotnet-vstest.Tests.csproj", "{131C05D4-D685-478F-A3FB-F5600EF93533}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-vstest.Tests", "test\dotnet-vstest.Tests\dotnet-vstest.Tests.csproj", "{131C05D4-D685-478F-A3FB-F5600EF93533}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndToEnd", "test\EndToEnd\EndToEnd.csproj", "{1BFF54F9-4E35-49DB-893C-AF2047722FC6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEnd", "test\EndToEnd\EndToEnd.csproj", "{1BFF54F9-4E35-49DB-893C-AF2047722FC6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Msi.Tests", "test\Installer\Microsoft.DotNet.Cli.Msi.Tests\Microsoft.DotNet.Cli.Msi.Tests.csproj", "{7F115EF9-1827-4175-B50E-F214A490093E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Msi.Tests", "test\Installer\Microsoft.DotNet.Cli.Msi.Tests\Microsoft.DotNet.Cli.Msi.Tests.csproj", "{7F115EF9-1827-4175-B50E-F214A490093E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Utils.Tests", "test\Microsoft.DotNet.Cli.Utils.Tests\Microsoft.DotNet.Cli.Utils.Tests.csproj", "{FC9A1FF2-86AC-4DBE-B045-1A8EE6E9B3F3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Utils.Tests", "test\Microsoft.DotNet.Cli.Utils.Tests\Microsoft.DotNet.Cli.Utils.Tests.csproj", "{FC9A1FF2-86AC-4DBE-B045-1A8EE6E9B3F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Configurer.UnitTests", "test\Microsoft.DotNet.Configurer.UnitTests\Microsoft.DotNet.Configurer.UnitTests.csproj", "{F228580D-9373-4A60-AB88-76DF58D11580}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Configurer.UnitTests", "test\Microsoft.DotNet.Configurer.UnitTests\Microsoft.DotNet.Configurer.UnitTests.csproj", "{F228580D-9373-4A60-AB88-76DF58D11580}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ProjectJsonMigration.Tests", "test\Microsoft.DotNet.ProjectJsonMigration.Tests\Microsoft.DotNet.ProjectJsonMigration.Tests.csproj", "{53F4CC00-72B3-4049-8888-FC05F622A9AC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ProjectJsonMigration.Tests", "test\Microsoft.DotNet.ProjectJsonMigration.Tests\Microsoft.DotNet.ProjectJsonMigration.Tests.csproj", "{53F4CC00-72B3-4049-8888-FC05F622A9AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{48E260F4-6F3F-4387-B61F-D15BABD06D9A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{48E260F4-6F3F-4387-B61F-D15BABD06D9A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msbuild.IntegrationTests", "test\msbuild.IntegrationTests\msbuild.IntegrationTests.csproj", "{23EE9BBB-3B33-4CF2-8D1A-29A8DB12E878}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "msbuild.IntegrationTests", "test\msbuild.IntegrationTests\msbuild.IntegrationTests.csproj", "{23EE9BBB-3B33-4CF2-8D1A-29A8DB12E878}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance", "test\Performance\Performance.csproj", "{F5E27BA5-063B-4770-A6E8-87252E9AB22C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Performance", "test\Performance\Performance.csproj", "{F5E27BA5-063B-4770-A6E8-87252E9AB22C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Build.Framework", "build_projects\Microsoft.DotNet.Cli.Build.Framework\Microsoft.DotNet.Cli.Build.Framework.csproj", "{AA744891-5209-4335-8457-37EC347DF833}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Build.Framework", "build_projects\Microsoft.DotNet.Cli.Build.Framework\Microsoft.DotNet.Cli.Build.Framework.csproj", "{AA744891-5209-4335-8457-37EC347DF833}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "shared-build-targets-utils", "build_projects\shared-build-targets-utils\shared-build-targets-utils.csproj", "{DA3595A8-35DE-42B9-97A4-4A2461BAD554}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "shared-build-targets-utils", "build_projects\shared-build-targets-utils\shared-build-targets-utils.csproj", "{DA3595A8-35DE-42B9-97A4-4A2461BAD554}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "update-dependencies", "build_projects\update-dependencies\update-dependencies.csproj", "{F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "update-dependencies", "build_projects\update-dependencies\update-dependencies.csproj", "{F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Sln.Internal", "src\Microsoft.DotNet.Cli.Sln.Internal\Microsoft.DotNet.Cli.Sln.Internal.csproj", "{C98C7C2E-2C29-4A40-958C-60561ED77791}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Sln.Internal", "src\Microsoft.DotNet.Cli.Sln.Internal\Microsoft.DotNet.Cli.Sln.Internal.csproj", "{C98C7C2E-2C29-4A40-958C-60561ED77791}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Cli.Sln.Internal.Tests", "test\Microsoft.DotNet.Cli.Sln.Internal.Tests\Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj", "{56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Cli.Sln.Internal.Tests", "test\Microsoft.DotNet.Cli.Sln.Internal.Tests\Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj", "{56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}" EndProject Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "dotnet-cache.Tests", "test\dotnet-cache.Tests\dotnet-cache.Tests.csproj", "{CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}" EndProject @@ -230,27 +227,28 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x64.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x86.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x86.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|Any CPU.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|Any CPU.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x64.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x64.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x86.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x86.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|Any CPU.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x64.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x64.Build.0 = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x86.ActiveCfg = Debug|x86 - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x86.Build.0 = Debug|x86 + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x64.ActiveCfg = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x64.Build.0 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x86.ActiveCfg = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|x86.Build.0 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|Any CPU.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x64.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x64.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x86.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Release|x86.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {48A62BA4-D798-46A2-AB49-8A8471CF8165}.Debug|Any CPU.ActiveCfg = Release|Any CPU {48A62BA4-D798-46A2-AB49-8A8471CF8165}.Debug|Any CPU.Build.0 = Release|Any CPU {48A62BA4-D798-46A2-AB49-8A8471CF8165}.Debug|x64.ActiveCfg = Release|Any CPU @@ -803,30 +801,6 @@ Global {2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|Any CPU.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|x64.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|x64.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|x86.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Debug|x86.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|x64.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|x86.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.MinSizeRel|x86.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|Any CPU.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|x64.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|x64.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|x86.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.Release|x86.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {3E28672F-F4E4-44D5-AEFB-1F425DECC57E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E28672F-F4E4-44D5-AEFB-1F425DECC57E}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E28672F-F4E4-44D5-AEFB-1F425DECC57E}.Debug|x64.ActiveCfg = Release|Any CPU @@ -1453,62 +1427,76 @@ Global {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x64.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x86.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x86.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|Any CPU.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|Any CPU.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x64.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x64.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x86.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x86.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|Any CPU.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x64.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x64.Build.0 = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x86.ActiveCfg = Debug|x86 - {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x86.Build.0 = Debug|x86 + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x64.ActiveCfg = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x64.Build.0 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x86.ActiveCfg = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|x86.Build.0 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|Any CPU.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x64.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x64.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x86.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Release|x86.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x64.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x86.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x86.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|Any CPU.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|Any CPU.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x64.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x64.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x86.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x86.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|Any CPU.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x64.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x64.Build.0 = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x86.ActiveCfg = Debug|x86 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x86.Build.0 = Debug|x86 + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x64.ActiveCfg = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x64.Build.0 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x86.ActiveCfg = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|x86.Build.0 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|Any CPU.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x64.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x64.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x86.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Release|x86.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x64.ActiveCfg = Debug|x64 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x64.Build.0 = Debug|x64 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x86.ActiveCfg = Debug|x86 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x86.Build.0 = Debug|x86 + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x64.ActiveCfg = Debug|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x64.Build.0 = Debug|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x86.ActiveCfg = Debug|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Debug|x86.Build.0 = Debug|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|x64.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|x64.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|x86.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.MinSizeRel|x86.Build.0 = Release|Any CPU {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|Any CPU.ActiveCfg = Release|Any CPU {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|Any CPU.Build.0 = Release|Any CPU - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.ActiveCfg = Release|x64 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.Build.0 = Release|x64 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.ActiveCfg = Release|x86 - {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.Build.0 = Release|x86 + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.RelWithDebInfo|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1541,7 +1529,6 @@ Global {D82A3246-9831-4024-A9B2-1932EEF3D56F} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {BE4C655A-DC54-4408-B739-743456D34111} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {2DFCC95F-75F7-46E1-8F56-256DB4CA98B2} = {0722D325-24C8-4E83-B5AF-0A083E7F0749} - {30C5EFC3-E6FD-4071-89FA-EBB9B5084C42} = {0722D325-24C8-4E83-B5AF-0A083E7F0749} {3E28672F-F4E4-44D5-AEFB-1F425DECC57E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {A5CA696F-585E-40AB-912C-6316BC330C5E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {4EF497BF-D717-4E03-90B1-932C7F51B918} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} diff --git a/README.md b/README.md index d1223ed6b..e0c2f74eb 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,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 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23| -|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![][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]|[![][opensuse-13.2-build-badge]][opensuse-13.2-build]|[![][fedora-23-build-badge]][fedora-23-build]| +|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | +|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| +|[![][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]| [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 @@ -61,12 +61,6 @@ Build Status [rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5446/badge [rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5446 -[opensuse-13.2-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5444/badge -[opensuse-13.2-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5444 - -[fedora-23-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5443/badge -[fedora-23-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5443 - Installers and Binaries ----------------------- @@ -87,14 +81,12 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | **Mac OS X** | [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] | -| **openSUSE 13.2** | [tar.gz][opensuse-13.2-targz] - [Checksum][opensuse-13.2-targz-checksum] | -| **Fedora 23** | [tar.gz][fedora-23-targz] - [Checksum][fedora-23-targz-checksum] | *Note: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* [version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/Windows_x64_Release_version_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_version_badge.svg [win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe [win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe.sha @@ -128,12 +120,6 @@ In order to download just the .NET Core runtime without the SDK, please visit ht [rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz [rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz.sha -[opensuse-13.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-opensuse.13.2-x64.latest.tar.gz -[opensuse-13.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-opensuse.13.2-x64.latest.tar.gz.sha - -[fedora-23-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-fedora.23-x64.latest.tar.gz -[fedora-23-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-fedora.23-x64.latest.tar.gz.sha - Docker ------ diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index 4096632bd..e4f6b5d73 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -5,27 +5,19 @@ $(PackageTargetFallback);portable-net45+win8;dnxcore50 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 - + - - 1.0.0-* - + - - 1.0.3 - + + - - 1.0.0-* - + - - $(DefineConstants);RELEASE - - \ No newline at end of file + diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/Program.cs b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/Program.cs +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/Program.cs b/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/Program.cs index 42b1c74d4..1bf340523 100644 --- a/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/Program.cs +++ b/TestAssets/DesktopTestProjects/AutoAddDesktopReferencesDuringMigrate/Program.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// 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; diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj index 35f2ba2b2..82a5ad25d 100644 --- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj +++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj @@ -11,18 +11,10 @@ - - 8.0.3 - - - 3.0.50813.1 - - - 3.0.1304 - - - 1.0.0-* - + + + + @@ -31,12 +23,7 @@ - - 1.0.0-* - + - - $(DefineConstants);RELEASE - diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj index dd8d8b537..94b99d56b 100644 --- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj +++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj @@ -11,18 +11,10 @@ - - 8.0.3 - - - 3.0.50813.1 - - - 3.0.1304 - - - 1.0.0-* - + + + + @@ -31,12 +23,7 @@ - - 1.0.0-* - + - - $(DefineConstants);RELEASE - diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/src/Program.cs b/TestAssets/DesktopTestProjects/BindingRedirectSample/src/Program.cs index a71a0aed5..57ecd14fc 100644 --- a/TestAssets/DesktopTestProjects/BindingRedirectSample/src/Program.cs +++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/src/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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.Diagnostics; using System.Linq; diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/Program.cs b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/Program.cs index 8ef303f2d..71b9980f3 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/Program.cs +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/Program.cs @@ -1,3 +1,6 @@ +// 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 DesktopAppWithNativeDep diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/Program.cs b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/Program.cs index bb5a31488..758142805 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/Program.cs +++ b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/Program.cs @@ -1,3 +1,6 @@ +// 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 DesktopAppWithRuntimes diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj index e621006e9..0f8a91828 100644 --- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj +++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj @@ -6,25 +6,17 @@ - - 1.0.0-* - + - - 1.6.0 - + + - - 1.0.0-* - + - - $(DefineConstants);RELEASE - - \ No newline at end of file + diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Program.cs b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Program.cs +++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj b/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj index 366798fca..008da4431 100644 --- a/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj +++ b/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj @@ -14,9 +14,7 @@ - - 1.0.3 - + diff --git a/TestAssets/NonRestoredTestProjects/AppThrowingException/App/Program.cs b/TestAssets/NonRestoredTestProjects/AppThrowingException/App/Program.cs index 5d9d13152..eadcb36e6 100644 --- a/TestAssets/NonRestoredTestProjects/AppThrowingException/App/Program.cs +++ b/TestAssets/NonRestoredTestProjects/AppThrowingException/App/Program.cs @@ -1,3 +1,6 @@ +// 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 AppThrowing @@ -9,4 +12,4 @@ namespace AppThrowing throw new MyException(); } } -} \ No newline at end of file +} diff --git a/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj b/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj index 04b137131..736c44d29 100644 --- a/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj +++ b/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj @@ -6,15 +6,11 @@ - - 1.0.3 - + - - 1.0.0 - + diff --git a/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/Program.cs b/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/Program.cs index 846370cce..d2db0fffd 100644 --- a/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/Program.cs +++ b/TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/Program.cs @@ -1,3 +1,6 @@ +// 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/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj index f36c1bf2b..62b4026ba 100644 --- a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj +++ b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj @@ -10,9 +10,7 @@ - - 1.0.0 - + diff --git a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/Program.cs b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/Program.cs +++ b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/Program.cs index 24b0cd5f1..855776696 100644 --- a/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/Program.cs +++ b/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/Program.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Broken/Broken.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Broken/Broken.csproj index 0b5be24a5..88f1dcd37 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Broken/Broken.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Broken/Broken.csproj @@ -3,6 +3,7 @@ Library net451;netcoreapp1.0 + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.cs index 4c665f47a..6b4e993f1 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.cs @@ -1,3 +1,6 @@ -public class EmptyItemGroup +// 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. + +public class EmptyItemGroup { -} \ No newline at end of file +} diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj index 5815b4190..63981a52b 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj @@ -5,10 +5,9 @@ - - 1.0.3 - + + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.cs index e4708deab..734d29ed8 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.cs @@ -1,4 +1,4 @@ // Dummy reference - it can be used as an existing reference in any of the projects public class Lib { -} \ No newline at end of file +} diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj index 51f727a05..64e0659ba 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj @@ -5,8 +5,6 @@ - - 1.0.3 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/SomeSourceFile.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/SomeSourceFile.cs index d99a03229..4b9f356dc 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/SomeSourceFile.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/SomeSourceFile.cs @@ -1,3 +1,6 @@ -public class SomeClass +// 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. + +public class SomeClass { } diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj index a7277eb65..910fe9d35 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj @@ -3,9 +3,8 @@ Library netcoreapp1.0 + - - 1.0.3 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj index a7277eb65..910fe9d35 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj @@ -3,9 +3,8 @@ Library netcoreapp1.0 + - - 1.0.3 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.cs index ead0b80b3..7fd23b9ef 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.cs @@ -1,3 +1,6 @@ -public class Net452AndNetCoreApp10Lib +// 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. + +public class Net452AndNetCoreApp10Lib { } diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj index 6e627ad42..bf854db06 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj @@ -4,8 +4,6 @@ net452;netcoreapp1.0 - - 1.0.3 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.cs index 8f0ebe8b1..a0e97f3ee 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.cs @@ -1,3 +1,6 @@ -public class Net45Lib +// 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. + +public class Net45Lib { } diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj index 96073b2c7..ae3ebf8f8 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.csproj @@ -4,8 +4,6 @@ net45 - - 1.0.3 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.cs index f250057d8..675dbba01 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.cs @@ -2,4 +2,4 @@ // it should be used as a reference passed to the dotnet add p2p public class ValidRef { -} \ No newline at end of file +} diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj index 044fe40ef..3299dd548 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj @@ -4,8 +4,6 @@ net451;netcoreapp1.0;netstandard1.4 - - 1.0.3 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.cs index 0ba94d2f9..d093e4a49 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.cs @@ -1,3 +1,6 @@ -public class WithDoubledRef +// 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. + +public class WithDoubledRef { -} \ No newline at end of file +} diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj index 09b0759f1..1e64e020d 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj @@ -4,10 +4,9 @@ net451;netcoreapp1.0 - - 1.0.3 - + + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.cs index 15d976dc2..4d402e492 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.cs @@ -1,3 +1,6 @@ -public class WithExistingRefCondOnItem +// 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. + +public class WithExistingRefCondOnItem { -} \ No newline at end of file +} diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj index 0464c2816..16e365509 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj @@ -4,10 +4,9 @@ net451;netcoreapp1.0 - - 1.0.3 - + + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.cs index 4de50b9d8..1bcd39cfd 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.cs @@ -1,3 +1,6 @@ -public class WithExistingRefCondWhitespaces +// 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. + +public class WithExistingRefCondWhitespaces { -} \ No newline at end of file +} diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj index 949805ccc..fc53d4535 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj @@ -4,9 +4,7 @@ net451;netcoreapp1.0 - - 1.0.3 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.cs index d827b8018..f3fcd06dc 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.cs @@ -1,3 +1,6 @@ -public class WithRefCondNonUniform +// 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. + +public class WithRefCondNonUniform { -} \ No newline at end of file +} diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj index ebf9b12ee..f1e277258 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj @@ -4,9 +4,7 @@ net451;netcoreapp1.0 - - 1.0.3 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.cs b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.cs index c71d17552..931aa9634 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.cs +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.cs @@ -1,3 +1,6 @@ -public class WithRefNoCondNonUniform +// 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. + +public class WithRefNoCondNonUniform { -} \ No newline at end of file +} diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj index 370bc5873..c7851c862 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj @@ -4,10 +4,9 @@ net451;netcoreapp1.0 - - 1.0.3 - + + diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs index 7ae090941..3263737e1 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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; diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj index 731464ac2..fd3e68501 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj @@ -9,13 +9,8 @@ - - 1.6.0 - + - - $(DefineConstants);RELEASE - diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs index 768391535..46ad7bb9d 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs @@ -1,4 +1,7 @@ -using System; +// 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; diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/Program.cs index 2906f8bbf..dc6aad3b3 100644 --- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/Program.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper1.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper1.cs index dd2447c0f..cead047c5 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper1.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper1.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper2.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper2.cs index eeabb8a3d..15f4cd39a 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper2.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/Helper2.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/IncludeThis.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/IncludeThis.cs index d9300fe2d..74b1d71d1 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/IncludeThis.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/IncludeThis.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/Program.cs index 67d7bea12..e3e9eebc3 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn1.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn1.cs index 042fc53d1..99421a7a7 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn1.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn1.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn2.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn2.cs index 5ba00add3..d80d2f47d 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn2.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/HelperBuiltIn2.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/IncludeThis.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/IncludeThis.cs index d9300fe2d..74b1d71d1 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/IncludeThis.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/IncludeThis.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/Program.cs index bf3f8b064..ab14e18ba 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis1.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis1.cs index c8ee6c75e..b4c0e60fb 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis1.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis1.cs @@ -1 +1,4 @@ +// 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 index c8ee6c75e..b4c0e60fb 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis2.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/ExcludeThis2.cs @@ -1 +1,4 @@ +// 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 index 51233cffa..2130cd0a7 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/Program.cs index 8fdd24dff..ca20e2e00 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/Program.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Program.cs index d0134277c..b0df821a7 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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; diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Program.cs index d0134277c..b0df821a7 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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; diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Program.cs b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Program.cs index d0134277c..b0df821a7 100644 --- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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; diff --git a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/Program.cs b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/Program.cs index 51233cffa..2130cd0a7 100755 --- a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/Program.cs b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/Program.cs index 51233cffa..2130cd0a7 100755 --- a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/Program.cs +++ b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/src/ProjectA/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/Program.cs b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/Program.cs index 24b0cd5f1..855776696 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/Program.cs +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/Program.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/Program.cs b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/Program.cs +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/Program.cs b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/Program.cs +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj index 890428162..a74e1a868 100755 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj @@ -4,12 +4,8 @@ Exe $(PackageTargetFallback);dnxcore50 + - - 1.0.0 - + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj index de60f199d..e54418724 100644 --- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj +++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj @@ -8,9 +8,7 @@ - - 1.0.0 - + diff --git a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/Program.cs b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/Program.cs index 846370cce..d2db0fffd 100644 --- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/Program.cs +++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/Program.cs @@ -1,3 +1,6 @@ +// 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/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/Program.cs b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/Program.cs index a95e5a932..0ea7804c7 100644 --- a/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/Program.cs +++ b/TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/ToolWithRandomPackageName/Program.cs @@ -1,3 +1,6 @@ +// 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/TestPackages/PackageWithFakeNativeDep/Lib.cs b/TestAssets/TestPackages/PackageWithFakeNativeDep/Lib.cs index c0f79e226..07a5ba6b0 100644 --- a/TestAssets/TestPackages/PackageWithFakeNativeDep/Lib.cs +++ b/TestAssets/TestPackages/PackageWithFakeNativeDep/Lib.cs @@ -1,3 +1,6 @@ +// 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 PackageWithFakeNativeDep { public static class Lib diff --git a/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj b/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj index 57c97bd00..9929c7099 100644 --- a/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj +++ b/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj @@ -13,9 +13,7 @@ - - 1.6.0 - + @@ -23,7 +21,4 @@ - - $(DefineConstants);RELEASE - diff --git a/TestAssets/TestPackages/ToolWithOutputName/Program.cs b/TestAssets/TestPackages/ToolWithOutputName/Program.cs index bfb5997b1..91bf8b3c7 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/Program.cs +++ b/TestAssets/TestPackages/ToolWithOutputName/Program.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj index 59a2ee3db..af6e62a36 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj +++ b/TestAssets/TestPackages/ToolWithOutputName/ToolWithOutputName.csproj @@ -13,12 +13,7 @@ - - 1.0.4 - + - - $(DefineConstants);RELEASE - diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/Program.cs b/TestAssets/TestPackages/dotnet-dependency-context-test/Program.cs index ac90ffffd..c2d8368b9 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/Program.cs +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 Microsoft.Extensions.DependencyModel; diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj index 95d254ef9..51e5027da 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj @@ -14,15 +14,8 @@ - - 1.0.4 - - - 1.0.1-beta-000933 - + + - - $(DefineConstants);RELEASE - diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/Program.cs b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/Program.cs index 17b66d125..9c481c55d 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/Program.cs +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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.IO; using System.Collections.Generic; using System.Linq; @@ -14,13 +17,13 @@ namespace Microsoft.DotNet.Tools.DependencyInvoker DebugHelper.HandleDebugSwitch(ref args); var dotnetParams = new DotnetBaseParams("dotnet-dependency-tool-invoker", "DotNet Dependency Tool Invoker", "Invokes tools declared as NuGet dependencies of a project"); - + dotnetParams.Parse(args); - + if (string.IsNullOrEmpty(dotnetParams.Command)) { Console.WriteLine("A command name must be provided"); - + return 1; } diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index 3d7b4134e..7222996bc 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -17,24 +17,17 @@ + $(ProjectRuntimeConfigFilePath) + - - 1.0.4 - - - $(CLI_NuGet_Version) - - - $(SdkNugetVersion) - + + + - - $(DefineConstants);RELEASE - diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/Program.cs b/TestAssets/TestPackages/dotnet-desktop-and-portable/Program.cs index 312fb7151..121c1f775 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/Program.cs +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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.Reflection; namespace ConsoleApplication diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj index 41da0203f..ab8932531 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj @@ -14,9 +14,7 @@ - - 1.0.4 - + diff --git a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/Program.cs b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/Program.cs index a71a0aed5..57ecd14fc 100644 --- a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/Program.cs +++ b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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.Diagnostics; using System.Linq; diff --git a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj index cea1ac554..4505fc5a0 100644 --- a/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj +++ b/TestAssets/TestPackages/dotnet-desktop-binding-redirects/dotnet-desktop-binding-redirects.csproj @@ -9,9 +9,7 @@ - - 5.0.0 - + @@ -20,7 +18,4 @@ - - $(DefineConstants);RELEASE - diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs index 32f43681a..bf77cb409 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestPackages/dotnet-portable/Program.cs b/TestAssets/TestPackages/dotnet-portable/Program.cs index 58d61b1bc..bcb5ed009 100644 --- a/TestAssets/TestPackages/dotnet-portable/Program.cs +++ b/TestAssets/TestPackages/dotnet-portable/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj index ae9f8d61b..f3463840d 100644 --- a/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj +++ b/TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj @@ -15,12 +15,7 @@ - - 1.0.4 - + - - $(DefineConstants);RELEASE - diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/Program.cs b/TestAssets/TestPackages/dotnet-prefercliruntime/Program.cs index c011575f6..d594c0619 100644 --- a/TestAssets/TestPackages/dotnet-prefercliruntime/Program.cs +++ b/TestAssets/TestPackages/dotnet-prefercliruntime/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj index 5ee797803..683f6c155 100644 --- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj +++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj @@ -11,7 +11,7 @@ $(ProjectRuntimeConfigFilePath) - + true \prefercliruntime @@ -19,9 +19,7 @@ - - 1.0.0 - + diff --git a/TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs b/TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs index bb536dcc4..1b3eb2ea9 100644 --- a/TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs +++ b/TestAssets/TestProjects/AppWith2Tfm0Rid/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 diff --git a/TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs b/TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs index bb536dcc4..1b3eb2ea9 100644 --- a/TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs +++ b/TestAssets/TestProjects/AppWith4netTfm0Rid/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/Program.cs b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/Program.cs +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/Program.cs b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/Program.cs +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/AppWithAssemblyInfo/Program.cs b/TestAssets/TestProjects/AppWithAssemblyInfo/Program.cs index 323c37abb..003e251ce 100644 --- a/TestAssets/TestProjects/AppWithAssemblyInfo/Program.cs +++ b/TestAssets/TestProjects/AppWithAssemblyInfo/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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; diff --git a/TestAssets/TestProjects/AppWithAssemblyInfo/Properties/AssemblyInfo.cs b/TestAssets/TestProjects/AppWithAssemblyInfo/Properties/AssemblyInfo.cs index d991503f6..5f2a0822d 100644 --- a/TestAssets/TestProjects/AppWithAssemblyInfo/Properties/AssemblyInfo.cs +++ b/TestAssets/TestProjects/AppWithAssemblyInfo/Properties/AssemblyInfo.cs @@ -1,4 +1,7 @@ -using System.Reflection; +// 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; diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj index 1c2ecdf95..a602632d0 100755 --- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj @@ -5,16 +5,10 @@ - - 1.0.3 - + + - - 1.0.0 - + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/Program.cs b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/Program.cs index 861f84043..cbcb20f55 100644 --- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/Program.cs +++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/Program.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj index 7935c117c..f6440a4d4 100755 --- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj @@ -5,13 +5,10 @@ - - 1.0.0 - + + - - 1.0.0 - + \ No newline at end of file diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/Program.cs b/TestAssets/TestProjects/AppWithDirectAndToolDep/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDep/Program.cs +++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj index e7faa8005..1cd74deae 100755 --- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj @@ -8,9 +8,7 @@ - - 1.0.0 - + \ No newline at end of file diff --git a/TestAssets/TestProjects/AppWithDirectDep/Program.cs b/TestAssets/TestProjects/AppWithDirectDep/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestProjects/AppWithDirectDep/Program.cs +++ b/TestAssets/TestProjects/AppWithDirectDep/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj index 877cce870..5a82f88d0 100755 --- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj @@ -5,19 +5,11 @@ - - 1.0.0 - - - 1.0.3 - + + + - - 1.0.0-* - + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/Program.cs b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/Program.cs index 29cf4486f..4178a0e4b 100644 --- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/Program.cs +++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/Program.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 8c58766c2..6acbb8178 100644 --- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -5,20 +5,14 @@ - - 1.0.0-* - + - - 1.0.3 - + - - 1.0.0-* - + - \ No newline at end of file + diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/Program.cs b/TestAssets/TestProjects/AppWithMultipleFxAndTools/Program.cs index f5f4b6d13..6cf5d8c9e 100644 --- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/Program.cs +++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/Program.cs b/TestAssets/TestProjects/AppWithOutputAssemblyName/Program.cs index 73c3dabba..b56f8e0b0 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/Program.cs +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/Program.cs @@ -1,3 +1,6 @@ +// 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 @@ -7,4 +10,4 @@ namespace AppWithOutputAssemblyName System.Console.WriteLine("Hello, World!"); } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/Program.cs b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/Program.cs index 7d1e94271..21cf5b1d3 100644 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/Program.cs +++ b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/Program.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/EntityFramework/Program.cs b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/EntityFramework/Program.cs index c56978bf5..c436bf19d 100644 --- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/EntityFramework/Program.cs +++ b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/EntityFramework/Program.cs @@ -1,3 +1,6 @@ +// 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 diff --git a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj index a5eb7a585..c1f39d820 100755 --- a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj +++ b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj @@ -5,19 +5,11 @@ - - 1.0.3 - + + - - 1.0.0 - - - 1.0.0 - + + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/AppWithToolDependency/Program.cs b/TestAssets/TestProjects/AppWithToolDependency/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/Program.cs +++ b/TestAssets/TestProjects/AppWithToolDependency/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj index 6a76893df..125932ea1 100755 --- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj +++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj @@ -9,17 +9,10 @@ - - 1.0.3 - + + - - 1.0.0-* - + - - $(DefineConstants);RELEASE;TRACE - true - \ No newline at end of file diff --git a/TestAssets/TestProjects/InvalidSolution/Lib/Library.cs b/TestAssets/TestProjects/InvalidSolution/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/InvalidSolution/Lib/Library.cs +++ b/TestAssets/TestProjects/InvalidSolution/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/LibraryWithNetStandardLibRef/Program.cs b/TestAssets/TestProjects/LibraryWithNetStandardLibRef/Program.cs index 79ddf6c75..334a639db 100644 --- a/TestAssets/TestProjects/LibraryWithNetStandardLibRef/Program.cs +++ b/TestAssets/TestProjects/LibraryWithNetStandardLibRef/Program.cs @@ -1,3 +1,6 @@ +// 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/LibraryWithOutputAssemblyName/Class.cs b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/Class.cs index cfd6c6188..ed618e6bc 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/Class.cs +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/Class.cs @@ -1,6 +1,9 @@ +// 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 LibraryWithOutputAssemblyName { public class MyClass { } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj index 529d3f399..af0401580 100755 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj @@ -4,11 +4,6 @@ - - 1.6.0 - + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/Program.cs b/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/Program.cs index 79ddf6c75..334a639db 100644 --- a/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/Program.cs +++ b/TestAssets/TestProjects/LibraryWithoutNetStandardLibRef/Program.cs @@ -1,3 +1,6 @@ +// 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/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj index 1125a1669..396ff3ae4 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj @@ -5,9 +5,7 @@ - - 1.0.3 - + \ No newline at end of file diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/Program.cs b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/Program.cs index f5f4b6d13..6cf5d8c9e 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/Program.cs +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 8c58766c2..6acbb8178 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -5,20 +5,14 @@ - - 1.0.0-* - + - - 1.0.3 - + - - 1.0.0-* - + - \ No newline at end of file + diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index ae3c52dfb..8e427e19e 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -6,11 +6,7 @@ - - 1.0.0 - - - 1.0.0 - + + \ No newline at end of file diff --git a/TestAssets/TestProjects/MSBuildTestApp/Program.cs b/TestAssets/TestProjects/MSBuildTestApp/Program.cs index 8dae6dd9e..20b3f028d 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/Program.cs +++ b/TestAssets/TestProjects/MSBuildTestApp/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 MSBuildTestApp { diff --git a/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj b/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj index ad4e204c8..48bba3bea 100644 --- a/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj +++ b/TestAssets/TestProjects/NewtonSoftDependentProject/NewtonSoftDependentProject.csproj @@ -4,6 +4,7 @@ Exe netcoreapp2.0 + diff --git a/TestAssets/TestProjects/NewtonSoftDependentProject/Program.cs b/TestAssets/TestProjects/NewtonSoftDependentProject/Program.cs index 0e57f9b64..2debeaadb 100644 --- a/TestAssets/TestProjects/NewtonSoftDependentProject/Program.cs +++ b/TestAssets/TestProjects/NewtonSoftDependentProject/Program.cs @@ -1,3 +1,6 @@ +// 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; using Newtonsoft.Json.Linq; diff --git a/TestAssets/TestProjects/PJAppWithMultipleFrameworks/Program.cs b/TestAssets/TestProjects/PJAppWithMultipleFrameworks/Program.cs index f5f4b6d13..6cf5d8c9e 100644 --- a/TestAssets/TestProjects/PJAppWithMultipleFrameworks/Program.cs +++ b/TestAssets/TestProjects/PJAppWithMultipleFrameworks/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/PJLibWithMultipleFrameworks/Program.cs b/TestAssets/TestProjects/PJLibWithMultipleFrameworks/Program.cs index 78725a390..235f81584 100644 --- a/TestAssets/TestProjects/PJLibWithMultipleFrameworks/Program.cs +++ b/TestAssets/TestProjects/PJLibWithMultipleFrameworks/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/PJTestAppSimple/Program.cs b/TestAssets/TestProjects/PJTestAppSimple/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestProjects/PJTestAppSimple/Program.cs +++ b/TestAssets/TestProjects/PJTestAppSimple/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/Program.cs index 9bfc3c72c..82de950de 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj index ee72a84fa..4d703151d 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj @@ -6,25 +6,21 @@ netcoreapp1.0 Exe + + - - $(CLI_NETSDK_Version) + - 1.0.3 - + $(DefineConstants);NETCOREAPP1_0 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/Program.cs index ca05ade7a..7d52ceac0 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj index 4997045cc..240bc8093 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj @@ -7,28 +7,25 @@ netcoreapp1.0 Exe + + + - - $(CLI_NETSDK_Version) + - 1.0.3 - + $(DefineConstants);NETCOREAPP1_0 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/Program.cs index ea50de9e8..50d5c20ea 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P1 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj index e85446e4e..a0dc455d3 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj @@ -6,28 +6,25 @@ netcoreapp1.0 + + + - - $(CLI_NETSDK_Version) + - 1.0.3 - + $(DefineConstants);NETCOREAPP1_0 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/Program.cs index 0ae001811..a31e7fd68 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P2 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj index 37b69a72b..3f6f94750 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj @@ -6,25 +6,21 @@ netcoreapp1.0 + + - - $(CLI_NETSDK_Version) + - 1.0.3 - + $(DefineConstants);NETCOREAPP1_0 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/Program.cs index 9bfc3c72c..82de950de 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj index 6ef51aa6d..c4f97bc73 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj @@ -7,29 +7,24 @@ netcoreapp1.0;netstandard1.6 Exe + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - - - 1.0.4 - + + $(DefineConstants);NETCOREAPP1_0 @@ -37,8 +32,5 @@ $(DefineConstants);NETSTANDARD1_6 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/Program.cs index ca05ade7a..7d52ceac0 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj index a71a9bc5e..c70a36fb0 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj @@ -7,32 +7,28 @@ netcoreapp1.0;netstandard1.6 Exe + + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - - - 1.0.4 - + + $(DefineConstants);NETCOREAPP1_0 @@ -40,8 +36,5 @@ $(DefineConstants);NETSTANDARD1_6 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/Program.cs index ea50de9e8..50d5c20ea 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P1 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj index 05206f4df..73e2816d9 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj @@ -6,29 +6,27 @@ netcoreapp1.0;netstandard1.5 + + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - + $(DefineConstants);NETCOREAPP1_0 @@ -36,8 +34,5 @@ $(DefineConstants);NETSTANDARD1_5 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/Program.cs index 0ae001811..a31e7fd68 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P2 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj index f6c4514e7..41f916c1e 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj @@ -6,26 +6,23 @@ netcoreapp1.0;netstandard1.5 + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - + $(DefineConstants);NETCOREAPP1_0 @@ -33,8 +30,5 @@ $(DefineConstants);NETSTANDARD1_5 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/Program.cs index ca05ade7a..7d52ceac0 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj index a657879c1..35fd4d3cf 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj @@ -7,32 +7,28 @@ netcoreapp1.0;netstandard1.6 Exe + + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - - - 1.0.4 - + + $(DefineConstants);NETCOREAPP1_0 @@ -40,8 +36,5 @@ $(DefineConstants);NETSTANDARD1_6 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/Program.cs index 7b1284ad8..d9fb50fea 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P1 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj index 101cfe3ab..e095ea696 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj @@ -6,30 +6,28 @@ netcoreapp1.0;netstandard1.5 + + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - + $(DefineConstants);NETCOREAPP1_0 @@ -37,8 +35,5 @@ $(DefineConstants);NETSTANDARD1_5 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/Program.cs index 121dbbfb7..594825e6e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P2 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj index a9c50ae5c..148aa6185 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj @@ -6,30 +6,28 @@ netcoreapp1.0;netstandard1.5 + + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - + $(DefineConstants);NETCOREAPP1_0 @@ -37,8 +35,5 @@ $(DefineConstants);NETSTANDARD1_5 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/Program.cs index 2e779be39..d2771ec2c 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P3 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj index 6930893a8..9e56001b4 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj @@ -6,29 +6,27 @@ netcoreapp1.0;netstandard1.5 + + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - + $(DefineConstants);NETCOREAPP1_0 @@ -36,8 +34,5 @@ $(DefineConstants);NETSTANDARD1_5 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/Program.cs index 71a2f4d72..6c5753f3e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P4 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj index b474c59bb..15ca5bbad 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj @@ -6,30 +6,28 @@ netcoreapp1.0;netstandard1.5 + + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - + $(DefineConstants);NETCOREAPP1_0 @@ -37,8 +35,5 @@ $(DefineConstants);NETSTANDARD1_5 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/Program.cs index 9fc92636d..cb2821fb3 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P5 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj index f6c4514e7..41f916c1e 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj @@ -6,26 +6,23 @@ netcoreapp1.0;netstandard1.5 + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - + $(DefineConstants);NETCOREAPP1_0 @@ -33,8 +30,5 @@ $(DefineConstants);NETSTANDARD1_5 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/Program.cs b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/Program.cs index ae467ffd4..8850d5744 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/Program.cs +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 ConsoleLibrary.P6 { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj index f6c4514e7..41f916c1e 100755 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj @@ -6,26 +6,23 @@ netcoreapp1.0;netstandard1.5 + + - - $(CLI_NETSDK_Version) + - - 1.0.3 - + - - 1.6.0 - + $(DefineConstants);NETCOREAPP1_0 @@ -33,8 +30,5 @@ $(DefineConstants);NETSTANDARD1_5 - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/Program.cs b/TestAssets/TestProjects/ProjectJsonConsoleTemplate/Program.cs index 5f9be2467..7e52efa0e 100644 --- a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/Program.cs +++ b/TestAssets/TestProjects/ProjectJsonConsoleTemplate/Program.cs @@ -1,3 +1,6 @@ +// 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 @@ -6,4 +9,4 @@ class Program { Console.WriteLine("Hello World!"); } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/AccountController.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/AccountController.cs index 035638af9..a6b81482d 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/AccountController.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/AccountController.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/HomeController.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/HomeController.cs index 4b21d0cce..67d139496 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/HomeController.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/HomeController.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/ManageController.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/ManageController.cs index 8d04fe58b..f7ff98504 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/ManageController.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Controllers/ManageController.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/ApplicationDbContext.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/ApplicationDbContext.cs index 336e6d466..329199667 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/ApplicationDbContext.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/ApplicationDbContext.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs index bb12d2bbb..5262b9296 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.cs index e6f038f8e..751316b28 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/00000000000000_CreateIdentitySchema.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/ApplicationDbContextModelSnapshot.cs index cb459319d..54608c041 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs index a60894ce8..033c4b789 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ForgotPasswordViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ForgotPasswordViewModel.cs index 70fab0c9f..5b026a9f3 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ForgotPasswordViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ForgotPasswordViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/LoginViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/LoginViewModel.cs index 7dc974b6b..ae17051ab 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/LoginViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/LoginViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/RegisterViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/RegisterViewModel.cs index bc86f2aed..a6d5f1a96 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/RegisterViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/RegisterViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ResetPasswordViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ResetPasswordViewModel.cs index 43198b7e5..15c2967f1 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ResetPasswordViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/ResetPasswordViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/SendCodeViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/SendCodeViewModel.cs index b8ed8f1d4..2f44b9951 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/SendCodeViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/SendCodeViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/VerifyCodeViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/VerifyCodeViewModel.cs index 394db8c59..c1016c143 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/VerifyCodeViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/AccountViewModels/VerifyCodeViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ApplicationUser.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ApplicationUser.cs index 4642ef2c3..047cfadd5 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ApplicationUser.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ApplicationUser.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/AddPhoneNumberViewModel.cs index d2baaf7e0..0648e6f44 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/AddPhoneNumberViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/AddPhoneNumberViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ChangePasswordViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ChangePasswordViewModel.cs index 421b91a03..51093e9b1 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ChangePasswordViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ChangePasswordViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs index beb1fd1a4..e56af0ec0 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/FactorViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/FactorViewModel.cs index b2d4f9e2f..1b74bc14b 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/FactorViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/FactorViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/IndexViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/IndexViewModel.cs index e0b69f2df..f97ce4cf4 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/IndexViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/IndexViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ManageLoginsViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ManageLoginsViewModel.cs index fc03a0c27..e2474b126 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ManageLoginsViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/ManageLoginsViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/RemoveLoginViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/RemoveLoginViewModel.cs index 394df34a0..031d5421b 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/RemoveLoginViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/RemoveLoginViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/SetPasswordViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/SetPasswordViewModel.cs index 76c1b4bb4..861834531 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/SetPasswordViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/SetPasswordViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs index 3c8c08c87..13ee9834e 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Program.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Program.cs index 74e9753fb..de237aae7 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Program.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Program.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/IEmailSender.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/IEmailSender.cs index 08fb35bad..8010a870c 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/IEmailSender.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/IEmailSender.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/ISmsSender.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/ISmsSender.cs index 8e57a2343..b887b6113 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/ISmsSender.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/ISmsSender.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/MessageServices.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/MessageServices.cs index de54bfc79..c3ee43128 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/MessageServices.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Services/MessageServices.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/Startup.cs b/TestAssets/TestProjects/ProjectJsonWebTemplate/Startup.cs index 2fa7ae51b..9280e73f0 100644 --- a/TestAssets/TestProjects/ProjectJsonWebTemplate/Startup.cs +++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/Startup.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/CSharpProject.csproj b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/CSharpProject.csproj index 2b11fd5a7..7d36c9d22 100644 --- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/CSharpProject.csproj +++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/CSharpProject.csproj @@ -31,6 +31,7 @@ prompt 4 + @@ -41,10 +42,12 @@ + + diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Program.cs b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Program.cs index 0760ae741..6c5339907 100644 --- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Program.cs +++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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.Text; diff --git a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Properties/AssemblyInfo.cs b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Properties/AssemblyInfo.cs index 9dc33d763..c008db98b 100644 --- a/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Properties/AssemblyInfo.cs +++ b/TestAssets/TestProjects/SlnFileWithNoProjectReferencesAndCSharpProject/CSharpProject/Properties/AssemblyInfo.cs @@ -1,4 +1,7 @@ -using System.Reflection; +// 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; diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj index 90ed848e5..cb6b4e876 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj @@ -11,8 +11,6 @@ - - 1.6.0 - + diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj index 90ed848e5..cb6b4e876 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj @@ -11,8 +11,6 @@ - - 1.6.0 - + diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj index 90ed848e5..cb6b4e876 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj @@ -11,8 +11,6 @@ - - 1.6.0 - + diff --git a/TestAssets/TestProjects/TestAppSimple/Program.cs b/TestAssets/TestProjects/TestAppSimple/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestProjects/TestAppSimple/Program.cs +++ b/TestAssets/TestProjects/TestAppSimple/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj index 365778100..3d080eec3 100755 --- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj +++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj @@ -3,12 +3,8 @@ netcoreapp1.0 Exe + - - 1.0.3 - + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithContents/Program.cs b/TestAssets/TestProjects/TestAppWithContents/Program.cs index 7ab8924f9..dc54ad2be 100644 --- a/TestAssets/TestProjects/TestAppWithContents/Program.cs +++ b/TestAssets/TestProjects/TestAppWithContents/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/TestAppWithEmbeddedResources/Program.cs b/TestAssets/TestProjects/TestAppWithEmbeddedResources/Program.cs index 0e2502ce3..9d31ed2c9 100755 --- a/TestAssets/TestProjects/TestAppWithEmbeddedResources/Program.cs +++ b/TestAssets/TestProjects/TestAppWithEmbeddedResources/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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; @@ -14,7 +17,7 @@ namespace ConsoleApplication if (resources.Count() > 1) { - throw new Exception($"{resources.Count()} found in the assembly. Was expecting only 1."); + throw new Exception($"{resources.Count()} found in the assembly. Was expecting only 1."); } var resourceNames = string.Join(",", resources); diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/App/Program.cs b/TestAssets/TestProjects/TestAppWithEmptySln/App/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithEmptySln/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithEmptySln/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithEmptySln/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithEmptySln/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithExplicitInclude/Program.cs b/TestAssets/TestProjects/TestAppWithExplicitInclude/Program.cs index c81448f54..7e52efa0e 100644 --- a/TestAssets/TestProjects/TestAppWithExplicitInclude/Program.cs +++ b/TestAssets/TestProjects/TestAppWithExplicitInclude/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithExplicitIncludeGlob/Program.cs b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/Program.cs index c81448f54..7e52efa0e 100644 --- a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/Program.cs +++ b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithMultipleFrameworksAndRuntimes/Program.cs b/TestAssets/TestProjects/TestAppWithMultipleFrameworksAndRuntimes/Program.cs index bb536dcc4..1b3eb2ea9 100644 --- a/TestAssets/TestProjects/TestAppWithMultipleFrameworksAndRuntimes/Program.cs +++ b/TestAssets/TestProjects/TestAppWithMultipleFrameworksAndRuntimes/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 diff --git a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/Program.cs b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/Program.cs index f565ae24f..da2c8fe6e 100644 --- a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithProjDepTool/Program.cs b/TestAssets/TestProjects/TestAppWithProjDepTool/Program.cs index 8dae6dd9e..20b3f028d 100644 --- a/TestAssets/TestProjects/TestAppWithProjDepTool/Program.cs +++ b/TestAssets/TestProjects/TestAppWithProjDepTool/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 MSBuildTestApp { diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj index f252d7975..0c5ea9efb 100644 --- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj +++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj @@ -5,18 +5,13 @@ - - 1.0.3 - - - 1.0.0 + + All - - 1.0.0-* - + \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithRuntimeOptions/Program.cs b/TestAssets/TestProjects/TestAppWithRuntimeOptions/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestProjects/TestAppWithRuntimeOptions/Program.cs +++ b/TestAssets/TestProjects/TestAppWithRuntimeOptions/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/TestAppWithSigning/Program.cs b/TestAssets/TestProjects/TestAppWithSigning/Program.cs index 51233cffa..2130cd0a7 100644 --- a/TestAssets/TestProjects/TestAppWithSigning/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSigning/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndCsprojFiles/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndCsprojInSubDir/src/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/src/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/src/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/src/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj index 7b66a1185..ce2fa0a6b 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj @@ -3,6 +3,7 @@ Exe netcoreapp1.0 + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/src/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/Program.cs index acdf5839d..11f138d4d 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndCsprojToRemove/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndDuplicateProjectReferences/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndExistingCsprojReferences/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/src/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/Program.cs b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/Program.cs index abb853a4a..b71a6fdb4 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/Program.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/Program.cs @@ -1,3 +1,6 @@ +// 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/TestAppWithSlnAndSolutionFolders/src/src/Lib/Library.cs b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/src/Lib/Library.cs index 205c42a01..71a4d4832 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/src/Lib/Library.cs +++ b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/src/Lib/Library.cs @@ -1,3 +1,6 @@ +// 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 Lib diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/Program.cs b/TestAssets/TestProjects/TestLibraryWithAnalyzer/Program.cs index b75e79659..0eeb0eb96 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/Program.cs +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 { diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj index 4924ce508..9c427890c 100755 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj @@ -6,11 +6,6 @@ - - 1.6.0 - + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/Program.cs b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/Program.cs index bb536dcc4..1b3eb2ea9 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/Program.cs +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 diff --git a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs index f42d679bf..4582f6761 100644 --- a/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs +++ b/TestAssets/TestProjects/TestLibraryWithTwoFrameworks/Program.cs @@ -1,4 +1,7 @@ -using System; +// 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 diff --git a/TestAssets/TestProjects/VSTestDesktopAndNetCore/Tests.cs b/TestAssets/TestProjects/VSTestDesktopAndNetCore/Tests.cs index 6b1329249..67b494cd5 100644 --- a/TestAssets/TestProjects/VSTestDesktopAndNetCore/Tests.cs +++ b/TestAssets/TestProjects/VSTestDesktopAndNetCore/Tests.cs @@ -1,4 +1,7 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; +// 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.VisualStudio.TestTools.UnitTesting; namespace TestNamespace { @@ -29,4 +32,4 @@ namespace TestNamespace } #endif } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj index 7c765ff51..e5aaf60ec 100644 --- a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj @@ -10,20 +10,12 @@ - - 1.0.3 - + - - 1.0.6-preview - - - 1.1.5-preview - - - $(CLI_TestPlatform_Version) - + + + \ No newline at end of file diff --git a/TestAssets/TestProjects/VSTestDotNetCore/Tests.cs b/TestAssets/TestProjects/VSTestDotNetCore/Tests.cs index e9b847369..1bd3cb13f 100644 --- a/TestAssets/TestProjects/VSTestDotNetCore/Tests.cs +++ b/TestAssets/TestProjects/VSTestDotNetCore/Tests.cs @@ -1,4 +1,7 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; +// 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.VisualStudio.TestTools.UnitTesting; namespace TestNamespace { @@ -16,4 +19,4 @@ namespace TestNamespace Assert.Fail(); } } -} \ No newline at end of file +} diff --git a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj index 97230db7a..da4e0ee8c 100644 --- a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj +++ b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj @@ -6,17 +6,9 @@ - - 1.0.3 - - - 1.0.6-preview - - - 1.1.5-preview - - - $(CLI_TestPlatform_Version) - + + + + \ No newline at end of file diff --git a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/UnitTest1.cs b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/UnitTest1.cs index b77a42021..f98bf0fe4 100644 --- a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/UnitTest1.cs +++ b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/UnitTest1.cs @@ -1,3 +1,6 @@ +// 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 Xunit; diff --git a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj index 1795bb8cf..f59b6770d 100644 --- a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj @@ -13,20 +13,12 @@ - - 1.0.3 - + - - - $(CLI_TestPlatform_Version) - - - 2.2.0-beta4-build3444 - - - 2.2.0-beta4-build1194 - + + + + diff --git a/TestAssets/TestProjects/VSTestXunitDotNetCore/UnitTest1.cs b/TestAssets/TestProjects/VSTestXunitDotNetCore/UnitTest1.cs index 5ed55618b..6a8094053 100644 --- a/TestAssets/TestProjects/VSTestXunitDotNetCore/UnitTest1.cs +++ b/TestAssets/TestProjects/VSTestXunitDotNetCore/UnitTest1.cs @@ -1,3 +1,6 @@ +// 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 Xunit; diff --git a/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj b/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj index 491c84b0b..7ebeb3326 100644 --- a/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj +++ b/TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj @@ -6,17 +6,9 @@ - - 1.0.3 - - - $(CLI_TestPlatform_Version) - - - 2.2.0-beta4-build3444 - - - 2.2.0-beta4-build1194 - + + + + diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/AccountController.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/AccountController.cs index 035638af9..a6b81482d 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/AccountController.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/AccountController.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/HomeController.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/HomeController.cs index 4b21d0cce..67d139496 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/HomeController.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/HomeController.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/ManageController.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/ManageController.cs index 8d04fe58b..f7ff98504 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/ManageController.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Controllers/ManageController.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/ApplicationDbContext.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/ApplicationDbContext.cs index 336e6d466..329199667 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/ApplicationDbContext.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/ApplicationDbContext.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs index bb12d2bbb..5262b9296 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.cs index e6f038f8e..751316b28 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/00000000000000_CreateIdentitySchema.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/ApplicationDbContextModelSnapshot.cs index cb459319d..54608c041 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs index a60894ce8..033c4b789 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ForgotPasswordViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ForgotPasswordViewModel.cs index 70fab0c9f..5b026a9f3 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ForgotPasswordViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ForgotPasswordViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/LoginViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/LoginViewModel.cs index 7dc974b6b..ae17051ab 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/LoginViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/LoginViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/RegisterViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/RegisterViewModel.cs index bc86f2aed..a6d5f1a96 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/RegisterViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/RegisterViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ResetPasswordViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ResetPasswordViewModel.cs index 43198b7e5..15c2967f1 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ResetPasswordViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/ResetPasswordViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/SendCodeViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/SendCodeViewModel.cs index b8ed8f1d4..2f44b9951 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/SendCodeViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/SendCodeViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/VerifyCodeViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/VerifyCodeViewModel.cs index 394db8c59..c1016c143 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/VerifyCodeViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/AccountViewModels/VerifyCodeViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ApplicationUser.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ApplicationUser.cs index 4642ef2c3..047cfadd5 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ApplicationUser.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ApplicationUser.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/AddPhoneNumberViewModel.cs index d2baaf7e0..0648e6f44 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/AddPhoneNumberViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/AddPhoneNumberViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ChangePasswordViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ChangePasswordViewModel.cs index 421b91a03..51093e9b1 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ChangePasswordViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ChangePasswordViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs index beb1fd1a4..e56af0ec0 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/FactorViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/FactorViewModel.cs index b2d4f9e2f..1b74bc14b 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/FactorViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/FactorViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/IndexViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/IndexViewModel.cs index e0b69f2df..f97ce4cf4 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/IndexViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/IndexViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ManageLoginsViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ManageLoginsViewModel.cs index fc03a0c27..e2474b126 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ManageLoginsViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/ManageLoginsViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/RemoveLoginViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/RemoveLoginViewModel.cs index 394df34a0..031d5421b 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/RemoveLoginViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/RemoveLoginViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/SetPasswordViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/SetPasswordViewModel.cs index 76c1b4bb4..861834531 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/SetPasswordViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/SetPasswordViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs index 3c8c08c87..13ee9834e 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Program.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Program.cs index 74e9753fb..de237aae7 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Program.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Program.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/IEmailSender.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/IEmailSender.cs index 08fb35bad..8010a870c 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/IEmailSender.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/IEmailSender.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/ISmsSender.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/ISmsSender.cs index 8e57a2343..b887b6113 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/ISmsSender.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/ISmsSender.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/MessageServices.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/MessageServices.cs index de54bfc79..c3ee43128 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/MessageServices.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Services/MessageServices.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Startup.cs b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Startup.cs index 2fa7ae51b..9280e73f0 100755 --- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Startup.cs +++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/Startup.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/build/GitCommitInfo.targets b/build/GitCommitInfo.targets index aa997e232..3631da0fa 100644 --- a/build/GitCommitInfo.targets +++ b/build/GitCommitInfo.targets @@ -1,13 +1,14 @@ - - - - + + + + - - - + + + - - diff --git a/build/sdks/sdks.csproj b/build/sdks/sdks.csproj index cdf3c4d9c..4c8158628 100755 --- a/build/sdks/sdks.csproj +++ b/build/sdks/sdks.csproj @@ -1,6 +1,6 @@  - + Library netcoreapp1.0 @@ -8,10 +8,8 @@ - - $(SdkPackageVersion) - + - + diff --git a/build/templates/templates.csproj b/build/templates/templates.csproj index cb3006f89..099a67e3f 100644 --- a/build/templates/templates.csproj +++ b/build/templates/templates.csproj @@ -1,6 +1,6 @@ - + Library netcoreapp1.0 @@ -8,10 +8,8 @@ - - $(TemplatePackageVersion) - + - + diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentArchitecture.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentArchitecture.cs index 165eee71d..a6b90cc63 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentArchitecture.cs +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentArchitecture.cs @@ -1,3 +1,6 @@ +// 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.DotNet.PlatformAbstractions; @@ -47,4 +50,4 @@ namespace Microsoft.DotNet.Cli.Build.Framework } } } -} \ No newline at end of file +} diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs index a3ffdf470..91bd81d17 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs @@ -1,3 +1,6 @@ +// 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.Runtime.InteropServices; diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildArchitecture.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildArchitecture.cs index b2137ea07..d5d50ee6f 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildArchitecture.cs +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildArchitecture.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.DotNet.Cli.Build.Framework { public enum BuildArchitecture @@ -5,4 +8,4 @@ namespace Microsoft.DotNet.Cli.Build.Framework x86 = 1, x64 = 2 } -} \ No newline at end of file +} diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs index 56552dc24..883402dbf 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.DotNet.Cli.Build.Framework { public enum BuildPlatform diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj index 23da68d2b..f0b957bab 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj @@ -10,21 +10,10 @@ - - 1.6.0 - - - 4.1.0 - - - 4.1.0 - - - 1.0.1-beta-000933 - + + + + - - $(DefineConstants);RELEASE - diff --git a/build_projects/dotnet-cli-build/AzureHelper.cs b/build_projects/dotnet-cli-build/AzureHelper.cs index 1c3f55e7f..5f0e375f4 100644 --- a/build_projects/dotnet-cli-build/AzureHelper.cs +++ b/build_projects/dotnet-cli-build/AzureHelper.cs @@ -398,4 +398,4 @@ namespace Microsoft.DotNet.Build.CloudTestTasks return dictionary; } } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/CreateAzureContainer.cs b/build_projects/dotnet-cli-build/CreateAzureContainer.cs index 9ad34e06c..4df677734 100644 --- a/build_projects/dotnet-cli-build/CreateAzureContainer.cs +++ b/build_projects/dotnet-cli-build/CreateAzureContainer.cs @@ -164,4 +164,4 @@ namespace Microsoft.DotNet.Build.CloudTestTasks return true; } } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/GetCommitCount.cs b/build_projects/dotnet-cli-build/GetCommitCount.cs deleted file mode 100644 index a160792ce..000000000 --- a/build_projects/dotnet-cli-build/GetCommitCount.cs +++ /dev/null @@ -1,47 +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.Framework; -using Microsoft.Build.Utilities; -using System.Runtime.InteropServices; - -namespace Microsoft.DotNet.Cli.Build -{ - public class GetCommitCount : ToolTask - { - [Output] - public string CommitCount { get; set; } - - protected override string ToolName - { - get { return "git"; } - } - - protected override MessageImportance StandardOutputLoggingImportance - { - get { return MessageImportance.High; } // or else the output doesn't get logged by default - } - - protected override string GenerateFullPathToTool() - { - // Workaround: https://github.com/Microsoft/msbuild/issues/1215 - // There's a "git" folder on the PATH in VS 2017 Developer command prompt and it causes msbuild to fail to execute git. - return RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "git.exe" : "git"; - } - - protected override string GenerateCommandLineCommands() - { - return $"rev-list --count HEAD"; - } - - protected override void LogEventsFromTextOutput(string line, MessageImportance importance) - { - var buildVersion = new BuildVersion() - { - CommitCount = int.Parse(line) - }; - - CommitCount = buildVersion.CommitCountString; - } - } -} diff --git a/build_projects/dotnet-cli-build/GetCommitHash.cs b/build_projects/dotnet-cli-build/GetCommitHash.cs deleted file mode 100644 index 69474f9c1..000000000 --- a/build_projects/dotnet-cli-build/GetCommitHash.cs +++ /dev/null @@ -1,42 +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.Framework; -using Microsoft.Build.Utilities; -using System.Runtime.InteropServices; - -namespace Microsoft.DotNet.Cli.Build -{ - public class GetCommitHash : ToolTask - { - [Output] - public string CommitHash { get; set; } - - protected override string ToolName - { - get { return "git"; } - } - - protected override MessageImportance StandardOutputLoggingImportance - { - get { return MessageImportance.High; } // or else the output doesn't get logged by default - } - - protected override string GenerateFullPathToTool() - { - // Workaround: https://github.com/Microsoft/msbuild/issues/1215 - // There's a "git" folder on the PATH in VS 2017 Developer command prompt and it causes msbuild to fail to execute git. - return RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "git.exe" : "git"; - } - - protected override string GenerateCommandLineCommands() - { - return $"rev-parse HEAD"; - } - - protected override void LogEventsFromTextOutput(string line, MessageImportance importance) - { - CommitHash = line; - } - } -} diff --git a/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs b/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs index 5d58cb5f9..9f6f5f39b 100644 --- a/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs +++ b/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs @@ -44,4 +44,4 @@ namespace Microsoft.DotNet.Cli.Build return osname; } } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/SetBlobPropertiesBasedOnFileTypeTask.cs b/build_projects/dotnet-cli-build/SetBlobPropertiesBasedOnFileTypeTask.cs index 2c4bc4648..d4caddc04 100644 --- a/build_projects/dotnet-cli-build/SetBlobPropertiesBasedOnFileTypeTask.cs +++ b/build_projects/dotnet-cli-build/SetBlobPropertiesBasedOnFileTypeTask.cs @@ -1,3 +1,6 @@ +// 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; @@ -61,4 +64,4 @@ namespace Microsoft.DotNet.Cli.Build return true; } } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/UploadClient.cs b/build_projects/dotnet-cli-build/UploadClient.cs index 6fe51e31f..246a38641 100644 --- a/build_projects/dotnet-cli-build/UploadClient.cs +++ b/build_projects/dotnet-cli-build/UploadClient.cs @@ -180,4 +180,4 @@ namespace Microsoft.DotNet.Build.CloudTestTasks } } } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/UploadToAzure.cs b/build_projects/dotnet-cli-build/UploadToAzure.cs index b166a87dc..550f4dfbf 100644 --- a/build_projects/dotnet-cli-build/UploadToAzure.cs +++ b/build_projects/dotnet-cli-build/UploadToAzure.cs @@ -183,4 +183,4 @@ namespace Microsoft.DotNet.Build.CloudTestTasks } } } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/ZipFileCreateFromDirectory.cs b/build_projects/dotnet-cli-build/ZipFileCreateFromDirectory.cs index 8ca191167..86c33611c 100644 --- a/build_projects/dotnet-cli-build/ZipFileCreateFromDirectory.cs +++ b/build_projects/dotnet-cli-build/ZipFileCreateFromDirectory.cs @@ -128,4 +128,4 @@ namespace Microsoft.DotNet.Build.Tasks return subdirectory.Substring(chop); } } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/ZipFileExtractToDirectory.cs b/build_projects/dotnet-cli-build/ZipFileExtractToDirectory.cs index aa78823f9..491abcf81 100644 --- a/build_projects/dotnet-cli-build/ZipFileExtractToDirectory.cs +++ b/build_projects/dotnet-cli-build/ZipFileExtractToDirectory.cs @@ -82,4 +82,4 @@ namespace Microsoft.DotNet.Build.Tasks return true; } } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 5ad281a48..2250e9540 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -6,53 +6,29 @@ netcoreapp1.0 true bin\$(Configuration) - $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 + $(PackageTargetFallback);portable-net45+win8+wp8+wpa81 + + - - 1.6.0 - - - 1.0.4 - - - $(CLI_MSBuild_Version) - - - 4.0.1 - - - 4.0.11 - - - 1.4.1-beta-24410-02 - - - 4.1.1 - - - 4.0.11 - - - 7.2.1 - - - $(CLI_NuGet_Version) - - - $(CLI_MSBuild_Version) - + + + + + + + + + + + - - $(CLI_MSBuild_Version) - - - 1.0.1-beta-000933 - + + \ No newline at end of file diff --git a/build_projects/shared-build-targets-utils/BuildFailureException.cs b/build_projects/shared-build-targets-utils/BuildFailureException.cs index eeee16171..56a9aa31e 100644 --- a/build_projects/shared-build-targets-utils/BuildFailureException.cs +++ b/build_projects/shared-build-targets-utils/BuildFailureException.cs @@ -1,4 +1,7 @@ -using System; +// 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 Microsoft.DotNet.Cli.Build { @@ -11,9 +14,9 @@ namespace Microsoft.DotNet.Cli.Build public BuildFailureException(string message) : base(message) { } - + public BuildFailureException(string message, Exception innerException) : base(message, innerException) { } } -} \ No newline at end of file +} diff --git a/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs b/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs index ff102bf0d..1f1047644 100644 --- a/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs +++ b/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs @@ -1,3 +1,6 @@ +// 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.Diagnostics; @@ -44,7 +47,7 @@ namespace Microsoft.DotNet.Cli.Build private CloudBlobContainer GetDotnetBlobContainer(string connectionString, string containerName) { CloudStorageAccount storageAccount = CloudStorageAccount.Parse(connectionString); - + return GetDotnetBlobContainer(storageAccount, containerName); } @@ -58,7 +61,7 @@ namespace Microsoft.DotNet.Cli.Build private CloudBlobContainer GetDotnetBlobContainer(CloudStorageAccount storageAccount, string containerName) { CloudBlobClient blobClient = storageAccount.CreateCloudBlobClient(); - + return blobClient.GetContainerReference(containerName); } diff --git a/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs b/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs index 9d056b010..34b5e122e 100644 --- a/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs +++ b/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// 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; namespace Microsoft.DotNet.Cli.Build { diff --git a/build_projects/shared-build-targets-utils/Utils/Dirs.cs b/build_projects/shared-build-targets-utils/Utils/Dirs.cs index 91b41d2d8..a22f2b59c 100644 --- a/build_projects/shared-build-targets-utils/Utils/Dirs.cs +++ b/build_projects/shared-build-targets-utils/Utils/Dirs.cs @@ -1,4 +1,7 @@ -using System; +// 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.IO; using System.Runtime.InteropServices; using Microsoft.DotNet.PlatformAbstractions; diff --git a/build_projects/shared-build-targets-utils/Utils/EnvVars.cs b/build_projects/shared-build-targets-utils/Utils/EnvVars.cs index b5d45ada5..220a694af 100644 --- a/build_projects/shared-build-targets-utils/Utils/EnvVars.cs +++ b/build_projects/shared-build-targets-utils/Utils/EnvVars.cs @@ -1,4 +1,7 @@ -using System; +// 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.DotNet.Cli.Build.Framework; namespace Microsoft.DotNet.Cli.Build diff --git a/build_projects/shared-build-targets-utils/Utils/FS.cs b/build_projects/shared-build-targets-utils/Utils/FS.cs index 132ca968a..68879fef2 100644 --- a/build_projects/shared-build-targets-utils/Utils/FS.cs +++ b/build_projects/shared-build-targets-utils/Utils/FS.cs @@ -1,4 +1,7 @@ -using System.IO; +// 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.IO; using System.Runtime.InteropServices; using System; diff --git a/build_projects/shared-build-targets-utils/Utils/PublishMutationUtilties.cs b/build_projects/shared-build-targets-utils/Utils/PublishMutationUtilties.cs index ccf17f9aa..7ea8e8e61 100644 --- a/build_projects/shared-build-targets-utils/Utils/PublishMutationUtilties.cs +++ b/build_projects/shared-build-targets-utils/Utils/PublishMutationUtilties.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Cli.Build.Framework; +// 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.DotNet.Cli.Build.Framework; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; diff --git a/build_projects/shared-build-targets-utils/Utils/Utils.cs b/build_projects/shared-build-targets-utils/Utils/Utils.cs index e23d08bcf..2d105c9e9 100644 --- a/build_projects/shared-build-targets-utils/Utils/Utils.cs +++ b/build_projects/shared-build-targets-utils/Utils/Utils.cs @@ -1,4 +1,7 @@ -using System; +// 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.IO; using System.Runtime.InteropServices; using System.Security.Cryptography; diff --git a/build_projects/shared-build-targets-utils/Utils/Version.cs b/build_projects/shared-build-targets-utils/Utils/Version.cs index def18eda2..cc2ec209b 100644 --- a/build_projects/shared-build-targets-utils/Utils/Version.cs +++ b/build_projects/shared-build-targets-utils/Utils/Version.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.DotNet.Cli.Build { public class Version diff --git a/build_projects/shared-build-targets-utils/VersionRepoUpdater.cs b/build_projects/shared-build-targets-utils/VersionRepoUpdater.cs index f1906776d..69734ce65 100644 --- a/build_projects/shared-build-targets-utils/VersionRepoUpdater.cs +++ b/build_projects/shared-build-targets-utils/VersionRepoUpdater.cs @@ -1,4 +1,7 @@ -using System; +// 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; diff --git a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj index e714a0b50..b7af21b7f 100644 --- a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj +++ b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj @@ -13,36 +13,15 @@ - - 1.6.0 - - - 4.0.1 - - - 4.0.11 - - - 1.4.1-beta-24410-02 - - - 4.1.1 - - - 4.0.0 - - - 4.0.11 - - - 7.2.1 - - - 1.0.1-beta-000933 - + + + + + + + + + - - $(DefineConstants);RELEASE - diff --git a/build_projects/update-dependencies/Program.cs b/build_projects/update-dependencies/Program.cs index 991d86af0..67caf4aef 100644 --- a/build_projects/update-dependencies/Program.cs +++ b/build_projects/update-dependencies/Program.cs @@ -36,7 +36,7 @@ namespace Microsoft.DotNet.Scripts disabledPackages: Enumerable.Empty())); DependencyUpdateResults updateResults = DependencyUpdateUtils.Update(updaters, dependencyBuildInfos); - if (updateResults.ChangesDetected() && !onlyUpdate) + if (!onlyUpdate && updateResults.ChangesDetected()) { GitHubAuth gitHubAuth = new GitHubAuth(s_config.Password, s_config.UserName, s_config.Email); GitHubProject origin = new GitHubProject(s_config.GitHubProject, s_config.UserName); diff --git a/buildpipeline/Dotnet-CLI-RHEL7-x64.json b/buildpipeline/Dotnet-CLI-RHEL7-x64.json index 097342660..029f3a75b 100644 --- a/buildpipeline/Dotnet-CLI-RHEL7-x64.json +++ b/buildpipeline/Dotnet-CLI-RHEL7-x64.json @@ -31,7 +31,7 @@ }, "inputs": { "scriptPath": "scripts/dockerrun-as-current-user.sh", - "args": "-t --rm --sig-proxy=true --name $(Build.BuildId) -v $(Build.SourcesDirectory):/opt/code -w /opt/code -e CHANNEL -e CONNECTION_STRING -e REPO_ID -e REPO_USER -e REPO_PASS -e REPO_SERVER -e DOTNET_BUILD_SKIP_CROSSGEN -e PUBLISH_TO_AZURE_BLOB -e NUGET_FEED_URL -e NUGET_API_KEY -e GITHUB_PASSWORD -e ARTIFACT_STORAGE_KEY -e ARTIFACT_STORAGE_ACCOUNT -e ARTIFACT_STORAGE_CONTAINER -e CHECKSUM_STORAGE_KEY -e CHECKSUM_STORAGE_ACCOUNT -e CHECKSUM_STORAGE_CONTAINER chcosta/dotnetcore:rhel7_prereqs /bin/bash -c \"HOME=/opt/code; git clean -X -d -f; ./build.sh $(BuildArguments)\"", + "args": "-t --rm --sig-proxy=true --name $(Build.BuildId) -v $(Build.SourcesDirectory):/opt/code -w /opt/code -e CHANNEL -e CONNECTION_STRING -e REPO_ID -e REPO_USER -e REPO_PASS -e REPO_SERVER -e DOTNET_BUILD_SKIP_CROSSGEN -e PUBLISH_TO_AZURE_BLOB -e NUGET_FEED_URL -e NUGET_API_KEY -e GITHUB_PASSWORD -e ARTIFACT_STORAGE_KEY -e ARTIFACT_STORAGE_ACCOUNT -e ARTIFACT_STORAGE_CONTAINER -e CHECKSUM_STORAGE_KEY -e CHECKSUM_STORAGE_ACCOUNT -e CHECKSUM_STORAGE_CONTAINER microsoft/dotnet-buildtools-prereqs:rhel7_prereqs /bin/bash -c \"HOME=/opt/code; git clean -X -d -f; ./build.sh $(BuildArguments)\"", "disableAutoCwd": "false", "cwd": "", "failOnStandardError": "false" diff --git a/netci.groovy b/netci.groovy index cc510c646..b2e30786e 100644 --- a/netci.groovy +++ b/netci.groovy @@ -55,7 +55,7 @@ platformList.each { platform -> Utilities.setMachineAffinity(newJob, os, 'latest-or-auto') Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - Utilities.addXUnitDotNETResults(newJob, '**/*-testResults.xml') + Utilities.addMSTestResults(newJob, '**/*.trx') Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") } diff --git a/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs b/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs index 636e35970..91e555c37 100644 --- a/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs +++ b/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs @@ -49,4 +49,4 @@ namespace Microsoft.DotNet.Archive } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj index dcb0a221c..9a2cd2cdf 100644 --- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj +++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj @@ -1,6 +1,6 @@  - + Archive and compression types. $(CliVersionPrefix) @@ -9,15 +9,9 @@ true true + - - 1.6.0 - - - 4.0.1 - + + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Archive/Properties/AssemblyInfo.cs index bd44bced5..110018e7f 100644 --- a/src/Microsoft.DotNet.Archive/Properties/AssemblyInfo.cs +++ b/src/Microsoft.DotNet.Archive/Properties/AssemblyInfo.cs @@ -1,3 +1,6 @@ +// 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; [assembly: AssemblyMetadataAttribute("Serviceable", "True")] diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs b/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs index 3e696ecde..f340f9373 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Cli.Sln.Internal +// 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 Microsoft.DotNet.Cli.Sln.Internal { internal class LocalizableStrings { diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj index 215c6a5e5..1b4b8d348 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj @@ -17,14 +17,8 @@ - - 4.0.1 - - - 4.1.0 - - - 1.6.0 - + + + diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Chain.cs b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Chain.cs index 263f65bb9..5032b659f 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Chain.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Chain.cs @@ -15,4 +15,4 @@ namespace Microsoft.DotNet.Cli.Utils.CommandParsing public readonly TLeft Left; public readonly TDown Down; } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/CommandGrammar.cs b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/CommandGrammar.cs index 11c8c0994..5d682ab39 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/CommandGrammar.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/CommandGrammar.cs @@ -60,4 +60,4 @@ namespace Microsoft.DotNet.Cli.Utils.CommandParsing return result.Value.ToArray(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Cursor.cs b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Cursor.cs index d8b639a8e..b46bf92e3 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Cursor.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Cursor.cs @@ -31,4 +31,4 @@ namespace Microsoft.DotNet.Cli.Utils.CommandParsing return new Result(result, new Cursor(_text, _start + length, _end)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Grammar.cs b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Grammar.cs index fe32f6700..431e65023 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Grammar.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Grammar.cs @@ -49,4 +49,4 @@ namespace Microsoft.DotNet.Cli.Utils.CommandParsing return pos => pos.Peek(0) != ch ? Result.Empty : pos.Advance(ch, 1); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Parser.cs b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Parser.cs index 997a3177d..6be28ec40 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Parser.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Parser.cs @@ -4,4 +4,4 @@ namespace Microsoft.DotNet.Cli.Utils.CommandParsing { public delegate Result Parser(Cursor cursor); -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/ParserExtensions.cs b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/ParserExtensions.cs index 04b16f3b3..69be3968b 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/ParserExtensions.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/ParserExtensions.cs @@ -82,4 +82,4 @@ namespace Microsoft.DotNet.Cli.Utils.CommandParsing return parser.Build(x => String.Concat(x.ToArray())); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Result.cs b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Result.cs index 9b01596e8..26eff19e6 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Result.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandParsing/Result.cs @@ -30,4 +30,4 @@ namespace Microsoft.DotNet.Cli.Utils.CommandParsing return new Result(value2, Remainder); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AbstractPathBasedCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AbstractPathBasedCommandResolver.cs index a9949d26a..396083fbc 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AbstractPathBasedCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AbstractPathBasedCommandResolver.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.DotNet.Cli.Utils { diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseCommandResolver.cs index 2eccd3de2..85192dc29 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseCommandResolver.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.PlatformAbstractions; +// 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.DotNet.PlatformAbstractions; namespace Microsoft.DotNet.Cli.Utils { diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseDllCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseDllCommandResolver.cs index eb495c103..95310fc8e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseDllCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/AppBaseDllCommandResolver.cs @@ -1,4 +1,7 @@ -using System.IO; +// 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.IO; using System.Linq; using Microsoft.DotNet.PlatformAbstractions; diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CommandResolutionStrategy.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CommandResolutionStrategy.cs index e239fccb6..da52bf31b 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CommandResolutionStrategy.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CommandResolutionStrategy.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Cli.Utils +// 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 Microsoft.DotNet.Cli.Utils { public enum CommandResolutionStrategy { @@ -29,4 +32,4 @@ // command not found None } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CommandResolverArguments.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CommandResolverArguments.cs index dca62db0a..2658dea5e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CommandResolverArguments.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CommandResolverArguments.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// 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 NuGet.Frameworks; namespace Microsoft.DotNet.Cli.Utils diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CompositeCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CompositeCommandResolver.cs index bce8811f3..35a1ee041 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CompositeCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/CompositeCommandResolver.cs @@ -1,3 +1,6 @@ +// 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; namespace Microsoft.DotNet.Cli.Utils @@ -39,4 +42,4 @@ namespace Microsoft.DotNet.Cli.Utils return null; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DefaultCommandResolverPolicy.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DefaultCommandResolverPolicy.cs index afb15dd64..d8a2c464b 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DefaultCommandResolverPolicy.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DefaultCommandResolverPolicy.cs @@ -1,3 +1,6 @@ +// 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.DotNet.PlatformAbstractions; namespace Microsoft.DotNet.Cli.Utils diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs index b682bb5af..c9a69f0c8 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonBuilder.cs @@ -312,4 +312,4 @@ namespace Microsoft.DotNet.Cli.Utils return new ResourceAssembly(resourceAssembly.Path, locale); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonCommandResolver.cs index 201a3eecd..387dfc28f 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/DepsJsonCommandResolver.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/GenericPlatformCommandSpecFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/GenericPlatformCommandSpecFactory.cs index 9472eb67c..f190699a0 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/GenericPlatformCommandSpecFactory.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/GenericPlatformCommandSpecFactory.cs @@ -1,3 +1,6 @@ +// 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; namespace Microsoft.DotNet.Cli.Utils diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ICommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ICommandResolver.cs index 363893d88..e3b05842f 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ICommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ICommandResolver.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Cli.Utils +// 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 Microsoft.DotNet.Cli.Utils { public interface ICommandResolver { diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ICommandResolverPolicy.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ICommandResolverPolicy.cs index f7116df42..a38b32605 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ICommandResolverPolicy.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ICommandResolverPolicy.cs @@ -1,7 +1,10 @@ +// 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 Microsoft.DotNet.Cli.Utils { public interface ICommandResolverPolicy { CompositeCommandResolver CreateCommandResolver(); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IPackagedCommandSpecFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IPackagedCommandSpecFactory.cs index becf5b74f..f3f4b5eda 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IPackagedCommandSpecFactory.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IPackagedCommandSpecFactory.cs @@ -1,3 +1,6 @@ +// 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 NuGet.ProjectModel; @@ -14,6 +17,6 @@ namespace Microsoft.DotNet.Cli.Utils CommandResolutionStrategy commandResolutionStrategy, string depsFilePath, string runtimeConfigPath); - + } } diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IPlatformCommandSpecFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IPlatformCommandSpecFactory.cs index 3748a9131..f91877bcf 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IPlatformCommandSpecFactory.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IPlatformCommandSpecFactory.cs @@ -1,3 +1,6 @@ +// 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; namespace Microsoft.DotNet.Cli.Utils diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IProject.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IProject.cs index 89d22bbbf..d335964c3 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IProject.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/IProject.cs @@ -24,4 +24,4 @@ namespace Microsoft.DotNet.Cli.Utils Dictionary EnvironmentVariables { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/LockFileTargetExtensions.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/LockFileTargetExtensions.cs index 9bb86d314..f09b9d1f5 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/LockFileTargetExtensions.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/LockFileTargetExtensions.cs @@ -98,4 +98,4 @@ namespace Microsoft.DotNet.Cli.Utils } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MSBuildProject.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MSBuildProject.cs index 4b6cda0e4..7430aab15 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MSBuildProject.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MSBuildProject.cs @@ -170,4 +170,4 @@ namespace Microsoft.DotNet.Cli.Utils return Path.Combine(intermediateOutputPath, "project.assets.json"); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MuxerCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MuxerCommandResolver.cs index 132efca13..a61a0c4d7 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MuxerCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/MuxerCommandResolver.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Cli.Utils +// 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 Microsoft.DotNet.Cli.Utils { public class MuxerCommandResolver : ICommandResolver { diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/NuGetUtils.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/NuGetUtils.cs index 2c569a8ab..72aa0a545 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/NuGetUtils.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/NuGetUtils.cs @@ -22,4 +22,4 @@ namespace Microsoft.DotNet.Cli.Utils return files.Where(f => !IsPlaceholderFile(f.Path)); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/OutputPathCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/OutputPathCommandResolver.cs index e6f20a660..76f492420 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/OutputPathCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/OutputPathCommandResolver.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// 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.IO; using Microsoft.DotNet.Cli.Utils; using NuGet.Frameworks; @@ -42,7 +45,7 @@ namespace Microsoft.DotNet.Cli.Utils string buildBasePath) { var projectFactory = new ProjectFactory(_environment); - + var project = projectFactory.GetProject( projectDirectory, framework, @@ -66,7 +69,7 @@ namespace Microsoft.DotNet.Cli.Utils return _environment.GetCommandPathFromRootPath(buildOutputPath, commandName); } - + internal override CommandResolutionStrategy GetCommandResolutionStrategy() { return CommandResolutionStrategy.OutputPath; diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs index 7a0a4a0cf..ca3ce324a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactory.cs @@ -1,4 +1,7 @@ -using System; +// 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; @@ -47,7 +50,7 @@ namespace Microsoft.DotNet.Cli.Utils return null; } - + var commandPath = GetCommandFilePath(nugetPackagesRoot, toolLibrary, toolAssembly); if (!File.Exists(commandPath)) @@ -61,9 +64,9 @@ namespace Microsoft.DotNet.Cli.Utils } return CreateCommandSpecWrappingWithMuxerIfDll( - commandPath, - commandArguments, - depsFilePath, + commandPath, + commandArguments, + depsFilePath, commandResolutionStrategy, nugetPackagesRoot, runtimeConfigPath); @@ -85,8 +88,8 @@ namespace Microsoft.DotNet.Cli.Utils } private CommandSpec CreateCommandSpecWrappingWithMuxerIfDll( - string commandPath, - IEnumerable commandArguments, + string commandPath, + IEnumerable commandArguments, string depsFilePath, CommandResolutionStrategy commandResolutionStrategy, string nugetPackagesRoot, @@ -97,20 +100,20 @@ namespace Microsoft.DotNet.Cli.Utils if (commandExtension == FileNameSuffixes.DotNet.DynamicLib) { return CreatePackageCommandSpecUsingMuxer( - commandPath, - commandArguments, - depsFilePath, + commandPath, + commandArguments, + depsFilePath, commandResolutionStrategy, nugetPackagesRoot, runtimeConfigPath); } - + return CreateCommandSpec(commandPath, commandArguments, commandResolutionStrategy); } private CommandSpec CreatePackageCommandSpecUsingMuxer( - string commandPath, - IEnumerable commandArguments, + string commandPath, + IEnumerable commandArguments, string depsFilePath, CommandResolutionStrategy commandResolutionStrategy, string nugetPackagesRoot, @@ -134,7 +137,7 @@ namespace Microsoft.DotNet.Cli.Utils arguments.Add("--runtimeconfig"); arguments.Add(runtimeConfigPath); } - + if (depsFilePath != null) { arguments.Add("--depsfile"); @@ -156,7 +159,7 @@ namespace Microsoft.DotNet.Cli.Utils } private CommandSpec CreateCommandSpec( - string commandPath, + string commandPath, IEnumerable commandArguments, CommandResolutionStrategy commandResolutionStrategy) { diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactoryWithCliRuntime.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactoryWithCliRuntime.cs index 212baf607..a081bcd30 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactoryWithCliRuntime.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PackagedCommandSpecFactoryWithCliRuntime.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PathCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PathCommandResolver.cs index 1a263d820..cf36ac00c 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PathCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PathCommandResolver.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Cli.Utils +// 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 Microsoft.DotNet.Cli.Utils { public class PathCommandResolver : AbstractPathBasedCommandResolver { diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PathCommandResolverPolicy.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PathCommandResolverPolicy.cs index 874c79639..40a5b3787 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PathCommandResolverPolicy.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/PathCommandResolverPolicy.cs @@ -1,3 +1,6 @@ +// 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.DotNet.PlatformAbstractions; namespace Microsoft.DotNet.Cli.Utils diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectDependenciesCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectDependenciesCommandResolver.cs index 600317e3f..9c1e97e5b 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectDependenciesCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectDependenciesCommandResolver.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectPathCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectPathCommandResolver.cs index 720e406a3..4ace64660 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectPathCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectPathCommandResolver.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Cli.Utils +// 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 Microsoft.DotNet.Cli.Utils { public class ProjectPathCommandResolver : AbstractPathBasedCommandResolver { diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ResourceAssemblyInfo.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ResourceAssemblyInfo.cs index 80346aae2..12183f077 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ResourceAssemblyInfo.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ResourceAssemblyInfo.cs @@ -14,4 +14,4 @@ namespace Microsoft.DotNet.Cli.Utils RelativePath = relativePath; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/RootedCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/RootedCommandResolver.cs index d7dac8b6c..b80848c5f 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/RootedCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/RootedCommandResolver.cs @@ -1,4 +1,7 @@ -using System.IO; +// 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.IO; namespace Microsoft.DotNet.Cli.Utils { diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ScriptCommandResolverPolicy.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ScriptCommandResolverPolicy.cs index 887d24aea..10dafbd10 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ScriptCommandResolverPolicy.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ScriptCommandResolverPolicy.cs @@ -1,3 +1,6 @@ +// 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.DotNet.PlatformAbstractions; namespace Microsoft.DotNet.Cli.Utils diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/SingleProjectInfo.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/SingleProjectInfo.cs index fa15442d6..02d9b7c99 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/SingleProjectInfo.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/SingleProjectInfo.cs @@ -24,4 +24,4 @@ namespace Microsoft.DotNet.Cli.Utils return $"{Name}.dll"; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/WindowsExePreferredCommandSpecFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/WindowsExePreferredCommandSpecFactory.cs index 4619f5bea..7815c77f0 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/WindowsExePreferredCommandSpecFactory.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/WindowsExePreferredCommandSpecFactory.cs @@ -1,4 +1,7 @@ -using System; +// 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; diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs index a740278b3..2759550d5 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// 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.IO; using NuGet.Frameworks; diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResult.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResult.cs index 9b7af5bde..7ffb87b74 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResult.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResult.cs @@ -22,4 +22,4 @@ namespace Microsoft.DotNet.Cli.Utils StdErr = stdErr; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandSpec.cs b/src/Microsoft.DotNet.Cli.Utils/CommandSpec.cs index bf7d7fb3b..4847f2d7d 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandSpec.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandSpec.cs @@ -1,3 +1,6 @@ +// 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; namespace Microsoft.DotNet.Cli.Utils @@ -32,4 +35,4 @@ namespace Microsoft.DotNet.Cli.Utils } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandUnknownException.cs b/src/Microsoft.DotNet.Cli.Utils/CommandUnknownException.cs index 93034ba7d..1b943f14c 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandUnknownException.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandUnknownException.cs @@ -1,4 +1,7 @@ -using System; +// 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 Microsoft.DotNet.Cli.Utils { @@ -18,4 +21,4 @@ namespace Microsoft.DotNet.Cli.Utils { } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/Env.cs b/src/Microsoft.DotNet.Cli.Utils/Env.cs index 20e9e43b2..6aad6f4c4 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Env.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Env.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// 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; namespace Microsoft.DotNet.Cli.Utils { diff --git a/src/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs b/src/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs index 2280f8e8b..6c23d4c9e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs +++ b/src/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs @@ -1,3 +1,6 @@ +// 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; @@ -27,9 +30,9 @@ namespace Microsoft.DotNet.Cli.Utils return _executableExtensions; } - } + } - private IEnumerable SearchPaths + private IEnumerable SearchPaths { get { diff --git a/src/Microsoft.DotNet.Cli.Utils/FileNameSuffixes.cs b/src/Microsoft.DotNet.Cli.Utils/FileNameSuffixes.cs index 86d1d6407..5bb3fc795 100644 --- a/src/Microsoft.DotNet.Cli.Utils/FileNameSuffixes.cs +++ b/src/Microsoft.DotNet.Cli.Utils/FileNameSuffixes.cs @@ -1,3 +1,6 @@ +// 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.DotNet.PlatformAbstractions; @@ -70,4 +73,4 @@ namespace Microsoft.DotNet.Cli.Utils public string StaticLib { get; internal set; } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/GracefulException.cs b/src/Microsoft.DotNet.Cli.Utils/GracefulException.cs index 448049ee4..50ab33a0b 100644 --- a/src/Microsoft.DotNet.Cli.Utils/GracefulException.cs +++ b/src/Microsoft.DotNet.Cli.Utils/GracefulException.cs @@ -1,4 +1,7 @@ -using System; +// 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 Microsoft.DotNet.Cli.Utils { @@ -18,4 +21,4 @@ namespace Microsoft.DotNet.Cli.Utils Data.Add(ExceptionExtensions.CLI_User_Displayed_Exception, true); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/IEnvironmentProvider.cs b/src/Microsoft.DotNet.Cli.Utils/IEnvironmentProvider.cs index 25124153e..43830b6f5 100644 --- a/src/Microsoft.DotNet.Cli.Utils/IEnvironmentProvider.cs +++ b/src/Microsoft.DotNet.Cli.Utils/IEnvironmentProvider.cs @@ -1,3 +1,6 @@ +// 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; namespace Microsoft.DotNet.Cli.Utils diff --git a/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.cs b/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.cs index ff4bf329b..6bbcac0ea 100644 --- a/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.cs +++ b/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.DotNet.Cli.Utils { internal class LocalizableStrings @@ -86,4 +89,4 @@ namespace Microsoft.DotNet.Cli.Utils public const string UnableToInvokeMemberNameAfterCommand = "Unable to invoke {0} after the command has been run"; } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 4f73b4c01..4543cc744 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -1,6 +1,6 @@  - + $(SdkVersion) netstandard1.5;net46 @@ -9,7 +9,7 @@ true true - + @@ -20,9 +20,11 @@ + + diff --git a/src/Microsoft.DotNet.Cli.Utils/Muxer.cs b/src/Microsoft.DotNet.Cli.Utils/Muxer.cs index 700e8daac..e603205bd 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Muxer.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Muxer.cs @@ -1,3 +1,6 @@ +// 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.IO; using System.Reflection; diff --git a/src/Microsoft.DotNet.Cli.Utils/PathUtility.cs b/src/Microsoft.DotNet.Cli.Utils/PathUtility.cs index 895257d28..6e970a835 100644 --- a/src/Microsoft.DotNet.Cli.Utils/PathUtility.cs +++ b/src/Microsoft.DotNet.Cli.Utils/PathUtility.cs @@ -79,7 +79,7 @@ namespace Microsoft.DotNet.Tools.Common EnsureDirectoryExists(directory); } - + public static void EnsureDirectoryExists(string directoryPath) { if (!Directory.Exists(directoryPath)) @@ -123,7 +123,7 @@ namespace Microsoft.DotNet.Tools.Common } /// - /// Returns path2 relative to path1, with Path.DirectorySeparatorChar as separator but ignoring directory + /// Returns path2 relative to path1, with Path.DirectorySeparatorChar as separator but ignoring directory /// traversals. /// public static string GetRelativePathIgnoringDirectoryTraversals(string path1, string path2) @@ -333,4 +333,4 @@ namespace Microsoft.DotNet.Tools.Common } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/Product.cs b/src/Microsoft.DotNet.Cli.Utils/Product.cs index 4c35c3bd3..023004ce4 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Product.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Product.cs @@ -1,3 +1,6 @@ +// 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; namespace Microsoft.DotNet.Cli.Utils diff --git a/src/Microsoft.DotNet.Cli.Utils/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Cli.Utils/Properties/AssemblyInfo.cs index f2b870535..63c302ad3 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Properties/AssemblyInfo.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Properties/AssemblyInfo.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/src/Microsoft.DotNet.Cli.Utils/RuntimeEnvironmentRidExtensions.cs b/src/Microsoft.DotNet.Cli.Utils/RuntimeEnvironmentRidExtensions.cs index 073e1407e..1d695a5de 100644 --- a/src/Microsoft.DotNet.Cli.Utils/RuntimeEnvironmentRidExtensions.cs +++ b/src/Microsoft.DotNet.Cli.Utils/RuntimeEnvironmentRidExtensions.cs @@ -1,84 +1,87 @@ +// 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.DotNet.PlatformAbstractions; - -namespace Microsoft.DotNet.Cli.Utils -{ - // This is to support some legacy stuff. - // dnu restore (and thus dotnet restore) always uses win7-x64 as the Windows restore target, - // so, when picking targets out of the lock file, we need to do version fallback since the - // active RID might be higher than the RID in the lock file. - // - // We should clean this up. Filed #619 to track. - public static class RuntimeEnvironmentRidExtensions - { - // Gets the identfier that is used for restore by default (this is different from the actual RID, but only on Windows) - public static string GetLegacyRestoreRuntimeIdentifier() - { - if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows) - { - return RuntimeEnvironment.GetRuntimeIdentifier(); - } - else - { - var arch = RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant(); - return "win7-" + arch; - } - } - - public static IEnumerable GetAllCandidateRuntimeIdentifiers() - { - return GetAllCandidateRuntimeIdentifiers(null); - } - - public static IEnumerable GetAllCandidateRuntimeIdentifiers(IEnumerable fallbackIdentifiers = null) - { - List result = new List(); - - if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows) - { - result.Add(RuntimeEnvironment.GetRuntimeIdentifier()); - } - else - { - var arch = RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant(); - if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.1", StringComparison.Ordinal)) - { - result.Add("win7-" + arch); - } - else if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.2", StringComparison.Ordinal)) - { - result.Add("win8-" + arch); - result.Add("win7-" + arch); - } - else if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.3", StringComparison.Ordinal)) - { - result.Add("win81-" + arch); - result.Add("win8-" + arch); - result.Add("win7-" + arch); - } - else if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("10.0", StringComparison.Ordinal)) - { - result.Add("win10-" + arch); - result.Add("win81-" + arch); - result.Add("win8-" + arch); - result.Add("win7-" + arch); - } - } - - if (fallbackIdentifiers != null) - { - foreach (string fallbackIdentifier in fallbackIdentifiers) - { - if (!result.Contains(fallbackIdentifier)) - { - result.Add(fallbackIdentifier); - } - } - } - - return result; - } + +using System; +using System.Collections.Generic; +using Microsoft.DotNet.PlatformAbstractions; + +namespace Microsoft.DotNet.Cli.Utils +{ + // This is to support some legacy stuff. + // dnu restore (and thus dotnet restore) always uses win7-x64 as the Windows restore target, + // so, when picking targets out of the lock file, we need to do version fallback since the + // active RID might be higher than the RID in the lock file. + // + // We should clean this up. Filed #619 to track. + public static class RuntimeEnvironmentRidExtensions + { + // Gets the identfier that is used for restore by default (this is different from the actual RID, but only on Windows) + public static string GetLegacyRestoreRuntimeIdentifier() + { + if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows) + { + return RuntimeEnvironment.GetRuntimeIdentifier(); + } + else + { + var arch = RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant(); + return "win7-" + arch; + } + } + + public static IEnumerable GetAllCandidateRuntimeIdentifiers() + { + return GetAllCandidateRuntimeIdentifiers(null); + } + + public static IEnumerable GetAllCandidateRuntimeIdentifiers(IEnumerable fallbackIdentifiers = null) + { + List result = new List(); + + if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows) + { + result.Add(RuntimeEnvironment.GetRuntimeIdentifier()); + } + else + { + var arch = RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant(); + if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.1", StringComparison.Ordinal)) + { + result.Add("win7-" + arch); + } + else if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.2", StringComparison.Ordinal)) + { + result.Add("win8-" + arch); + result.Add("win7-" + arch); + } + else if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("6.3", StringComparison.Ordinal)) + { + result.Add("win81-" + arch); + result.Add("win8-" + arch); + result.Add("win7-" + arch); + } + else if (RuntimeEnvironment.OperatingSystemVersion.StartsWith("10.0", StringComparison.Ordinal)) + { + result.Add("win10-" + arch); + result.Add("win81-" + arch); + result.Add("win8-" + arch); + result.Add("win7-" + arch); + } + } + + if (fallbackIdentifiers != null) + { + foreach (string fallbackIdentifier in fallbackIdentifiers) + { + if (!result.Contains(fallbackIdentifier)) + { + result.Add(fallbackIdentifier); + } + } + } + + return result; + } } } diff --git a/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTrace.cs b/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTrace.cs index abbf866d8..696c00195 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTrace.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTrace.cs @@ -31,4 +31,4 @@ namespace Microsoft.DotNet.Cli.Utils return _threads; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceEvent.cs b/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceEvent.cs index bcfb53bae..9bf2e36ee 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceEvent.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceEvent.cs @@ -24,4 +24,4 @@ namespace Microsoft.DotNet.Cli.Utils Children = children.OrderBy(e => e.StartUtc).ToList(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs b/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs index 403ee079b..f1b3b8cfb 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceOutput.cs @@ -77,4 +77,4 @@ namespace Microsoft.DotNet.Cli.Utils } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceThreadContext.cs b/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceThreadContext.cs index 41a42d746..2be2af011 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceThreadContext.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Tracing/PerfTraceThreadContext.cs @@ -73,4 +73,4 @@ namespace Microsoft.DotNet.Cli.Utils public PerfTraceEvent CreateEvent() => new PerfTraceEvent(_eventType, _instance, Children, _startUtc, _stopwatch.Elapsed); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs index 75c7dac5a..f570128d4 100644 --- a/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs @@ -7,4 +7,4 @@ namespace Microsoft.DotNet.Configurer { void PrimeCache(); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs index 063f4c447..0eaa8d91d 100644 --- a/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs +++ b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs @@ -13,4 +13,4 @@ namespace Microsoft.DotNet.Configurer void CreateIfNotExists(); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Configurer/LocalizableStrings.cs b/src/Microsoft.DotNet.Configurer/LocalizableStrings.cs index 5e5ec9d3b..5fe83556d 100644 --- a/src/Microsoft.DotNet.Configurer/LocalizableStrings.cs +++ b/src/Microsoft.DotNet.Configurer/LocalizableStrings.cs @@ -21,4 +21,4 @@ A command is running to initially populate your local package cache, to improve public const string FailedToPrimeCacheError = "Failed to prime the NuGet cache. {0} failed with: {1}"; } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index 1b39817e3..645bc4fe1 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -11,13 +11,10 @@ git git://github.com/dotnet/cli - + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs b/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs index 32ec58a65..c8d509c40 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs @@ -12,11 +12,11 @@ namespace Microsoft.DotNet.Configurer { private ITemporaryDirectory _temporaryDirectory; - public string NuGetPackagesArchive => + public string NuGetPackagesArchive => Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "nuGetPackagesArchive.lzma")); public NuGetPackagesArchiver() : this(FileSystemWrapper.Default.Directory) - { + { } internal NuGetPackagesArchiver(IDirectory directory) @@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Configurer } public string ExtractArchive() - { + { var progress = new ConsoleProgressReport(); var archive = new IndexedArchive(); @@ -37,6 +37,6 @@ namespace Microsoft.DotNet.Configurer public void Dispose() { _temporaryDirectory.Dispose(); - } + } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.Configurer/Properties/Properties.cs b/src/Microsoft.DotNet.Configurer/Properties/Properties.cs index 54a364c16..9377630bc 100644 --- a/src/Microsoft.DotNet.Configurer/Properties/Properties.cs +++ b/src/Microsoft.DotNet.Configurer/Properties/Properties.cs @@ -1,5 +1,8 @@ +// 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; [assembly: AssemblyMetadataAttribute("Serviceable", "True")] -[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file +[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs index 591462989..53005a456 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs @@ -43,4 +43,4 @@ namespace Microsoft.Extensions.EnvironmentAbstractions return directoryFullName; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/EnvironmentWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/EnvironmentWrapper.cs index 405cd9054..8e81a0ca4 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/EnvironmentWrapper.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/EnvironmentWrapper.cs @@ -14,4 +14,4 @@ namespace Microsoft.Extensions.EnvironmentAbstractions return Environment.GetEnvironmentVariable(name); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/FileSystemWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/FileSystemWrapper.cs index 9d69002e8..881807431 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/FileSystemWrapper.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/FileSystemWrapper.cs @@ -11,4 +11,4 @@ namespace Microsoft.Extensions.EnvironmentAbstractions public IDirectory Directory { get; } = new DirectoryWrapper(); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs index 9a71ba5d2..954c7ba03 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs @@ -41,4 +41,4 @@ namespace Microsoft.Extensions.EnvironmentAbstractions } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/IDirectory.cs b/src/Microsoft.DotNet.InternalAbstractions/IDirectory.cs index 95464df21..61087e088 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/IDirectory.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/IDirectory.cs @@ -15,4 +15,4 @@ namespace Microsoft.Extensions.EnvironmentAbstractions string GetDirectoryFullName(string path); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/IEnvironment.cs b/src/Microsoft.DotNet.InternalAbstractions/IEnvironment.cs index 79452612f..8b3785c20 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/IEnvironment.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/IEnvironment.cs @@ -7,4 +7,4 @@ namespace Microsoft.Extensions.EnvironmentAbstractions { string GetEnvironmentVariable(string name); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs index 3e19c63f0..604ce6f9d 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs @@ -23,4 +23,4 @@ namespace Microsoft.Extensions.EnvironmentAbstractions void CreateEmptyFile(string path); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj index 373a80b57..a5c6d9d6a 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj +++ b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj @@ -13,39 +13,19 @@ git git://github.com/dotnet/cli - + - - 1.6.0 - + + - - 4.1.0 - - - 4.0.11 - - - 4.1.0 - - - 4.0.1 - - - 4.1.0 - - - 4.1.0 - - - 4.1.0 - - - 4.0.0 - + + + + + + + + - - $(DefineConstants);RELEASE - diff --git a/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs b/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs index a062d0c47..1ab5c59fd 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs @@ -1,4 +1,7 @@ -using System.Reflection; +// 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; [assembly: AssemblyMetadataAttribute("Serviceable", "True")] diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs index bb86cd1c3..34ac15ee9 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/ConstantPackageVersions.cs @@ -16,4 +16,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration public const string MstestTestFrameworkVersion = "1.0.8-rc"; public const string BundleMinifierToolVersion = "2.2.301"; } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/DotnetSupportedPackageVersionsCsvProvider.cs b/src/Microsoft.DotNet.ProjectJsonMigration/DotnetSupportedPackageVersionsCsvProvider.cs index 8f2fe2bc7..29efa26fe 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/DotnetSupportedPackageVersionsCsvProvider.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/DotnetSupportedPackageVersionsCsvProvider.cs @@ -52,4 +52,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration return !string.IsNullOrEmpty(version); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/IDotnetSupportedPackageVersionsProvider.cs b/src/Microsoft.DotNet.ProjectJsonMigration/IDotnetSupportedPackageVersionsProvider.cs index bdb354992..27d05f907 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/IDotnetSupportedPackageVersionsProvider.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/IDotnetSupportedPackageVersionsProvider.cs @@ -10,4 +10,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration void AddDotnetSupportedPackageVersions( IDictionary projectDependenciesPackages); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/LocalizableStrings.cs b/src/Microsoft.DotNet.ProjectJsonMigration/LocalizableStrings.cs index 1a669e877..f81a55525 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/LocalizableStrings.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/LocalizableStrings.cs @@ -123,4 +123,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration public const string PropertyInfo = "{0}: {1}, {{ Name={2}, Value={3} }}"; } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/AnalyzerOptions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/AnalyzerOptions.cs index 87cdc0eee..ac60f0957 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/AnalyzerOptions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/AnalyzerOptions.cs @@ -54,4 +54,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel return !(left == right); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/AnalyzerAssembly.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/AnalyzerAssembly.cs index 6ec2b0b27..75456f630 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/AnalyzerAssembly.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/AnalyzerAssembly.cs @@ -11,22 +11,22 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Compilation /// The fully-qualified path to the analyzer assembly. /// public string AssemblyPath { get; } - + /// /// The supported language of the analyzer assembly. /// public string AnalyzerLanguage { get; } - + /// /// The required framework for hosting the analyzer assembly. /// public NuGetFramework RequiredFramework { get; } - + /// /// The required runtime for hosting the analyzer assembly. /// public string RuntimeIdentifier { get; } - + public AnalyzerReference( string assembly, NuGetFramework framework, @@ -39,4 +39,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Compilation RuntimeIdentifier = runtimeIdentifier; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryAssetGroup.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryAssetGroup.cs index 941fc0f48..ecbd44ffd 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryAssetGroup.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryAssetGroup.cs @@ -26,4 +26,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Compilation /// public IReadOnlyList Assets { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryExportBuilder.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryExportBuilder.cs index 54b55d7b1..b58782d4f 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryExportBuilder.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryExportBuilder.cs @@ -188,4 +188,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Compilation list.Add(item); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryResourceAssembly.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryResourceAssembly.cs index 79e93d615..23815fd93 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryResourceAssembly.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Compilation/LibraryResourceAssembly.cs @@ -15,4 +15,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Compilation public string Locale { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/CompilationOutputFiles.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/CompilationOutputFiles.cs index 588bb3734..0610ae1d3 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/CompilationOutputFiles.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/CompilationOutputFiles.cs @@ -101,4 +101,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel return includeFiles.Select(f => f.SourcePath); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DiagnosticMessage.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DiagnosticMessage.cs index a8c8c07b4..c533a3e27 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DiagnosticMessage.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DiagnosticMessage.cs @@ -40,9 +40,9 @@ namespace Microsoft.DotNet.Internal.ProjectModel source: source) { } - public DiagnosticMessage(string errorCode, string message, string formattedMessage, string filePath, + public DiagnosticMessage(string errorCode, string message, string formattedMessage, string filePath, DiagnosticMessageSeverity severity, int startLine, int startColumn, int endLine, int endColumn) - : this(errorCode, + : this(errorCode, message, formattedMessage, filePath, @@ -129,4 +129,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel /// public LibraryDescription Source { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DiagnosticMessageSeverity.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DiagnosticMessageSeverity.cs index 2ead2eed5..8a823300e 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DiagnosticMessageSeverity.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DiagnosticMessageSeverity.cs @@ -12,4 +12,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel Warning, Error, } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DirectoryNames.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DirectoryNames.cs index 2b8e8b7ed..d1f12812f 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DirectoryNames.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/DirectoryNames.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.DotNet.Internal.ProjectModel { internal static class DirectoryNames diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileNameSuffixes.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileNameSuffixes.cs index ba5fbcd7b..8f880eaf5 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileNameSuffixes.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileNameSuffixes.cs @@ -1,3 +1,6 @@ +// 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.DotNet.PlatformAbstractions; diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/DirectoryInfoBase.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/DirectoryInfoBase.cs index 37f31803e..5829d6499 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/DirectoryInfoBase.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/DirectoryInfoBase.cs @@ -13,4 +13,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Abstractions public abstract FileInfoBase GetFile(string path); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileInfoBase.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileInfoBase.cs index 2a4dc403f..633c8e524 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileInfoBase.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileInfoBase.cs @@ -6,4 +6,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Abstractions internal abstract class FileInfoBase : FileSystemInfoBase { } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileInfoWrapper.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileInfoWrapper.cs index 2cd2abcab..c28dcfdc3 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileInfoWrapper.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileInfoWrapper.cs @@ -29,4 +29,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Abstractions get { return new DirectoryInfoWrapper(_fileInfo.Directory); } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileSystemInfoBase.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileSystemInfoBase.cs index 09a88909a..3d50eb272 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileSystemInfoBase.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Abstractions/FileSystemInfoBase.cs @@ -11,4 +11,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Abstractions public abstract DirectoryInfoBase ParentDirectory { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/FilePatternMatch.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/FilePatternMatch.cs index b3bb6d075..23506bdb4 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/FilePatternMatch.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/FilePatternMatch.cs @@ -37,4 +37,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing return hashCodeCombiner.CombinedHash; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/ILinearPattern.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/ILinearPattern.cs index 9fcaa0306..13c399597 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/ILinearPattern.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/ILinearPattern.cs @@ -9,4 +9,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal { IList Segments { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IPathSegment.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IPathSegment.cs index 64300e4f6..fe571da2e 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IPathSegment.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IPathSegment.cs @@ -9,4 +9,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal bool Match(string value); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IPattern.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IPattern.cs index d7bc796cd..c4ea64c28 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IPattern.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IPattern.cs @@ -9,4 +9,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal IPatternContext CreatePatternContextForExclude(); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IRaggedPattern.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IRaggedPattern.cs index 2bc081089..931f14fb3 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IRaggedPattern.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/IRaggedPattern.cs @@ -15,4 +15,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal IList EndsWith { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/CurrentPathSegment.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/CurrentPathSegment.cs index 6569c70ed..441537144 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/CurrentPathSegment.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/CurrentPathSegment.cs @@ -14,4 +14,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal.Pat return false; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/LiteralPathSegment.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/LiteralPathSegment.cs index e41a1e3a3..ad914c0f7 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/LiteralPathSegment.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/LiteralPathSegment.cs @@ -45,4 +45,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal.Pat return StringComparisonHelper.GetStringComparer(_comparisonType).GetHashCode(Value); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/ParentPathSegment.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/ParentPathSegment.cs index c83618abc..ffcd6a97e 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/ParentPathSegment.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/ParentPathSegment.cs @@ -16,4 +16,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal.Pat return string.Equals(LiteralParent, value, StringComparison.Ordinal); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/RecursiveWildcardSegment.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/RecursiveWildcardSegment.cs index 9337247fc..e6a4d44b9 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/RecursiveWildcardSegment.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/RecursiveWildcardSegment.cs @@ -14,4 +14,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal.Pat return false; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/WildcardPathSegment.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/WildcardPathSegment.cs index 66e944dfb..8022aa8c3 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/WildcardPathSegment.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PathSegments/WildcardPathSegment.cs @@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal.Pat { internal class WildcardPathSegment : IPathSegment { - // It doesn't matter which StringComparison type is used in this MatchAll segment because + // It doesn't matter which StringComparison type is used in this MatchAll segment because // all comparing are skipped since there is no content in the segment. public static readonly WildcardPathSegment MatchAll = new WildcardPathSegment( string.Empty, new List(), string.Empty, StringComparison.OrdinalIgnoreCase); @@ -71,4 +71,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal.Pat return true; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PatternContexts/PatternContext.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PatternContexts/PatternContext.cs index 6afc07c3d..d846541dc 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PatternContexts/PatternContext.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PatternContexts/PatternContext.cs @@ -36,4 +36,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal.Pat return _stack.Count == 0; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PatternTestResult.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PatternTestResult.cs index 20146a528..58d6dabd9 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PatternTestResult.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/PatternTestResult.cs @@ -21,4 +21,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal return new PatternTestResult(isSuccessful: true, stem: stem); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/Patterns/PatternBuilder.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/Patterns/PatternBuilder.cs index fc275fe06..7684ee502 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/Patterns/PatternBuilder.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Internal/Patterns/PatternBuilder.cs @@ -104,7 +104,7 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal.Pat pattern[beginSegment + 2] == '.') { // recognize **. - // swallow the first *, add the recursive path segment and + // swallow the first *, add the recursive path segment and // the remaining part will be treat as wild card in next loop. segment = new RecursiveWildcardSegment(); endSegment = beginSegment; @@ -269,4 +269,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing.Internal.Pat } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Matcher.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Matcher.cs index 1b93f480a..b08855011 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Matcher.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/Matcher.cs @@ -45,4 +45,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing return context.Execute(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/MatcherExtensions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/MatcherExtensions.cs index be4cfba4c..e2aa7fb68 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/MatcherExtensions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/MatcherExtensions.cs @@ -41,4 +41,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing return result; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/PatternMatchingResult.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/PatternMatchingResult.cs index 1cc933c01..3e2a10fa4 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/PatternMatchingResult.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/FileSystemGlobbing/PatternMatchingResult.cs @@ -14,4 +14,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.FileSystemGlobbing public IEnumerable Files { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Files/PackIncludeEntry.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Files/PackIncludeEntry.cs index 40bc57f1b..260891bcf 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Files/PackIncludeEntry.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Files/PackIncludeEntry.cs @@ -46,4 +46,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Files return new string[0]; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/ExportFile.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/ExportFile.cs index 92f586592..eae343aa8 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/ExportFile.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/ExportFile.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// 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.Linq; using NuGet.ProjectModel; @@ -20,4 +23,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Graph Exports = exports.Any() ? exports : new List(0); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/LockFileExtensions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/LockFileExtensions.cs index 0a6d879f3..f45ff7e94 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/LockFileExtensions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/LockFileExtensions.cs @@ -1,3 +1,6 @@ +// 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 NuGet.ProjectModel; @@ -70,4 +73,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Graph return true; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/ProjectLibraryDependency.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/ProjectLibraryDependency.cs index 5b2c015d5..cc9fb10fc 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/ProjectLibraryDependency.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Graph/ProjectLibraryDependency.cs @@ -1,3 +1,6 @@ +// 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 NuGet.LibraryModel; namespace Microsoft.DotNet.Internal.ProjectModel @@ -17,4 +20,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel LibraryRange = libraryRange; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/IProjectReader.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/IProjectReader.cs index a9e8c61a2..b46bf0ce8 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/IProjectReader.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/IProjectReader.cs @@ -7,4 +7,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel { Project ReadProject(string projectPath, ProjectReaderSettings settings = null); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/OutputPathsCalculator.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/OutputPathsCalculator.cs index d3269f61e..dac398927 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/OutputPathsCalculator.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/OutputPathsCalculator.cs @@ -74,4 +74,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel return new OutputPaths(intermediateOutputPath, compilationOutputPath, runtimeOutputPath, compilationFiles, runtimeFiles); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/PackOptions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/PackOptions.cs index cd5677bb9..0172c5fd0 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/PackOptions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/PackOptions.cs @@ -29,4 +29,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel public IncludeContext PackInclude { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectContextIdentity.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectContextIdentity.cs index 4278a9aca..fbd95238f 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectContextIdentity.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectContextIdentity.cs @@ -36,4 +36,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel return combiner.CombinedHash; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectFileDependencyGroup.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectFileDependencyGroup.cs index eea721847..a82db9434 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectFileDependencyGroup.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectFileDependencyGroup.cs @@ -18,4 +18,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel public IEnumerable Dependencies { get; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectModelPlatformExtensions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectModelPlatformExtensions.cs index b7c826b31..d1aa74050 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectModelPlatformExtensions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectModelPlatformExtensions.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// 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.Linq; using Microsoft.DotNet.Internal.ProjectModel.Compilation; using NuGet.LibraryModel; diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectReaderSettings.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectReaderSettings.cs index 101a4b390..ae2016674 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectReaderSettings.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ProjectReaderSettings.cs @@ -1,4 +1,7 @@ -using System; +// 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 Microsoft.DotNet.Internal.ProjectModel { diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/FrameworkInformation.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/FrameworkInformation.cs index 4638b9674..3e44a3430 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/FrameworkInformation.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resolution/FrameworkInformation.cs @@ -49,4 +49,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Resolution public string Path { get; set; } public Version Version { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ResourceFile.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ResourceFile.cs index 679595df3..1605cde4f 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ResourceFile.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/ResourceFile.cs @@ -1,4 +1,7 @@ -using System; +// 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; diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resources/CultureInfoCache.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resources/CultureInfoCache.cs index b414e9028..7cc2db9e1 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resources/CultureInfoCache.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resources/CultureInfoCache.cs @@ -1,3 +1,6 @@ +// 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; @@ -436,4 +439,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Resources "zh-CHT" }; } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resources/ResourceUtility.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resources/ResourceUtility.cs index 436007fba..b3f7eb16c 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resources/ResourceUtility.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Resources/ResourceUtility.cs @@ -76,4 +76,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Resources return string.Empty; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeConfig/RuntimeConfig.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeConfig/RuntimeConfig.cs index 7c7e20102..0fa019796 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeConfig/RuntimeConfig.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeConfig/RuntimeConfig.cs @@ -57,4 +57,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel return RuntimeConfigFramework.ParseFromFrameworkRoot(framework); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeConfig/RuntimeConfigFramework.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeConfig/RuntimeConfigFramework.cs index ca1d4a396..2c94490b0 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeConfig/RuntimeConfigFramework.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeConfig/RuntimeConfigFramework.cs @@ -33,4 +33,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel }; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeGraphCollector.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeGraphCollector.cs index f1b5c7dbd..4e92196c5 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeGraphCollector.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeGraphCollector.cs @@ -31,4 +31,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel return graph; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeOptions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeOptions.cs index 2c9fac1dd..a03d22ca8 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeOptions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/RuntimeOptions.cs @@ -9,4 +9,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel public bool GcConcurrent { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/CollectionExtensions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/CollectionExtensions.cs index 1344ab101..b9d37016a 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/CollectionExtensions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/CollectionExtensions.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Internal.ProjectModel.Compilation; +// 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.DotNet.Internal.ProjectModel.Compilation; using System.Linq; namespace System.Collections.Generic diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/PathUtility.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/PathUtility.cs index 90f2bab76..73257f35c 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/PathUtility.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/PathUtility.cs @@ -57,7 +57,7 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Utilities EnsureDirectoryExists(directory); } - + public static void EnsureDirectoryExists(string directoryPath) { if (!Directory.Exists(directoryPath)) @@ -213,4 +213,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Utilities } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/ResilientFileStreamOpener.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/ResilientFileStreamOpener.cs index e2f4e29d0..ab31cbaa5 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/ResilientFileStreamOpener.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/ResilientFileStreamOpener.cs @@ -42,4 +42,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Utilities } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/VersionUtility.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/VersionUtility.cs index 90a721e38..cfc75f6a6 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/VersionUtility.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.Internal.ProjectModel/Utilities/VersionUtility.cs @@ -120,4 +120,4 @@ namespace Microsoft.DotNet.Internal.ProjectModel.Utilities return sb.ToString(); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj index e9f009b92..3c0c013f2 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj @@ -9,21 +9,21 @@ true true + PreserveNewest + + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/MigrationError.cs b/src/Microsoft.DotNet.ProjectJsonMigration/MigrationError.cs index 868292fc7..b79bcea32 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/MigrationError.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/MigrationError.cs @@ -28,4 +28,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration return $"{ErrorCode}::{GeneralErrorReason}: {Message}"; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/MigrationErrorCodes.cs b/src/Microsoft.DotNet.ProjectJsonMigration/MigrationErrorCodes.cs index 1d5818b5d..9fd5a3f51 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/MigrationErrorCodes.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/MigrationErrorCodes.cs @@ -47,4 +47,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration public static Func MIGRATE20018 => (message) => new MigrationError(nameof(MIGRATE20018), LocalizableStrings.MIGRATE20018, message); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/MigrationException.cs b/src/Microsoft.DotNet.ProjectJsonMigration/MigrationException.cs index 08047e66e..31652bc43 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/MigrationException.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/MigrationException.cs @@ -5,12 +5,12 @@ using System; namespace Microsoft.DotNet.ProjectJsonMigration { - internal class MigrationException : Exception - { + internal class MigrationException : Exception + { public MigrationError Error { get; } - public MigrationException(MigrationError error, string message) : base(message) - { + public MigrationException(MigrationError error, string message) : base(message) + { Error = error; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/MigrationTrace.cs b/src/Microsoft.DotNet.ProjectJsonMigration/MigrationTrace.cs index ab2029f24..46eff9e46 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/MigrationTrace.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/MigrationTrace.cs @@ -46,4 +46,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Models/DefaultProjectItemInfo.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Models/DefaultProjectItemInfo.cs index 5cbd37153..657edd357 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Models/DefaultProjectItemInfo.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Models/DefaultProjectItemInfo.cs @@ -14,4 +14,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Models public string Condition {get; set;} public string ParentCondition {get; set;} } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Models/DefaultProjectPropertyInfo.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Models/DefaultProjectPropertyInfo.cs index cb4097e79..e93482913 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Models/DefaultProjectPropertyInfo.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Models/DefaultProjectPropertyInfo.cs @@ -14,4 +14,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Models } } - \ No newline at end of file + diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Models/SerializableMigrationDefaultsInfo.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Models/SerializableMigrationDefaultsInfo.cs index 25dc7b08d..2b0770d25 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Models/SerializableMigrationDefaultsInfo.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Models/SerializableMigrationDefaultsInfo.cs @@ -10,4 +10,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Models public IEnumerable Items { get; set; } public IEnumerable Properties { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectExtensions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectExtensions.cs index 9bca917b0..f7db81b49 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectExtensions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectExtensions.cs @@ -68,4 +68,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration return dependencies.Any(pred); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectType.cs b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectType.cs index 93349d576..e42cee05b 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/ProjectType.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/ProjectType.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.DotNet.ProjectJsonMigration { internal enum ProjectType @@ -7,4 +10,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration Test, Web } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateAssemblyInfoRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateAssemblyInfoRule.cs index 4b6d3ec9e..46f51cb5e 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateAssemblyInfoRule.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateAssemblyInfoRule.cs @@ -167,4 +167,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackOptionsRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackOptionsRule.cs index 570e8e648..d98e6e5e1 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackOptionsRule.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigratePackOptionsRule.cs @@ -17,42 +17,42 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules internal class MigratePackOptionsRule : IMigrationRule { private AddPropertyTransform TagsTransform => new AddPropertyTransform( - "PackageTags", + "PackageTags", packOptions => string.Join(";", packOptions.Tags), packOptions => packOptions.Tags != null && packOptions.Tags.Any()); private AddPropertyTransform ReleaseNotesTransform => new AddPropertyTransform( - "PackageReleaseNotes", + "PackageReleaseNotes", packOptions => packOptions.ReleaseNotes, packOptions => !string.IsNullOrEmpty(packOptions.ReleaseNotes)); private AddPropertyTransform IconUrlTransform => new AddPropertyTransform( - "PackageIconUrl", + "PackageIconUrl", packOptions => packOptions.IconUrl, packOptions => !string.IsNullOrEmpty(packOptions.IconUrl)); private AddPropertyTransform ProjectUrlTransform => new AddPropertyTransform( - "PackageProjectUrl", + "PackageProjectUrl", packOptions => packOptions.ProjectUrl, packOptions => !string.IsNullOrEmpty(packOptions.ProjectUrl)); private AddPropertyTransform LicenseUrlTransform => new AddPropertyTransform( - "PackageLicenseUrl", + "PackageLicenseUrl", packOptions => packOptions.LicenseUrl, packOptions => !string.IsNullOrEmpty(packOptions.LicenseUrl)); private AddPropertyTransform RequireLicenseAcceptanceTransform => new AddPropertyTransform( - "PackageRequireLicenseAcceptance", + "PackageRequireLicenseAcceptance", packOptions => packOptions.RequireLicenseAcceptance.ToString().ToLower(), packOptions => true); private AddPropertyTransform RepositoryTypeTransform => new AddPropertyTransform( - "RepositoryType", + "RepositoryType", packOptions => packOptions.RepositoryType, packOptions => !string.IsNullOrEmpty(packOptions.RepositoryType)); private AddPropertyTransform RepositoryUrlTransform => new AddPropertyTransform( - "RepositoryUrl", + "RepositoryUrl", packOptions => packOptions.RepositoryUrl, packOptions => !string.IsNullOrEmpty(packOptions.RepositoryUrl)); @@ -145,4 +145,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Rules return normalizedTargetPath[normalizedTargetPath.Length - 1] == Path.DirectorySeparatorChar; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs b/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs index 511763603..1ea5aa239 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/SupportedPackageVersions.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration { get { - return !string.IsNullOrEmpty(Name) && + return !string.IsNullOrEmpty(Name) && (Name.Equals("Microsoft.NETCore.App", StringComparison.OrdinalIgnoreCase) || Name.Equals("NETStandard.Library", StringComparison.OrdinalIgnoreCase)); } @@ -287,4 +287,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration .AddDotnetSupportedPackageVersions(ProjectDependencyPackages); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/UpdateContextTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/UpdateContextTransform.cs index 4e3080f52..7418274fc 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/UpdateContextTransform.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/UpdateContextTransform.cs @@ -60,4 +60,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Transforms { } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransform.cs index 23e82b8f7..df8eaf24b 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransform.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransform.cs @@ -7,4 +7,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Transforms { U Transform(T source); } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransformApplicator.cs b/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransformApplicator.cs index 6b1bb5f52..f1af39fad 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransformApplicator.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransformApplicator.cs @@ -18,4 +18,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Transforms U destinationElement, bool mergeExisting) where T : ProjectElement where U : ProjectElementContainer; } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj index df14f600d..b4021bad7 100644 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj +++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj @@ -9,20 +9,17 @@ true true - + + - - 4.0.1 - + + - - $(DefineConstants);RELEASE - \ No newline at end of file diff --git a/src/Microsoft.DotNet.TestFramework/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.TestFramework/Properties/AssemblyInfo.cs index bd44bced5..110018e7f 100644 --- a/src/Microsoft.DotNet.TestFramework/Properties/AssemblyInfo.cs +++ b/src/Microsoft.DotNet.TestFramework/Properties/AssemblyInfo.cs @@ -1,3 +1,6 @@ +// 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; [assembly: AssemblyMetadataAttribute("Serviceable", "True")] diff --git a/src/dotnet-archive/dotnet-archive.csproj b/src/dotnet-archive/dotnet-archive.csproj index baf11b332..a983cefce 100644 --- a/src/dotnet-archive/dotnet-archive.csproj +++ b/src/dotnet-archive/dotnet-archive.csproj @@ -1,16 +1,19 @@  - + $(CliTargetFramework) Exe + + + diff --git a/src/dotnet/CommandCreationException.cs b/src/dotnet/CommandCreationException.cs index 2e437dfbb..837b86ec0 100644 --- a/src/dotnet/CommandCreationException.cs +++ b/src/dotnet/CommandCreationException.cs @@ -1,4 +1,7 @@ -using System; +// 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.Text; diff --git a/src/dotnet/CommandLine/CommandOption.cs b/src/dotnet/CommandLine/CommandOption.cs index f7de40e48..caed0bd77 100644 --- a/src/dotnet/CommandLine/CommandOption.cs +++ b/src/dotnet/CommandLine/CommandOption.cs @@ -44,7 +44,7 @@ namespace Microsoft.DotNet.Cli.CommandLine ValueName = part.Substring(1, part.Length - 5); } else - { + { throw new ArgumentException(String.Format(LocalizableStrings.InvalidTemplateError, nameof(template))); } } @@ -132,4 +132,4 @@ namespace Microsoft.DotNet.Cli.CommandLine return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); } } -} \ No newline at end of file +} diff --git a/src/dotnet/CommandLine/LocalizableStrings.cs b/src/dotnet/CommandLine/LocalizableStrings.cs index de0570b96..ff01edf1b 100644 --- a/src/dotnet/CommandLine/LocalizableStrings.cs +++ b/src/dotnet/CommandLine/LocalizableStrings.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.DotNet.Cli.CommandLine { internal class LocalizableStrings @@ -44,4 +47,4 @@ namespace Microsoft.DotNet.Cli.CommandLine public const string MSBuildAdditionalArgsHelpText = "Any extra options that should be passed to MSBuild. See 'dotnet msbuild -h' for available options."; } -} \ No newline at end of file +} diff --git a/src/dotnet/MsbuildProject.cs b/src/dotnet/MsbuildProject.cs index bceeb144d..1f5811cd2 100644 --- a/src/dotnet/MsbuildProject.cs +++ b/src/dotnet/MsbuildProject.cs @@ -268,4 +268,4 @@ namespace Microsoft.DotNet.Tools } } } -} \ No newline at end of file +} diff --git a/src/dotnet/ProcessStartInfoExtensions.cs b/src/dotnet/ProcessStartInfoExtensions.cs index 721e0ec55..cb8e0de83 100644 --- a/src/dotnet/ProcessStartInfoExtensions.cs +++ b/src/dotnet/ProcessStartInfoExtensions.cs @@ -1,4 +1,7 @@ -using System; +// 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 Microsoft.DotNet.Cli diff --git a/src/dotnet/ProjectGlobbingResolver.cs b/src/dotnet/ProjectGlobbingResolver.cs index 2a3054489..28591b9de 100644 --- a/src/dotnet/ProjectGlobbingResolver.cs +++ b/src/dotnet/ProjectGlobbingResolver.cs @@ -67,4 +67,4 @@ namespace Microsoft.DotNet.Tools.Compiler } } } -} \ No newline at end of file +} diff --git a/src/dotnet/Properties/AssemblyInfo.cs b/src/dotnet/Properties/AssemblyInfo.cs index 1684d65c1..17e7262e4 100644 --- a/src/dotnet/Properties/AssemblyInfo.cs +++ b/src/dotnet/Properties/AssemblyInfo.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/src/dotnet/commands/dotnet-add/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/LocalizableStrings.cs index 2e6868f4b..cca914239 100644 --- a/src/dotnet/commands/dotnet-add/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-add/LocalizableStrings.cs @@ -7,4 +7,4 @@ namespace Microsoft.DotNet.Tools.Add { public const string NetAddCommand = ".NET Add Command"; } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-add/Program.cs b/src/dotnet/commands/dotnet-add/Program.cs index 6ed977a98..09de6a9f9 100644 --- a/src/dotnet/commands/dotnet-add/Program.cs +++ b/src/dotnet/commands/dotnet-add/Program.cs @@ -29,4 +29,4 @@ namespace Microsoft.DotNet.Tools.Add return command.RunCommand(args); } } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs index 5c5bf6287..6713d6c64 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs @@ -35,4 +35,4 @@ namespace Microsoft.DotNet.Tools.Add.PackageReference public const string CmdPackageDirectory = "PACKAGE_DIRECTORY"; } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs index 2336df766..c5a1fa054 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs @@ -178,4 +178,4 @@ namespace Microsoft.DotNet.Tools.Add.PackageReference return args.ToArray(); } } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs index d35d5f75e..d1f1537e5 100644 --- a/src/dotnet/commands/dotnet-build/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-build/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Tools.Build +// 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 Microsoft.DotNet.Tools.Build { internal class LocalizableStrings { diff --git a/src/dotnet/commands/dotnet-cache/LocalizableStrings.cs b/src/dotnet/commands/dotnet-cache/LocalizableStrings.cs index 1d0e50970..677ae5618 100644 --- a/src/dotnet/commands/dotnet-cache/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-cache/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Tools.Cache +// 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 Microsoft.DotNet.Tools.Cache { internal class LocalizableStrings { @@ -21,7 +24,7 @@ public const string OutputOption = "OUTPUT_DIR"; public const string OutputOptionDescription = "Output directory in which to cache the given assemblies."; - + public const string FrameworkVersionOption = "FrameworkVersion"; public const string FrameworkVersionOptionDescription = "The Microsoft.NETCore.App package version that will be used to run the assemblies."; diff --git a/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs b/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs index 9ca0883ff..0d5a95f84 100644 --- a/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-clean/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Tools.Clean +// 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 Microsoft.DotNet.Tools.Clean { internal class LocalizableStrings { diff --git a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs b/src/dotnet/commands/dotnet-help/LocalizableStrings.cs index d6ba17f6e..04a938ac8 100644 --- a/src/dotnet/commands/dotnet-help/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-help/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Tools.Help +// 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 Microsoft.DotNet.Tools.Help { internal class LocalizableStrings { diff --git a/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs b/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs index f424fe939..08ad32f28 100644 --- a/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-migrate/LocalizableStrings.cs @@ -1,3 +1,6 @@ +// 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 Microsoft.DotNet.Tools.Migrate { internal class LocalizableStrings @@ -7,7 +10,7 @@ namespace Microsoft.DotNet.Tools.Migrate public const string AppDescription = "Command used to migrate project.json projects to msbuild"; public const string CmdProjectArgument = "PROJECT_JSON/GLOBAL_JSON/SOLUTION_FILE/PROJECT_DIR"; - public const string CmdProjectArgumentDescription = + public const string CmdProjectArgumentDescription = @"The path to one of the following: - a project.json file to migrate. - a global.json file, it will migrate the folders specified in global.json. diff --git a/src/dotnet/commands/dotnet-migrate/ProjectRootElementExtensions.cs b/src/dotnet/commands/dotnet-migrate/ProjectRootElementExtensions.cs index bf8f2b0a6..9c5ccf8f7 100644 --- a/src/dotnet/commands/dotnet-migrate/ProjectRootElementExtensions.cs +++ b/src/dotnet/commands/dotnet-migrate/ProjectRootElementExtensions.cs @@ -1,3 +1,6 @@ +// 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.Linq; using Microsoft.Build.Construction; using Microsoft.DotNet.ProjectJsonMigration; @@ -15,4 +18,4 @@ namespace Microsoft.DotNet.Tools.Migrate .GetMetadataWithName("version").Value; } } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-migrate/TemporaryDotnetNewTemplateProject.cs b/src/dotnet/commands/dotnet-migrate/TemporaryDotnetNewTemplateProject.cs index 41a008e1d..b1a82e5b5 100644 --- a/src/dotnet/commands/dotnet-migrate/TemporaryDotnetNewTemplateProject.cs +++ b/src/dotnet/commands/dotnet-migrate/TemporaryDotnetNewTemplateProject.cs @@ -1,4 +1,7 @@ -using Microsoft.Build.Construction; +// 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.Cli; using System; using System.Collections.Generic; diff --git a/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.cs b/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.cs index 8059f37ef..dae4177ba 100644 --- a/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-msbuild/LocalizableStrings.cs @@ -1,7 +1,10 @@ +// 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 Microsoft.DotNet.Tools.MSBuild { internal class LocalizableStrings { public const string VerbosityOptionDescription = "Set the verbosity level of the command. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"; } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-msbuild/MSBuildLogger.cs b/src/dotnet/commands/dotnet-msbuild/MSBuildLogger.cs index 9a7803e1e..88d64a832 100644 --- a/src/dotnet/commands/dotnet-msbuild/MSBuildLogger.cs +++ b/src/dotnet/commands/dotnet-msbuild/MSBuildLogger.cs @@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tools.MSBuild { try { - string sessionId = + string sessionId = Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName); if (sessionId != null) @@ -71,4 +71,4 @@ namespace Microsoft.DotNet.Tools.MSBuild base.Shutdown(); } } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs b/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs index b315e70c4..542fc129b 100644 --- a/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-pack/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Tools.Pack +// 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 Microsoft.DotNet.Tools.Pack { internal class LocalizableStrings { diff --git a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs index c62500216..6b47683bb 100644 --- a/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-publish/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Tools.Publish +// 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 Microsoft.DotNet.Tools.Publish { internal class LocalizableStrings { diff --git a/src/dotnet/commands/dotnet-remove/LocalizableStrings.cs b/src/dotnet/commands/dotnet-remove/LocalizableStrings.cs index 424151bb0..5f88aa844 100644 --- a/src/dotnet/commands/dotnet-remove/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-remove/LocalizableStrings.cs @@ -7,4 +7,4 @@ namespace Microsoft.DotNet.Tools.Remove { public const string NetRemoveCommand = ".NET Remove Command"; } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.cs b/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.cs index bde80c6ea..55186bf11 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-package/LocalizableStrings.cs @@ -14,4 +14,4 @@ namespace Microsoft.DotNet.Tools.Remove.PackageReference public const string SpecifyExactlyOnePackageReference = "Please specify only one package reference to remove."; } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-package/Program.cs b/src/dotnet/commands/dotnet-remove/dotnet-remove-package/Program.cs index b63b058e2..85af67e76 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-package/Program.cs +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-package/Program.cs @@ -73,4 +73,4 @@ namespace Microsoft.DotNet.Tools.Remove.PackageReference }; } } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-restore-projectjson/NuGet3.cs b/src/dotnet/commands/dotnet-restore-projectjson/NuGet3.cs index 4da814e55..61bacc5fd 100644 --- a/src/dotnet/commands/dotnet-restore-projectjson/NuGet3.cs +++ b/src/dotnet/commands/dotnet-restore-projectjson/NuGet3.cs @@ -1,3 +1,6 @@ +// 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; diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs index ac3d8b115..bf364d895 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Tools.Restore +// 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 Microsoft.DotNet.Tools.Restore { internal class LocalizableStrings { diff --git a/src/dotnet/commands/dotnet-run/LocalizableStrings.cs b/src/dotnet/commands/dotnet-run/LocalizableStrings.cs index c05a1b6fc..6ecf87779 100644 --- a/src/dotnet/commands/dotnet-run/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-run/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Tools.Run +// 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 Microsoft.DotNet.Tools.Run { internal class LocalizableStrings { @@ -34,4 +37,4 @@ public const string RunCommandAdditionalArgsHelpText = "Arguments passed to the application that is being run."; } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-sln/Program.cs b/src/dotnet/commands/dotnet-sln/Program.cs index a1e81ad80..11e1abe65 100644 --- a/src/dotnet/commands/dotnet-sln/Program.cs +++ b/src/dotnet/commands/dotnet-sln/Program.cs @@ -31,4 +31,4 @@ namespace Microsoft.DotNet.Tools.Sln return command.RunCommand(args); } } -} \ No newline at end of file +} diff --git a/src/dotnet/commands/dotnet-test/LocalizableStrings.cs b/src/dotnet/commands/dotnet-test/LocalizableStrings.cs index 418bb31f0..def80ab0a 100644 --- a/src/dotnet/commands/dotnet-test/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-test/LocalizableStrings.cs @@ -1,4 +1,7 @@ -namespace Microsoft.DotNet.Tools.Test +// 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 Microsoft.DotNet.Tools.Test { internal class LocalizableStrings { @@ -31,7 +34,7 @@ public const string CmdLoggerOption = "LoggerUri/FriendlyName"; - public const string CmdLoggerDescription = @"Specify a logger for test results. + public const string CmdLoggerDescription = @"Specify a logger for test results. Example: --logger ""trx[;LogFileName=]"""; public const string CmdConfiguration = "CONFIGURATION"; diff --git a/src/dotnet/commands/dotnet-vstest/Program.cs b/src/dotnet/commands/dotnet-vstest/Program.cs index 8cc29074f..6ebd5440f 100644 --- a/src/dotnet/commands/dotnet-vstest/Program.cs +++ b/src/dotnet/commands/dotnet-vstest/Program.cs @@ -14,4 +14,4 @@ namespace Microsoft.DotNet.Tools.VSTest return new VSTestForwardingApp(args).Execute(); } } -} \ No newline at end of file +} diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 92b1899fb..a855b26b8 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -28,40 +28,17 @@ - - 9.0.1 - - - 4.3.0 - - - 2.0.0 - - - $(CLI_SharedFrameworkVersion) - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - - - 4.3.0 - Analyzers;Build;ContentFiles;Native;Runtime - - - $(CLI_MSBuild_Version) - - - $(PlatformAbstractionsVersion) - + + + + + + + + + + + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 62ce1e4e5..ba18663e9 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -1,12 +1,13 @@  - + $(CliVersionPrefix) $(CliTargetFramework) false false + diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index 19ff7b73e..5a4e4121f 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -7,6 +7,7 @@ false false + diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.cs b/test/ArgumentForwardingTests/ArgumentForwardingTests.cs index d9cc2c6c0..2d889e043 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.cs +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.cs @@ -268,4 +268,4 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding return ParseReflectorOutput(stdOut); } } -} \ No newline at end of file +} diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj index 5d64b79f3..4b73c9e78 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj @@ -12,36 +12,18 @@ - - true - - - true - - - - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - - - $(PlatformAbstractionsVersion) - + + + + - + diff --git a/test/ArgumentsReflector/Reflector.cs b/test/ArgumentsReflector/Reflector.cs index 4176ebb0d..32523bfce 100644 --- a/test/ArgumentsReflector/Reflector.cs +++ b/test/ArgumentsReflector/Reflector.cs @@ -24,4 +24,4 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding } } } -} \ No newline at end of file +} diff --git a/test/EndToEnd/EndToEnd.csproj b/test/EndToEnd/EndToEnd.csproj index d7689c82e..d2207d758 100644 --- a/test/EndToEnd/EndToEnd.csproj +++ b/test/EndToEnd/EndToEnd.csproj @@ -19,29 +19,13 @@ - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - - - 1.0.0-prerelease-00206 - - - $(PlatformAbstractionsVersion) - + + + + + diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/InstallFixture.cs b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/InstallFixture.cs index d42441477..e8153080c 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/InstallFixture.cs +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/InstallFixture.cs @@ -1,4 +1,7 @@ -using System; +// 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 Xunit; namespace Dotnet.Cli.Msi.Tests diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/InstallationTests.cs b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/InstallationTests.cs index 8bbff333b..57333b901 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/InstallationTests.cs +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/InstallationTests.cs @@ -1,4 +1,7 @@ -using System; +// 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.IO; using Xunit; diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj index b24cec34e..e576ed679 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj @@ -16,18 +16,10 @@ - - 1.6.0 - - - 2.2.0-beta4-build3444 - - - 2.1.0 - - - 1.0.0 - + + + + diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/MsiManager.cs b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/MsiManager.cs index 9aeedc6ad..15ae4b707 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/MsiManager.cs +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/MsiManager.cs @@ -1,4 +1,7 @@ -using System; +// 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 System.IO; using System.Linq; diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/PostInstallTests.cs b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/PostInstallTests.cs index f637973e5..604653b68 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/PostInstallTests.cs +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/PostInstallTests.cs @@ -1,4 +1,7 @@ -using Microsoft.Win32; +// 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.Win32; using Xunit; namespace Dotnet.Cli.Msi.Tests diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/PostUninstallTests.cs b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/PostUninstallTests.cs index 0b71f5129..2c5957f1e 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/PostUninstallTests.cs +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/PostUninstallTests.cs @@ -1,4 +1,7 @@ -using Microsoft.Win32; +// 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.Win32; using Xunit; namespace Dotnet.Cli.Msi.Tests diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Properties/AssemblyInfo.cs b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Properties/AssemblyInfo.cs index 28844fb0a..801ed17c2 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Properties/AssemblyInfo.cs +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Properties/AssemblyInfo.cs @@ -1,8 +1,11 @@ -using System.Reflection; +// 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 +// 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: AssemblyTitle("Microsoft.DotNet.Cli.Msi.Tests")] @@ -14,8 +17,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// 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 +// 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)] @@ -25,11 +28,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Utils.cs b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Utils.cs index 82085fb4f..8a11be0ef 100644 --- a/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Utils.cs +++ b/test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Utils.cs @@ -1,4 +1,7 @@ -using System.IO; +// 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.IO; using System.Linq; using Microsoft.Win32; @@ -16,7 +19,7 @@ namespace Dotnet.Cli.Msi.Tests internal static string GetCurrentPathEnvironmentVariable() { - var hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32); + var hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32); var regKey = hklm.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\Session Manager\Environment", false); return (string)regKey.GetValue("Path"); diff --git a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj index ee13293c5..562e754f8 100644 --- a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj @@ -21,17 +21,9 @@ - - $(CLI_TestPlatform_Version) - - - 2.2.0-beta4-build3444 - - - 2.2.0-beta4-build1194 - - - 4.18.0 - + + + + \ No newline at end of file diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenThatWeWantToReadLockFilesQuickly.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenThatWeWantToReadLockFilesQuickly.cs index 410e8c9b2..156cb3d98 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenThatWeWantToReadLockFilesQuickly.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenThatWeWantToReadLockFilesQuickly.cs @@ -46,4 +46,4 @@ namespace Microsoft.DotNet.Cli.Utils.Tests stopWatch.ElapsedMilliseconds.Should().BeLessThan(1000); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 6565df694..3995076df 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -1,6 +1,6 @@  - + $(CliTargetFramework) $(CLI_SharedFrameworkVersion) @@ -27,44 +27,18 @@ - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - $(CLI_NuGet_Version) - - - $(CLI_NuGet_Version) - - - $(CLI_NuGet_Version) - - - $(CLI_NuGet_Version) - - - 4.4.0-beta8 - - - 2.2.0-beta4-build3444 - - - $(PlatformAbstractionsVersion) - - - $(CLI_MSBuild_Version) - + + + + + + + + + + diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj index 34cb13f3a..5cffd690d 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj +++ b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj @@ -16,32 +16,13 @@ - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 4.18.0 - - - 4.4.0-beta8 - - - 2.2.0-beta4-build3444 - + + + + + diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/GivenAProjectMigrator.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/GivenAProjectMigrator.cs index 368e9600b..f61bebe43 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/GivenAProjectMigrator.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/GivenAProjectMigrator.cs @@ -1,4 +1,7 @@ -using System; +// 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; @@ -113,7 +116,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests public void ItHasErrorWhenMigratingAProjectJsonWithoutAFrameworks() { var testInstance = TestAssets.Get( - "NonRestoredTestProjects", + "NonRestoredTestProjects", "TestLibraryWithProjectFileWithoutFrameworks") .CreateInstance() .WithSourceFiles(); @@ -151,4 +154,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/GivenMSBuildExtensions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/GivenMSBuildExtensions.cs index 2abb716a1..70ed3f562 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/GivenMSBuildExtensions.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/GivenMSBuildExtensions.cs @@ -1,4 +1,7 @@ -using System.Linq; +// 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.Linq; using FluentAssertions; using Microsoft.Build.Construction; using Xunit; @@ -260,4 +263,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests item2.Metadata.First().Value.Should().Be("value"); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj index 09db009b0..b6989809a 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj @@ -23,29 +23,13 @@ - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - - - 4.18.0 - - - 4.4.0-beta8 - + + + + + diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/ProjectJsonBuilder.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/ProjectJsonBuilder.cs index c720a6416..ccf82f40a 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/ProjectJsonBuilder.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/ProjectJsonBuilder.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.TestFramework; +// 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.DotNet.TestFramework; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -17,7 +20,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests private JObject _projectJson; private bool _baseDefined = false; - + public ProjectJsonBuilder(TestAssets testAssets) { _testAssets = testAssets; @@ -58,7 +61,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests } public ProjectJsonBuilder FromEmptyBase() - { + { SetBase(new JObject()); return this; } diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToCleanTheOutputProject.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToCleanTheOutputProject.cs index a5ee4c588..58dcde99c 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToCleanTheOutputProject.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToCleanTheOutputProject.cs @@ -35,4 +35,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests mockProj.Targets.Should().HaveCount(c => c == 1); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateAssemblyInfo.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateAssemblyInfo.cs index 59df20f0b..61ebd00b0 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateAssemblyInfo.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateAssemblyInfo.cs @@ -127,4 +127,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests generateAssemblyAttributes.First().Value.Should().Be("false"); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs index cdf24ddaa..d888ea3fd 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateBuildOptions.cs @@ -1,4 +1,7 @@ -using Microsoft.Build.Construction; +// 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.ProjectJsonMigration; using Microsoft.DotNet.Internal.ProjectModel; using Microsoft.DotNet.Tools.Test.Utilities; @@ -34,7 +37,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests mockProj.Items.Count(i => i.ItemType.Equals("Compile", StringComparison.Ordinal)) .Should().Be(1); - mockProj.Items.Count(i => + mockProj.Items.Count(i => i.ItemType.Equals("Compile", StringComparison.Ordinal) && i.Remove.Equals("node_modules")) .Should().Be(1); @@ -460,7 +463,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests private void MigratingGroupIncludeExcludePopulatesAppropriateProjectItemElement( string group, string itemName, - int expectedNumberOfCompileItems, + int expectedNumberOfCompileItems, string expectedRootFiles) { var testDirectory = Temp.CreateDirectory().Path; diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs index 4c5f5ca7f..21db22530 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs @@ -1,4 +1,7 @@ -using System; +// 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; @@ -185,7 +188,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests // 2 for Configuration BuildOptions (1 Remove, 1 Include) contentItems.Where(i => i.ConditionChain().Count() == 1).Should().HaveCount(2); - + var configIncludeContentItem = contentItems.First( item => item.ConditionChain().Count() > 0 && !string.IsNullOrEmpty(item.Include)); var configRemoveContentItem = contentItems.First( @@ -235,11 +238,11 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests contentItems.Where(i => i.ConditionChain().Count() == 1).Should().HaveCount(3); var configIncludeContentItem = contentItems.First( - item => item.ConditionChain().Count() > 0 + item => item.ConditionChain().Count() > 0 && item.Include.Contains("root")); var configIncludeContentItem2 = contentItems.First( - item => item.ConditionChain().Count() > 0 + item => item.ConditionChain().Count() > 0 && item.Include.Contains(@"src\file1.cs")); var configRemoveContentItem = contentItems.First( @@ -346,7 +349,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var configIncludeContentItem = contentItems.First( item => item.ConditionChain().Count() > 0 && item.Include == "root"); - + var configIncludeContentItem2 = contentItems.First( item => item.ConditionChain().Count() > 0 && item.Include == "src"); @@ -380,7 +383,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests configIncludeContentItem3.GetMetadataWithName("CopyToOutputDirectory").Should().NotBeNull(); configIncludeContentItem3.GetMetadataWithName("CopyToOutputDirectory").Value.Should().Be("PreserveNewest"); } - + [Fact] public void ConfigurationBuildOptionsWhichHaveMappingsOverlappingWithIncludesInRootBuildoptionsHasRemove() { @@ -413,7 +416,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var contentItems = mockProj.Items.Where(item => item.ItemType == "Content"); contentItems.Count().Should().Be(4); - + var rootBuildOptionsContentItems = contentItems.Where(i => i.ConditionChain().Count() == 0).ToList(); rootBuildOptionsContentItems.Count().Should().Be(2); foreach (var buildOptionContentItem in rootBuildOptionsContentItems) @@ -494,7 +497,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests item => item.ConditionChain().Count() > 0 && item.Include == "root"); configIncludeEncompassedItem.Should().BeNull(); - + var configIncludeContentItem = contentItems.First( item => item.ConditionChain().Count() > 0 && item.Include == "src"); @@ -534,7 +537,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests private ProjectRootElement RunConfigurationsAndBuildOptionsRuleOnPj(string s, string testDirectory = null) { return RunRulesOnPj( - s, + s, new IMigrationRule[] { new MigrateBuildOptionsRule(), diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateJsonProperties.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateJsonProperties.cs index b3f109132..3aeed10b8 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateJsonProperties.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateJsonProperties.cs @@ -26,7 +26,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { var mockProj = RunPropertiesRuleOnPj(@" { - ""userSecretsId"": ""XYZ"" + ""userSecretsId"": ""XYZ"" }"); mockProj.Properties.Count(p => p.Name == "UserSecretsId").Should().Be(1); @@ -38,7 +38,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { var mockProj = RunPropertiesRuleOnPj(@" { - ""userSecretsId"": """" + ""userSecretsId"": """" }"); mockProj.Properties.Count(p => p.Name == "UserSecretsId").Should().Be(0); @@ -53,4 +53,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests }, project, testDirectory); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackOptions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackOptions.cs index e88dd1816..513fa4c9c 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackOptions.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackOptions.cs @@ -21,10 +21,10 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""summary"": ""Some not important summary"" - } + } }"); - - EmitsOnlyAlwaysEmittedPackOptionsProperties(mockProj); + + EmitsOnlyAlwaysEmittedPackOptionsProperties(mockProj); } [Fact] @@ -34,7 +34,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""owner"": ""Some not important owner"" - } + } }"); EmitsOnlyAlwaysEmittedPackOptionsProperties(mockProj); @@ -47,7 +47,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""tags"": [] - } + } }"); mockProj.Properties.Count(p => p.Name == "PackageTags").Should().Be(0); @@ -60,7 +60,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""tags"": [""hyperscale"", ""cats""] - } + } }"); mockProj.Properties.Count(p => p.Name == "PackageTags").Should().Be(1); @@ -74,7 +74,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""releaseNotes"": ""Some release notes value."" - } + } }"); mockProj.Properties.Count(p => p.Name == "PackageReleaseNotes").Should().Be(1); @@ -89,7 +89,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""iconUrl"": ""http://www.mylibrary.gov/favicon.ico"" - } + } }"); mockProj.Properties.Count(p => p.Name == "PackageIconUrl").Should().Be(1); @@ -104,7 +104,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""projectUrl"": ""http://www.url.to.library.com"" - } + } }"); mockProj.Properties.Count(p => p.Name == "PackageProjectUrl").Should().Be(1); @@ -119,7 +119,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""licenseUrl"": ""http://www.url.to.library.com/licence"" - } + } }"); mockProj.Properties.Count(p => p.Name == "PackageLicenseUrl").Should().Be(1); @@ -134,7 +134,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""requireLicenseAcceptance"": ""true"" - } + } }"); mockProj.Properties.Count(p => p.Name == "PackageRequireLicenseAcceptance").Should().Be(1); @@ -148,7 +148,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { ""packOptions"": { ""requireLicenseAcceptance"": ""false"" - } + } }"); mockProj.Properties.Count(p => p.Name == "PackageRequireLicenseAcceptance").Should().Be(1); @@ -164,7 +164,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests ""repository"": { ""type"": ""git"" } - } + } }"); mockProj.Properties.Count(p => p.Name == "RepositoryType").Should().Be(1); @@ -277,8 +277,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests }"); var expectedPackagePath = string.Join( - ";", - new [] { + ";", + new [] { Path.Combine("different", "path"), Path.Combine("other", "path") }); @@ -307,6 +307,6 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { project.Properties.Count().Should().Be(1); project.Properties.All(p => p.Name == "PackageRequireLicenseAcceptance").Should().BeTrue(); - } + } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs index 1bc10c03a..f243f096d 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackageDependencies.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [Fact] public void ItMigratesBasicPackageReference() { - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""dependencies"": { ""APackage"" : ""1.0.0-preview"", @@ -31,7 +31,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [Fact] public void ItMigratesTypeBuildToPrivateAssets() { - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""dependencies"": { ""APackage"" : { @@ -52,7 +52,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [Fact] public void ItMigratesSuppressParentArrayToPrivateAssets() { - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""dependencies"": { ""APackage"" : { @@ -71,7 +71,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [Fact] public void ItMigratesSuppressParentStringToPrivateAssets() { - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""dependencies"": { ""APackage"" : { @@ -90,7 +90,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [Fact] public void ItMigratesIncludeExcludeArraysToIncludeAssets() { - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""dependencies"": { ""APackage"" : { @@ -110,7 +110,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [Fact] public void ItMigratesIncludeStringToIncludeAssets() { - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""dependencies"": { ""APackage"" : { @@ -130,7 +130,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [Fact] public void ItMigratesIncludeExcludeOverlappingStringsToIncludeAssets() { - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""dependencies"": { ""APackage"" : { @@ -151,7 +151,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [Fact] public void ItMigratesTools() { - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""tools"": { ""APackage"" : ""1.0.0-preview"", @@ -167,7 +167,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { var importPropertyName = "PackageTargetFallback"; - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""frameworks"": { ""netcoreapp1.0"" : { @@ -179,7 +179,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests ""net451"" : { ""imports"": ""netstandard1.3"" } - } + } }"); var imports = mockProj.Properties.Where(p => p.Name == importPropertyName); @@ -205,7 +205,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { var importPropertyName = "PackageTargetFallback"; - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""frameworks"": { ""netcoreapp1.0"" : { @@ -223,7 +223,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests [Fact] public void ItAutoAddDesktopReferencesDuringMigrate() { - var mockProj = RunPackageDependenciesRuleOnPj(@" + var mockProj = RunPackageDependenciesRuleOnPj(@" { ""frameworks"": { ""net35"" : {}, @@ -518,4 +518,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests netStandardImplicitPackageVersion.Condition.Should().BeEmpty(); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSVersions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSVersions.cs index d2e17fe0b..00cf1407b 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSVersions.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePackagesToTheirLTSVersions.cs @@ -281,4 +281,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests .Which.Value.Should().Be(targetVersion); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs index 378c9dd03..0c1df382a 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs @@ -1,4 +1,7 @@ -using Microsoft.Build.Construction; +// 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.ProjectJsonMigration; using Microsoft.DotNet.Internal.ProjectModel; using Microsoft.DotNet.TestFramework; @@ -303,7 +306,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests public void ItMigratesUnqualifiedDependenciesAsProjectReferenceWhenAMatchingProjectIsFound() { var mockProj = MigrateProject("TestAppWithUnqualifiedDependencies", "ProjectA"); - var projectReferenceInclude = Path.Combine("..", "ProjectB", "ProjectB.csproj"); + var projectReferenceInclude = Path.Combine("..", "ProjectB", "ProjectB.csproj"); var projectReferences = mockProj.Items.Should().ContainSingle( item => item.ItemType == "ProjectReference" && item.Include == projectReferenceInclude); diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePublishOptions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePublishOptions.cs index 4c70e90c4..80b634b16 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePublishOptions.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigratePublishOptions.cs @@ -1,4 +1,7 @@ -using System; +// 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.IO; using System.Linq; using Microsoft.Build.Construction; @@ -250,4 +253,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests }, s, testDirectory); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateRootOptions.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateRootOptions.cs index 1ddf6dcfc..77dca900a 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateRootOptions.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateRootOptions.cs @@ -24,7 +24,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests mockProj.Properties.First(p => p.Name == "Authors").Value.Should().Be( "Some author;Some other author"); } - + private ProjectRootElement RunPropertiesRuleOnPj(string project, string testDirectory = null) { testDirectory = testDirectory ?? Temp.CreateDirectory().Path; @@ -34,4 +34,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests }, project, testDirectory); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateRuntimes.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateRuntimes.cs index 205875477..65cd00209 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateRuntimes.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateRuntimes.cs @@ -1,4 +1,7 @@ -using Microsoft.Build.Construction; +// 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.ProjectJsonMigration; using Microsoft.DotNet.Tools.Test.Utilities; using NuGet.Frameworks; diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs index 4d7b60096..fb5f453ea 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs @@ -1,4 +1,7 @@ -using Microsoft.Build.Construction; +// 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.ProjectJsonMigration; using Microsoft.DotNet.Internal.ProjectModel; using Microsoft.DotNet.Tools.Test.Utilities; @@ -32,8 +35,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj); var migrationInputs = new MigrationRuleInputs( - new[] { projectContext }, - mockProj, + new[] { projectContext }, + mockProj, mockProj.AddItemGroup(), mockProj.AddPropertyGroup()); @@ -56,9 +59,9 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj); var migrationInputs = new MigrationRuleInputs( - projectContexts, - mockProj, - mockProj.AddItemGroup(), + projectContexts, + mockProj, + mockProj.AddItemGroup(), mockProj.AddPropertyGroup()); new MigrateTFMRule().Apply(migrationSettings, migrationInputs); @@ -81,9 +84,9 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj); var migrationInputs = new MigrationRuleInputs( - projectContexts, - mockProj, - mockProj.AddItemGroup(), + projectContexts, + mockProj, + mockProj.AddItemGroup(), mockProj.AddPropertyGroup()); new MigrateTFMRule().Apply(migrationSettings, migrationInputs); @@ -106,9 +109,9 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj); var migrationInputs = new MigrationRuleInputs( - projectContexts, - mockProj, - mockProj.AddItemGroup(), + projectContexts, + mockProj, + mockProj.AddItemGroup(), mockProj.AddPropertyGroup()); new MigrateTFMRule().Apply(migrationSettings, migrationInputs); @@ -133,9 +136,9 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj); var migrationInputs = new MigrationRuleInputs( - projectContexts, - mockProj, - mockProj.AddItemGroup(), + projectContexts, + mockProj, + mockProj.AddItemGroup(), mockProj.AddPropertyGroup()); new MigrateTFMRule().Apply(migrationSettings, migrationInputs); @@ -157,9 +160,9 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj); var migrationInputs = new MigrationRuleInputs( - projectContexts, - mockProj, - mockProj.AddItemGroup(), + projectContexts, + mockProj, + mockProj.AddItemGroup(), mockProj.AddPropertyGroup()); new MigrateTFMRule().Apply(migrationSettings, migrationInputs); @@ -187,9 +190,9 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests // Run BuildOptionsRule var migrationSettings = MigrationSettings.CreateMigrationSettingsTestHook(testDirectory, testDirectory, mockProj); var migrationInputs = new MigrationRuleInputs( - projectContexts, - mockProj, - mockProj.AddItemGroup(), + projectContexts, + mockProj, + mockProj.AddItemGroup(), mockProj.AddPropertyGroup()); new MigrateTFMRule().Apply(migrationSettings, migrationInputs); diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs index afcede957..fa3d7ed9a 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTools.cs @@ -26,7 +26,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests string targetVersion) { var mockProj = RunPackageDependenciesRuleOnPj("{ \"dependencies\": { \"" + sourceToolName + "\" : { \"version\": \"" + sourceVersion + "\", \"type\": \"build\" } } }"); - + var packageRef = mockProj.Items.First(i => i.Include == targetToolName && i.ItemType == "PackageReference"); packageRef.GetMetadataWithName("Version").Value.Should().Be(targetVersion); @@ -72,7 +72,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { const string anyVersion = "1.0.0-preview2-final"; var mockProj = RunPackageDependenciesRuleOnPj("{ \"tools\": { \"" + sourceToolName + "\": \"" + anyVersion + "\" } }"); - + EmitsToolReferences(mockProj, Tuple.Create(targetToolName, targetVersion)); } @@ -100,4 +100,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests EmitsToolReferences(mockProj, Tuple.Create("Microsoft.EntityFrameworkCore.Tools.DotNet", ConstantPackageVersions.AspNetToolsVersion)); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateWebProjects.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateWebProjects.cs index 403c2ddb6..81a9f475a 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateWebProjects.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateWebProjects.cs @@ -61,4 +61,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests return Path.GetFileName(projectDirectory); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs index 9a5526646..f97bc4a35 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/PackageDependenciesTestBase.cs @@ -60,4 +60,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests }, s, testDirectory); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs index e8b7484ed..3ea3523a8 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/TemporaryProjectFileRuleRunner.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// 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.Linq; using Microsoft.Build.Construction; using Microsoft.DotNet.ProjectJsonMigration.Rules; @@ -49,7 +52,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests if (projectContexts.Count() == 0) { projectContexts = new [] - { + { ProjectContext.Create(testPj, FrameworkConstants.CommonFrameworks.NetCoreApp10) }; } @@ -80,4 +83,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests return project; } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAConditionalTransform.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAConditionalTransform.cs index c74fb6b04..d4a5030e4 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAConditionalTransform.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAConditionalTransform.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.ProjectJsonMigration; +// 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.DotNet.ProjectJsonMigration; using System; using System.Collections.Generic; using System.Linq; diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenATransformApplicator.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenATransformApplicator.cs index 667d2ca90..36a0fb196 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenATransformApplicator.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenATransformApplicator.cs @@ -1,4 +1,7 @@ -using System; +// 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.Build.Construction; using Xunit; using FluentAssertions; @@ -85,4 +88,4 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests mergedPropertyToAdd.Value.Should().Be("$(Variable2);value3;$(Variable3)"); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddItemTransform.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddItemTransform.cs index b9bf9735a..e97453c86 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddItemTransform.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddItemTransform.cs @@ -1,4 +1,7 @@ -using Microsoft.Build.Construction; +// 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.ProjectJsonMigration; using System; using System.Collections.Generic; diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddPropertyTransform.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddPropertyTransform.cs index 6d29c2fdd..008308948 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddPropertyTransform.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Transforms/GivenAnAddPropertyTransform.cs @@ -1,4 +1,7 @@ -using Microsoft.Build.Construction; +// 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.ProjectJsonMigration; using System; using System.Collections.Generic; @@ -55,8 +58,8 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests var propertyValue = "Value1"; var propertyTransform = new AddPropertyTransform( - propertyName, - propertyValue, + propertyName, + propertyValue, t => true); var property = propertyTransform.Transform(null); property.Should().NotBeNull(); diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetLegacyRuntimeIdentifiers.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetLegacyRuntimeIdentifiers.cs index 4c54ab034..5c96c2a9c 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetLegacyRuntimeIdentifiers.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/DotnetLegacyRuntimeIdentifiers.cs @@ -28,4 +28,4 @@ namespace Microsoft.DotNet.Tools.Test.Utilities } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Extensions/ProcessExtensions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Extensions/ProcessExtensions.cs index 4cff45ff4..565cac435 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Extensions/ProcessExtensions.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Extensions/ProcessExtensions.cs @@ -1,3 +1,6 @@ +// 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.Diagnostics; @@ -117,8 +120,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities var taskCompletionSource = new TaskCompletionSource(); subject.EnableRaisingEvents = true; - - subject.Exited += (s, a) => + + subject.Exited += (s, a) => { taskCompletionSource.SetResult(null); diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index 9ee038a76..c37a13777 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -10,23 +10,17 @@ true $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + + - - 1.6.0 - - - 4.18.0 - - - 2.2.0-beta4-build3444 - - - $(PlatformAbstractionsVersion) - + + + + \ No newline at end of file diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/NetworkHelper.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/NetworkHelper.cs index 75f54474a..51f55ea6e 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/NetworkHelper.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/NetworkHelper.cs @@ -1,3 +1,6 @@ +// 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.Net; diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/PortManager.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/PortManager.cs index 303f89a34..c3df27f4f 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/PortManager.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/NetworkUtils/PortManager.cs @@ -1,3 +1,6 @@ +// 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.Threading; diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetConfig.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetConfig.cs index 1cbcf0273..f6f05bd51 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetConfig.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/NuGetConfig.cs @@ -24,4 +24,4 @@ namespace Microsoft.DotNet.Tools.Test.Utilities File.WriteAllText(path, contents); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/PeReaderUtils.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/PeReaderUtils.cs index c8f7f34a4..fc3d19587 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/PeReaderUtils.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/PeReaderUtils.cs @@ -126,4 +126,4 @@ namespace Microsoft.DotNet.Tools.Test.Utilities return arguments; } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs index 88c50a9b3..98bfc776e 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs @@ -1,4 +1,7 @@ -using System.Runtime.CompilerServices; +// 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.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file +[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs index d20542db1..0b634cd79 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs @@ -1,3 +1,6 @@ +// 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.IO; using System.Linq; @@ -79,4 +82,4 @@ namespace Microsoft.DotNet.Tools.Test.Utilities .FullName; } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/FileNameUtilities.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/FileNameUtilities.cs index 625370ba1..e2e63d4a6 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/FileNameUtilities.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/FileNameUtilities.cs @@ -6,7 +6,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities /// /// Implements a few file name utilities that are needed by the compiler. /// In general the compiler is not supposed to understand the format of the paths. - /// In rare cases it needs to check if a string is a valid file name or change the extension + /// In rare cases it needs to check if a string is a valid file name or change the extension /// (embedded resources, netmodules, output name). /// The APIs are intentionally limited to cover just these rare cases. Do not add more APIs. /// @@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities internal const char VolumeSeparatorChar = ':'; /// - /// Returns true if the string represents an unqualified file name. + /// Returns true if the string represents an unqualified file name. /// The name may contain any characters but directory and volume separators. /// /// Path. @@ -121,8 +121,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities /// /// /// Equivalent of - /// - /// If is null, returns null. + /// + /// If is null, returns null. /// If path does not end with an extension, the new extension is appended to the path. /// If extension is null, equivalent to . /// @@ -180,4 +180,4 @@ namespace Microsoft.DotNet.Tools.Test.Utilities return (fileNameStart <= 0) ? path : path.Substring(fileNameStart); } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/ImmutableArrayTestExtensions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/ImmutableArrayTestExtensions.cs index b3dcb57bb..f7ffe420f 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/ImmutableArrayTestExtensions.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/ImmutableArrayTestExtensions.cs @@ -40,4 +40,4 @@ namespace Microsoft.DotNet.Tools.Test.Utilities } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/PathKind.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/PathKind.cs index 0c37a6ffb..349ee5b3e 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/PathKind.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/PathKind.cs @@ -40,4 +40,4 @@ namespace Microsoft.DotNet.Tools.Test.Utilities /// Absolute, } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/PathUtilities.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/PathUtilities.cs index 9b1b7b8e3..e1cfbffb6 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/PathUtilities.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/PathUtilities.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities // For example we need to be able to work with invalid paths or paths containing wildcards internal static class PathUtilities { - // We consider '/' a directory separator on Unix like systems. + // We consider '/' a directory separator on Unix like systems. // On Windows both / and \ are equally accepted. internal static readonly char DirectorySeparatorChar = IsUnixLikePlatform ? '/' : '\\'; internal static readonly char AltDirectorySeparatorChar = '/'; @@ -73,7 +73,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities /// /// /// Unlike it - /// doesn't check for invalid path characters, + /// doesn't check for invalid path characters, /// doesn't strip any trailing directory separators (TODO: tomat), /// doesn't recognize UNC structure \\computer-name\share\directory-name\file-name (TODO: tomat). /// @@ -295,9 +295,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities /// Absolute root path. /// Relative path. /// - /// An absolute combined path, or null if is - /// absolute (e.g. "C:\abc", "\\machine\share\abc"), - /// relative to the current root (e.g. "\abc"), + /// An absolute combined path, or null if is + /// absolute (e.g. "C:\abc", "\\machine\share\abc"), + /// relative to the current root (e.g. "\abc"), /// or relative to a drive directory (e.g. "C:abc\def"). /// /// @@ -376,4 +376,4 @@ namespace Microsoft.DotNet.Tools.Test.Utilities || assemblyDisplayNameOrPath.IndexOf(AltDirectorySeparatorChar) != -1; } } -} \ No newline at end of file +} diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index b1e4e5329..686afe6a3 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -1,12 +1,13 @@  - + $(CliTargetFramework) $(CLI_SharedFrameworkVersion) Msbuild.Tests.Utilities $(PackageTargetFallback);dotnet5.4;portable-net451+win8 + @@ -15,6 +16,7 @@ + diff --git a/test/Msbuild.Tests.Utilities/ProjDir.cs b/test/Msbuild.Tests.Utilities/ProjDir.cs index b29adae8b..3ca2f4019 100644 --- a/test/Msbuild.Tests.Utilities/ProjDir.cs +++ b/test/Msbuild.Tests.Utilities/ProjDir.cs @@ -31,4 +31,4 @@ namespace Msbuild.Tests.Utilities return ProjectRootElement.Open(CsProjPath, new ProjectCollection()); } } -} \ No newline at end of file +} diff --git a/test/Msbuild.Tests.Utilities/ProjectRootElementExtensions.cs b/test/Msbuild.Tests.Utilities/ProjectRootElementExtensions.cs index bd960bb92..bc18d2cfb 100644 --- a/test/Msbuild.Tests.Utilities/ProjectRootElementExtensions.cs +++ b/test/Msbuild.Tests.Utilities/ProjectRootElementExtensions.cs @@ -41,8 +41,8 @@ namespace Msbuild.Tests.Utilities } public static int NumberOfProjectReferencesWithIncludeAndConditionContaining( - this ProjectRootElement root, - string includePattern, + this ProjectRootElement root, + string includePattern, string patternInCondition) { return root.ItemsWithIncludeAndConditionContaining( @@ -68,4 +68,4 @@ namespace Msbuild.Tests.Utilities return root.ItemsWithIncludeContaining("ProjectReference", includePattern).Count(); } } -} \ No newline at end of file +} diff --git a/test/Performance/Performance.csproj b/test/Performance/Performance.csproj deleted file mode 100644 index db7cf67c3..000000000 --- a/test/Performance/Performance.csproj +++ /dev/null @@ -1,55 +0,0 @@ - - - - - netcoreapp1.1 - true - Performance - $(PackageTargetFallback);dotnet5.4;portable-net451+win8 - - - - - - - true - - - true - - - - - - true - - - - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - $(CLI_SharedFrameworkVersion) - - - 4.3.0 - - - 2.2.0-beta4-build3444 - - - 1.0.0-prerelease-00206 - - - 1.0.0-alpha-build0028 - - - - - $(DefineConstants);RELEASE - - diff --git a/test/crossgen.Tests/crossgen.Tests.csproj b/test/crossgen.Tests/crossgen.Tests.csproj index 70b278143..48df94f04 100644 --- a/test/crossgen.Tests/crossgen.Tests.csproj +++ b/test/crossgen.Tests/crossgen.Tests.csproj @@ -12,27 +12,11 @@ - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + - - - $(DefineConstants);RELEASE - diff --git a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj index 8f4457281..d07d2002a 100644 --- a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj +++ b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj @@ -11,34 +11,16 @@ - - true - - - true - - - true - + - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 4.3.0 - - - 2.2.0-beta4-build3444 - - - $(CLI_MSBuild_Version) - + + + + + diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.csproj b/test/dotnet-build.Tests/dotnet-build.Tests.csproj index 45bd5be54..6ebffe33b 100644 --- a/test/dotnet-build.Tests/dotnet-build.Tests.csproj +++ b/test/dotnet-build.Tests/dotnet-build.Tests.csproj @@ -11,27 +11,12 @@ - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/test/dotnet-cache.Tests/dotnet-cache.Tests.csproj b/test/dotnet-cache.Tests/dotnet-cache.Tests.csproj index 02a1e5bb9..06ecba4cc 100644 --- a/test/dotnet-cache.Tests/dotnet-cache.Tests.csproj +++ b/test/dotnet-cache.Tests/dotnet-cache.Tests.csproj @@ -11,23 +11,11 @@ - - - - - - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/test/dotnet-help.Tests/dotnet-help.Tests.csproj b/test/dotnet-help.Tests/dotnet-help.Tests.csproj index 76086fab0..73bdcfde8 100644 --- a/test/dotnet-help.Tests/dotnet-help.Tests.csproj +++ b/test/dotnet-help.Tests/dotnet-help.Tests.csproj @@ -12,39 +12,12 @@ - - - true - - - true - - - true - - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - $(CLI_MSBuild_Version) - - - 2.2.0-beta4-build3444 - + + + + diff --git a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index a84af992a..be7c7c2e4 100644 --- a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -10,32 +10,15 @@ - - - true - - - true - - - true - + - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - - - 4.18.0 - + + + + diff --git a/test/dotnet-migrate.Tests/GivenThatAnAppWasMigrated.cs b/test/dotnet-migrate.Tests/GivenThatAnAppWasMigrated.cs index a76e765bc..4611ef0b1 100644 --- a/test/dotnet-migrate.Tests/GivenThatAnAppWasMigrated.cs +++ b/test/dotnet-migrate.Tests/GivenThatAnAppWasMigrated.cs @@ -1,3 +1,6 @@ +// 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; @@ -100,9 +103,9 @@ namespace Microsoft.DotNet.Migration.Tests .CreateInstance(identifier: testProjectName) .WithSourceFiles() .Root; - + var backupRoot = testRoot.GetDirectory("backup"); - + var migratableArtifacts = GetProjectJsonArtifacts(testRoot); new MigrateCommand() diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateAppsUsingGlobalJson.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateAppsUsingGlobalJson.cs index 3f7fea788..d4072691a 100644 --- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateAppsUsingGlobalJson.cs +++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateAppsUsingGlobalJson.cs @@ -77,4 +77,4 @@ namespace Microsoft.DotNet.Migration.Tests .Pass(); } } -} \ No newline at end of file +} diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index 41e0b0d92..4663939f0 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -21,35 +21,13 @@ - - true - - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - - - 4.18.0 - - - 4.4.0-beta8 - + + + + + diff --git a/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs index 72e412172..eb3b7256e 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetBuildInvocation.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Tools.Build; +// 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.DotNet.Tools.Build; using FluentAssertions; using Xunit; diff --git a/test/dotnet-msbuild.Tests/GivenDotnetCacheInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetCacheInvocation.cs index d7c0740d0..2202ba2cd 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetCacheInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetCacheInvocation.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Tools.Cache; +// 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.DotNet.Tools.Cache; using FluentAssertions; using Xunit; using System; diff --git a/test/dotnet-msbuild.Tests/GivenDotnetCleanInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetCleanInvocation.cs index 8817d3f02..742baf6ba 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetCleanInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetCleanInvocation.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Tools.Clean; +// 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.DotNet.Tools.Clean; using FluentAssertions; using Xunit; using System; diff --git a/test/dotnet-msbuild.Tests/GivenDotnetPackInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetPackInvocation.cs index 0a30d536f..34624df92 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetPackInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetPackInvocation.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Tools.Pack; +// 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.DotNet.Tools.Pack; using FluentAssertions; using Xunit; using System; diff --git a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs index d1ed249bb..8eb025f72 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Tools.Publish; +// 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.DotNet.Tools.Publish; using FluentAssertions; using Xunit; using System; diff --git a/test/dotnet-msbuild.Tests/GivenDotnetRestoreInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetRestoreInvocation.cs index f5c95187c..282549125 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetRestoreInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetRestoreInvocation.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Tools.Restore; +// 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.DotNet.Tools.Restore; using FluentAssertions; using Xunit; using System; diff --git a/test/dotnet-msbuild.Tests/GivenDotnetVsTestForwardingApp.cs b/test/dotnet-msbuild.Tests/GivenDotnetVsTestForwardingApp.cs index e1bf1d752..46e56e71c 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetVsTestForwardingApp.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetVsTestForwardingApp.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Tools.VSTest; +// 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.DotNet.Tools.VSTest; using FluentAssertions; using Xunit; using System; diff --git a/test/dotnet-msbuild.Tests/GivenForwardingApp.cs b/test/dotnet-msbuild.Tests/GivenForwardingApp.cs index cc25efd2e..5ef48c827 100644 --- a/test/dotnet-msbuild.Tests/GivenForwardingApp.cs +++ b/test/dotnet-msbuild.Tests/GivenForwardingApp.cs @@ -1,4 +1,7 @@ -using System; +// 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.Text; using Xunit; diff --git a/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs b/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs index b04887e2b..fab53877f 100644 --- a/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs +++ b/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs @@ -1,4 +1,7 @@ -using System.IO; +// 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.IO; using Microsoft.DotNet.Tools.MSBuild; using FluentAssertions; using Xunit; diff --git a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj index 49b1c6d6e..69f57b7f0 100644 --- a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj +++ b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj @@ -12,36 +12,11 @@ - - - true - - - true - - - true - - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 645c1621d..25add3e18 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -1,4 +1,7 @@ -using System; +// 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.Text; diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index f48b81ded..4128a4099 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -12,39 +12,12 @@ - - - true - - - true - - - true - - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - $(CLI_MSBuild_Version) - - - 2.2.0-beta4-build3444 - + + + + diff --git a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj index 906e8fde9..dda2a8cd0 100644 --- a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj +++ b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj @@ -13,38 +13,12 @@ - - true - - - true - - - true - - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - - - 4.4.0-beta8 - + + + + diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj index b3323a1c1..cef65d60c 100644 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj +++ b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj @@ -19,26 +19,12 @@ - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 4.3.0 - - - 2.2.0-beta4-build3444 - + + + + diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj index 86829a28d..ea8493b24 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj @@ -17,27 +17,12 @@ - - - true - - - true - - - true - + - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj index 5b9b4e266..b3d7f3b16 100644 --- a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj +++ b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj @@ -1,6 +1,6 @@  - + $(CliTargetFramework) $(CLI_SharedFrameworkVersion) @@ -10,35 +10,16 @@ - - - true - - - true - - - true - + - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - - - $(CLI_MSBuild_Version) - - - 4.18.0 - + + + + + diff --git a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj index 455f9e57e..2803c75e5 100644 --- a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj +++ b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj @@ -12,45 +12,14 @@ - - - true - - - true - - - true - - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - $(CLI_MSBuild_Version) - - - 2.2.0-beta4-build3444 - - - $(PlatformAbstractionsVersion) - - - 4.18.0 - + + + + + + diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index adbf0d15c..565807b7f 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -77,45 +77,45 @@ namespace Microsoft.DotNet.Cli.Run.Tests .WithWorkingDirectory(testProjectDirectory) .ExecuteWithCapturedOutput("--framework netcoreapp1.0") .Should().Pass() - .And.HaveStdOutContaining("Hello World!"); + .And.HaveStdOutContaining("Hello World!"); } - - [Fact] - public void ItRunsPortableAppsFromADifferentPathAfterBuilding() + + [Fact] + public void ItRunsPortableAppsFromADifferentPathAfterBuilding() { var testInstance = TestAssets.Get("MSBuildTestApp") .CreateInstance() .WithSourceFiles() .WithRestoreFiles(); - - new BuildCommand() - .WithWorkingDirectory(testInstance.Root) - .Execute() - .Should().Pass(); - new RunCommand() - .WithWorkingDirectory(testInstance.Root) - .ExecuteWithCapturedOutput($"--no-build") - .Should().Pass() - .And.HaveStdOutContaining("Hello World!"); - } - - [Fact] - public void ItRunsPortableAppsFromADifferentPathWithoutBuilding() - { - var testAppName = "MSBuildTestApp"; + new BuildCommand() + .WithWorkingDirectory(testInstance.Root) + .Execute() + .Should().Pass(); + + new RunCommand() + .WithWorkingDirectory(testInstance.Root) + .ExecuteWithCapturedOutput($"--no-build") + .Should().Pass() + .And.HaveStdOutContaining("Hello World!"); + } + + [Fact] + public void ItRunsPortableAppsFromADifferentPathWithoutBuilding() + { + var testAppName = "MSBuildTestApp"; var testInstance = TestAssets.Get(testAppName) .CreateInstance() .WithSourceFiles() .WithRestoreFiles(); - var projectFile = testInstance.Root.GetFile(testAppName + ".csproj"); + var projectFile = testInstance.Root.GetFile(testAppName + ".csproj"); - new RunCommand() - .WithWorkingDirectory(testInstance.Root.Parent) - .ExecuteWithCapturedOutput($"--project {projectFile.FullName}") - .Should().Pass() - .And.HaveStdOutContaining("Hello World!"); + new RunCommand() + .WithWorkingDirectory(testInstance.Root.Parent) + .ExecuteWithCapturedOutput($"--project {projectFile.FullName}") + .Should().Pass() + .And.HaveStdOutContaining("Hello World!"); } [Fact] @@ -146,4 +146,4 @@ namespace Microsoft.DotNet.Cli.Run.Tests .And.HaveStdOutContaining("Hello World"); } } -} \ No newline at end of file +} diff --git a/test/dotnet-run.Tests/dotnet-run.Tests.csproj b/test/dotnet-run.Tests/dotnet-run.Tests.csproj index 4121c3076..baf437495 100644 --- a/test/dotnet-run.Tests/dotnet-run.Tests.csproj +++ b/test/dotnet-run.Tests/dotnet-run.Tests.csproj @@ -11,26 +11,11 @@ - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj index 4bd7c986a..2a630a940 100644 --- a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj +++ b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj @@ -18,17 +18,9 @@ - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - - - $(CLI_MSBuild_Version) - + + + + diff --git a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj index eef3a4b75..cf1befb50 100644 --- a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj +++ b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj @@ -18,14 +18,8 @@ - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj index b0584c0e6..77ec8a398 100644 --- a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj +++ b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj @@ -18,14 +18,8 @@ - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/test/dotnet-test.Tests/dotnet-test.Tests.csproj b/test/dotnet-test.Tests/dotnet-test.Tests.csproj index 53457c8f9..d0ec87860 100644 --- a/test/dotnet-test.Tests/dotnet-test.Tests.csproj +++ b/test/dotnet-test.Tests/dotnet-test.Tests.csproj @@ -10,27 +10,12 @@ - - - true - - - true - - - true - + - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj index 8be6bfa89..8b3592d0f 100644 --- a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj +++ b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj @@ -11,26 +11,11 @@ - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/test/dotnet.Tests/CommandLineApplicationTests.cs b/test/dotnet.Tests/CommandLineApplicationTests.cs index 8a7237dd3..458ae4a98 100644 --- a/test/dotnet.Tests/CommandLineApplicationTests.cs +++ b/test/dotnet.Tests/CommandLineApplicationTests.cs @@ -1,4 +1,7 @@ -using System; +// 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 FluentAssertions; using Microsoft.DotNet.Cli.CommandLine; using Xunit; diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index f8b38332e..871edb5cd 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -36,7 +36,7 @@ namespace Microsoft.DotNet.Tests _firstDotnetVerbUseCommandResult = command.ExecuteWithCapturedOutput("new --debug:ephemeral-hive"); _nugetCacheFolder = new DirectoryInfo(testNugetCache); - } + } [Fact] public void UsingDotnetForTheFirstTimeSucceeds() @@ -135,4 +135,4 @@ A command is running to initially populate your local package cache, to improve return s.Replace("\r\n", "\n").Replace("\r", "\n"); } } -} \ No newline at end of file +} diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index 76c285159..d360368cf 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -34,38 +34,13 @@ - - true - - - true - - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - - - 1.0.0-prerelease-00206 - - - $(PlatformAbstractionsVersion) - + + + + + diff --git a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj index 1e7441484..9e4307049 100644 --- a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj +++ b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj @@ -11,26 +11,11 @@ - - true - - - true - - - true - - - 15.0.0-preview-20161024-02 - - - 2.2.0-beta4-build1194 - - - 2.2.0-beta4-build3444 - + + + diff --git a/tools/Archiver/Archiver.csproj b/tools/Archiver/Archiver.csproj index 9f168dae6..2a63e855f 100644 --- a/tools/Archiver/Archiver.csproj +++ b/tools/Archiver/Archiver.csproj @@ -6,13 +6,16 @@ Exe $(CLI_SharedFrameworkVersion) + + + diff --git a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj deleted file mode 100644 index bc9389356..000000000 --- a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - netcoreapp2.0 - portable - Exe - $(PackageTargetFallback);dnxcore50;portable-net45+win8 - - - - - $(CLI_SharedFrameworkVersion) - - - $(CLI_MSBuild_Version) - - - \ No newline at end of file diff --git a/tools/MigrationDefaultsConstructor/Program.cs b/tools/MigrationDefaultsConstructor/Program.cs deleted file mode 100755 index d5c05de11..000000000 --- a/tools/MigrationDefaultsConstructor/Program.cs +++ /dev/null @@ -1,193 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Collections.Generic; -using Microsoft.DotNet.Cli; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; -using Newtonsoft.Json; -using System.Threading; -using Microsoft.Build.Construction; -using Microsoft.DotNet.ProjectJsonMigration.Models; - -namespace MigrationDefaultsConstructor -{ - public class Program - { - private const string c_temporaryDotnetNewMSBuildProjectName = "p"; - - static void Main(string[] args) - { - var sdkRootPath=args[0]; - - var beforeCommonSdkTargetsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.BeforeCommon.targets"); - var commonSdkTargetsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.Common.targets"); - var sdkTargetsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.targets"); - var sdkPropsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.props"); - var csharpTargetsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.CSharp.targets"); - var csharpPropsFilePath = Path.Combine(sdkRootPath, "src", "Tasks", "Microsoft.NET.Build.Tasks", "build", "Microsoft.NET.Sdk.CSharp.props"); - - var beforeCommonSdkTargetsFile = ProjectRootElement.Open(beforeCommonSdkTargetsFilePath); - var commonSdkTargetsFile = ProjectRootElement.Open(commonSdkTargetsFilePath); - var sdkTargetsFile = ProjectRootElement.Open(sdkTargetsFilePath); - var sdkPropsFile = ProjectRootElement.Open(sdkPropsFilePath); - var csharpPropsFile = ProjectRootElement.Open(csharpPropsFilePath); - var csharpTargetsFile = ProjectRootElement.Open(csharpTargetsFilePath); - - var allProperties = new List(); - var allItems = new List(); - - AddPropertyDefault(allProperties, sdkPropsFile, "OutputType"); - AddPropertyDefault(allProperties, sdkPropsFile, "Configuration", ignoreConditions: true); - AddPropertyDefault(allProperties, sdkPropsFile, "Platform"); - AddPropertyDefault(allProperties, sdkPropsFile, "FileAlignment"); - AddPropertyDefault(allProperties, sdkPropsFile, "PlatformTarget"); - AddPropertyDefault(allProperties, sdkPropsFile, "ErrorReport"); - AddPropertyDefault(allProperties, sdkPropsFile, "AssemblyName"); - AddPropertyDefault(allProperties, sdkPropsFile, "RootNamespace"); - AddPropertyDefault(allProperties, sdkPropsFile, "Deterministic"); - - AddPropertyDefault(allProperties, csharpPropsFile, "WarningLevel"); - AddPropertyDefault(allProperties, csharpPropsFile, "NoWarn"); - - AddHardcodedPropertyDefault(allProperties, "PackageRequireLicenseAcceptance", "false"); - - AddConfigurationPropertyDefaults(allProperties, sdkPropsFile, "Debug"); - AddConfigurationPropertyDefaults(allProperties, sdkPropsFile, "Release"); - - AddConfigurationPropertyDefaults(allProperties, csharpPropsFile, "Debug"); - AddConfigurationPropertyDefaults(allProperties, csharpPropsFile, "Release"); - - AddPropertyDefault(allProperties, commonSdkTargetsFile, "VersionPrefix", ignoreConditions: true); - AddPropertyDefault(allProperties, commonSdkTargetsFile, "AssemblyTitle", ignoreConditions: true); - AddPropertyDefault(allProperties, commonSdkTargetsFile, "Product", ignoreConditions: true); - AddPropertyDefault(allProperties, commonSdkTargetsFile, "NeutralLanguage", ignoreConditions: true); - - AddPropertyDefault(allProperties, beforeCommonSdkTargetsFile, "AutoUnifyAssemblyReferences", ignoreConditions: true); - AddPropertyDefault(allProperties, beforeCommonSdkTargetsFile, "DesignTimeAutoUnify", ignoreConditions: true); - AddPropertyDefault(allProperties, beforeCommonSdkTargetsFile, "TargetExt", ignoreConditions: true); - - AddCompileAndEmbeddedResourceDefaults(allItems, sdkTargetsFile); - - var wrapper = new SerializableMigrationDefaultsInfo() - { - Items = allItems, - Properties = allProperties - }; - - var output = Path.Combine(Directory.GetCurrentDirectory(), "sdkdefaults.json"); - string json = JsonConvert.SerializeObject(wrapper, Formatting.Indented); - File.WriteAllText(output, json); - } - - private static void AddHardcodedPropertyDefault(List allProperties, - string name, - string value, - string condition="", - string parentCondition="") - { - var propertyInfo = new DefaultProjectPropertyInfo - { - Name = name, - Value = value, - Condition = condition, - ParentCondition = parentCondition - }; - - allProperties.Add(propertyInfo); - } - - private static void AddCompileAndEmbeddedResourceDefaults(List allItems, ProjectRootElement msbuild) - { - var exclude = msbuild.Properties.Where(p=>p.Name == "DefaultExcludes").First().Value; - - var compileInclude = msbuild.Items.Where(i => i.ItemType == "Compile").First().Include; - if (string.IsNullOrEmpty(compileInclude)) - { - compileInclude = "**\\*.cs"; - } - - var embedInclude = msbuild.Items.Where(i => i.ItemType == "EmbeddedResource").First().Include; - if (string.IsNullOrEmpty(embedInclude)) - { - embedInclude = "**\\*.resx"; - } - - allItems.Add(new DefaultProjectItemInfo - { - ItemType = "Compile", - Include=compileInclude, - Exclude=exclude - }); - - allItems.Add(new DefaultProjectItemInfo - { - ItemType = "EmbeddedResource", - Include=embedInclude, - Exclude=exclude - }); - } - - private static void AddConfigurationPropertyDefaults(List allProperties, ProjectRootElement msbuild, string config) - { - var configPropertyGroup = msbuild.PropertyGroups.Where(p => p.Condition.Contains("$(Configuration)") && p.Condition.Contains(config)).First(); - - configPropertyGroup.Condition = $" '$(Configuration)' == '{config}' "; - - foreach (var property in configPropertyGroup.Properties) - { - var propertyInfo = new DefaultProjectPropertyInfo - { - Name = property.Name, - Value = property.Value, - Condition = property.Condition, - ParentCondition = property.Parent.Condition - }; - - allProperties.Add(propertyInfo); - } - } - - private static void AddPropertyDefault(List allProperties, ProjectRootElement msbuild, string propertyName, int? index=null, bool ignoreConditions=false) - { - var properties = msbuild.Properties.Where(p => p.Name == propertyName).ToList(); - if (!properties.Any()) - { - throw new Exception("property not found:" + propertyName); - } - - if (properties.Count() > 1 && index == null) - { - throw new Exception("More than one property found but index is null:" + propertyName); - } - - var property = properties[index ?? 0]; - - if (ignoreConditions) - { - var propertyInfo = new DefaultProjectPropertyInfo - { - Name = property.Name, - Value = property.Value, - Condition = null, - ParentCondition = null - }; - - allProperties.Add(propertyInfo); - } - else - { - var propertyInfo = new DefaultProjectPropertyInfo - { - Name = property.Name, - Value = property.Value, - Condition = property.Condition, - ParentCondition = property.Parent.Condition - }; - - allProperties.Add(propertyInfo); - } - } - } -} diff --git a/tools/MigrationDefaultsConstructor/README.md b/tools/MigrationDefaultsConstructor/README.md deleted file mode 100644 index a3ad7f386..000000000 --- a/tools/MigrationDefaultsConstructor/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Migration Defaults Constructor - -This pulls the migration property and item defaults from a clone of the dotnet/sdk repo. - -Run `./run.sh` to generate an sdkdefaults.json - -Move it to the Microsoft.DotNet.ProjectJsonMigration project under `src` to override the defaults in dotnet (it's embedded as a resource). \ No newline at end of file diff --git a/tools/MigrationDefaultsConstructor/run.sh b/tools/MigrationDefaultsConstructor/run.sh deleted file mode 100755 index 77e4c0877..000000000 --- a/tools/MigrationDefaultsConstructor/run.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - -rm -rf bin obj -dotnet publish -o bin -f netcoreapp1.0 -cp -a "$DIR/bin/runtimes/any/native/." "$DIR/bin" - -sdkRevision="cc1fc023e3375b3944dbedfdd4ba2b5d2cbd01f0" -sdkRoot="$DIR/bin/sdk" -(cd bin && \ - git clone https://github.com/dotnet/sdk.git && \ - cd sdk && \ - git reset --hard $sdkRevision) - -dotnet "$DIR/bin/MigrationDefaultsConstructor.dll" "$sdkRoot" \ No newline at end of file