From db7ebc9100d4c49395c7c91cbdb9ad45c7bd8c5f Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Wed, 28 Jun 2017 21:18:39 -0700 Subject: [PATCH 001/128] Add F# to dotnet cli 1..1.0 --- Microsoft.DotNet.Cli.sln | 275 ++++++++++-------- build/Microsoft.DotNet.Cli.Compile.targets | 10 +- ...rosoft.DotNet.Cli.DependencyVersions.props | 1 + src/tool_fsharp/RunFsc.cmd | 6 + src/tool_fsharp/RunFsc.sh | 17 ++ src/tool_fsharp/tool_fsc.csproj | 60 ++++ 6 files changed, 247 insertions(+), 122 deletions(-) create mode 100644 src/tool_fsharp/RunFsc.cmd create mode 100644 src/tool_fsharp/RunFsc.sh create mode 100644 src/tool_fsharp/tool_fsc.csproj diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index b75c5e5e71..c5d0447e13 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26524.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject @@ -68,7 +68,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B1 build\publish\PublishContent.targets = build\publish\PublishContent.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}") = "crossgen", "crossgen", "{19AC02B7-6D2C-4C2B-A410-9D4A59CE0E47}" ProjectSection(SolutionItems) = preProject @@ -83,119 +83,121 @@ 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_fsc", "src\tool_fsharp\tool_fsc.csproj", "{32E9AEFC-EC97-41FA-84DD-74227A9A7692}" 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_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}" 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_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" +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}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" 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}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" 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}") = "binding-redirects.Tests", "test\binding-redirects.Tests\binding-redirects.Tests.csproj", "{4EF497BF-D717-4E03-90B1-932C7F51B918}" 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}") = "crossgen.Tests", "test\crossgen.Tests\crossgen.Tests.csproj", "{18B43540-346F-4AFF-8868-A82CF098FAFD}" +EndProject +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-add-p2p.Tests", "test\dotnet-add-p2p.Tests\dotnet-add-p2p.Tests.csproj", "{C6BEBDCE-991D-4611-9CDE-9F3914979868}" 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-build.Tests", "test\dotnet-build.Tests\dotnet-build.Tests.csproj", "{BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}" 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-migrate.Tests", "test\dotnet-migrate.Tests\dotnet-migrate.Tests.csproj", "{726D2CB9-80E5-4496-9C86-910AC452C45E}" 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-msbuild.Tests", "test\dotnet-msbuild.Tests\dotnet-msbuild.Tests.csproj", "{EF745C56-0350-4C42-AA22-86D592E1D8D5}" 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-new.Tests", "test\dotnet-new.Tests\dotnet-new.Tests.csproj", "{87063BA1-454D-4433-ADF9-89C667275D62}" 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-nuget.UnitTests", "test\dotnet-nuget.UnitTests\dotnet-nuget.UnitTests.csproj", "{07DD4AE1-5CF6-4EDB-AB29-31EB532F950F}" 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-pack.Tests", "test\dotnet-pack.Tests\dotnet-pack.Tests.csproj", "{7256EEBC-814D-42CF-821B-58CB61F3E070}" 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-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.csproj", "{448F6884-B613-440E-82A6-07E6BB54794C}" 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-run.Tests", "test\dotnet-run.Tests\dotnet-run.Tests.csproj", "{526D7B7A-0485-48A3-A43F-F03A0DBC9897}" 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-test.Tests", "test\dotnet-test.Tests\dotnet-test.Tests.csproj", "{C8D98389-E3CF-4BEF-A9EF-D78672E51866}" 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}") = "dotnet-vstest.Tests", "test\dotnet-vstest.Tests\dotnet-vstest.Tests.csproj", "{131C05D4-D685-478F-A3FB-F5600EF93533}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEnd", "test\EndToEnd\EndToEnd.csproj", "{1BFF54F9-4E35-49DB-893C-AF2047722FC6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndToEnd", "test\EndToEnd\EndToEnd.csproj", "{1BFF54F9-4E35-49DB-893C-AF2047722FC6}" 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.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}") = "Kestrel.Tests", "test\Kestrel.Tests\Kestrel.Tests.csproj", "{85296DB1-1999-4137-B6EE-CD417D64699C}" 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.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.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.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.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.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.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}") = "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}") = "msbuild.IntegrationTests", "test\msbuild.IntegrationTests\msbuild.IntegrationTests.csproj", "{23EE9BBB-3B33-4CF2-8D1A-29A8DB12E878}" +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}") = "Performance", "test\Performance\Performance.csproj", "{F5E27BA5-063B-4770-A6E8-87252E9AB22C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance", "test\Performance\Performance.csproj", "{F5E27BA5-063B-4770-A6E8-87252E9AB22C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptExecutorTests", "test\ScriptExecutorTests\ScriptExecutorTests.csproj", "{90C8861D-1C4C-4D2A-9715-B217760A1655}" 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}") = "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}") = "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}") = "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}") = "update-dependencies", "build_projects\update-dependencies\update-dependencies.csproj", "{F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}" +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}") = "Microsoft.DotNet.Cli.Sln.Internal", "src\Microsoft.DotNet.Cli.Sln.Internal\Microsoft.DotNet.Cli.Sln.Internal.csproj", "{C98C7C2E-2C29-4A40-958C-60561ED77791}" +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.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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -213,28 +215,30 @@ Global RelWithDebInfo|x86 = RelWithDebInfo|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|Any CPU.ActiveCfg = Debug|x86 - {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|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|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 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.Build.0 = Debug|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 @@ -1507,50 +1511,78 @@ Global {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|Any CPU.ActiveCfg = Debug|x86 - {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 - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|Any CPU.ActiveCfg = Debug|x86 - {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 + {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|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 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.Build.0 = Debug|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|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 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.Build.0 = Debug|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 + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x64.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x64.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x86.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x86.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x86.Build.0 = Debug|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|Any CPU.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x64.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x64.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x86.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x86.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU + {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1621,5 +1653,6 @@ Global {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} {C98C7C2E-2C29-4A40-958C-60561ED77791} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} + {32E9AEFC-EC97-41FA-84DD-74227A9A7692} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} EndGlobalSection EndGlobal diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index 9f8802765b..f89553f02e 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -126,6 +126,12 @@ VersionSuffix="$(VersionSuffix)" ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" /> + + @@ -169,6 +175,7 @@ + @@ -194,7 +201,8 @@ JITPath="$(LibCLRJitPath)" CrossgenPath="$(CrossgenPath)" ReadyToRun="True" - PlatformAssemblyPaths="@(PlatformAssemblies); + PlatformAssemblyPaths="%(CrossgenTargets.RootDir)%(CrossgenTargets.Directory); + @(PlatformAssemblies); @(CompileStageSdkDirectories); $(SharedFrameworkNameVersionPath)" /> diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index ed18c5be0a..aaacd11080 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,6 +4,7 @@ 1.1.2 15.3.0-preview-000400-01 2.3.0-beta3-61816-04 + 4.2.0-rc-170621-0 1.1.0-alpha-20170615-3 4.3.0-preview3-4168 1.0.0-alpha-20170516-2-509 diff --git a/src/tool_fsharp/RunFsc.cmd b/src/tool_fsharp/RunFsc.cmd new file mode 100644 index 0000000000..3be9b946ff --- /dev/null +++ b/src/tool_fsharp/RunFsc.cmd @@ -0,0 +1,6 @@ +@echo off + +REM Copyright (c) .NET Foundation and contributors. All rights reserved. +REM Licensed under the MIT license. See LICENSE file in the project root for full license information. + +"%~dp0..\..\..\dotnet" "%~dp0fsc.exe" %* diff --git a/src/tool_fsharp/RunFsc.sh b/src/tool_fsharp/RunFsc.sh new file mode 100644 index 0000000000..5ead812869 --- /dev/null +++ b/src/tool_fsharp/RunFsc.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +set -e + +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 )" + +"$DIR/../../../dotnet" "$DIR/fsc.exe" "$@" diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj new file mode 100644 index 0000000000..1e1d45c902 --- /dev/null +++ b/src/tool_fsharp/tool_fsc.csproj @@ -0,0 +1,60 @@ + + + + + + $(CliVersionPrefix) + netcoreapp1.1 + true + + + + + + + + + + PreserveNewest + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2746e5cc2d0fd4d57b5f553b558e9c41eb130244 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 29 Jun 2017 09:33:54 -0700 Subject: [PATCH 002/128] MSBuild 15.3.402 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index ed18c5be0a..4c29bffc14 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.0-preview-000400-01 + 15.3.0-preview-000402-01 2.3.0-beta3-61816-04 1.1.0-alpha-20170615-3 4.3.0-preview3-4168 From 508ad89a4478929cf09427e95f182f6edbcafc68 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 29 Jun 2017 10:27:06 -0700 Subject: [PATCH 003/128] Enable VB for dotnet cli 1.1 --- build/Microsoft.DotNet.Cli.Compile.targets | 6 ------ .../dotnet-msbuild/MSBuildForwardingApp.cs | 7 +++++++ src/tool_roslyn/RunVbc.cmd | 6 ++++++ src/tool_roslyn/RunVbc.sh | 17 +++++++++++++++++ src/tool_roslyn/tool_roslyn.csproj | 11 +++++++++-- 5 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 src/tool_roslyn/RunVbc.cmd create mode 100644 src/tool_roslyn/RunVbc.sh diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index 9f8802765b..b38fea6230 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -240,12 +240,6 @@ - - - - - - diff --git a/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs b/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs index 6b2b0f47f2..3c74c7193e 100644 --- a/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs +++ b/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs @@ -27,6 +27,7 @@ public class MSBuildForwardingApp { { "MSBuildExtensionsPath", AppContext.BaseDirectory }, { "CscToolExe", GetRunCscPath() }, + { "VbcToolExe", GetRunVbcPath() }, { "MSBuildSDKsPath", GetMSBuildSDKsPath() } }; @@ -111,5 +112,11 @@ private static string GetRunCscPath() var scriptExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".cmd" : ".sh"; return Path.Combine(AppContext.BaseDirectory, "Roslyn", $"RunCsc{scriptExtension}"); } + + private static string GetRunVbcPath() + { + var scriptExtension = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".cmd" : ".sh"; + return Path.Combine(AppContext.BaseDirectory, "Roslyn", $"RunVbc{scriptExtension}"); + } } } diff --git a/src/tool_roslyn/RunVbc.cmd b/src/tool_roslyn/RunVbc.cmd new file mode 100644 index 0000000000..e891b1bf5c --- /dev/null +++ b/src/tool_roslyn/RunVbc.cmd @@ -0,0 +1,6 @@ +@echo off + +REM Copyright (c) .NET Foundation and contributors. All rights reserved. +REM Licensed under the MIT license. See LICENSE file in the project root for full license information. + +"%~dp0..\..\..\dotnet" "%~dp0vbc.exe" %* diff --git a/src/tool_roslyn/RunVbc.sh b/src/tool_roslyn/RunVbc.sh new file mode 100644 index 0000000000..3dda886a06 --- /dev/null +++ b/src/tool_roslyn/RunVbc.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +set -e + +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 )" + +"$DIR/../../../dotnet" "$DIR/vbc.exe" "$@" diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index f040f15c52..4bed7fe7b3 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -16,7 +16,7 @@ - + PreserveNewest PreserveNewest @@ -33,7 +33,7 @@ DestinationFiles="@(HackFilesToCopy->'$(PublishDir)/%(RecursiveDir)%(Filename)%(Extension)')" /> - @@ -55,6 +55,13 @@ DestinationFiles="$(PublishDir)/csc.exe; $(PublishDir)/csc.runtimeconfig.json; $(PublishDir)/csc.deps.json;" /> + + Date: Thu, 29 Jun 2017 12:25:22 -0700 Subject: [PATCH 004/128] feedback --- Microsoft.DotNet.Cli.sln | 278 ++++++++++++++------------------ src/tool_fsharp/tool_fsc.csproj | 4 +- 2 files changed, 126 insertions(+), 156 deletions(-) diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index c5d0447e13..e123ea821c 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26524.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject @@ -68,7 +68,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B1 build\publish\PublishContent.targets = build\publish\PublishContent.targets EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "crossgen", "crossgen", "{19AC02B7-6D2C-4C2B-A410-9D4A59CE0E47}" ProjectSection(SolutionItems) = preProject @@ -83,121 +83,121 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC build\prepare\UbuntuCoreclrAndCoreFxDependencies.props = build\prepare\UbuntuCoreclrAndCoreFxDependencies.props EndProjectSection EndProject -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}" +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}" EndProject -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}" +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}" EndProject -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}" +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}" EndProject -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}" +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}" 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v1\dotnet-hello\dotnet-hello.csproj", "{AA831686-C4EB-4250-9EC3-D252303B36A2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v1\dotnet-hello\dotnet-hello.csproj", "{AA831686-C4EB-4250-9EC3-D252303B36A2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v2\dotnet-hello\dotnet-hello.csproj", "{DED9654E-74A5-4BCB-83A4-05D4B78D7833}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-hello", "TestAssets\TestPackages\dotnet-hello\v2\dotnet-hello\dotnet-hello.csproj", "{DED9654E-74A5-4BCB-83A4-05D4B78D7833}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-portable", "TestAssets\TestPackages\dotnet-portable\dotnet-portable.csproj", "{2E852476-0B95-4A5B-9C29-53A950D1278F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-portable", "TestAssets\TestPackages\dotnet-portable\dotnet-portable.csproj", "{2E852476-0B95-4A5B-9C29-53A950D1278F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-prefercliruntime", "TestAssets\TestPackages\dotnet-prefercliruntime\dotnet-prefercliruntime.csproj", "{736BF068-7389-41B9-BF63-D4E49B9BC833}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-prefercliruntime", "TestAssets\TestPackages\dotnet-prefercliruntime\dotnet-prefercliruntime.csproj", "{736BF068-7389-41B9-BF63-D4E49B9BC833}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageWithFakeNativeDep", "TestAssets\TestPackages\PackageWithFakeNativeDep\PackageWithFakeNativeDep.csproj", "{48408A19-CCC5-4C85-990B-0A9F827BF29A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageWithFakeNativeDep", "TestAssets\TestPackages\PackageWithFakeNativeDep\PackageWithFakeNativeDep.csproj", "{48408A19-CCC5-4C85-990B-0A9F827BF29A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToolWithOutputName", "TestAssets\TestPackages\ToolWithOutputName\ToolWithOutputName.csproj", "{8FB83810-5A4C-4097-9A79-8E687E4981CB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToolWithOutputName", "TestAssets\TestPackages\ToolWithOutputName\ToolWithOutputName.csproj", "{8FB83810-5A4C-4097-9A79-8E687E4981CB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-archive", "src\dotnet-archive\dotnet-archive.csproj", "{F0CB08B6-2809-4D37-B1DD-A9B7F1B0D95D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-archive", "src\dotnet-archive\dotnet-archive.csproj", "{F0CB08B6-2809-4D37-B1DD-A9B7F1B0D95D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet", "src\dotnet\dotnet.csproj", "{203F0362-DAFC-4679-A01E-7FBC331D8647}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet", "src\dotnet\dotnet.csproj", "{203F0362-DAFC-4679-A01E-7FBC331D8647}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Archive", "src\Microsoft.DotNet.Archive\Microsoft.DotNet.Archive.csproj", "{F8C66E8A-FC59-40B3-AC0F-58CA22526F76}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Archive", "src\Microsoft.DotNet.Archive\Microsoft.DotNet.Archive.csproj", "{F8C66E8A-FC59-40B3-AC0F-58CA22526F76}" EndProject -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}" +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}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Configurer", "src\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.csproj", "{ABB81DAE-0D26-483C-BE3B-0F9ACD812A62}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Configurer", "src\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.csproj", "{ABB81DAE-0D26-483C-BE3B-0F9ACD812A62}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.InternalAbstractions", "src\Microsoft.DotNet.InternalAbstractions\Microsoft.DotNet.InternalAbstractions.csproj", "{570950AD-A080-4F32-980C-F50E312910DF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.InternalAbstractions", "src\Microsoft.DotNet.InternalAbstractions\Microsoft.DotNet.InternalAbstractions.csproj", "{570950AD-A080-4F32-980C-F50E312910DF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ProjectJsonMigration", "src\Microsoft.DotNet.ProjectJsonMigration\Microsoft.DotNet.ProjectJsonMigration.csproj", "{A8E6EFEB-027A-4C4B-A73C-C193A0F00569}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ProjectJsonMigration", "src\Microsoft.DotNet.ProjectJsonMigration\Microsoft.DotNet.ProjectJsonMigration.csproj", "{A8E6EFEB-027A-4C4B-A73C-C193A0F00569}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.TestFramework", "src\Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{6592A22C-2386-4E83-A4D3-FC08075C723A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.TestFramework", "src\Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{6592A22C-2386-4E83-A4D3-FC08075C723A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "redist", "src\redist\redist.csproj", "{098D9321-1201-4974-A75E-F58EBCD98ACF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_fsc", "src\tool_fsharp\tool_fsc.csproj", "{32E9AEFC-EC97-41FA-84DD-74227A9A7692}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_roslyn", "src\tool_roslyn\tool_roslyn.csproj", "{A0670C63-BA7A-4C1B-B9A7-1CA26A7F235C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_msbuild", "src\tool_msbuild\tool_msbuild.csproj", "{D82A3246-9831-4024-A9B2-1932EEF3D56F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tool_nuget", "src\tool_nuget\tool_nuget.csproj", "{BE4C655A-DC54-4408-B739-743456D34111}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_nuget", "src\tool_nuget\tool_nuget.csproj", "{BE4C655A-DC54-4408-B739-743456D34111}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Archiver", "tools\Archiver\Archiver.csproj", "{2DFCC95F-75F7-46E1-8F56-256DB4CA98B2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigrationDefaultsConstructor", "tools\MigrationDefaultsConstructor\MigrationDefaultsConstructor.csproj", "{30C5EFC3-E6FD-4071-89FA-EBB9B5084C42}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentForwardingTests", "test\ArgumentForwardingTests\ArgumentForwardingTests.csproj", "{3E28672F-F4E4-44D5-AEFB-1F425DECC57E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgumentsReflector", "test\ArgumentsReflector\ArgumentsReflector.csproj", "{A5CA696F-585E-40AB-912C-6316BC330C5E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "binding-redirects.Tests", "test\binding-redirects.Tests\binding-redirects.Tests.csproj", "{4EF497BF-D717-4E03-90B1-932C7F51B918}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "binding-redirects.Tests", "test\binding-redirects.Tests\binding-redirects.Tests.csproj", "{4EF497BF-D717-4E03-90B1-932C7F51B918}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crossgen.Tests", "test\crossgen.Tests\crossgen.Tests.csproj", "{18B43540-346F-4AFF-8868-A82CF098FAFD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "crossgen.Tests", "test\crossgen.Tests\crossgen.Tests.csproj", "{18B43540-346F-4AFF-8868-A82CF098FAFD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet.Tests", "test\dotnet.Tests\dotnet.Tests.csproj", "{C3845C85-1F59-4552-BE52-32F513CE795F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet.Tests", "test\dotnet.Tests\dotnet.Tests.csproj", "{C3845C85-1F59-4552-BE52-32F513CE795F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-add-p2p.Tests", "test\dotnet-add-p2p.Tests\dotnet-add-p2p.Tests.csproj", "{C6BEBDCE-991D-4611-9CDE-9F3914979868}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-build.Tests", "test\dotnet-build.Tests\dotnet-build.Tests.csproj", "{BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-build.Tests", "test\dotnet-build.Tests\dotnet-build.Tests.csproj", "{BBB5A4C8-CD2D-4A6A-9159-0FEAF84B745E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-migrate.Tests", "test\dotnet-migrate.Tests\dotnet-migrate.Tests.csproj", "{726D2CB9-80E5-4496-9C86-910AC452C45E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-migrate.Tests", "test\dotnet-migrate.Tests\dotnet-migrate.Tests.csproj", "{726D2CB9-80E5-4496-9C86-910AC452C45E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-msbuild.Tests", "test\dotnet-msbuild.Tests\dotnet-msbuild.Tests.csproj", "{EF745C56-0350-4C42-AA22-86D592E1D8D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-msbuild.Tests", "test\dotnet-msbuild.Tests\dotnet-msbuild.Tests.csproj", "{EF745C56-0350-4C42-AA22-86D592E1D8D5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-new.Tests", "test\dotnet-new.Tests\dotnet-new.Tests.csproj", "{87063BA1-454D-4433-ADF9-89C667275D62}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-new.Tests", "test\dotnet-new.Tests\dotnet-new.Tests.csproj", "{87063BA1-454D-4433-ADF9-89C667275D62}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-nuget.UnitTests", "test\dotnet-nuget.UnitTests\dotnet-nuget.UnitTests.csproj", "{07DD4AE1-5CF6-4EDB-AB29-31EB532F950F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-nuget.UnitTests", "test\dotnet-nuget.UnitTests\dotnet-nuget.UnitTests.csproj", "{07DD4AE1-5CF6-4EDB-AB29-31EB532F950F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-pack.Tests", "test\dotnet-pack.Tests\dotnet-pack.Tests.csproj", "{7256EEBC-814D-42CF-821B-58CB61F3E070}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-pack.Tests", "test\dotnet-pack.Tests\dotnet-pack.Tests.csproj", "{7256EEBC-814D-42CF-821B-58CB61F3E070}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.csproj", "{448F6884-B613-440E-82A6-07E6BB54794C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.csproj", "{448F6884-B613-440E-82A6-07E6BB54794C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-run.Tests", "test\dotnet-run.Tests\dotnet-run.Tests.csproj", "{526D7B7A-0485-48A3-A43F-F03A0DBC9897}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-run.Tests", "test\dotnet-run.Tests\dotnet-run.Tests.csproj", "{526D7B7A-0485-48A3-A43F-F03A0DBC9897}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-test.Tests", "test\dotnet-test.Tests\dotnet-test.Tests.csproj", "{C8D98389-E3CF-4BEF-A9EF-D78672E51866}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-test.Tests", "test\dotnet-test.Tests\dotnet-test.Tests.csproj", "{C8D98389-E3CF-4BEF-A9EF-D78672E51866}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-vstest.Tests", "test\dotnet-vstest.Tests\dotnet-vstest.Tests.csproj", "{131C05D4-D685-478F-A3FB-F5600EF93533}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-vstest.Tests", "test\dotnet-vstest.Tests\dotnet-vstest.Tests.csproj", "{131C05D4-D685-478F-A3FB-F5600EF93533}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndToEnd", "test\EndToEnd\EndToEnd.csproj", "{1BFF54F9-4E35-49DB-893C-AF2047722FC6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEnd", "test\EndToEnd\EndToEnd.csproj", "{1BFF54F9-4E35-49DB-893C-AF2047722FC6}" EndProject -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}" +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}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kestrel.Tests", "test\Kestrel.Tests\Kestrel.Tests.csproj", "{85296DB1-1999-4137-B6EE-CD417D64699C}" EndProject -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}" +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}" EndProject -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}" +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}" EndProject -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}" +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}" EndProject -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}" +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}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msbuild.IntegrationTests", "test\msbuild.IntegrationTests\msbuild.IntegrationTests.csproj", "{23EE9BBB-3B33-4CF2-8D1A-29A8DB12E878}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "msbuild.IntegrationTests", "test\msbuild.IntegrationTests\msbuild.IntegrationTests.csproj", "{23EE9BBB-3B33-4CF2-8D1A-29A8DB12E878}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance", "test\Performance\Performance.csproj", "{F5E27BA5-063B-4770-A6E8-87252E9AB22C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Performance", "test\Performance\Performance.csproj", "{F5E27BA5-063B-4770-A6E8-87252E9AB22C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptExecutorTests", "test\ScriptExecutorTests\ScriptExecutorTests.csproj", "{90C8861D-1C4C-4D2A-9715-B217760A1655}" EndProject -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}" +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}" +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}" EndProject -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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "update-dependencies", "build_projects\update-dependencies\update-dependencies.csproj", "{F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "update-dependencies", "build_projects\update-dependencies\update-dependencies.csproj", "{F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}" +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("{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}" +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}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_fsc", "src\tool_fsharp\tool_fsc.csproj", "{602976C5-2477-4B4C-AD9A-1EAFB250529A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -215,30 +215,28 @@ Global RelWithDebInfo|x86 = RelWithDebInfo|x86 EndGlobalSection 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|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 = Debug|Any CPU - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU - {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.MinSizeRel|x86.Build.0 = Debug|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 + {8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}.Debug|Any CPU.ActiveCfg = Debug|x86 + {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 {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 @@ -1511,78 +1509,50 @@ Global {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {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|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 = Debug|Any CPU - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU - {C98C7C2E-2C29-4A40-958C-60561ED77791}.MinSizeRel|x86.Build.0 = Debug|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|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 = Debug|Any CPU - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU - {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.MinSizeRel|x86.Build.0 = Debug|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 - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x64.ActiveCfg = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x64.Build.0 = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x86.ActiveCfg = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Debug|x86.Build.0 = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.MinSizeRel|x86.Build.0 = Debug|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|Any CPU.Build.0 = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x64.ActiveCfg = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x64.Build.0 = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x86.ActiveCfg = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.Release|x86.Build.0 = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {32E9AEFC-EC97-41FA-84DD-74227A9A7692}.RelWithDebInfo|x86.Build.0 = Release|Any CPU + {C98C7C2E-2C29-4A40-958C-60561ED77791}.Debug|Any CPU.ActiveCfg = Debug|x86 + {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 + {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A}.Debug|Any CPU.ActiveCfg = Debug|x86 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1653,6 +1623,6 @@ Global {F2D1A7DA-B3EB-4CA7-BAA9-A18CEC398853} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} {C98C7C2E-2C29-4A40-958C-60561ED77791} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {56F1E090-B80F-4BDF-8991-4B0F9B5B8C9A} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - {32E9AEFC-EC97-41FA-84DD-74227A9A7692} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {602976C5-2477-4B4C-AD9A-1EAFB250529A} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} EndGlobalSection EndGlobal diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj index 1e1d45c902..2d1f6e8621 100644 --- a/src/tool_fsharp/tool_fsc.csproj +++ b/src/tool_fsharp/tool_fsc.csproj @@ -20,7 +20,6 @@ - @@ -29,8 +28,9 @@ + DestinationFiles="@(HackFilesToCopy->'$(PublishDir)/%(RecursiveDir)%(Filename)%(Extension)')" /> + From 0dd4f123d2245ab552e44cf783b54145140d5f4d Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 29 Jun 2017 19:08:33 -0700 Subject: [PATCH 005/128] Update Template Engine and templates for 1.x --- ...rosoft.DotNet.Cli.DependencyVersions.props | 4 +-- src/dotnet/Program.cs | 1 + .../commands/dotnet-new/NewCommandShim.cs | 29 +++++++------------ test/dotnet-new.Tests/NewCommandTests.cs | 4 +-- ...atTheUserIsRunningDotNetForTheFirstTime.cs | 1 - 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index fa216040c0..f7d5d560fa 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -9,8 +9,8 @@ 4.3.0-preview3-4168 1.0.0-alpha-20170516-2-509 15.0.0 - 1.0.0-beta1-20170202-111 - 1.0.0-beta1-20170427-174 + 1.0.0-beta2-20170629-269 + 1.0.0-beta2-20170629-269 1.0.3 1.0.3 diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 63119cdba3..de3736386c 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -28,6 +28,7 @@ using Microsoft.DotNet.Tools.Test; using Microsoft.DotNet.Tools.VSTest; using NuGet.Frameworks; +using Command = Microsoft.DotNet.Cli.Utils.Command; namespace Microsoft.DotNet.Cli { diff --git a/src/dotnet/commands/dotnet-new/NewCommandShim.cs b/src/dotnet/commands/dotnet-new/NewCommandShim.cs index e979ecb741..52c94239b0 100644 --- a/src/dotnet/commands/dotnet-new/NewCommandShim.cs +++ b/src/dotnet/commands/dotnet-new/NewCommandShim.cs @@ -6,8 +6,11 @@ using System.Globalization; using System.IO; using System.Linq; -using System.Runtime.CompilerServices; +using System.Reflection; +using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; +using Microsoft.DotNet.Tools.MSBuild; using Microsoft.TemplateEngine.Abstractions; using Microsoft.TemplateEngine.Cli; using Microsoft.TemplateEngine.Edge; @@ -25,29 +28,17 @@ internal class NewCommandShim public static int Run(string[] args) { - return New3Command.Run(CommandName, CreateHost(), FirstRun, args); + var logger = new TelemetryLogger(null); + return New3Command.Run(CommandName, CreateHost(), logger, FirstRun, args); } private static ITemplateEngineHost CreateHost() { - var builtIns = new Dictionary> + var builtIns = new AssemblyComponentCatalog(new[] { - { new Guid("0C434DF7-E2CB-4DEE-B216-D7C58C8EB4B3"), () => typeof(RunnableProjectGenerator) }, - { new Guid("3147965A-08E5-4523-B869-02C8E9A8AAA1"), () => typeof(BalancedNestingConfig) }, - { new Guid("3E8BCBF0-D631-45BA-A12D-FBF1DE03AA38"), () => typeof(ConditionalConfig) }, - { new Guid("A1E27A4B-9608-47F1-B3B8-F70DF62DC521"), () => typeof(FlagsConfig) }, - { new Guid("3FAE1942-7257-4247-B44D-2DDE07CB4A4A"), () => typeof(IncludeConfig) }, - { new Guid("3D33B3BF-F40E-43EB-A14D-F40516F880CD"), () => typeof(RegionConfig) }, - { new Guid("62DB7F1F-A10E-46F0-953F-A28A03A81CD1"), () => typeof(ReplacementConfig) }, - { new Guid("370996FE-2943-4AED-B2F6-EC03F0B75B4A"), () => typeof(ConstantMacro) }, - { new Guid("BB625F71-6404-4550-98AF-B2E546F46C5F"), () => typeof(EvaluateMacro) }, - { new Guid("10919008-4E13-4FA8-825C-3B4DA855578E"), () => typeof(GuidMacro) }, - { new Guid("F2B423D7-3C23-4489-816A-41D8D2A98596"), () => typeof(NowMacro) }, - { new Guid("011E8DC1-8544-4360-9B40-65FD916049B7"), () => typeof(RandomMacro) }, - { new Guid("8A4D4937-E23F-426D-8398-3BDBD1873ADB"), () => typeof(RegexMacro) }, - { new Guid("B57D64E0-9B4F-4ABE-9366-711170FD5294"), () => typeof(SwitchMacro) }, - { new Guid("10919118-4E13-4FA9-825C-3B4DA855578E"), () => typeof(CaseChangeMacro) } - }.ToList(); + typeof(RunnableProjectGenerator).GetTypeInfo().Assembly, + typeof(ConditionalConfig).GetTypeInfo().Assembly, + }); var preferences = new Dictionary { diff --git a/test/dotnet-new.Tests/NewCommandTests.cs b/test/dotnet-new.Tests/NewCommandTests.cs index 4a9c7d115e..45eccf5c7c 100644 --- a/test/dotnet-new.Tests/NewCommandTests.cs +++ b/test/dotnet-new.Tests/NewCommandTests.cs @@ -16,7 +16,7 @@ public void WhenSwitchIsSkippedThenItPrintsError() cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().StartWith("No templates matched the input template name: [Web1.1]"); + cmd.StdErr.Should().StartWith("No templates matched the input template name: Web1.1."); } [Fact] @@ -26,7 +26,7 @@ public void WhenTemplateNameIsNotUniquelyMatchedThenItIndicatesProblemToUser() cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: [c]"); + cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: c."); } } } diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index 273d4fd217..1f352ec382 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -105,7 +105,6 @@ public void ItRestoresTheNuGetPackagesToTheNuGetCacheFolder() "microsoft.extensions.logging.console", "microsoft.extensions.logging.debug", "microsoft.extensions.options.configurationextensions", - "microsoft.visualstudio.web.browserlink", }; _nugetCacheFolder From 4454c4e19133007c8072067e8b418f86d00d6f9d Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 30 Jun 2017 10:15:07 -0700 Subject: [PATCH 006/128] Update the SDK to 1.1.0-alpha-20170630-2 This SDK contains the F# targets. --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index f7d5d560fa..b9516fa310 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000402-01 2.3.0-beta3-61816-04 4.2.0-rc-170621-0 - 1.1.0-alpha-20170615-3 + 1.1.0-alpha-20170630-2 4.3.0-preview3-4168 1.0.0-alpha-20170516-2-509 15.0.0 From 47ef990e66c5d97219c9334f579a9102bad95ddc Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 30 Jun 2017 11:58:16 -0700 Subject: [PATCH 007/128] chmod .sh files --- build/Microsoft.DotNet.Cli.Compile.targets | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index a5a3a67a3e..954b23ee66 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -226,6 +226,15 @@ u=rwx,g=rx,o=rx + + 755 + + + 755 + + + 755 + Date: Fri, 30 Jun 2017 12:03:04 -0700 Subject: [PATCH 008/128] Copy Paste error --- build/Microsoft.DotNet.Cli.Compile.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets index 954b23ee66..804db01f2d 100644 --- a/build/Microsoft.DotNet.Cli.Compile.targets +++ b/build/Microsoft.DotNet.Cli.Compile.targets @@ -232,7 +232,7 @@ 755 - + 755 From 502c0828460d05857dae5e71c9573d991fa4da31 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 30 Jun 2017 12:17:20 -0700 Subject: [PATCH 009/128] Publishing a 'coherent' badge. --- build/Publish.targets | 42 ++++++++++++++++++++++++++++++------- build/VersionBadge.props | 5 +++-- build/publish/Badge.targets | 12 +++++++++++ 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index d38175d64b..e1608b8e5d 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -16,13 +16,15 @@ + DependsOnTargets="GenerateVersionBadge; + GenerateCoherentBadge; + GatherItemsForPattern; + GenerateChecksums; + UploadArtifactsToAzure; + UploadChecksumsToAzure; + PublishDebFilesToDebianRepo; + PublishCliVersionBadge; + PublishCliCoherentBadge" /> @@ -65,4 +67,30 @@ ContainerName="$(ArtifactContainerName)" Items="@(CliVersionBadgeToUpload)" /> + + + + + + + + + $(Product)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/')) + + + + + + + \ No newline at end of file diff --git a/build/VersionBadge.props b/build/VersionBadge.props index 42f210be03..b0d2ca4179 100644 --- a/build/VersionBadge.props +++ b/build/VersionBadge.props @@ -1,11 +1,12 @@ - $(OSName)_$(Architecture) + $(OSName)_$(Architecture) ubuntu_16_04_x64 ubuntu_16_10_x64 fedora_24_x64 opensuse_42_1_x64 - $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg + $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg + $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_coherent_badge.svg diff --git a/build/publish/Badge.targets b/build/publish/Badge.targets index 7c87a7ac6c..d80313c199 100644 --- a/build/publish/Badge.targets +++ b/build/publish/Badge.targets @@ -14,4 +14,16 @@ ReplacementPatterns="ver_number" ReplacementStrings="$(SdkVersion)" /> + + + + + + \ No newline at end of file From 207a7e4307924b55d958a4166380918e5f13a8d6 Mon Sep 17 00:00:00 2001 From: Zhi Li Date: Fri, 30 Jun 2017 14:25:46 -0700 Subject: [PATCH 010/128] update nuget to 4.3.0-preview4-4258 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index fa216040c0..a4d674c7ed 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,7 +6,7 @@ 2.3.0-beta3-61816-04 4.2.0-rc-170621-0 1.1.0-alpha-20170615-3 - 4.3.0-preview3-4168 + 4.3.0-preview4-4258 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From dd137f6b42691ac7164d2f319a8d7fb1c9cd7fc7 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 30 Jun 2017 22:42:00 -0700 Subject: [PATCH 011/128] Revert "Pinning the SDK version to: "2.0.0-preview3-006628"" This reverts commit 0dd17b6330705376c387a90aa8d3786ff296a62b. --- run-build.ps1 | 4 ++-- run-build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run-build.ps1 b/run-build.ps1 index 4911e1a32b..d3bb1152b1 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1 # install a stage0 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1" -Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview3-006628" -Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview3-006628" +Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index 93d9820c09..95154cdf6c 100755 --- a/run-build.sh +++ b/run-build.sh @@ -155,7 +155,7 @@ export VSTEST_TRACE_BUILD=1 export DOTNET_MULTILEVEL_LOOKUP=0 # Install a stage 0 -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" --version "2.0.0-preview3-006628" $LINUX_PORTABLE_INSTALL_ARGS) +(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then From 557dd8d37635bd12753da2e86ed333dfa14aa7b5 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Sat, 1 Jul 2017 11:26:48 -0700 Subject: [PATCH 012/128] Update to SetupCrossgen 229 - Coherence 26027 --- build/DependencyVersions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 655225c0c9..f490458025 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,8 +23,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170629-268 - 1.0.0-beta2-20170629-268 - 1.0.0-beta2-20170629-268 + 1.0.0-beta2-20170630-271 + 1.0.0-beta2-20170630-271 2.0.0-preview3-25428-01 2.0.0-preview3-25428-01 0.1.1-alpha-167 @@ -35,9 +35,9 @@ timestamped - dev-224 + dev-229 preview3 - 25975 + 26027 From c819188efbc32576810f463ed803a2382a230096 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Sat, 1 Jul 2017 13:07:02 -0700 Subject: [PATCH 013/128] Update F# to latest --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index fa216040c0..66b0811933 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,7 +4,7 @@ 1.1.2 15.3.0-preview-000402-01 2.3.0-beta3-61816-04 - 4.2.0-rc-170621-0 + 4.2.0-rc-170630-0 1.1.0-alpha-20170615-3 4.3.0-preview3-4168 1.0.0-alpha-20170516-2-509 From c7d9dba0d2806ba782f25a8d628442e2aa05dca3 Mon Sep 17 00:00:00 2001 From: Livar Date: Mon, 3 Jul 2017 10:12:04 -0700 Subject: [PATCH 014/128] Update SDK to 2.0.0-preview3-20170703-2 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e18d72145b..36f0f77e75 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.0-preview3-20170622-1 + 2.0.0-preview3-20170703-2 $(CLI_NETSDK_Version) 4.3.0-preview4-4258 From 6363063076746d3034b5e4362d67c19955d129b2 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Mon, 3 Jul 2017 11:04:01 -0700 Subject: [PATCH 015/128] Update compiler --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a3a15fb3bc..807864c859 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -6,7 +6,7 @@ 2.3.0-beta3-61816-04 2.3.0-pre-20170624-6 1.6.0-beta2-25304 - 4.2.0-rc-170621-0 + 4.2.0-rc-170630-0 4.4.1-pre-20170624-6 timestamped - dev-229 + dev-249 preview3 - 26027 + 26071 From e4f2fabcd97ffc0da194de4d2ef2bdfb821fd467 Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Wed, 5 Jul 2017 10:50:32 -0500 Subject: [PATCH 019/128] Security build definition merge. (#2) --- .../security/DotNet-CLI-Security-Windows.json | 718 ++++++++++++++++++ build/buildpipeline/security/dir.props | 4 + build/buildpipeline/security/pipeline.json | 22 + build/buildpipeline/security/syncAzure.proj | 21 + .../buildpipeline/security/syncAzure.targets | 31 + 5 files changed, 796 insertions(+) create mode 100644 build/buildpipeline/security/DotNet-CLI-Security-Windows.json create mode 100644 build/buildpipeline/security/dir.props create mode 100644 build/buildpipeline/security/pipeline.json create mode 100644 build/buildpipeline/security/syncAzure.proj create mode 100644 build/buildpipeline/security/syncAzure.targets diff --git a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json new file mode 100644 index 0000000000..2198083370 --- /dev/null +++ b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json @@ -0,0 +1,718 @@ +{ + "build": [ + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Clone Core-Setup", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_Git)", + "arguments": "clone $(CoreSetupUrl) core-setup", + "workingFolder": "$(Build.SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Checkout Core-Setup master", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_Git)", + "arguments": "checkout master", + "workingFolder": "$(build.SourcesDirectory)\\core-setup", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Run init-tools.cmd", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "init-tools.cmd", + "arguments": "", + "workingFolder": "$(Build.SourcesDirectory)\\core-setup", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Delete CLI dir.props", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-path \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param ($path)\ngci \"$path\\dir.props\" | Remove-Item -Force", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Download blobs from container $(PB_CloudDropAccountName)", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(Build.SourcesDirectory)\\build\\buildpipeline\\security\\syncAzure.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", + "platform": "x64", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/p:AzureAccount=\"$(PB_CloudDropAccountName)\" /p:AzureToken=\"$(PB_CloudDropAccessToken)\" /p:BlobName=\"$(PB_BlobNameFilter)\" /verbosity:diag", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Copy downloaded packages to security folder", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "PowerShell_23", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$pkgDir = \"$SrcDir\\core-setup\\packages\\AzureTransfer\"\nCopy-Item \"$pkgDir \" \"$secDir\" -Force -Recurse\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Extract downloaded packages", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\ngci \"$secDir\\*.zip\" | % {\n$dstDir = Join-Path \"$secDir\" $($_.BaseName)\nExpand-Archive -Path $($_.FullName) -DestinationPath \"$dstDir\" -Force\nWrite-Host \"Expanded: $($_.FullName)\"\nRemove-Item $_.FullName -Force\n}\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "List all files", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "$(Build.SourcesDirectory)", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Workaround for long path - DELETE files with path length greater than or equal to 240 characters", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "Task_10", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$longPath = New-Object System.Collections.ArrayList\ngci \"$SrcDir\\*\" -recurse | where {!$_.PSIsContainer} | % {\nif ($($_.FullName.Length) -ge 240)\n{\n$longPath.Add($($_.Directory.FullName)) | Out-Null\n}\n}\n$longPath | % {\nStart-Process \"cmd\" -ArgumentList \"/c rd /S /Q $_\" -Wait\nWrite-Host \"DELETED $_\"\n}\n", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Remove non-CLI files", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "PowerShell_22", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$f=\"dotnet\", \"Microsoft.DotNet.Archive\", \"Microsoft.DotNet.Cli.Sln.Internal\", \"Microsoft.DotNet.Cli.Utils\", \"Microsoft.DotNet.Configurer\", \"Microsoft.DotNet.InternalAbstractions\", \"Microsoft.DotNet.TestFramework\"\ngci \"$secDir\" -recurse | where {!$_.PSIsContainer} | % {\nif ($f -inotcontains $_.BaseName) {\nif ($_.Extension -ine \".exe\" -and $_.Name -ine \"latest.version\") { \nRemove-Item $_.FullName\nWrite-Host \"Removed: $($_.FullName)\"\n}}}", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "List all files - post delete", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "Task_11", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "$(Build.SourcesDirectory)", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run BinSkim ", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "3056813a-40e9-4b2f-8f6b-612d1bc4e045", + "versionSpec": "3.*", + "definitionType": "task" + }, + "inputs": { + "InputType": "CommandLine", + "arguments": "analyze $(Build.SourcesDirectory)\\security\\*.dll $(Build.SourcesDirectory)\\security\\*.exe --recurse --sympath $(Build.SourcesDirectory)\\security\\*.pdb --verbose --statistics", + "Function": "analyze", + "AnalyzeTarget": "$(Build.ArtifactStagingDirectory)", + "AnalyzeSymPath": "", + "AnalyzeConfigPath": "default", + "AnalyzePluginPath": "", + "AnalyzeRecurse": "true", + "AnalyzeVerbose": "true", + "AnalyzeHashes": "true", + "AnalyzeStatistics": "false", + "AnalyzeEnvironment": "false", + "ExportRulesOutputType": "SARIF", + "DumpTarget": "$(Build.ArtifactStagingDirectory)", + "DumpRecurse": "true", + "DumpVerbose": "true", + "toolVersion": "Latest" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run APIScan", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "9adea2b1-3752-438c-80c6-a6f0a812abdd", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "targetMode": "binarysym", + "softwareFolder": "$(Build.SourcesDirectory)\\security", + "mpdFolder": "", + "softwareName": "CLI", + "softwareVersionNum": "$(PB_BuildNumber)", + "softwareBuildNum": "$(PB_BuildNumber)", + "modeType": "prerelease", + "noCopySymbols": "false", + "noCopyBinaries": "false", + "noDecompress": "true", + "exclusionList": "", + "email": "", + "symbolsFolder": "$(Build.SourcesDirectory)\\security", + "preBbtBinariesFolder": "", + "preBbtSymbolsFolder": "", + "isLargeApp": "false", + "analyzerTimeout": "00:00:00", + "preserveTempFiles": "false", + "toolVersion": "Latest" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Checkout CLI at SHA listed in latest.version", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\" -git \"$(PB_Git)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir, $git)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$shaFile= Join-Path \"$secDir\" \"latest.version\"\n$sha = gc \"$shaFile\" -first 1\n\nif ([string]::IsNullOrWhiteSpace($sha))\n{ Write-Error \"Unable to determine latest commit SHA.\" }\n\nStart-Process \"$git\" -ArgumentList \"clean -df\" -Wait -Verbose -ErrorAction Stop\nStart-Process \"$git\" -ArgumentList \"checkout $sha\" -Wait -Verbose -ErrorAction Stop\nWrite-Host \"Checked out at $sha\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run Core-Setup clean.cmd", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "clean.cmd", + "arguments": "-all", + "workingFolder": "$(Build.SourcesDirectory)\\core-setup", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Delete Core-Setup folder", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-path \"$(Build.SourcesDirectory)\\core-setup\"", + "workingFolder": "", + "inlineScript": "param ($path)\nRemove-Item \"$path\" -Force -Recurse -ErrorAction Continue\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "List all files - post checkout", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "$(Build.SourcesDirectory)", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run CredScan", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "ea576cd4-c61f-48f8-97e7-a3cb07b90a6f", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "outputFormat": "pre", + "toolVersion": "Latest", + "scanFolder": "$(Build.SourcesDirectory)", + "searchersFileType": "Default", + "searchersFile": "", + "suppressionsFile": "", + "suppressAsError": "false", + "batchSize": "" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run PoliCheck", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d785890c-0d0d-46bd-8167-8fa9d49990c7", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "inputType": "Basic", + "cmdLineArgs": "/F:$(Build.SourcesDirectory) /T:9 /O:PoliCheck.xml", + "targetType": "F", + "targetArgument": "$(Build.SourcesDirectory)", + "importEx": "0", + "termTypeT": "0029a9", + "termTypeTCustom": "9", + "termTypeK": "", + "termTypeL": "", + "EXGT": "false", + "result": "PoliCheck.xml", + "optionsFC": "1", + "optionsXS": "1", + "optionsCTGLEN": "", + "optionsSEV": "", + "optionsPE": "", + "optionsHMENABLE": "", + "optionsHPATH": "", + "optionsHVER": "", + "optionsRulesDBPath": "", + "optionsRule": "", + "optionsXCLASS": "", + "optionsTASKNAME": "", + "optionsWORKINGDIRECTORY": "", + "optionsFTPATH": "", + "optionsD": "", + "optionsB1": "", + "optionsB2": "", + "optionsB3": "", + "optionsOCDB": "", + "toolVersion": "Latest" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Post Analysis", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "f5679091-e6da-4974-a8dc-0eec03a8ea63", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "APIScan": "true", + "BinScope": "false", + "BinSkim": "true", + "BinSkimBreakOn": "Error", + "CredScan": "true", + "FortifySCA": "false", + "FxCop": "false", + "FxCopBreakOn": "ErrorAbove", + "ModernCop": "false", + "ModernCopBreakOn": "Error", + "PoliCheck": "true", + "PoliCheckBreakOn": "Severity1", + "SDLNativeRules": "false", + "TSLint": "false", + "TSLintBreakOn": "Error" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Publish Security Analysis Logs", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "4096c760-3a8a-435d-9689-88c0311bbc0e", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "ArtifactName": "CodeAnalysisLogs", + "ArtifactType": "Container", + "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)", + "RvName": "", + "ProductComponentName": "", + "ProductVersionNumber": "", + "PlatformName": "", + "SDLToolName": "", + "SDLToolResultFile": "" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "TSA upload to Codebase: DotNet-CLI-Trusted_$(CodeBase) Stamp: Azure", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "3da26988-bb64-4a23-8f06-45531d297dae", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "codebase": "NewOrUpdate", + "tsaStamp": "Azure", + "tsaWebApiUrl": "$(TSAStamp)", + "codeBaseName": "DotNet-CLI-Trusted_$(CodeBase)", + "notificationAlias": "$(NotificationAlias)", + "codeBaseAdmins": "NORTHAMERICA\\raeda", + "instanceUrlAzure": "MSAZURE", + "instanceUrlBing": "", + "instanceUrlCarbon": "", + "instanceUrlDevDiv": "DEVDIV", + "instanceUrlSkype": "", + "instanceUrlTsa": "", + "instanceUrlPpe": "", + "projectNameDAIPVSTF": "", + "projectNameDYNAMICSCRM": "", + "projectNameMSAZURE": "One", + "projectNameMSDYENG": "", + "projectNameMSECG": "", + "projectNameIDENTITYDIVISION": "Code Scan - TSA", + "projectNameVSTFRD": "", + "projectNameMSASG": "", + "projectNameMICROSOFTVSTS": "", + "projectNameMSDATA": "", + "projectNameMSENG": "", + "projectNameDEVDIV": "DevDiv", + "projectNameSKYPETEST2": "", + "projectNameONEDRIVE": "", + "projectNameSQLBUVSTS": "", + "projectNamePOWERBI": "", + "projectNameAZUREVSTFPPE": "", + "projectNameSKYPE": "", + "projectNameDOMOREEXP": "", + "projectNameSQLBUVSTSTEST": "", + "areaPath": "One\\DevDiv\\DotNetCore", + "iterationPath": "One", + "uploadAPIScan": "true", + "uploadBinScope": "false", + "uploadBinSkim": "true", + "uploadCredScan": "true", + "uploadFortifySCA": "false", + "uploadFxCop": "false", + "uploadModernCop": "false", + "uploadPoliCheck": "true", + "uploadPREfast": "false", + "validateToolOutput": "Warning", + "validateCompatibility": "Error", + "uploadAsync": "true" + } + } + ], + "options": [ + { + "enabled": false, + "definition": { + "id": "5bc3cfb7-6b54-4a4b-b5d2-a3905949f8a6" + }, + "inputs": {} + }, + { + "enabled": false, + "definition": { + "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" + }, + "inputs": { + "multipliers": "[]", + "parallel": "false", + "continueOnError": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" + }, + "inputs": { + "workItemType": "234347", + "assignToRequestor": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" + }, + "inputs": {} + }, + { + "enabled": false, + "definition": { + "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" + }, + "inputs": { + "branchFilters": "[\"+refs/heads/*\"]", + "additionalFields": "{}" + } + } + ], + "variables": { + "system.debug": { + "value": "false" + } + }, + "demands": [ + "Agent.OS -equals windows_nt", + "msbuild" + ], + "retentionRules": [ + { + "branches": [ + "+refs/heads/*" + ], + "artifacts": [ + "build.SourceLabel" + ], + "artifactTypesToDelete": [], + "daysToKeep": 10, + "minimumToKeep": 1, + "deleteBuildRecord": true, + "deleteTestResults": true + } + ], + "_links": { + "self": { + "href": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661" + }, + "web": { + "href": "https://devdiv.visualstudio.com/_permalink/_build/index?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" + }, + "editor": { + "href": "https://devdiv.visualstudio.com/_permalink/_build/definitionEditor?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" + }, + "badge": { + "href": "https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6661/badge" + } + }, + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", + "jobAuthorizationScope": 1, + "jobTimeoutInMinutes": 600, + "jobCancelTimeoutInMinutes": 5, + "badgeEnabled": true, + "repository": { + "properties": { + "cleanOptions": "3", + "labelSources": "0", + "labelSourcesFormat": "$(build.buildNumber)", + "reportBuildStatus": "true", + "gitLfsSupport": "false", + "skipSyncSource": "false", + "checkoutNestedSubmodules": "false", + "fetchDepth": "0" + }, + "id": "ceac4423-53f8-4c97-bc62-173630412581", + "type": "TfsGit", + "name": "DotNet-Cli-Trusted", + "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Cli-Trusted", + "defaultBranch": "refs/heads/master", + "clean": "true", + "checkoutSubmodules": false + }, + "processParameters": {}, + "quality": "definition", + "authoredBy": { + "id": "9d5fdf9f-36b6-4d0c-a12e-2737a673af94", + "displayName": "Ravi Eda", + "uniqueName": "raeda@microsoft.com", + "url": "https://app.vssps.visualstudio.com/Aa44b2c06-f247-425c-8464-4a0676af910a/_apis/Identities/9d5fdf9f-36b6-4d0c-a12e-2737a673af94", + "imageUrl": "https://devdiv.visualstudio.com/_api/_common/identityImage?id=9d5fdf9f-36b6-4d0c-a12e-2737a673af94" + }, + "queue": { + "id": 36, + "name": "DotNet-Build", + "pool": { + "id": 39, + "name": "DotNet-Build" + } + }, + "id": 6661, + "name": "DotNet-CLI-Security-Windows", + "url": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661", + "uri": "vstfs:///Build/Definition/6661", + "path": "\\", + "type": 2, + "revision": 6, + "createdDate": "2017-06-21T21:58:12.397Z", + "project": { + "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "name": "DevDiv", + "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", + "url": "https://devdiv.visualstudio.com/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "state": "wellFormed", + "revision": 418097676, + "visibility": 0 + } +} diff --git a/build/buildpipeline/security/dir.props b/build/buildpipeline/security/dir.props new file mode 100644 index 0000000000..3e28b4a52a --- /dev/null +++ b/build/buildpipeline/security/dir.props @@ -0,0 +1,4 @@ + + + + diff --git a/build/buildpipeline/security/pipeline.json b/build/buildpipeline/security/pipeline.json new file mode 100644 index 0000000000..dbac3626b0 --- /dev/null +++ b/build/buildpipeline/security/pipeline.json @@ -0,0 +1,22 @@ +{ + "Repository": "cli", + "Definitions": { + "Path": ".", + "Type": "VSTS", + "BaseUrl": "https://devdiv.visualstudio.com/DefaultCollection", + "SkipBranchAndVersionOverrides": "false" + }, + "Pipelines": [ + { + "Name": "Security Build for Windows", + "Parameters": { + "TreatWarningsAsErrors": "false" + }, + "Definitions": [ + { + "Name": "DotNet-CLI-Security-Windows" + } + ] + } + ] +} diff --git a/build/buildpipeline/security/syncAzure.proj b/build/buildpipeline/security/syncAzure.proj new file mode 100644 index 0000000000..45d7657ebd --- /dev/null +++ b/build/buildpipeline/security/syncAzure.proj @@ -0,0 +1,21 @@ + + + + + + $(BuildToolsTaskDesktopDir)Microsoft.DotNet.Build.CloudTestTasks.dll + dotnet + $(PackagesDir)AzureTransfer + + + + + + + + + + + + + diff --git a/build/buildpipeline/security/syncAzure.targets b/build/buildpipeline/security/syncAzure.targets new file mode 100644 index 0000000000..4cc360a11c --- /dev/null +++ b/build/buildpipeline/security/syncAzure.targets @@ -0,0 +1,31 @@ + + + + + + + $(PackagesDir)/AzureTransfer + + + + + + + + + <_OSFilteredBlobNames Include="@(_BlobList)" + Condition="'$(OSGroup)' == 'Windows_NT' AND + ('%(_BlobList.Extension)' == '.zip' OR '%(_BlobList.Extension)' == '.exe' OR '%(_BlobList.Extension)' == '.version')" /> + + + + + From 2b15cb43cf19b05587ea4e80bc526b17008c1a49 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 5 Jul 2017 09:54:46 -0700 Subject: [PATCH 020/128] Adding a Minimum VS Defined SDK version to the resolver. If it set to 1.0.4 if the minimum SDK version file is not found. --- .../Interop.NETStandard.cs | 6 +- .../MSBuildSdkResolver.cs | 30 ++++++++ ...Microsoft.DotNet.MSBuildSdkResolver.csproj | 6 +- .../GivenAnMSBuildSdkResolver.cs | 73 ++++++++++++++++++- 4 files changed, 107 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs index afb2fd32a6..272471bd38 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs @@ -2,10 +2,10 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. // NOTE: Currently, only the NET46 build ships (with Visual Studio/desktop msbuild), -// but the netstandard1.3 adaptation here acts a proof-of-concept for cross-platform +// but the netstandard1.5 adaptation here acts a proof-of-concept for cross-platform // portability of the underlying hostfxr API and gives us build and test coverage // on non-Windows machines. -#if NETSTANDARD1_3 +#if NETSTANDARD1_5 using System.Runtime.InteropServices; using System.Text; @@ -34,4 +34,4 @@ private static int hostfxr_resolve_sdk(string exe_dir, string working_dir, [Out] } } -#endif // NETSTANDARD1_3 \ No newline at end of file +#endif // NETSTANDARD1_5 \ No newline at end of file diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs index b4358a0c7e..f5195f8399 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; namespace Microsoft.DotNet.MSBuildSdkResolver { @@ -64,6 +65,7 @@ public override SdkResult Resolve(SdkReference sdkReference, SdkResolverContext + " the version specified in global.json." }); } + string minimumMSBuildVersionString = GetMinimumMSBuildVersion(netcoreSdkDir); var minimumMSBuildVersion = Version.Parse(minimumMSBuildVersionString); if (context.MSBuildVersion < minimumMSBuildVersion) @@ -77,6 +79,18 @@ public override SdkResult Resolve(SdkReference sdkReference, SdkResolverContext + " version currently available." }); } + + string minimumVSDefinedSDKVersion = GetMinimumVSDefinedSDKVersion(); + if (IsNetCoreSDKSmallerThanTheMinimumVersion(netcoreSdkVersion, minimumVSDefinedSDKVersion)) + { + return factory.IndicateFailure( + new[] + { + $"Version {netcoreSdkVersion} of the .NET Core SDK is smaller than the minimum version" + + $" {minimumVSDefinedSDKVersion} required by Visual Studio. Check that a recent enough" + + " .NET Core SDK is installed or increase the version specified in global.json." + }); + } } string msbuildSdkDir = Path.Combine(msbuildSdksDir, sdkReference.Name, "Sdk"); @@ -107,6 +121,22 @@ private static string GetMinimumMSBuildVersion(string netcoreSdkDir) return File.ReadLines(minimumVersionFilePath).First().Trim(); } + private static string GetMinimumVSDefinedSDKVersion() + { + string dotnetMSBuildSdkResolverDirectory = + Path.GetDirectoryName(typeof(DotNetMSBuildSdkResolver).GetTypeInfo().Assembly.Location); + string minimumVSDefinedSdkVersionFilePath = + Path.Combine(dotnetMSBuildSdkResolverDirectory, "minimumVSDefinedSDKVersion"); + + if (!File.Exists(minimumVSDefinedSdkVersionFilePath)) + { + // smallest version that is required by VS 15.3. + return "1.0.4"; + } + + return File.ReadLines(minimumVSDefinedSdkVersionFilePath).First().Trim(); + } + private bool IsNetCoreSDKSmallerThanTheMinimumVersion(string netcoreSdkVersion, string minimumVersion) { FXVersion netCoreSdkFXVersion; diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index 335eed3ce6..ca8867c759 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -3,8 +3,8 @@ $(SdkVersion) - netstandard1.3;net46 - netstandard1.3 + netstandard1.5;net46 + netstandard1.5 AnyCPU win-x86;win-x64 true @@ -20,7 +20,7 @@ - + diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs index 73cc41a641..97e1db0be2 100644 --- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs +++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs @@ -13,6 +13,8 @@ using Xunit.Abstractions; using System; +[assembly: CollectionBehavior(DisableTestParallelization = true)] + namespace Microsoft.DotNet.Cli.Utils.Tests { public class GivenAnMSBuildSdkResolver : TestBase @@ -106,11 +108,59 @@ public void ItReturnsNullWhenTheSDKRequiresAHigherVersionOfMSBuildThanTheOneAvai } [Fact] - public void ItReturnsTheVersionIfItIsEqualToTheMinVersion() + public void ItReturnsNullWhenTheDefaultVSRequiredSDKVersionIsHigherThanTheSDKVersionAvailable() + { + var environment = new TestEnvironment(); + var expected = + environment.CreateSdkDirectory(ProgramFiles.X64, "Some.Test.Sdk", "1.0.1"); + environment.CreateMuxerAndAddToPath(ProgramFiles.X64); + + var resolver = environment.CreateResolver(); + var result = (MockResult)resolver.Resolve( + new SdkReference("Some.Test.Sdk", null, "1.0.0"), + new MockContext { ProjectFilePath = environment.TestDirectory.FullName }, + new MockFactory()); + + result.Success.Should().BeFalse(); + result.Path.Should().BeNull(); + result.Version.Should().BeNull(); + result.Warnings.Should().BeNullOrEmpty(); + result.Errors.Should().Contain($"Version 1.0.1 of the .NET Core SDK is smaller than the minimum version" + + " 1.0.4 required by Visual Studio. Check that a recent enough" + + " .NET Core SDK is installed or increase the version specified in global.json."); + } + + [Fact] + public void ItReturnsNullWhenTheTheVSRequiredSDKVersionIsHigherThanTheSDKVersionAvailable() + { + var environment = new TestEnvironment(); + var expected = + environment.CreateSdkDirectory(ProgramFiles.X64, "Some.Test.Sdk", "1.0.1"); + environment.CreateMuxerAndAddToPath(ProgramFiles.X64); + environment.CreateMinimumVSDefinedSDKVersionFile("2.0.0"); + + var resolver = environment.CreateResolver(); + var result = (MockResult)resolver.Resolve( + new SdkReference("Some.Test.Sdk", null, "1.0.0"), + new MockContext { ProjectFilePath = environment.TestDirectory.FullName }, + new MockFactory()); + + result.Success.Should().BeFalse(); + result.Path.Should().BeNull(); + result.Version.Should().BeNull(); + result.Warnings.Should().BeNullOrEmpty(); + result.Errors.Should().Contain($"Version 1.0.1 of the .NET Core SDK is smaller than the minimum version" + + " 2.0.0 required by Visual Studio. Check that a recent enough" + + " .NET Core SDK is installed or increase the version specified in global.json."); + } + + [Fact] + public void ItReturnsTheVersionIfItIsEqualToTheMinVersionAndTheVSDefinedMinVersion() { var environment = new TestEnvironment(); var expected = environment.CreateSdkDirectory(ProgramFiles.X64, "Some.Test.Sdk", "99.99.99"); environment.CreateMuxerAndAddToPath(ProgramFiles.X64); + environment.CreateMinimumVSDefinedSDKVersionFile("99.99.99"); var resolver = environment.CreateResolver(); var result = (MockResult)resolver.Resolve( @@ -126,11 +176,12 @@ public void ItReturnsTheVersionIfItIsEqualToTheMinVersion() } [Fact] - public void ItReturnsTheVersionIfItIsHigherThanTheMinVersion() + public void ItReturnsTheVersionIfItIsHigherThanTheMinVersionAndTheVSDefinedMinVersion() { var environment = new TestEnvironment(); var expected = environment.CreateSdkDirectory(ProgramFiles.X64, "Some.Test.Sdk", "999.99.99"); environment.CreateMuxerAndAddToPath(ProgramFiles.X64); + environment.CreateMinimumVSDefinedSDKVersionFile("999.99.98"); var resolver = environment.CreateResolver(); var result = (MockResult)resolver.Resolve( @@ -167,6 +218,8 @@ public TestEnvironment(string identifier = "", [CallerMemberName] string calling identifier: identifier, callingMethod: callingMethod); + DeleteMinimumVSDefinedSDKVersionFile(); + PathEnvironmentVariable = string.Empty; } @@ -248,6 +301,22 @@ public string GetEnvironmentVariable(string variable) return null; } } + + public void CreateMinimumVSDefinedSDKVersionFile(string version) + { + File.WriteAllText(GetMinimumVSDefinedSDKVersionFilePath(), version); + } + + private void DeleteMinimumVSDefinedSDKVersionFile() + { + File.Delete(GetMinimumVSDefinedSDKVersionFilePath()); + } + + private string GetMinimumVSDefinedSDKVersionFilePath() + { + string baseDirectory = AppContext.BaseDirectory; + return Path.Combine(baseDirectory, "minimumVSDefinedSDKVersion"); + } } private sealed class MockContext : SdkResolverContext From 3380fee934fe3cf73ee1174aadca26a5e562b3cc Mon Sep 17 00:00:00 2001 From: Arun Mahapatra Date: Thu, 6 Jul 2017 20:36:52 +0530 Subject: [PATCH 021/128] Update test platform to 15.3.0-preview-20170703-02 * Adds support for running net46 tests on non windows machines if mono is installed --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6b5f81dc8b..557ac7d2ca 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ 4.3.0-preview4-4258 2.0.0-preview2-25331-02 2.0.0-rel-20170629-588 - 15.3.0-preview-20170628-02 + 15.3.0-preview-20170703-02 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) From cb9290e3a3f4c9d9518da1e8e136ada4bc9925bb Mon Sep 17 00:00:00 2001 From: Ashley Hauck Date: Thu, 6 Jul 2017 08:30:32 -0700 Subject: [PATCH 022/128] Update Roslyn to 2.3.0-beta4-61830-03 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 3343c25bf8..7e1a4b2e7d 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -3,7 +3,7 @@ 1.1.2 15.3.0-preview-000402-01 - 2.3.0-beta3-61816-04 + 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 1.1.0-alpha-20170630-2 4.3.0-preview3-4168 From 9c2c9b70101fd02a7f8651d40af7515f40897cbd Mon Sep 17 00:00:00 2001 From: Ashley Hauck Date: Thu, 6 Jul 2017 08:31:40 -0700 Subject: [PATCH 023/128] Update Roslyn to 2.3.0-beta4-61830-03 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1615e7b6ce..e8ac7673ca 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.0-preview3-25502-01 15.3.0-preview-000402-01 - 2.3.0-beta3-61816-04 + 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 1.6.0-beta2-25304 4.2.0-rc-170630-0 From 087f1830efce5084f7f2f2fe29a1152517bb2119 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 6 Jul 2017 09:21:59 -0700 Subject: [PATCH 024/128] The 'Coherent' property needs to be available for 'FinishBuild' and 'PublishArtifacts' targets. --- build/Publish.targets | 4 +++- build/publish/FinishBuild.targets | 22 ---------------------- build/publish/RuntimeCoherence.targets | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 build/publish/RuntimeCoherence.targets diff --git a/build/Publish.targets b/build/Publish.targets index 48c4db93d5..a4c5499598 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -5,12 +5,14 @@ - + + diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets index 69a9170ae9..8ffbe0097d 100644 --- a/build/publish/FinishBuild.targets +++ b/build/publish/FinishBuild.targets @@ -2,7 +2,6 @@ @@ -14,27 +13,6 @@ - - - - false - true - - - - - - - - - - - diff --git a/build/publish/RuntimeCoherence.targets b/build/publish/RuntimeCoherence.targets new file mode 100644 index 0000000000..a4249fbf04 --- /dev/null +++ b/build/publish/RuntimeCoherence.targets @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + false + true + + + From c617e5f0ce15a25ef66cea2cabc367089dab9cae Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 6 Jul 2017 11:11:07 -0700 Subject: [PATCH 025/128] Changes per code review... --- build/Publish.targets | 2 +- build/publish/RuntimeCoherence.targets | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index a4c5499598..2fb5138380 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -12,7 +12,7 @@ Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' " DependsOnTargets="Init; Package; - RuntimeCoherence; + EvaluateRuntimeCoherence; PublishArtifacts; FinishBuild" /> diff --git a/build/publish/RuntimeCoherence.targets b/build/publish/RuntimeCoherence.targets index a4249fbf04..5ba7482bfe 100644 --- a/build/publish/RuntimeCoherence.targets +++ b/build/publish/RuntimeCoherence.targets @@ -1,8 +1,8 @@ - + CompareRuntimeVersions" /> @@ -16,8 +16,7 @@ - + false true From 9ba1bc1be054eb39c21728f04519a3d2a6a8d2d4 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 6 Jul 2017 11:11:15 -0700 Subject: [PATCH 026/128] Update to SetupCrossgen 256 - Coherence 26096 --- build/DependencyVersions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1615e7b6ce..85482114fc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,8 +23,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170629-268 - 1.0.0-beta2-20170703-273 - 1.0.0-beta2-20170703-273 + 1.0.0-beta2-20170706-274 + 1.0.0-beta2-20170706-274 2.0.0-preview3-25428-01 2.0.0-preview3-25428-01 0.1.1-alpha-167 @@ -35,9 +35,9 @@ timestamped - dev-249 + dev-256 preview3 - 26071 + 26096 From 1256bd0d5795151adc1c07c5c9c677d91e044256 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 6 Jul 2017 15:46:51 -0700 Subject: [PATCH 027/128] Changing the name of the cab file generated by the two msis. Before they were stomping on each other. --- packaging/windows/msbuildextensions/generatemsi.ps1 | 4 ++-- packaging/windows/msbuildextensions/msbuildextensions.wxs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/windows/msbuildextensions/generatemsi.ps1 b/packaging/windows/msbuildextensions/generatemsi.ps1 index 84ca7462e0..a7444058d0 100644 --- a/packaging/windows/msbuildextensions/generatemsi.ps1 +++ b/packaging/windows/msbuildextensions/generatemsi.ps1 @@ -16,8 +16,8 @@ param( . "$PSScriptRoot\..\..\..\scripts\common\_common.ps1" $RepoRoot = Convert-Path "$PSScriptRoot\..\..\.." -$InstallFileswsx = "install-files.wxs" -$InstallFilesWixobj = "install-files.wixobj" +$InstallFileswsx = "install-msbuild-extensions-files.wxs" +$InstallFilesWixobj = "install-msbuild-extensions-files.wixobj" function RunHeat { diff --git a/packaging/windows/msbuildextensions/msbuildextensions.wxs b/packaging/windows/msbuildextensions/msbuildextensions.wxs index 9cfa987fac..e44a14855c 100644 --- a/packaging/windows/msbuildextensions/msbuildextensions.wxs +++ b/packaging/windows/msbuildextensions/msbuildextensions.wxs @@ -6,7 +6,7 @@ - + From 2770013d0dc202f29b28a711ceacafbcd621ec41 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 6 Jul 2017 16:32:34 -0700 Subject: [PATCH 028/128] Updating the downlevel msi to embed the cab file in the msi itself. --- packaging/windows/msbuildextensions/msbuildextensions.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/msbuildextensions/msbuildextensions.wxs b/packaging/windows/msbuildextensions/msbuildextensions.wxs index e44a14855c..be689ea3ff 100644 --- a/packaging/windows/msbuildextensions/msbuildextensions.wxs +++ b/packaging/windows/msbuildextensions/msbuildextensions.wxs @@ -6,7 +6,7 @@ - + From cde3a8bcb20e99fc5cf1edb05c93e22a3fa490c3 Mon Sep 17 00:00:00 2001 From: Matt Ellis Date: Tue, 6 Jun 2017 17:55:18 -0700 Subject: [PATCH 029/128] MIT License *NIX Builds. Remove non MIT licensed components from the CLI when building on non windows platforms. The shared framework provides the LICENSE file that is included with the tarballs, so we just need to ensure we don't pull any windows specific stuff that is not MIT licensed. Fixes: dotnet/core-setup#676 --- src/redist/redist.csproj | 8 ++++++++ src/tool_roslyn/tool_roslyn.csproj | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 665666da5d..c45cd6bdf6 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -142,6 +142,14 @@ AssetPath="%(NuPkgContentForMSBuildExtensionsRelativePaths.Identity)" /> + + + + + diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index ff2d6ac5d8..bd702ca7c3 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -16,7 +16,7 @@ - + From c7c7f20a22462ef7cb7f46ad555cecdaf46ffe48 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 16:25:22 +0100 Subject: [PATCH 030/128] Update SPA templates to 1.0.0-preview-000357 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 306a73a2a0..da31ba8ff4 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -30,7 +30,7 @@ 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 - 1.0.0-preview-000321 + 1.0.0-preview-000357 0.2.0-beta-000042 From 27a2fdc708c9199a984554afd3923fc15a6cc0d5 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 7 Jul 2017 17:33:24 +0100 Subject: [PATCH 031/128] Update SPA templates further to 1.0.0-preview-000358 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index da31ba8ff4..59ce3919d8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -30,7 +30,7 @@ 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 - 1.0.0-preview-000357 + 1.0.0-preview-000358 0.2.0-beta-000042 From 941602830604e4df536ce652bc7c6744131f6c3e Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Fri, 7 Jul 2017 17:36:54 +0000 Subject: [PATCH 032/128] Update CoreSetup to preview3-25507-02 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 306a73a2a0..011d9b0511 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25502-01 + 2.0.0-preview3-25507-02 15.3.0-preview-000402-01 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170629-268 1.0.0-beta2-20170706-274 1.0.0-beta2-20170706-274 - 2.0.0-preview3-25428-01 - 2.0.0-preview3-25428-01 + 2.0.0-preview3-25507-02 + 2.0.0-preview3-25507-02 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From 191e3e3019d125af17fdca0eb6b1cd9649ee0c23 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 27 Jun 2017 13:46:09 -0700 Subject: [PATCH 033/128] Installer Success Reporting for Windows Issue https://github.com/dotnet/cli/issues/7091 Add internal command dotnet internal-reportinstallsuccess. Before Windows installer finishes, run this command instead of dotnet new. It will trigger the first time experience as well as sending telemetry with installer exe name. This command blocks to ensure that the webservice call completes. --- packaging/windows/clisdk/bundle.wxs | 1 + packaging/windows/clisdk/dotnet.wxs | 16 ++++-- src/dotnet/BuiltInCommandsCatalog.cs | 4 ++ src/dotnet/Parser.cs | 1 + src/dotnet/Telemetry.cs | 9 +++ .../InternalReportinstallsuccessCommand.cs | 56 +++++++++++++++++++ ...ternalReportinstallsuccessCommandParser.cs | 16 ++++++ test/dotnet.Tests/TelemetryCommandTest.cs | 21 ++++++- 8 files changed, 119 insertions(+), 5 deletions(-) create mode 100644 src/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommand.cs create mode 100644 src/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommandParser.cs diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs index d1de0ef58e..4f379ca3e5 100644 --- a/packaging/windows/clisdk/bundle.wxs +++ b/packaging/windows/clisdk/bundle.wxs @@ -37,6 +37,7 @@ + diff --git a/packaging/windows/clisdk/dotnet.wxs b/packaging/windows/clisdk/dotnet.wxs index 976bf5a554..315b801e5b 100644 --- a/packaging/windows/clisdk/dotnet.wxs +++ b/packaging/windows/clisdk/dotnet.wxs @@ -30,12 +30,20 @@ - - + + - - + + diff --git a/src/dotnet/BuiltInCommandsCatalog.cs b/src/dotnet/BuiltInCommandsCatalog.cs index 68bfdb1ab6..25c69fdbd2 100644 --- a/src/dotnet/BuiltInCommandsCatalog.cs +++ b/src/dotnet/BuiltInCommandsCatalog.cs @@ -143,6 +143,10 @@ public static class BuiltInCommandsCatalog ["parse"] = new BuiltInCommandMetadata { Command = ParseCommand.Run + }, + ["internal-reportinstallsuccess"] = new BuiltInCommandMetadata + { + Command = InternalReportinstallsuccess.Run } }; } diff --git a/src/dotnet/Parser.cs b/src/dotnet/Parser.cs index a377cbd3e2..5f5bdd6c83 100644 --- a/src/dotnet/Parser.cs +++ b/src/dotnet/Parser.cs @@ -54,6 +54,7 @@ private static void ConfigureCommandLineLocalizedStrings() Create.Command("msbuild", ""), Create.Command("vstest", ""), CompleteCommandParser.Complete(), + InternalReportinstallsuccessCommandParser.InternalReportinstallsuccess(), CommonOptions.HelpOption(), Create.Option("--info", ""), Create.Option("-d", ""), diff --git a/src/dotnet/Telemetry.cs b/src/dotnet/Telemetry.cs index baa0d70154..457e6f7aff 100644 --- a/src/dotnet/Telemetry.cs +++ b/src/dotnet/Telemetry.cs @@ -76,6 +76,15 @@ public void TrackEvent(string eventName, IDictionary properties, ); } + public void ThreadBlockingTrackEvent(string eventName, IDictionary properties, IDictionary measurements) + { + if (!Enabled) + { + return; + } + TrackEventTask(eventName, properties, measurements); + } + private void InitializeTelemetry() { try diff --git a/src/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommand.cs b/src/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommand.cs new file mode 100644 index 0000000000..f3ac8702f0 --- /dev/null +++ b/src/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommand.cs @@ -0,0 +1,56 @@ +// Copyright (c) .NET 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.IO; +using System.Collections.Generic; +using Microsoft.DotNet.Configurer; + +namespace Microsoft.DotNet.Cli +{ + public class InternalReportinstallsuccess + { + internal const string TelemetrySessionIdEnvironmentVariableName = "DOTNET_CLI_TELEMETRY_SESSIONID"; + + public static int Run(string[] args) + { + var telemetry = new ThreadBlockingTelemetry(); + ProcessInputAndSendTelemetry(args, telemetry); + + return 0; + } + + public static void ProcessInputAndSendTelemetry(string[] args, ITelemetry telemetry) + { + var parser = Parser.Instance; + var result = parser.ParseFrom("dotnet internal-reportinstallsuccess", args); + + var internalReportinstallsuccess = result["dotnet"]["internal-reportinstallsuccess"]; + + var exeName = Path.GetFileName(internalReportinstallsuccess.Arguments.Single()); + telemetry.TrackEvent( + "reportinstallsuccess", + new Dictionary { { "exeName", exeName } }, + new Dictionary()); + } + + internal class ThreadBlockingTelemetry : ITelemetry + { + private Telemetry telemetry; + + internal ThreadBlockingTelemetry() + { + var sessionId = + Environment.GetEnvironmentVariable(TelemetrySessionIdEnvironmentVariableName); + telemetry = new Telemetry(new FirstTimeUseNoticeSentinel(new CliFallbackFolderPathCalculator()), sessionId); + } + public bool Enabled => telemetry.Enabled; + + public void TrackEvent(string eventName, IDictionary properties, IDictionary measurements) + { + telemetry.ThreadBlockingTrackEvent(eventName, properties, measurements); + } + } + } +} \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommandParser.cs b/src/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommandParser.cs new file mode 100644 index 0000000000..1c83a86b37 --- /dev/null +++ b/src/dotnet/commands/dotnet-internal-reportinstallsuccess/InternalReportinstallsuccessCommandParser.cs @@ -0,0 +1,16 @@ +// Copyright (c) .NET 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.DotNet.Cli.CommandLine; + +namespace Microsoft.DotNet.Cli +{ + internal static class InternalReportinstallsuccessCommandParser + { + public static Command InternalReportinstallsuccess() => + Create.Command( + "internal-reportinstallsuccess", "internal only", + Accept.ExactlyOneArgument()); + } +} \ No newline at end of file diff --git a/test/dotnet.Tests/TelemetryCommandTest.cs b/test/dotnet.Tests/TelemetryCommandTest.cs index cb4a943c2b..5fd8a96897 100644 --- a/test/dotnet.Tests/TelemetryCommandTest.cs +++ b/test/dotnet.Tests/TelemetryCommandTest.cs @@ -17,14 +17,15 @@ public class MockTelemetry : ITelemetry public bool Enabled { get; set; } public string EventName { get; set; } + public IDictionary Properties { get; set; } public void TrackEvent(string eventName, IDictionary properties, IDictionary measurements) { EventName = eventName; + Properties = properties; } } - public class TelemetryCommandTests : TestBase { [Fact] @@ -35,5 +36,23 @@ public void TestProjectDependencyIsNotAvailableThroughDriver() Microsoft.DotNet.Cli.Program.ProcessArgs(args, mockTelemetry); Assert.Equal(mockTelemetry.EventName, args[0]); } + + [Fact] + public void InternalreportinstallsuccessCommandCollectExeNameWithEventname() + { + MockTelemetry mockTelemetry = new MockTelemetry(); + string[] args = { "c:\\mypath\\dotnet-sdk-latest-win-x64.exe" }; + + InternalReportinstallsuccess.ProcessInputAndSendTelemetry(args, mockTelemetry); + + mockTelemetry.EventName.Should().Be("reportinstallsuccess"); + mockTelemetry.Properties["exeName"].Should().Be("dotnet-sdk-latest-win-x64.exe"); + } + + [Fact] + public void InternalreportinstallsuccessCommandIsRegistedInBuiltIn() + { + BuiltInCommandsCatalog.Commands.Should().ContainKey("internal-reportinstallsuccess"); + } } } From 941c29c2be579c3d2177130736b21ba470e9e31e Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 7 Jul 2017 10:20:00 -0700 Subject: [PATCH 034/128] Mark test windows only --- test/dotnet.Tests/TelemetryCommandTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet.Tests/TelemetryCommandTest.cs b/test/dotnet.Tests/TelemetryCommandTest.cs index 5fd8a96897..731713a590 100644 --- a/test/dotnet.Tests/TelemetryCommandTest.cs +++ b/test/dotnet.Tests/TelemetryCommandTest.cs @@ -37,7 +37,7 @@ public void TestProjectDependencyIsNotAvailableThroughDriver() Assert.Equal(mockTelemetry.EventName, args[0]); } - [Fact] + [WindowsOnlyFact] public void InternalreportinstallsuccessCommandCollectExeNameWithEventname() { MockTelemetry mockTelemetry = new MockTelemetry(); From e4087198332862f36f040ddea47d19cc6125ac94 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 7 Jul 2017 16:04:59 -0700 Subject: [PATCH 035/128] Updating the Readme.md; adding references to 'coherent' builds. --- README.md | 78 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 47cdad0e52..2762de76a0 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,10 @@ This project has adopted the code of conduct defined by the [Contributor Covenan Build Status ------------ -|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 | Ubuntu 16.10 |Debian 8 |Windows x64 |Windows x86 |macOS |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | Linux x64 | -|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][linux-build-badge]][linux-build]| + +|Windows x64 |Windows x86 |Mac OS X |Linux x64 |Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Ubuntu 16.10 |Debian 8 |RHEL 7.2 | +|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| +|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-build]|[![][rhel-build-badge]][rhel-build]| [win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6208/badge [win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6208 @@ -33,6 +34,12 @@ Build Status [win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6209/badge [win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6209 +[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6203/badge +[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6203 + +[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6201/badge +[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6201 + [ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6205/badge [ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6205 @@ -45,18 +52,9 @@ Build Status [debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6199/badge [debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6199 -[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6203/badge -[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6203 - -[centos-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6198/badge -[centos-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6198 - [rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6204/badge [rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6204 -[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6201/badge -[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6201 - Installers and Binaries ----------------------- @@ -67,59 +65,79 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > **Note:** please be aware that below installers are the **latest bits**. If you > want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling). -| Platform | release/2.0.0
[![][version-badge]][version] | -| -------- | :-------------------------------------: | -| **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | -| **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | -| **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | -| **Linux x64** | [tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | -| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | -| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | -| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | -| **Debian 8** | [Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | -| **CentOS 7.1 / Oracle Linux 7** | tar.gz - See **Linux x64** | -| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** | -| **Fedora 24** | tar.gz - See **Linux x64** | -| **OpenSUSE 42.1** | tar.gz - See **Linux x64** | - -*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.* +| Platform | Latest Daily Build
*release/2.0.0* | Latest Coherent Build1
*release/2.0.0* | +| -------- | :-------------------------------------: | :-------------------------------------: | +| **Windows x64** | [![][win-x64-version-badge]][version]
[Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | [![][win-x64-coherent-badge]][coherent-version] | +| **Windows x86** | [![][win-x86-version-badge]][version]
[Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | [![][win-x86-coherent-badge]][coherent-version] | +| **Mac OS X** | [![][osx-version-badge]][version]
[Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | [![][osx-coherent-badge]][coherent-version] | +| **Linux x64** | [![][linux-version-badge]][version]
[tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | [![][linux-coherent-badge]][coherent-version] | +| **Ubuntu 14.04 / Linux Mint 17** | [![][ubuntu-14.04-version-badge]][version]
[Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][ubuntu-14.04-coherent-badge]][coherent-version] | +| **Ubuntu 16.04** | [![][ubuntu-16.04-version-badge]][version]
[Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][ubuntu-16.04-coherent-badge]][coherent-version] | +| **Ubuntu 16.10** | [![][ubuntu-16.10-version-badge]][version]
[Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][ubuntu-16.10-coherent-badge]][coherent-version] | +| **Debian 8** | [![][debian-8-version-badge]][version]
[Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][debian-8-coherent-badge]][coherent-version] | +| **RHEL 7.2** | [![][rhel-7-version-badge]][version]
[Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][rhel-7-coherent-badge]][coherent-version] | +| **CentOS 7.1 / Oracle Linux 7** | tar.gz - See **Linux x64** || +| **Fedora 24** | tar.gz - See **Linux x64** || +| **OpenSUSE 42.1** | tar.gz - See **Linux x64** || + +Reference notes: +> **1**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* +>

**2**: *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/release/2.0.0/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/release/2.0.0/win_x64_Release_version_badge.svg +[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.coherent.version [win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe [win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe.sha [win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip [win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe [win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe.sha [win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip [win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg [osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg.sha [osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz [osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz [linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb [ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha +[ubuntu-14.04-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb [ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha +[ubuntu-16.04-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb [ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha +[ubuntu-16.10-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb [debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb.sha +[debian-8-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm [rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm.sha +[rhel-7-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg + +[win-x64-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg +[win-x86-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg +[osx-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg +[linux-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg +[ubuntu-14.04-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg +[ubuntu-16.04-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg +[ubuntu-16.10-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg +[debian-8-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg +[rhel-7-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg # Debian daily feed From 8fff365c86498acd68ebe96f76ff526e0a28acb3 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 7 Jul 2017 16:24:32 -0700 Subject: [PATCH 036/128] Updating the ReadMe: "rel-1.0.1" to "rel-1.1.0" --- README.md | 82 +++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 44a0bf75b5..edfdc062ba 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > **Note:** please be aware that below installers are the **latest bits**. If you > want to install the latest released versions, please check out the [section above](#download-links).) -| Platform | rel/1.0.1
[![][version-badge]][version] | +| Platform | rel/1.1.0
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -103,60 +103,60 @@ In order to download just the .NET Core runtime without the SDK, please visit ht *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/rel-1.0.1/latest.version +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/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/rel-1.0.1/Windows_x64_Release_version_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/Windows_x64_Release_version_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x64.latest.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x64.latest.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x64.latest.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x64.latest.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x86.latest.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x86.latest.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x86.latest.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x86.latest.zip.sha -[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu-x64.latest.deb -[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu-x64.latest.deb.sha -[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu-x64.latest.tar.gz -[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu-x64.latest.tar.gz.sha +[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu-x64.latest.deb +[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu-x64.latest.deb.sha +[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu-x64.latest.tar.gz +[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu-x64.latest.tar.gz.sha -[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.04-x64.latest.deb.sha -[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz -[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha +[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb +[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb.sha +[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz +[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha -[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.10-x64.latest.deb.sha -[ubuntu-16.10-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz -[ubuntu-16.10-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz.sha +[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu.16.10-x64.latest.deb +[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu.16.10-x64.latest.deb.sha +[ubuntu-16.10-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz +[ubuntu-16.10-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz.sha -[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-debian-x64.latest.tar.gz -[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-debian-x64.latest.tar.gz.sha +[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-debian-x64.latest.tar.gz +[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-debian-x64.latest.tar.gz.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-osx-x64.latest.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-osx-x64.latest.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-osx-x64.latest.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-osx-x64.latest.tar.gz.sha -[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-centos-x64.latest.tar.gz -[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-centos-x64.latest.tar.gz.sha +[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-centos-x64.latest.tar.gz +[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-centos-x64.latest.tar.gz.sha -[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-rhel-x64.latest.tar.gz -[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-rhel-x64.latest.tar.gz.sha +[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-rhel-x64.latest.tar.gz +[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-rhel-x64.latest.tar.gz.sha -[opensuse-13.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.13.2-x64.latest.tar.gz -[opensuse-13.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.13.2-x64.latest.tar.gz.sha +[opensuse-13.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-opensuse.13.2-x64.latest.tar.gz +[opensuse-13.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-opensuse.13.2-x64.latest.tar.gz.sha -[opensuse-42.1-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.42.1-x64.latest.tar.gz -[opensuse-42.1-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.42.1-x64.latest.tar.gz.sha +[opensuse-42.1-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-opensuse.42.1-x64.latest.tar.gz +[opensuse-42.1-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-opensuse.42.1-x64.latest.tar.gz.sha -[fedora-23-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.23-x64.latest.tar.gz -[fedora-23-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.23-x64.latest.tar.gz.sha +[fedora-23-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-fedora.23-x64.latest.tar.gz +[fedora-23-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-fedora.23-x64.latest.tar.gz.sha -[fedora-24-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.24-x64.latest.tar.gz -[fedora-24-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.24-x64.latest.tar.gz.sha +[fedora-24-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-fedora.24-x64.latest.tar.gz +[fedora-24-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-fedora.24-x64.latest.tar.gz.sha Docker From e8cb581990d0b1520ffa1057a36b439852d725ab Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 7 Jul 2017 16:58:51 -0700 Subject: [PATCH 037/128] Fix fedora.23 dockerfile Use existing docker image to reduce error from extra dependency. Append CLI specific packages --- scripts/docker/fedora.23/Dockerfile | 30 ++--------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/scripts/docker/fedora.23/Dockerfile b/scripts/docker/fedora.23/Dockerfile index 0c4b20d792..b8508bde7f 100644 --- a/scripts/docker/fedora.23/Dockerfile +++ b/scripts/docker/fedora.23/Dockerfile @@ -4,36 +4,10 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM fedora:23 - -# Install the base toolchain we need to build anything (clang, cmake, make and the like) -# this does not include libraries that we need to compile different projects, we'd like -# them in a different layer. -RUN dnf install -y cmake \ - clang \ - lldb-devel \ - make \ - which && \ - dnf clean all +FROM microsoft/dotnet-buildtools-prereqs:fedora23_prereqs # Install tools used by the VSO build automation. -RUN dnf install -y git \ - zip \ - tar \ - nodejs \ - findutils \ - npm && \ - dnf clean all && \ - npm install -g azure-cli && \ - npm cache clean - -# Dependencies of CoreCLR and CoreFX. -RUN dnf install -y libicu-devel \ - libuuid-devel \ - libcurl-devel \ - openssl-devel \ - libunwind-devel \ - lttng-ust-devel && \ +RUN dnf install -y findutils && \ dnf clean all # Upgrade NSS, used for SSL, to avoid NuGet restore timeouts. From e316bd0f9c236c1e0806686489090e751f7df827 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 7 Jul 2017 19:45:59 -0700 Subject: [PATCH 038/128] Update to SetupCrossgen 270 - Coherence 26151 Add localization package for template engine Fix issue where unknown symbols are treated as literals in MSBuild files Fix issue where files marked for copy-only processing are excluded instead --- build/DependencyVersions.props | 12 ++++++------ src/dotnet/dotnet.csproj | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3e66ff3cea..8550639efc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,9 +22,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170629-268 - 1.0.0-beta2-20170706-274 - 1.0.0-beta2-20170706-274 + 1.0.0-beta2-20170707-280 + 1.0.0-beta2-20170707-280 + 1.0.0-beta2-20170707-280 2.0.0-preview3-25507-02 2.0.0-preview3-25507-02 0.1.1-alpha-167 @@ -35,9 +35,9 @@ timestamped - dev-256 - preview3 - 26096 + dev-270 + rtm + 26151 diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 7ecb12147a..71da966763 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -65,6 +65,7 @@ + From 062f248b94d6656eb696f42aa7ba49c3d94d36dd Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 7 Jul 2017 20:34:13 -0700 Subject: [PATCH 039/128] Undo change to include Template Engine loc as it seems to be causing the build to fail while trying to copy the pt-br resource assembly --- src/dotnet/dotnet.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 71da966763..7ecb12147a 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -65,7 +65,6 @@ - From 3b180f49ba27b555fa6dabf8ec1a075d4920fa91 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 7 Jul 2017 23:38:20 -0700 Subject: [PATCH 040/128] Enable VB dotnet new test cases --- .../GivenThatIWantANewAppWithSpecifiedType.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index d631abdf02..1977445a84 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -25,18 +25,15 @@ public class GivenThatIWantANewAppWithSpecifiedType : TestBase [InlineData("F#", "mstest", false)] [InlineData("F#", "xunit", false)] [InlineData("F#", "mvc", true)] + [InlineData("VB", "console", false)] + [InlineData("VB", "classlib", false)] + [InlineData("VB", "mstest", false)] + [InlineData("VB", "xunit", false)] public void TemplateRestoresAndBuildsWithoutWarnings( string language, string projectType, bool useNuGetConfigForAspNet) { - if (language == "F#" && !EnvironmentInfo.HasSharedFramework("netcoreapp1.0")) - { - // F# requires netcoreapp1.0 to be present in order to build - // https://github.com/dotnet/netcorecli-fsc/issues/76 - return; - } - string rootPath = TestAssetsManager.CreateTestDirectory(identifier: $"{language}_{projectType}").Path; new TestCommand("dotnet") { WorkingDirectory = rootPath } From e04b35fbbf5a80e0e2dcbbbcd314c2bd269751f5 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Mon, 10 Jul 2017 00:28:50 +0000 Subject: [PATCH 041/128] Update CoreSetup to preview3-25510-01 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 8550639efc..57e757af02 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25507-02 + 2.0.0-preview3-25510-01 15.3.0-preview-000402-01 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170707-280 1.0.0-beta2-20170707-280 1.0.0-beta2-20170707-280 - 2.0.0-preview3-25507-02 - 2.0.0-preview3-25507-02 + 2.0.0-preview3-25510-01 + 2.0.0-preview3-25510-01 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From d9cfe3344bd7002b0989b97994896dfea7eef5cd Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 10 Jul 2017 10:06:23 -0700 Subject: [PATCH 042/128] Linux portable should not try to publish to the Debian repo. --- build/publish/PublishDebian.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/publish/PublishDebian.targets b/build/publish/PublishDebian.targets index 08767a3ce3..43ab5abdac 100644 --- a/build/publish/PublishDebian.targets +++ b/build/publish/PublishDebian.targets @@ -19,7 +19,7 @@ - + From 9a1e39f08364d7b43de54b091f2780f4c9b6f6cb Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 10 Jul 2017 10:57:28 -0700 Subject: [PATCH 043/128] Fix wrong number of parameters passed to test when doing the merge. --- .../GivenThatIWantANewAppWithSpecifiedType.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index c432cfd53a..b64b3e5c15 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -31,10 +31,10 @@ public class GivenThatIWantANewAppWithSpecifiedType : TestBase [InlineData("F#", "mstest", false, false)] [InlineData("F#", "xunit", false, false)] [InlineData("F#", "mvc", true, false)] - [InlineData("VB", "console", false)] - [InlineData("VB", "classlib", false)] - [InlineData("VB", "mstest", false)] - [InlineData("VB", "xunit", false)] + [InlineData("VB", "console", false, false)] + [InlineData("VB", "classlib", false, false)] + [InlineData("VB", "mstest", false, false)] + [InlineData("VB", "xunit", false, false)] public void TemplateRestoresAndBuildsWithoutWarnings( string language, string projectType, From b1e7bc0e8bda47b5ce1c590de7b3643b1d8b97b9 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 10 Jul 2017 14:14:10 -0700 Subject: [PATCH 044/128] Updates per code review. --- README.md | 59 +++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 2762de76a0..af553a33fb 100644 --- a/README.md +++ b/README.md @@ -65,79 +65,70 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > **Note:** please be aware that below installers are the **latest bits**. If you > want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling). -| Platform | Latest Daily Build
*release/2.0.0* | Latest Coherent Build1
*release/2.0.0* | -| -------- | :-------------------------------------: | :-------------------------------------: | -| **Windows x64** | [![][win-x64-version-badge]][version]
[Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | [![][win-x64-coherent-badge]][coherent-version] | -| **Windows x86** | [![][win-x86-version-badge]][version]
[Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | [![][win-x86-coherent-badge]][coherent-version] | -| **Mac OS X** | [![][osx-version-badge]][version]
[Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | [![][osx-coherent-badge]][coherent-version] | -| **Linux x64** | [![][linux-version-badge]][version]
[tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | [![][linux-coherent-badge]][coherent-version] | -| **Ubuntu 14.04 / Linux Mint 17** | [![][ubuntu-14.04-version-badge]][version]
[Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][ubuntu-14.04-coherent-badge]][coherent-version] | -| **Ubuntu 16.04** | [![][ubuntu-16.04-version-badge]][version]
[Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][ubuntu-16.04-coherent-badge]][coherent-version] | -| **Ubuntu 16.10** | [![][ubuntu-16.10-version-badge]][version]
[Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][ubuntu-16.10-coherent-badge]][coherent-version] | -| **Debian 8** | [![][debian-8-version-badge]][version]
[Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][debian-8-coherent-badge]][coherent-version] | -| **RHEL 7.2** | [![][rhel-7-version-badge]][version]
[Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | [![][rhel-7-coherent-badge]][coherent-version] | -| **CentOS 7.1 / Oracle Linux 7** | tar.gz - See **Linux x64** || -| **Fedora 24** | tar.gz - See **Linux x64** || -| **OpenSUSE 42.1** | tar.gz - See **Linux x64** || +| Latest Coherent Build1
*release/2.0.0*
[![][coherent-version-badge]][coherent-version] | +| -------- | Reference notes: > **1**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* ->

**2**: *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.* + +| Platform | Latest Daily Build
*release/2.0.0*
[![][version-badge]][version] | +| -------- | :-------------------------------------: | +| **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | +| **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | +| **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | +| **Linux x64** | [tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | +| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | +| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | +| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | +| **Debian 8** | [Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | +| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | +| **CentOS 7.1 / Oracle Linux 7** | tar.gz - See **Linux x64** | +| **Fedora 24** | tar.gz - See **Linux x64** | +| **OpenSUSE 42.1** | tar.gz - See **Linux x64** | + +Reference notes: +> **2**: *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/release/2.0.0/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/release/2.0.0/win_x64_Release_version_badge.svg + [coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.coherent.version +[comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg [win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe [win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe.sha [win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip [win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip.sha -[win-x64-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe [win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe.sha [win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip [win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip.sha -[win-x86-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg [osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg.sha [osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz [osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz.sha -[osx-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz [linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz.sha -[linux-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb [ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha -[ubuntu-14.04-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb [ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha -[ubuntu-16.04-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb [ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha -[ubuntu-16.10-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb [debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb.sha -[debian-8-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg [rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm [rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm.sha -[rhel-7-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg - -[win-x64-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg -[win-x86-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg -[osx-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg -[linux-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg -[ubuntu-14.04-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg -[ubuntu-16.04-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg -[ubuntu-16.10-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg -[debian-8-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg -[rhel-7-coherent-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg # Debian daily feed From 9e743d873058682327b6f102e68d213922a86608 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 10 Jul 2017 15:11:19 -0700 Subject: [PATCH 045/128] Updates per code review. --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index af553a33fb..31dab4f1c2 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ This project has adopted the code of conduct defined by the [Contributor Covenan Build Status ------------ - |Windows x64 |Windows x86 |Mac OS X |Linux x64 |Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Ubuntu 16.10 |Debian 8 |RHEL 7.2 | |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| |[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-build]|[![][rhel-build-badge]][rhel-build]| @@ -65,11 +64,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > **Note:** please be aware that below installers are the **latest bits**. If you > want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling). -| Latest Coherent Build1
*release/2.0.0*
[![][coherent-version-badge]][coherent-version] | -| -------- | -Reference notes: -> **1**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* | Platform | Latest Daily Build
*release/2.0.0*
[![][version-badge]][version] | | -------- | :-------------------------------------: | @@ -86,8 +81,12 @@ Reference notes: | **Fedora 24** | tar.gz - See **Linux x64** | | **OpenSUSE 42.1** | tar.gz - See **Linux x64** | + +| Latest Coherent Build1
*release/2.0.0*
[![][coherent-version-badge]][coherent-version] | + Reference notes: -> **2**: *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.* +> **1**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* +>

**2**: *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/release/2.0.0/latest.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) From 4518d1846b23235db9865144a8b8b65f7f324a5c Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 10 Jul 2017 15:13:40 -0700 Subject: [PATCH 046/128] Update. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 31dab4f1c2..2412c420ce 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | Latest Coherent Build1
*release/2.0.0*
[![][coherent-version-badge]][coherent-version] | +|:------:| Reference notes: > **1**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* From 4aef6c7754111b888d74723eb546711c0d5b1b07 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 10 Jul 2017 15:15:54 -0700 Subject: [PATCH 047/128] Update --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2412c420ce..8563ac70fa 100644 --- a/README.md +++ b/README.md @@ -72,23 +72,23 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | | **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | | **Linux x64** | [tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | -| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | -| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | -| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | -| **Debian 8** | [Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | -| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]
_see installer note below_2
tar.gz - See **Linux x64** | +| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** | +| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** | +| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** | +| **Debian 8** | [Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** | +| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** | | **CentOS 7.1 / Oracle Linux 7** | tar.gz - See **Linux x64** | | **Fedora 24** | tar.gz - See **Linux x64** | | **OpenSUSE 42.1** | tar.gz - See **Linux x64** | -| Latest Coherent Build1
*release/2.0.0*
[![][coherent-version-badge]][coherent-version] | +| Latest Coherent Build2
*release/2.0.0* | |:------:| +| [![][coherent-version-badge]][coherent-version] | Reference notes: -> **1**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* ->

**2**: *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.* - +> **1**: *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.* +>

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* [version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/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/release/2.0.0/win_x64_Release_version_badge.svg From 1d49d0753a360a15cc5e6bbeceb96950e6b32a11 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 10 Jul 2017 15:18:15 -0700 Subject: [PATCH 048/128] Update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8563ac70fa..122707c676 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht Reference notes: > **1**: *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.* >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* + [version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/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/release/2.0.0/win_x64_Release_version_badge.svg From 5aec446657e23980417a0cfc6207e04c4339c2b6 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Mon, 10 Jul 2017 15:20:35 -0700 Subject: [PATCH 049/128] Update to SetupCrossgen 277 - Coherence 26182 Enable loc for dotnet new --- build/DependencyVersions.props | 10 +++++----- src/dotnet/dotnet.csproj | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 57e757af02..21b73e0279 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,9 +22,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170707-280 - 1.0.0-beta2-20170707-280 - 1.0.0-beta2-20170707-280 + 1.0.0-beta2-20170710-283 + 1.0.0-beta2-20170710-283 + 1.0.0-beta2-20170710-283 2.0.0-preview3-25510-01 2.0.0-preview3-25510-01 0.1.1-alpha-167 @@ -35,9 +35,9 @@ timestamped - dev-270 + dev-277 rtm - 26151 + 26182 diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 7ecb12147a..71da966763 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -65,6 +65,7 @@ + From ea467db3afb51dbe1ce243e98d218044ce648bf1 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Mon, 10 Jul 2017 15:57:30 -0700 Subject: [PATCH 050/128] Update test to pass --no-restore to templates --- .../GenerateNuGetPackagesArchiveVersion.cs | 2 +- src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs | 2 +- test/EndToEnd/GivenDotNetUsesMSBuild.cs | 2 +- .../dotnet-add-reference.Tests/GivenDotnetAddReference.cs | 2 +- test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs | 2 +- .../GivenDotnetListReference.cs | 2 +- test/dotnet-new.Tests/GivenThatIWantANewApp.cs | 8 ++++---- .../GivenThatIWantANewAppWithSpecifiedType.cs | 4 +++- test/dotnet-pack.Tests/PackTests.cs | 2 +- .../GivenDotnetPublishPublishesProjects.cs | 2 +- .../dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs | 2 +- test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs | 6 +++--- test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs | 2 +- 13 files changed, 20 insertions(+), 18 deletions(-) diff --git a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs index 75bcf02321..4ba8fb393e 100644 --- a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs +++ b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs @@ -47,7 +47,7 @@ public override bool Execute() { ToolPath = ToolPath, TemplateType = newArgs[0], - TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\"", + TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\" --no-restore", HostObject = HostObject, BuildEngine = BuildEngine }; diff --git a/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs b/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs index 0657f4abec..bc997da4ca 100644 --- a/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs +++ b/src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs @@ -15,7 +15,7 @@ public void CreateWithEphemeralHiveAndNoRestore( string outputDirectory, string workingDirectory) { - RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive" }, workingDirectory); + RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive", "--no-restore" }, workingDirectory); } private void RunCommand(string commandToExecute, IEnumerable args, string workingDirectory) { diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index fa7e2cb752..f714ee38c6 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -19,7 +19,7 @@ public void ItCanNewRestoreBuildRunCleanMSBuildProject() { string projectDirectory = directory.Path; - string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive"; + string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) diff --git a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs index 0210cda52b..bbe3390713 100644 --- a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs +++ b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs @@ -68,7 +68,7 @@ private ProjDir NewLib(string dir = null, [System.Runtime.CompilerServices.Calle try { - string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive"; + string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(projDir.Path) .ExecuteWithCapturedOutput(args) diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index a95130cd22..febd7a9b36 100644 --- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -93,7 +93,7 @@ public void ItRunsWhenRestoringToSpecificPackageDir() string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive"; + string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) diff --git a/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs index 92332290d3..12766e9834 100644 --- a/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs +++ b/test/dotnet-list-reference.Tests/GivenDotnetListReference.cs @@ -209,7 +209,7 @@ private ProjDir NewLib(string testProjectName = "temp", [System.Runtime.Compiler try { - string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive"; + string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(dir.Path) .ExecuteWithCapturedOutput(newArgs) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index ec8d961950..a468bd7b8a 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -21,13 +21,13 @@ public void When_dotnet_new_is_invoked_mupliple_times_it_should_fail() new NewCommand() .WithWorkingDirectory(rootPath) - .Execute($"console --debug:ephemeral-hive"); + .Execute($"console --debug:ephemeral-hive --no-restore"); DateTime expectedState = Directory.GetLastWriteTime(rootPath); var result = new NewCommand() .WithWorkingDirectory(rootPath) - .ExecuteWithCapturedOutput($"console --debug:ephemeral-hive"); + .ExecuteWithCapturedOutput($"console --debug:ephemeral-hive --no-restore"); DateTime actualState = Directory.GetLastWriteTime(rootPath); @@ -64,7 +64,7 @@ private void CreateAndRestoreNewProject( new NewCommand() .WithWorkingDirectory(projectFolder) - .Execute($"{projectType} --debug:ephemeral-hive") + .Execute($"{projectType} --debug:ephemeral-hive --no-restore") .Should().Pass(); // https://github.com/dotnet/templating/issues/946 - remove DisableImplicitAssetTargetFallback once this is fixed. @@ -87,7 +87,7 @@ public void NewProjectRestoresCorrectPackageVersion(string type, string property new NewCommand() .WithWorkingDirectory(rootPath) - .Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive") + .Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive --no-restore") .Should().Pass(); new RestoreCommand() diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index b64b3e5c15..e65f9def63 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -42,9 +42,11 @@ public void TemplateRestoresAndBuildsWithoutWarnings( bool skipSpaWebpackSteps) { string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName; + //This works around the SPA templates not currently supporting the "--no-restore" switch + string noRestoreDirective = skipSpaWebpackSteps ? "" : "--no-restore"; new TestCommand("dotnet") { WorkingDirectory = rootPath } - .Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive") + .Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive {noRestoreDirective}") .Should().Pass(); if (useNuGetConfigForAspNet) diff --git a/test/dotnet-pack.Tests/PackTests.cs b/test/dotnet-pack.Tests/PackTests.cs index 23d7ecbdea..32b940a457 100644 --- a/test/dotnet-pack.Tests/PackTests.cs +++ b/test/dotnet-pack.Tests/PackTests.cs @@ -245,7 +245,7 @@ public void ItPacksAppWhenRestoringToSpecificPackageDirectory() string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -o \"{rootPath}\""; + string newArgs = $"console -o \"{rootPath}\" --no-restore"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index 8b5e09ca9c..2db2018fa7 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -206,7 +206,7 @@ public void ItPublishesAppWhenRestoringToSpecificPackageDirectory() string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -o \"{rootPath}\""; + string newArgs = $"console -o \"{rootPath}\" --no-restore"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) diff --git a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs index 77407296f0..65da417b23 100644 --- a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs +++ b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs @@ -65,7 +65,7 @@ private ProjDir NewLib(string dir = null, [System.Runtime.CompilerServices.Calle try { - string newArgs = $"classlib -o \"{projDir.Path}\""; + string newArgs = $"classlib -o \"{projDir.Path}\" --no-restore"; new NewCommandShim() .WithWorkingDirectory(projDir.Path) .ExecuteWithCapturedOutput(newArgs) diff --git a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs index 1022596a3a..40afaea2ed 100644 --- a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs +++ b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs @@ -24,7 +24,7 @@ public void ItRestoresAppToSpecificDirectory() string dir = "pkgs"; string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir)); - string newArgs = $"console -o \"{rootPath}\""; + string newArgs = $"console -o \"{rootPath}\" --no-restore"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) @@ -51,7 +51,7 @@ public void ItRestoresLibToSpecificDirectory() string dir = "pkgs"; string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir)); - string newArgs = $"classlib -o \"{rootPath}\""; + string newArgs = $"classlib -o \"{rootPath}\" --no-restore"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) @@ -98,7 +98,7 @@ public void ItRestoresWithTheSpecifiedVerbosity() string dir = "pkgs"; string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir)); - string newArgs = $"console -o \"{rootPath}\""; + string newArgs = $"console -o \"{rootPath}\" --no-restore"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index 69ec51360d..36a0d3fde6 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -198,7 +198,7 @@ public void ItRunsAppWhenRestoringToSpecificPackageDirectory() string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -o \"{rootPath}\""; + string newArgs = $"console -o \"{rootPath}\" --no-restore"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) From 5378b074d94b0535bf1e50fdf1464cadef833004 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 11 Jul 2017 11:51:03 -0700 Subject: [PATCH 051/128] Updating the VSO build IDs. --- README.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 122707c676..ed403e3a7a 100644 --- a/README.md +++ b/README.md @@ -27,32 +27,32 @@ Build Status |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| |[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-build]|[![][rhel-build-badge]][rhel-build]| -[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6208/badge -[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6208 +[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6786/badge +[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6786 -[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6209/badge -[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6209 +[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6787/badge +[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6787 -[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6203/badge -[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6203 +[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6781/badge +[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6781 -[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6201/badge -[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6201 +[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6780/badge +[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6780 -[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6205/badge -[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6205 +[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6783/badge +[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6783 -[ubuntu-16.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6206/badge -[ubuntu-16.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6206 +[ubuntu-16.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6784/badge +[ubuntu-16.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6784 -[ubuntu-16.10-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6207/badge -[ubuntu-16.10-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6207 +[ubuntu-16.10-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6785/badge +[ubuntu-16.10-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6785 -[debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6199/badge -[debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6199 +[debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6778/badge +[debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6778 -[rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6204/badge -[rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6204 +[rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6782/badge +[rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6782 Installers and Binaries ----------------------- From 1147b6c2fed5db434896dd86d231670097e3b833 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 11 Jul 2017 10:08:59 -0700 Subject: [PATCH 052/128] Sync with windows installer experience for mac --- packaging/osx/clisdk/scripts/postinstall | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packaging/osx/clisdk/scripts/postinstall b/packaging/osx/clisdk/scripts/postinstall index 4d69748e9a..1ec0bf6fac 100755 --- a/packaging/osx/clisdk/scripts/postinstall +++ b/packaging/osx/clisdk/scripts/postinstall @@ -11,7 +11,6 @@ INSTALL_DESTINATION=$2 # A temporary fix for the permissions issue(s) chmod -R 755 $INSTALL_DESTINATION -# Run 'dotnet new' to trigger the first time experience to initialize the cache -$INSTALL_DESTINATION/dotnet new > /dev/null 2>&1 || true +$INSTALL_DESTINATION/dotnet internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true exit 0 From 9162230e85bed66bf702e857df410dd74727c11a Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 11 Jul 2017 18:03:11 +0000 Subject: [PATCH 053/128] sync windows installer change to rpm and deb --- packaging/deb/postinst | 2 +- packaging/rpm/scripts/after_install_host.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/deb/postinst b/packaging/deb/postinst index cf3769c9e1..e5ca8ee435 100755 --- a/packaging/deb/postinst +++ b/packaging/deb/postinst @@ -19,4 +19,4 @@ Installation Note -------------- A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete." -dotnet new > /dev/null 2>&1 || true +dotnet internal-reportinstallsuccess "debianpackage" > /dev/null 2>&1 || true diff --git a/packaging/rpm/scripts/after_install_host.sh b/packaging/rpm/scripts/after_install_host.sh index b0b121425b..72980c801b 100644 --- a/packaging/rpm/scripts/after_install_host.sh +++ b/packaging/rpm/scripts/after_install_host.sh @@ -23,4 +23,4 @@ Installation Note -------------- A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete." -dotnet new > /dev/null 2>&1 || true +dotnet internal-reportinstallsuccess "rpmpackage" > /dev/null 2>&1 || true From c5c6e22de49ab0b1de0b116e050713bf04a9885e Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Tue, 11 Jul 2017 22:20:37 +0000 Subject: [PATCH 054/128] Update CoreSetup to preview3-25511-03 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 21b73e0279..40d9256f3f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25510-01 + 2.0.0-preview3-25511-03 15.3.0-preview-000402-01 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170710-283 1.0.0-beta2-20170710-283 1.0.0-beta2-20170710-283 - 2.0.0-preview3-25510-01 - 2.0.0-preview3-25510-01 + 2.0.0-preview3-25511-03 + 2.0.0-preview3-25511-03 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From 747e9fd6adc189d12a418fd4bac978c4b1582369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 12 Jul 2017 16:33:29 +0200 Subject: [PATCH 055/128] MSBuildSdkResolver: resolve symlink for 'dotnet' binary On Linux the dotnet installed by the dotnet packages is a symlink (/usr/bin/dotnet -> ../share/dotnet/dotnet). We need to resolve the symlink so we're passing the path to the actual .NET Core installation to libhostfxr. Fixes https://github.com/dotnet/cli/issues/7125 --- .../Interop.NETStandard.cs | 16 ++++++++++++++++ .../MSBuildSdkResolver.cs | 12 +++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs index 272471bd38..74abc2a617 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs @@ -7,6 +7,7 @@ // on non-Windows machines. #if NETSTANDARD1_5 +using System; using System.Runtime.InteropServices; using System.Text; @@ -16,6 +17,14 @@ internal static partial class Interop { internal static readonly bool RunningOnWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + internal static string realpath(string path) + { + var ptr = unix_realpath(path, IntPtr.Zero); + var result = Marshal.PtrToStringAnsi(ptr); // uses UTF8 on Unix + unix_free(ptr); + return result; + } + private static int hostfxr_resolve_sdk(string exe_dir, string working_dir, [Out] StringBuilder buffer, int buffer_size) { // hostfxr string encoding is platform -specific so dispatch to the @@ -31,6 +40,13 @@ private static int hostfxr_resolve_sdk(string exe_dir, string working_dir, [Out] // CharSet.Ansi is UTF8 on Unix [DllImport("hostfxr", EntryPoint = nameof(hostfxr_resolve_sdk), CharSet = CharSet.Ansi, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)] private static extern int unix_hostfxr_resolve_sdk(string exe_dir, string working_dir, [Out] StringBuilder buffer, int buffer_size); + + // CharSet.Ansi is UTF8 on Unix + [DllImport("libc", EntryPoint = nameof(realpath), CharSet = CharSet.Ansi, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)] + private static extern IntPtr unix_realpath(string path, IntPtr buffer); + + [DllImport("libc", EntryPoint = "free", ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)] + private static extern void unix_free(IntPtr ptr); } } diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs index f5195f8399..08a5524794 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs @@ -174,8 +174,18 @@ private string GetDotnetExeDirectory() } var environmentProvider = new EnvironmentProvider(_getEnvironmentVariable); + var dotnetExe = environmentProvider.GetCommandPath("dotnet"); - return Path.GetDirectoryName(environmentProvider.GetCommandPath("dotnet")); +#if NETSTANDARD1_5 + if (dotnetExe != null && !Interop.RunningOnWindows) + { + // e.g. on Linux the 'dotnet' command from PATH is a symlink so we need to + // resolve it to get the actual path to the binary + dotnetExe = Interop.realpath(dotnetExe) ?? dotnetExe; + } +#endif + + return Path.GetDirectoryName(dotnetExe); } } } From 600946c58b558a72015b56655026af365037902a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 11 Jul 2017 17:12:26 +0200 Subject: [PATCH 056/128] MSBuildSdkResolver: clarify comment in Interop.NETStandard.cs The .NET Standard build ships with Mono/msbuild. --- .../Interop.NETStandard.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs index 74abc2a617..b672a5dfbe 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs @@ -1,10 +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. -// NOTE: Currently, only the NET46 build ships (with Visual Studio/desktop msbuild), -// but the netstandard1.5 adaptation here acts a proof-of-concept for cross-platform +// NOTE: the NET46 build ships with Visual Studio/desktop msbuild on Windows. +// The netstandard1.5 adaptation here acts a proof-of-concept for cross-platform // portability of the underlying hostfxr API and gives us build and test coverage -// on non-Windows machines. +// on non-Windows machines. It also ships with msbuild on Mono. #if NETSTANDARD1_5 using System; From b783f0c3282f89bf164ccdc8bfc4428409decb32 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Wed, 12 Jul 2017 17:18:01 +0000 Subject: [PATCH 057/128] Update CoreSetup to preview3-25512-01 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 40d9256f3f..99de067dd8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25511-03 + 2.0.0-preview3-25512-01 15.3.0-preview-000402-01 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170710-283 1.0.0-beta2-20170710-283 1.0.0-beta2-20170710-283 - 2.0.0-preview3-25511-03 - 2.0.0-preview3-25511-03 + 2.0.0-preview3-25512-01 + 2.0.0-preview3-25512-01 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From 88c14cb40d460574fe0e88450e3bc96a0bc894d3 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 12 Jul 2017 09:04:56 -0700 Subject: [PATCH 058/128] Update to Coherence 26239 Updates store and archive acquisition for the change that no longer has a different number for the SetupCrossgen build --- NuGet.Config | 4 +++- build/BundledRuntimes.props | 2 +- build/DependencyVersions.props | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 3fb7835eee..11723f1b5e 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -5,7 +5,9 @@ - + + + diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 685df5297f..1e5738a718 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -31,7 +31,7 @@ - $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeVersion) + $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeVersion)-$(AspNetCoreCoherenceTimestamp) runtime.version $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 40d9256f3f..2e76dcc237 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,8 +23,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170710-283 - 1.0.0-beta2-20170710-283 - 1.0.0-beta2-20170710-283 + 1.0.0-beta2-20170712-285 + 1.0.0-beta2-20170712-285 2.0.0-preview3-25511-03 2.0.0-preview3-25511-03 0.1.1-alpha-167 @@ -35,9 +35,9 @@ timestamped - dev-277 + 2.0.0 rtm - 26182 + 26239 From 4d0e8b5892ebe1fd16b466e9127d5e610122c6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 12 Jul 2017 16:33:29 +0200 Subject: [PATCH 059/128] MSBuildSdkResolver: resolve symlink for 'dotnet' binary On Linux the dotnet installed by the dotnet packages is a symlink (/usr/bin/dotnet -> ../share/dotnet/dotnet). We need to resolve the symlink so we're passing the path to the actual .NET Core installation to libhostfxr. Fixes https://github.com/dotnet/cli/issues/7125 --- .../Interop.NETStandard.cs | 16 ++++++++++++++++ .../MSBuildSdkResolver.cs | 12 +++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs index 272471bd38..74abc2a617 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Interop.NETStandard.cs @@ -7,6 +7,7 @@ // on non-Windows machines. #if NETSTANDARD1_5 +using System; using System.Runtime.InteropServices; using System.Text; @@ -16,6 +17,14 @@ internal static partial class Interop { internal static readonly bool RunningOnWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + internal static string realpath(string path) + { + var ptr = unix_realpath(path, IntPtr.Zero); + var result = Marshal.PtrToStringAnsi(ptr); // uses UTF8 on Unix + unix_free(ptr); + return result; + } + private static int hostfxr_resolve_sdk(string exe_dir, string working_dir, [Out] StringBuilder buffer, int buffer_size) { // hostfxr string encoding is platform -specific so dispatch to the @@ -31,6 +40,13 @@ private static int hostfxr_resolve_sdk(string exe_dir, string working_dir, [Out] // CharSet.Ansi is UTF8 on Unix [DllImport("hostfxr", EntryPoint = nameof(hostfxr_resolve_sdk), CharSet = CharSet.Ansi, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)] private static extern int unix_hostfxr_resolve_sdk(string exe_dir, string working_dir, [Out] StringBuilder buffer, int buffer_size); + + // CharSet.Ansi is UTF8 on Unix + [DllImport("libc", EntryPoint = nameof(realpath), CharSet = CharSet.Ansi, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)] + private static extern IntPtr unix_realpath(string path, IntPtr buffer); + + [DllImport("libc", EntryPoint = "free", ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)] + private static extern void unix_free(IntPtr ptr); } } diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs index f5195f8399..08a5524794 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/MSBuildSdkResolver.cs @@ -174,8 +174,18 @@ private string GetDotnetExeDirectory() } var environmentProvider = new EnvironmentProvider(_getEnvironmentVariable); + var dotnetExe = environmentProvider.GetCommandPath("dotnet"); - return Path.GetDirectoryName(environmentProvider.GetCommandPath("dotnet")); +#if NETSTANDARD1_5 + if (dotnetExe != null && !Interop.RunningOnWindows) + { + // e.g. on Linux the 'dotnet' command from PATH is a symlink so we need to + // resolve it to get the actual path to the binary + dotnetExe = Interop.realpath(dotnetExe) ?? dotnetExe; + } +#endif + + return Path.GetDirectoryName(dotnetExe); } } } From eb640dee8426a69320d103f04bdcc76f618aae15 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Wed, 12 Jul 2017 17:23:13 -0500 Subject: [PATCH 060/128] MSBuild 15.3.406 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index e2faad9094..f645197e7a 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.0-preview-000402-01 + 15.3.406 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 1.1.0-alpha-20170630-2 From 82dc7fdebbd30d19102634961a91a142ec98814c Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Wed, 12 Jul 2017 17:26:01 -0500 Subject: [PATCH 061/128] MSBuild 15.3.406 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 58ce7a3492..057bed8742 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0-preview3-25512-01 - 15.3.0-preview-000402-01 + 15.3.406 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 1.6.0-beta2-25304 From 50fa4461d1495455ecc9fb35d8ca40c771ff22df Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 12 Jul 2017 17:00:24 -0700 Subject: [PATCH 062/128] Update the SDK to 1.1.0-alpha-20170713-1 This carries the version cap for the 1.1 SDK. It has already been approved for insertion into VS. --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index e2faad9094..280bdf7044 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.0-preview-000402-01 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 - 1.1.0-alpha-20170630-2 + 1.1.0-alpha-20170713-1 4.3.0-preview4-4258 1.0.0-alpha-20170516-2-509 15.0.0 From eaa6eacc1adb4b1edd05f524b2cc2a25b848d51f Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Thu, 13 Jul 2017 16:24:08 +0000 Subject: [PATCH 063/128] Update CoreSetup to preview3-25513-01 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 057bed8742..15ff835fdd 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25512-01 + 2.0.0-preview3-25513-01 15.3.406 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170710-283 1.0.0-beta2-20170712-285 1.0.0-beta2-20170712-285 - 2.0.0-preview3-25512-01 - 2.0.0-preview3-25512-01 + 2.0.0-preview3-25513-01 + 2.0.0-preview3-25513-01 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From 780427ae1140a52b3980d524e5abcc55c12b29ce Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 13 Jul 2017 16:43:42 +0100 Subject: [PATCH 064/128] Update SPA templates package to 1.0.0-preview-000403 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 057bed8742..3876e0c8a9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -30,7 +30,7 @@ 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 - 1.0.0-preview-000358 + 1.0.0-preview-000403 0.2.0-beta-000042 From 7d6ed58265652c778ad8381cb5fb196d3c3e57d6 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Thu, 13 Jul 2017 17:26:22 +0000 Subject: [PATCH 065/128] Update CoreSetup to preview3-25513-02 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5294a1d465..b2ca254e62 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25513-01 + 2.0.0-preview3-25513-02 15.3.406 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170710-283 1.0.0-beta2-20170712-285 1.0.0-beta2-20170712-285 - 2.0.0-preview3-25513-01 - 2.0.0-preview3-25513-01 + 2.0.0-preview3-25513-02 + 2.0.0-preview3-25513-02 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From dcce9ce34c131e00415d50d36818238c2144d9e0 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 13 Jul 2017 12:04:04 -0700 Subject: [PATCH 066/128] Rename aspnet core store relate prop According to email The URL will be something like: https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/store/$(Branch)-$(TimeStamp)/aspnetcore-store-$(AspNetVersion)-$(Release)-$(TimeStamp)-$(RID).deb For example, if we are doing a build in the dev branch today, the URL might look like this https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/store/dev-12345/aspnetcore-store-2.0.0-rtm-12345-debian-x64.deb But the same build from our 2.0.0 branch would be https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/store/2.0.0-12345/aspnetcore-store-2.0.0-rtm-12345-debian-x64.deb For 2.0 the branches we had were dev, 2.0.0-preview1, 2.0.0-preview2 and 2.0.0 (for RTM without any release moniker) --- build/BundledRuntimes.props | 4 ++-- build/DependencyVersions.props | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 1e5738a718..6d8f76c465 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -31,7 +31,7 @@ - $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeVersion)-$(AspNetCoreCoherenceTimestamp) + $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName) runtime.version $(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName) @@ -41,7 +41,7 @@ linux -$(AspNetCoreCoherenceTimestamp) - -$(AspNetCoherenceLabel)$(AspNetCoreRuntimeStoreSuffix) + -$(AspNetCoreRelease)$(AspNetCoreRuntimeStoreSuffix) Build.RS.$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)$(AspNetCoreRuntimeInstallerArchiveSuffix)$(ArchiveExtension) $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b2ca254e62..ff9b0ef818 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -35,10 +35,15 @@ timestamped - 2.0.0 - rtm + + 2.0.0 + rtm + 2.0.0 26239 + aspnetcore-store + $(AspNetCoreVersion)-$(AspNetCoreRelease) + $(AspNetCoreBranchName)-$(AspNetCoreCoherenceTimestamp) From b9c5e2ec57090d63bdf7819d750a1022ea4077b6 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 13 Jul 2017 12:07:51 -0700 Subject: [PATCH 067/128] dotnet-sdk DEB package consume store by dependency Instead of Packing along. Edit Debian config, add download store deb package as part of the packing process as well as test. --- build/package/Installer.DEB.proj | 15 ++++++--------- build/package/Installer.DEB.targets | 17 +++++++++++++++++ packaging/deb/dotnet-debian_config.json | 3 ++- .../dotnet-uninstall-debian-packages.sh | 2 ++ 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 2c917db52d..51efaca628 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -16,7 +16,8 @@ @@ -24,6 +25,7 @@ + - - - + @@ -110,6 +105,7 @@ + @@ -123,6 +119,7 @@ + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index c67895054d..b2187ff584 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -35,6 +35,10 @@ dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp) + $(HostRid) + debian-x64 + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb @@ -83,6 +87,9 @@ $(SharedFxDebianPackageName) + + $(AspNetCoreRuntimePackageName) + , @@ -107,4 +114,14 @@ + + + + $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) + + + diff --git a/packaging/deb/dotnet-debian_config.json b/packaging/deb/dotnet-debian_config.json index 86adb7537c..4d813f3fda 100644 --- a/packaging/deb/dotnet-debian_config.json +++ b/packaging/deb/dotnet-debian_config.json @@ -29,6 +29,7 @@ }, "debian_dependencies":{ - "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY% + "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%, + "%ASPNETCOREPACKAGESTORE_DEBIAN_PACKAGE_NAME%": {} } } diff --git a/scripts/obtain/uninstall/dotnet-uninstall-debian-packages.sh b/scripts/obtain/uninstall/dotnet-uninstall-debian-packages.sh index 2fcd4280bc..a62ce9ed41 100755 --- a/scripts/obtain/uninstall/dotnet-uninstall-debian-packages.sh +++ b/scripts/obtain/uninstall/dotnet-uninstall-debian-packages.sh @@ -13,8 +13,10 @@ if [ $current_userid -ne 0 ]; then fi host_package_name="dotnet-host" +aspnetcore_package_store_package_name="^aspnetcore-store.*" remove_all(){ + apt-get purge -y $aspnetcore_package_store_package_name apt-get purge -y $host_package_name } From 21aa774707bef5c5d6165b2d7bcdbf813678d341 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 13 Jul 2017 12:08:35 -0700 Subject: [PATCH 068/128] dotnet-sdk rpm package consume store by dependency Instead of Packing along. Edit RPM config, add download store rpm package as part of the test. --- build/package/Installer.RPM.targets | 34 ++++++++++++++----- packaging/rpm/dotnet-config.json | 8 +++-- .../dotnet-uninstall-rpm-packages.sh | 2 ++ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index e64e73ce4a..58eaca2016 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -50,6 +50,11 @@ dotnet-hostfxr-$(HostFxrRpmPackageVersion) $(HostFxrRpmPackageName.ToLower()) dotnet-host + $(HostRid) + rhel-x64 + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp) + $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreCoherenceTimestamp) + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm @@ -74,7 +79,6 @@ - - - $(SharedFrameworkVersion) + + $(AspNetCoreRuntimePackageName) + + + $(AspNetCoreRuntimePackageVersion) + $(SharedFxRpmPackageName) @@ -162,6 +166,16 @@ + + + $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) + + + + @@ -182,11 +196,12 @@ @@ -194,6 +209,7 @@ + @@ -207,6 +223,8 @@ + + diff --git a/packaging/rpm/dotnet-config.json b/packaging/rpm/dotnet-config.json index 6ed9d53ad2..38f533bcb2 100644 --- a/packaging/rpm/dotnet-config.json +++ b/packaging/rpm/dotnet-config.json @@ -25,14 +25,16 @@ { "package_name": "%SHARED_HOST_RPM_NAME%", "package_version": "%SHARED_HOST_RPM_VERSION%" + }, + { + "package_name": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_NAME%", + "package_version": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_VERSION%" } ], "directories": [ "/usr/share/dotnet/sdk", - "/usr/share/dotnet/store", - "/usr/share/dotnet/additionalDeps", "/usr/share/doc/%SDK_RPM_PACKAGE_NAME%" ], "after_install_source": "scripts/after_install_host.sh", "after_remove_source": "scripts/after_remove_host.sh" -} \ No newline at end of file +} diff --git a/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh b/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh index d3572ec38d..ef7be91afb 100755 --- a/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh +++ b/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh @@ -13,9 +13,11 @@ if [ $current_userid -ne 0 ]; then fi host_package_name="dotnet-host" +aspnetcore_package_store_package_name="aspnetcore-store*" remove_all(){ yum remove -y $host_package_name + yum remove -y $aspnetcore_package_store_package_name } is_dotnet_host_installed(){ From d24c861929ec227b0ad4e190b2d4b1dbcec5a677 Mon Sep 17 00:00:00 2001 From: "Ashish Jain (NUGET)" Date: Thu, 13 Jul 2017 14:37:10 -0700 Subject: [PATCH 069/128] Updating NuGet version to 4.3.0-preview4-4273 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b2ca254e62..d812fef27d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.0-preview3-20170703-2 $(CLI_NETSDK_Version) - 4.3.0-preview4-4258 + 4.3.0-preview4-4273 2.0.0-preview2-25331-02 2.0.0-rel-20170629-588 15.3.0-preview-20170628-02 From 5e5cd8736309d5c8c593e1b5e6e14e0ebb6ae949 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 13 Jul 2017 14:59:00 -0700 Subject: [PATCH 070/128] Rename to AspNetCoreRuntimePackageTimestamp --- build/BundledRuntimes.props | 2 +- build/DependencyVersions.props | 4 ++-- build/package/Installer.DEB.targets | 4 ++-- build/package/Installer.RPM.targets | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 6d8f76c465..396c9f2df0 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -40,7 +40,7 @@ $(HostOSName) linux - -$(AspNetCoreCoherenceTimestamp) + -$(AspNetCoreRuntimePackageTimestamp) -$(AspNetCoreRelease)$(AspNetCoreRuntimeStoreSuffix) Build.RS.$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)$(AspNetCoreRuntimeInstallerArchiveSuffix)$(ArchiveExtension) $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index ff9b0ef818..b5d76fdddc 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -39,11 +39,11 @@ 2.0.0 rtm 2.0.0 - 26239 + 26239 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) - $(AspNetCoreBranchName)-$(AspNetCoreCoherenceTimestamp) + $(AspNetCoreBranchName)-$(AspNetCoreRuntimePackageTimestamp) diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index b2187ff584..879be4b8a4 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -35,10 +35,10 @@ dotnet-hostfxr-$(HostFxrDebianPackageVersion) $(HostFxrDebianPackageName.ToLower()) dotnet-host - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp) + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(HostRid) debian-x64 - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 58eaca2016..13818cd919 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -52,9 +52,9 @@ dotnet-host $(HostRid) rhel-x64 - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp) - $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreCoherenceTimestamp) - $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreCoherenceTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) + $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) + $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm From 9f4ef463d2544fdd9868572d4ec0bd436fde91cc Mon Sep 17 00:00:00 2001 From: "Ashish Jain (NUGET)" Date: Thu, 13 Jul 2017 16:26:26 -0700 Subject: [PATCH 071/128] Updated NuGet to 4.3.0-preview4-4273 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 2edc5d2e4d..92f5f6b6b0 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,7 +6,7 @@ 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 1.1.0-alpha-20170713-1 - 4.3.0-preview4-4258 + 4.3.0-preview4-4273 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta2-20170629-269 From f762870debeb37752bde093282dc564c71e6456b Mon Sep 17 00:00:00 2001 From: seancpeters Date: Thu, 13 Jul 2017 16:28:37 -0700 Subject: [PATCH 072/128] use dotnet/templating build 286 (#7155) --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b5d76fdddc..1992e47b0c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,8 +23,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170710-283 - 1.0.0-beta2-20170712-285 - 1.0.0-beta2-20170712-285 + 1.0.0-beta2-20170713-286 + 1.0.0-beta2-20170713-286 2.0.0-preview3-25513-02 2.0.0-preview3-25513-02 0.1.1-alpha-167 From 633ec51720fcf6988c83c0617093747da47990b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbyn=C4=9Bk=20Sailer?= Date: Fri, 14 Jul 2017 09:14:59 +0200 Subject: [PATCH 073/128] LOC CHECKIN | cli-release/2.0.0 | 20170714 --- .../xlf/LocalizableStrings.it.xlf | 2 +- .../xlf/LocalizableStrings.cs.xlf | 14 ++-- .../xlf/LocalizableStrings.de.xlf | 14 ++-- .../xlf/LocalizableStrings.it.xlf | 2 +- .../xlf/LocalizableStrings.ja.xlf | 12 +-- .../xlf/LocalizableStrings.ko.xlf | 2 +- .../xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.ru.xlf | 2 +- .../xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.cs.xlf | 24 +++--- .../xlf/LocalizableStrings.de.xlf | 22 +++--- .../xlf/LocalizableStrings.es.xlf | 24 +++--- .../xlf/LocalizableStrings.fr.xlf | 24 +++--- .../xlf/LocalizableStrings.it.xlf | 22 +++--- .../xlf/LocalizableStrings.ja.xlf | 22 +++--- .../xlf/LocalizableStrings.ko.xlf | 22 +++--- .../xlf/LocalizableStrings.pl.xlf | 22 +++--- .../xlf/LocalizableStrings.pt-BR.xlf | 26 +++---- .../xlf/LocalizableStrings.ru.xlf | 22 +++--- .../xlf/LocalizableStrings.tr.xlf | 26 +++---- .../xlf/LocalizableStrings.zh-Hans.xlf | 22 +++--- .../xlf/LocalizableStrings.zh-Hant.xlf | 28 +++---- .../CommandLine/xlf/LocalizableStrings.cs.xlf | 22 +++--- .../CommandLine/xlf/LocalizableStrings.de.xlf | 22 +++--- .../CommandLine/xlf/LocalizableStrings.es.xlf | 22 +++--- .../CommandLine/xlf/LocalizableStrings.fr.xlf | 22 +++--- .../CommandLine/xlf/LocalizableStrings.it.xlf | 22 +++--- .../CommandLine/xlf/LocalizableStrings.ja.xlf | 22 +++--- .../CommandLine/xlf/LocalizableStrings.ko.xlf | 22 +++--- .../CommandLine/xlf/LocalizableStrings.pl.xlf | 22 +++--- .../xlf/LocalizableStrings.pt-BR.xlf | 22 +++--- .../CommandLine/xlf/LocalizableStrings.ru.xlf | 22 +++--- .../CommandLine/xlf/LocalizableStrings.tr.xlf | 22 +++--- .../xlf/LocalizableStrings.zh-Hans.xlf | 22 +++--- .../xlf/LocalizableStrings.zh-Hant.xlf | 22 +++--- .../xlf/LocalizableStrings.es.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../xlf/LocalizableStrings.ru.xlf | 2 +- .../xlf/LocalizableStrings.ja.xlf | 4 +- .../xlf/LocalizableStrings.fr.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.fr.xlf | 2 +- .../xlf/LocalizableStrings.ko.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.fr.xlf | 4 +- .../dotnet-help/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-help/xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../xlf/LocalizableStrings.cs.xlf | 2 +- .../xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-list/xlf/LocalizableStrings.ru.xlf | 2 +- .../xlf/LocalizableStrings.fr.xlf | 2 +- .../xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-pack/xlf/LocalizableStrings.fr.xlf | 4 +- .../xlf/LocalizableStrings.pt-BR.xlf | 4 +- .../xlf/LocalizableStrings.fr.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 4 +- .../xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.ru.xlf | 2 +- .../xlf/LocalizableStrings.ko.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../xlf/LocalizableStrings.cs.xlf | 2 +- .../xlf/LocalizableStrings.de.xlf | 2 +- .../xlf/LocalizableStrings.es.xlf | 8 +- .../xlf/LocalizableStrings.fr.xlf | 10 +-- .../xlf/LocalizableStrings.it.xlf | 2 +- .../xlf/LocalizableStrings.ja.xlf | 2 +- .../xlf/LocalizableStrings.ko.xlf | 2 +- .../xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 4 +- .../xlf/LocalizableStrings.ru.xlf | 2 +- .../xlf/LocalizableStrings.tr.xlf | 4 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../dotnet-run/xlf/LocalizableStrings.cs.xlf | 26 +++---- .../dotnet-run/xlf/LocalizableStrings.de.xlf | 26 +++---- .../dotnet-run/xlf/LocalizableStrings.es.xlf | 28 +++---- .../dotnet-run/xlf/LocalizableStrings.fr.xlf | 26 +++---- .../dotnet-run/xlf/LocalizableStrings.it.xlf | 28 +++---- .../dotnet-run/xlf/LocalizableStrings.ja.xlf | 26 +++---- .../dotnet-run/xlf/LocalizableStrings.ko.xlf | 26 +++---- .../dotnet-run/xlf/LocalizableStrings.pl.xlf | 26 +++---- .../xlf/LocalizableStrings.pt-BR.xlf | 26 +++---- .../dotnet-run/xlf/LocalizableStrings.ru.xlf | 26 +++---- .../dotnet-run/xlf/LocalizableStrings.tr.xlf | 28 +++---- .../xlf/LocalizableStrings.zh-Hans.xlf | 26 +++---- .../xlf/LocalizableStrings.zh-Hant.xlf | 26 +++---- .../xlf/LocalizableStrings.fr.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-test/xlf/LocalizableStrings.es.xlf | 16 ++-- .../dotnet-test/xlf/LocalizableStrings.fr.xlf | 8 +- .../dotnet-test/xlf/LocalizableStrings.ja.xlf | 4 +- .../dotnet-test/xlf/LocalizableStrings.ko.xlf | 6 +- .../dotnet-test/xlf/LocalizableStrings.pl.xlf | 4 +- .../xlf/LocalizableStrings.pt-BR.xlf | 14 ++-- .../dotnet-test/xlf/LocalizableStrings.tr.xlf | 8 +- .../xlf/CommonLocalizableStrings.cs.xlf | 2 +- .../xlf/CommonLocalizableStrings.de.xlf | 2 +- .../xlf/CommonLocalizableStrings.es.xlf | 72 +++++++++--------- .../xlf/CommonLocalizableStrings.fr.xlf | 4 +- .../xlf/CommonLocalizableStrings.it.xlf | 4 +- .../xlf/CommonLocalizableStrings.ja.xlf | 2 +- .../xlf/CommonLocalizableStrings.ko.xlf | 76 +++++++++---------- .../xlf/CommonLocalizableStrings.pl.xlf | 4 +- .../xlf/CommonLocalizableStrings.pt-BR.xlf | 8 +- .../xlf/CommonLocalizableStrings.ru.xlf | 2 +- .../xlf/CommonLocalizableStrings.tr.xlf | 4 +- .../xlf/CommonLocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/CommonLocalizableStrings.zh-Hant.xlf | 2 +- src/dotnet/xlf/LocalizableStrings.es.xlf | 74 +++++++++--------- src/dotnet/xlf/LocalizableStrings.ko.xlf | 76 +++++++++---------- src/dotnet/xlf/LocalizableStrings.pt-BR.xlf | 2 +- src/dotnet/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- 126 files changed, 735 insertions(+), 787 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf index 85771b494f..a19ec0313e 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf @@ -39,7 +39,7 @@ Invalid format in line {0}: {1} - Formato non valido a riga {0}: {1} + Formato non valido alla riga {0}: {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf index d72c9edf88..1aaef6cd52 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf @@ -14,17 +14,17 @@ {0}: attempting to find command {1} in {2} - {0}: pokus o nalezení příkazu {1} v {2} + {0}: Pokus o nalezení příkazu {1} v {2} {0}: failed to find toolAssembly for {1} - {0}: nepodařilo se najít toolAssembly pro {1} + {0}: Nepodařilo se najít toolAssembly pro {1} {0}: failed to find commandPath {1} - {0}: nepodařilo se najít commandPath {1} + {0}: Nepodařilo se najít commandPath {1} @@ -121,7 +121,7 @@ {0}: attempting to create commandspec - {0}: pokus o vytvoření specifikace příkazu commandspec + {0}: Pokus o vytvoření specifikace příkazu commandspec @@ -131,7 +131,7 @@ {0}: expect deps.json at: {1} - {0}: soubor deps.json se očekává v: {1} + {0}: Soubor deps.json se očekává v: {1} @@ -206,7 +206,7 @@ < {0} exited with {1} in {2} ms. - < {0} skončil s {1} ve {2} ms. + < {0} skončil s {1} za {2} ms. @@ -231,7 +231,7 @@ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore` - Spustitelný soubor příkazu {0} se nenašel. Projekt zřejmě nebyl obnoven, nebo obnovení selhalo – spusťte příkaz run `dotnet restore`. + Spustitelný soubor příkazu {0} se nenašel. Projekt se nepodařilo obnovit nebo jeho obnovení nebylo úspěšné. Spusťte příkaz dotnet restore. diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf index 8b0515edb4..03af407f76 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf @@ -14,7 +14,7 @@ {0}: attempting to find command {1} in {2} - {0}: Versuch, Befehl {1} in {2} zu finden + {0}: Nach Befehl {1} wird in {2} gesucht @@ -39,7 +39,7 @@ {0}: attempting to resolve {1} - {0}: Versuch, {1} aufzulösen + {0}: Es wird versucht, {1} aufzulösen @@ -99,7 +99,7 @@ {0}: Attempting to resolve command spec from tool {1} - {0}: Versuch, commandspec aus Tool {1} aufzulösen. + {0}: Es wird versucht, commandspec aus Tool {1} aufzulösen. @@ -121,7 +121,7 @@ {0}: attempting to create commandspec - {0}: Versuch, commandspec zu erstellen + {0}: Es wird versucht, commandspec zu erstellen @@ -161,7 +161,7 @@ The project may not have been restored or restore failed - run `dotnet restore` - Das Projekt wurde möglicherweise nicht wiederhergestellt, oder bei der Wiederherstellung ist ein Fehler aufgetreten - führen Sie `dotnet restore` aus. + Das Projekt wurde möglicherweise nicht wiederhergestellt, oder bei der Wiederherstellung ist ein Fehler aufgetreten. führen Sie "dotnet restore" aus. @@ -206,7 +206,7 @@ < {0} exited with {1} in {2} ms. - < {0} wird in {2} ms mit {1} beendet. + < {0} wurde nach {2} ms mit {1} beendet. @@ -231,7 +231,7 @@ The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore` - Der für "{0}" auszuführende Befehle wurde nicht gefunden. Das Projekt wurde möglicherweise nicht wiederhergestellt, oder bei der Wiederherstellung ist ein Fehler aufgetreten – führen Sie "dotnet restore" aus. + Der für "{0}" auszuführende Befehl wurde nicht gefunden. Das Projekt wurde möglicherweise nicht wiederhergestellt, oder bei der Wiederherstellung ist ein Fehler aufgetreten. Führen Sie "dotnet restore" aus. diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf index 7933431291..84efa6a292 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf @@ -79,7 +79,7 @@ Specify which project file to use because this '{0}' contains more than one project file. - Specificare il file di progetto da usare perché questo file perché questo elemento '{0}' contiene più file di progetto. + Specificare il file di progetto da usare perché questo elemento '{0}' contiene più file di progetto. diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf index df6ae7af0f..88387b7426 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf @@ -44,7 +44,7 @@ {0}: Did not find a matching project {1}. - {0}:一致するプロジェクト {1}.が見つかりませんでした。 + {0}: 一致するプロジェクト {1}.が見つかりませんでした。 @@ -69,12 +69,12 @@ {0}: MSBUILD_EXE_PATH = {1} - {0}:MSBUILD_EXE_PATH = {1} + {0}: MSBUILD_EXE_PATH = {1} {0}: MSBuild project path = {1} - {0}:MSBuild project path = {1} + {0}: MSBuild project path = {1} @@ -99,7 +99,7 @@ {0}: Attempting to resolve command spec from tool {1} - {0}:ツール {1} から commandspec を解決しようとしています + {0}: ツール {1} から commandspec を解決しようとしています @@ -161,7 +161,7 @@ The project may not have been restored or restore failed - run `dotnet restore` - プロジェクトが復元されていない可能性があるか、または - run `dotnet restore` の復元に失敗しました。 + プロジェクトが復元されていないか、復元に失敗した可能性があります。`dotnet restore` を実行します @@ -171,7 +171,7 @@ Waiting for debugger to attach. Press ENTER to continue - デバッガーのアタッチを待っています...続行するには、ENTER キーを押してください + デバッガーのアタッチを待っています。続行するには、ENTER キーを押してください diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf index 028f28a5ba..ff639f8e2e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf @@ -191,7 +191,7 @@ WriteLine forwarder set previously - WriteLine 전달자가 전에 설정됨 + WriteLine 전달자가 이전에 설정됨 diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf index 49ae8eed02..a36aa643d5 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf @@ -105,7 +105,7 @@ {0}: nuget packages root: {1} - {0}: Korzeń pakietów NuGet: + {0}: Katalog główny pakietów NuGet: {1} diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf index 40b6ff0c24..d4bb9fefd1 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf @@ -161,7 +161,7 @@ The project may not have been restored or restore failed - run `dotnet restore` - Возможно, проект не был восстановлен или его восстановление завершилось со сбоем, запустите команду "dotnet restore". + Возможно, проект не был восстановлен или его восстановление завершилось со сбоем. Запустите команду "dotnet restore". diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf index 4eb79b65ca..f0634cf3ef 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf @@ -24,7 +24,7 @@ {0}: failed to find commandPath {1} - {0}: {1} için commandPath bulunamadı + {0}: {1} commandPath bulunamadı diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf index f9baf02cb5..6ae013bb94 100644 --- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf @@ -131,7 +131,7 @@ {0}: expect deps.json at: {1} - {0}: 需要deps.json: {1} + {0}: 需要 deps.json: {1} diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf index 52a1fd5b79..69c2a2361b 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf @@ -12,19 +12,15 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - Vítá vás .NET Core! + Vítá vás .NET Core! --------------------- Další informace o .NET Core najdete na https://aka.ms/dotnet-docs. Dostupné příkazy si zobrazíte pomocí dotnet --help, případně přejděte na https://aka.ms/dotnet-cli-docs. Telemetrie -------------- Nástroje .NET Core shromažďují data o využití s cílem vylepšit vaše prostředí. Data jsou anonymní a nezahrnují argumenty příkazového řádku. Data shromažďuje Microsoft, který je sdílí s komunitou. -S telemetrií můžete vyjádřit výslovný nesouhlas, a to nastavením proměnné prostředí DOTNET_CLI_TELEMETRY_OPTOUT na 1 prostřednictvím vašeho oblíbeného rozhraní. -Další informace o telemetrii nástrojů .NET Core si můžete přečíst na webu https://aka.ms/dotnet-cli-telemetry. - -Probíhá konfigurace... -------------------- -Běží příkaz pro počáteční naplnění vaší místní mezipaměti balíčků, aby se vylepšila rychlost obnovování a umožnil se offline přístup. Provádění tohoto příkazu může trvat až minutu a proběhne jen jednou. +S telemetrií můžete vyjádřit výslovný nesouhlas, a to nastavením proměnné prostředí DOTNET_CLI_TELEMETRY_OPTOUT na 1 prostřednictvím svého oblíbeného rozhraní. +Další informace o telemetrii nástrojů .NET Core si můžete přečíst na webu https://aka.ms/dotnet-cli-telemetry. @@ -36,9 +32,9 @@ Běží příkaz pro počáteční naplnění vaší místní mezipaměti balí Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + Probíhá konfigurace... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +Běží příkaz pro počáteční naplnění vaší místní mezipaměti balíčků, aby se vylepšila rychlost obnovování a umožnil se offline přístup. Provádění tohoto příkazu může trvat až minutu a proběhne jen jednou. @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + Oprávnění ke změně složky {0} bylo zamítnuto. -Here are some options to fix this error: +Tuto chybu můžete opravit pomocí některé z těchto možností: --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. Znovu spusťte tento příkaz pomocí přístupu se zvýšenou úrovní oprávnění. +2. Zakažte software spouštěný při prvním zapnutí počítače tak, že nastavíte proměnnou prostředí DOTNET_SKIP_FIRST_TIME_EXPERIENCE na hodnotu Pravda. +3. Zkopírujte sadu .NET Core SDK do nechráněného umístění a použijte ji z tohoto umístění. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf index a029697dee..e101ef5794 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf @@ -12,7 +12,7 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - Willkommen bei .NET Core! + Willkommen bei .NET Core! --------------------- Weitere Informationen zu .NET Core finden Sie unter https://aka.ms/dotnet-docs. Verwenden Sie "dotnet --help", um die verfügbaren Befehle anzuzeigen, oder wechseln Sie zu https://aka.ms/dotnet-cli-docs. @@ -20,11 +20,7 @@ Telemetrie -------------- Über die .NET Core-Tools werden Nutzungsdaten erfasst, damit wir die Benutzeroberfläche weiter für Sie verbessern können. Die Daten sind anonym und enthalten keine Befehlszeilenargumente. Die Daten werden von Microsoft gesammelt und mit der Community geteilt. Sie können die Erfassung von Telemetriedaten deaktivieren, indem Sie die Umgebungsvariable DOTNET_CLI_TELEMETRY_OPTOUT mithilfe Ihrer bevorzugten Shell auf 1 festlegen. -Weitere Informationen zur Telemetrie der .NET Core-Tools finden Sie unter https://aka.ms/dotnet-cli-telemetry. - -Konfiguration wird durchgeführt... -------------------- -Ein Befehl wird ausgeführt, um Ihren lokalen Paketcache erstmals aufzufüllen, die Wiederherstellungsgeschwindigkeit zu verbessern und Onlinezugriff zu ermöglichen. Die Ausführung dieses Befehls nimmt bis zu einer Minute in Anspruch und wird einmalig ausgeführt. +Weitere Informationen zur Telemetrie der .NET Core-Tools finden Sie unter https://aka.ms/dotnet-cli-telemetry. @@ -36,9 +32,9 @@ Ein Befehl wird ausgeführt, um Ihren lokalen Paketcache erstmals aufzufüllen, Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + Konfiguration wird durchgeführt... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +Ein Befehl wird ausgeführt, um Ihren lokalen Paketcache erstmals aufzufüllen, die Wiederherstellungsgeschwindigkeit zu verbessern und Onlinezugriff zu ermöglichen. Die Ausführung dieses Befehls nimmt bis zu einer Minute in Anspruch und wird einmalig ausgeführt. @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + Die Berechtigung zum Ändern des Ordners "{0}" wurde verweigert. -Here are some options to fix this error: +Im Folgenden finden Sie einige Optionen, um diesen Fehler zu beheben: --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. Führen Sie diesen Befehl mit erhöhten Zugriffsrechten noch mal aus. +2. Deaktivieren Sie die erste Ausführung, indem Sie die Umgebungsvariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE auf "true" festlegen. +3. Kopieren Sie das .NET Core SDK an einen nicht geschützten Speicherort, und kopieren Sie es von dort. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf index 2033ddcf5d..49e0cd07d3 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf @@ -12,19 +12,15 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - Bienvenido a .NET Core + Bienvenido a .NET Core --------------------- -Obtenga más información sobre .NET Core en https://aka.ms/dotnet-docs. Use dotnet --help para ver los comandos disponibles o vaya a https://aka.ms/dotnet-cli-docs. +Aprenda sobre .NET Core en https://aka.ms/dotnet-docs. Use dotnet --help para ver los comandos disponibles o vaya a https://aka.ms/dotnet-cli-docs. Telemetría -------------- Las herramientas de .NET Core recopilan datos de uso con el fin de mejorar su experiencia. Los datos son anónimos y no incluyen argumentos de la línea de comandos. Microsoft recopila los datos y los comparte con la comunidad. Si desea optar por no participar en la telemetría, establezca una variable de entorno DOTNET_CLI_TELEMETRY_OPTOUT en 1 con el shell de su preferencia. -Puede leer más información sobre la telemetría de las herramientas de .NET Core en https://aka.ms/dotnet-cli-telemetry. - -Configurando... -------------------- -Un comando se ejecuta para rellenar inicialmente la caché de paquete local a fin de mejorar la velocidad de restauración y permitir el acceso sin conexión. Este comando demorará hasta un minuto para completarse y solo sucederá una vez. +Puede leer más información sobre la telemetría de las herramientas de .NET Core en https://aka.ms/dotnet-cli-telemetry. @@ -36,9 +32,9 @@ Un comando se ejecuta para rellenar inicialmente la caché de paquete local a fi Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + Configurando... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +Se está ejecutando un comando para rellenar inicialmente la caché de paquetes local, para mejorar la velocidad de restauración y habilitar el acceso sin conexión. Este comando tardará en completarse un minuto y solo sucederá una vez. @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + Permiso denegado para modificar la carpeta "{0}". -Here are some options to fix this error: +Estas son algunas opciones para corregir este error: --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. Vuelva a ejecutar este comando con acceso con privilegios elevados. +2. Deshabilite la primera experiencia de ejecución; para ello, establezca la variable de entorno DOTNET_SKIP_FIRST_TIME_EXPERIENCE en true. +3. Copie el SDK de .NET Core en una ubicación no protegida y úselo desde ahí. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf index 42e71a3f12..fb9d015ce5 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf @@ -12,19 +12,15 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - Bienvenue dans .NET Core ! + Bienvenue dans .NET Core ! --------------------- En savoir plus sur .NET Core @ https://aka.ms/dotnet-docs. Utilisez dotnet --help pour voir les commandes disponibles, ou accédez à https://aka.ms/dotnet-cli-docs. Télémétrie -------------- Les outils .NET Core collectent des données d'utilisation pour améliorer votre expérience utilisateur. Ces données sont anonymes et n'incluent aucun argument de ligne de commande. Les données sont collectées par Microsoft et partagées par la communauté. -Vous pouvez refuser l'adhésion à la télémétrie en assignant la valeur 1 à la variable d'environnement DOTNET_CLI_TELEMETRY_OPTOUT via l'interpréteur de commandes de votre choix. -Pour plus d'informations sur la télémétrie des outils .NET Core, consultez https://aka.ms/dotnet-cli-telemetry. - -Configuration en cours... -------------------- -Une commande s'exécute pour remplir votre cache de package local, améliorer la vitesse de restauration et activer l'accès hors connexion. L'exécution de cette commande peut prendre jusqu'à une minute et n'a lieu qu'une seule fois. +Vous pouvez refuser l'adhésion à la télémétrie en affectant la valeur 1 à la variable d'environnement DOTNET_CLI_TELEMETRY_OPTOUT via l'interpréteur de commandes de votre choix. +Pour plus d'informations sur la télémétrie des outils .NET Core, consultez https://aka.ms/dotnet-cli-telemetry. @@ -36,9 +32,9 @@ Une commande s'exécute pour remplir votre cache de package local, améliorer la Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + Configuration en cours... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +Une commande s'exécute pour remplir votre cache de package local, améliorer la vitesse de restauration et activer l'accès hors connexion. L'exécution de cette commande peut prendre jusqu'à une minute et n'a lieu qu'une seule fois. @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + Autorisation refusée pour la modification du dossier '{0}'. -Here are some options to fix this error: +Voici quelques options pour corriger cette erreur : --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. Réexécutez cette commande avec un accès élevé. +2. Désactivez l'introduction de l'interface logicielle lors de la première utilisation en affectant la valeur true à la variable d'environnement DOTNET_SKIP_FIRST_TIME_EXPERIENCE. +3. Copiez le kit .NET Core SDK à un emplacement non protégé à partir duquel vous l'utiliserez ensuite. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf index 40e6319d89..c24c808491 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf @@ -12,7 +12,7 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - Benvenuti a .NET Core + Benvenuti a .NET Core --------------------- Per altre informazioni su .NET Core, vedere https://aka.ms/dotnet-docs. Per visualizzare i comandi disponibili, usare dotnet --help oppure vedere https://aka.ms/dotnet-cli-docs. @@ -20,11 +20,7 @@ Telemetria -------------- Gli strumenti di .NET Core consentono di raccogliere i dati di utilizzo allo scopo di migliorare l'esperienza. I dati sono anonimi e non includono gli argomenti della riga di comando. Vengono raccolti da Microsoft e condivisi con la community. È possibile escludere la telemetria impostando la variabile di ambiente DOTNET_CLI_TELEMETRY_OPTOUT su 1 nella shell preferita. -Per altre informazioni sulla telemetria degli strumenti di .NET Core, vedere https://aka.ms/dotnet-cli-telemetry. - -Configurazione... -------------------- -È in esecuzione un comando per popolare inizialmente la cache dei pacchetti locale, migliorare la velocità di ripristino e abilitare l'accesso offline. Il completamento di questo comando, che viene eseguito una sola volta, richiede circa un minuto. +Per altre informazioni sulla telemetria degli strumenti di .NET Core, vedere https://aka.ms/dotnet-cli-telemetry. @@ -36,9 +32,9 @@ Configurazione... Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + Configurazione... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +È in esecuzione un comando per popolare inizialmente la cache dei pacchetti locale, migliorare la velocità di ripristino e abilitare l'accesso offline. Il completamento di questo comando, che viene eseguito una sola volta, richiede circa un minuto. @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + L'autorizzazione per modificare la cartella '{0}' è stata negata. -Here are some options to fix this error: +Ecco alcune opzioni per correggere questo errore: --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. Eseguire di nuovo questo comando con privilegi di accesso elevati. +2. Disabilitare il completamento dell'installazione impostando su true la variabile di ambiente DOTNET_SKIP_FIRST_TIME_EXPERIENCE. +3. Copiare .NET Core SDK in un percorso non protetto e usarlo da tale posizione. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf index a0eb36e43a..b201c51445 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf @@ -12,7 +12,7 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - .NET Core へようこそ! + .NET Core へようこそ! --------------------- .NET Core について詳しくは、https://aka.ms/dotnet-docs をご覧ください。dotnet --help を使って使用可能なコマンドを確認するか、https://aka.ms/dotnet-cli-docs をご覧ください。 @@ -20,11 +20,7 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te -------------- .NET Core ツールは、操作性を向上させるために利用状況データを収集します。データは匿名で、コマンドライン引数が含まれません。データは Microsoft によって収集され、コミュニティと共有されます。 テレメトリを無効にするには、お好きなシェルを使用して、DOTNET_CLI_TELEMETRY_OPTOUT 環境変数を 1 に設定します。 -.NET Core ツールのテレメトリについて詳しくは、https://aka.ms/dotnet-cli-telemetry をお読みください。 - -構成中... -------------------- -ローカル パッケージ キャッシュを最初に設定し、復元速度を向上させ、オフライン アクセスを可能にするため、コマンドを実行しています。このコマンドは 1 回だけ実行され、最大 1 分かかる場合があります。 +.NET Core ツールのテレメトリについて詳しくは、https://aka.ms/dotnet-cli-telemetry をお読みください。 @@ -36,9 +32,9 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + 構成中... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +ローカル パッケージ キャッシュを最初に設定し、復元速度を向上させ、オフライン アクセスを可能にするため、コマンドを実行しています。このコマンドは 1 回だけ実行され、完了までに最大 1 分かかる場合があります。 @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + '{0}' フォルダーを変更するためのアクセス許可が拒否されました。 -Here are some options to fix this error: +このエラーを修正するためのいくつかのオプションを次に示します。 --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. 昇格したアクセス権でこのコマンドを再実行します。 +2. 環境変数 DOTNET_SKIP_FIRST_TIME_EXPERIENCE を true に設定して、最初の実行エクスペリエンスを無効にします。 +3. 保護されていない場所に .NET Core SDK をコピーし、そこから使用します。 diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf index 912a1935c1..6f912a283e 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf @@ -12,7 +12,7 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - NET Core를 시작합니다! + .NET Core를 시작합니다! --------------------- .NET Core에 대한 자세한 내용은 https://aka.ms/dotnet-docs를 참조하세요. 사용 가능한 명령을 보려면 dotnet --help를 사용하거나 https://aka.ms/dotnet-cli-docs를 방문하세요. @@ -20,11 +20,7 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te -------------- .NET Core 도구는 사용자 환경 개선을 위해 사용량 데이터를 수집합니다. 데이터는 익명이며 명령줄 인수를 포함하지 않습니다. Microsoft에서 데이터를 수집하여 커뮤니티와 공유합니다. 자주 사용하는 셸에서 DOTNET_CLI_TELEMETRY_OPTOUT 환경 변수를 1로 설정하여 원격 분석을 옵트아웃할 수 있습니다. -.NET Core 도구 원격 분석에 대한 자세한 내용은 https://aka.ms/dotnet-cli-telemetry에서 확인할 수 있습니다. - -구성 중... -------------------- -초기에 로컬 패키지 캐시를 채우고, 복원 속도를 개선하고, 오프라인 액세스를 사용하도록 설정하기 위한 명령을 실행 중입니다. 완료하는 데 최대 1분이 소요되며 한 번만 실행됩니다. +.NET Core 도구 원격 분석에 대한 자세한 내용은 https://aka.ms/dotnet-cli-telemetry에서 확인할 수 있습니다. @@ -36,9 +32,9 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + 구성 중... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +초기에 로컬 패키지 캐시를 채우고, 복원 속도를 개선하고, 오프라인 액세스를 사용하도록 설정하기 위한 명령을 실행하고 있습니다. 완료하는 데 최대 1분이 소요되며 한 번만 실행됩니다. @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + '{0}' 폴더를 수정하는 데 필요한 사용 권한이 거부되었습니다. -Here are some options to fix this error: +이 오류를 해결하기 위한 옵션을 다음과 같습니다. --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. 높은 액세스 권한으로 이 명령을 다시 실행합니다. +2. 환경 변수 DOTNET_SKIP_FIRST_TIME_EXPERIENCE를 true로 설정하여 첫 실행 경험을 사용하지 않습니다. +3. .NET Core SDK를 보호되지 않은 위치로 복사한 후 이 위치에서 사용합니다. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf index d998cc6666..e2d132a85c 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf @@ -12,7 +12,7 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - .NET Core — Zapraszamy! + .NET Core — Zapraszamy! --------------------- Więcej informacji o programie .NET Core znajdziesz na stronie https://aka.ms/dotnet-docs. Aby wyświetlić dostępne polecenia, użyj polecenia dotnet --help lub przejdź na stronę https://aka.ms/dotnet-cli-docs. @@ -20,11 +20,7 @@ Telemetria -------------- Narzędzia programu .NET Core zbierają dane dotyczące użycia w celu ulepszenia Twojego środowiska pracy. Dane te są anonimowe i nie obejmują argumentów wiersza polecenia. Zbiera je firma Microsoft i udostępnia społeczności. Z telemetrii można zrezygnować, ustawiając zmienną środowiskową DOTNET_CLI_TELEMETRY_OPTOUT na wartość 1 przy użyciu ulubionej powłoki. -Więcej informacji na temat telemetrii narzędzi programu .NET Core możesz znaleźć na stronie https://aka.ms/dotnet-cli-telemetry. - -Trwa konfigurowanie… -------------------- -Wykonywane jest polecenie w celu wstępnego wypełnienia lokalnej pamięci podręcznej pakietów, poprawy szybkości przywracania i włączenia dostępu offline. Wykonanie tego polecenia jest jednorazowe i zajmie maksymalnie minutę. +Więcej informacji na temat telemetrii narzędzi programu .NET Core możesz znaleźć na stronie https://aka.ms/dotnet-cli-telemetry. @@ -36,9 +32,9 @@ Wykonywane jest polecenie w celu wstępnego wypełnienia lokalnej pamięci podr Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + Trwa konfigurowanie… ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +Wykonywane jest polecenie w celu wstępnego wypełnienia lokalnej pamięci podręcznej pakietów, poprawy szybkości przywracania i włączenia dostępu offline. Wykonanie tego polecenia jest jednorazowe i zajmie maksymalnie minutę. @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + Odmowa uprawnień do zmodyfikowania folderu „{0}”. -Here are some options to fix this error: +Oto kilka opcji naprawiania tego błędu: --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. Uruchom to polecenie ponownie z podwyższonym poziomem uprawnień. +2. Wyłącz środowisko pierwszego uruchomienia, ustawiając dla zmiennej środowiskowej DOTNET_SKIP_FIRST_TIME_EXPERIENCE wartość true. +3. Skopiuj zestaw .NET Core SDK do lokalizacji niechronionej i tam z niego korzystaj. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf index b6677da51b..0a789402bf 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf @@ -12,19 +12,15 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - Bem-vindo ao .NET Core! + Bem-vindo ao .NET Core! --------------------- Saiba mais sobre o .NET Core em https://aka.ms/dotnet-docs. Use dotnet --help para ver os comandos disponíveis ou acesse https://aka.ms/dotnet-cli-docs. Telemetria -------------- As ferramentas do .NET Core coletam dados de uso para melhorar sua experiência. Os dados são anônimos e não incluem argumentos de linha de comando. Os dados são coletados pela Microsoft e compartilhados com a comunidade. -É possível recusar a telemetria definindo uma variável de ambiente DOTNET_CLI_TELEMETRY_OPTOUT como 1 usando seu shell favorito. -Leia mais sobre a telemetria das ferramentas do .NET Core em https://aka.ms/dotnet-cli-telemetry. - -Configurando... -------------------- -Um comando está sendo executado para popular inicialmente o cache do pacote local, a fim de melhorar a velocidade de restauração e habilitar o acesso offline. Esse comando levará até um minuto para ser concluído e só ocorrerá uma vez. +É possível recusar a telemetria ao configurar uma variável de ambiente DOTNET_CLI_TELEMETRY_OPTOUT como 1 usando seu shell favorito. +Leia mais sobre a telemetria das ferramentas do .NET Core em https://aka.ms/dotnet-cli-telemetry. @@ -36,9 +32,9 @@ Um comando está sendo executado para popular inicialmente o cache do pacote loc Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + Configurando... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +Um comando está sendo executado para popular inicialmente o cache do pacote local, a fim de melhorar a velocidade de restauração e habilitar o acesso offline. Esse comando levará até um minuto para ser concluído e só ocorrerá uma vez. @@ -50,14 +46,14 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + Permissão negada para modificar a pasta '{0}'. -Here are some options to fix this error: +Aqui estão algumas opções para consertar este erro: --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. - +1. Execute este comando novamente com acesso elevado. +2. Desabilite a primeira experiência de execução ao configurar a variável de ambiente DOTNET_SKIP_FIRST_TIME_EXPERIENCE como verdadeira. +3. Copie o SDK do .NET Core para uma localização não protegida e use-o de lá. + diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf index f1f42e9a23..46ceb61efe 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf @@ -12,7 +12,7 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - Добро пожаловать в .NET Core! + Добро пожаловать в .NET Core! --------------------- Дополнительные сведения о .NET Core можно получить по адресу https://aka.ms/dotnet-docs. Для просмотра доступных команд используйте dotnet --help или перейдите на страницу https://aka.ms/dotnet-cli-docs. @@ -20,11 +20,7 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te -------------- Средства .NET Core собирают данные об использовании для улучшения взаимодействия с пользователем. Эти данные анонимны и не включают в себя аргументы командной строки. Сбор данных осуществляется корпорацией Майкрософт, которая предоставляет их сообществу. Вы можете явно отказаться от телеметрии, присвоив переменной среды DOTNET_CLI_TELEMETRY_OPTOUT значение 1 с помощью предпочитаемой оболочки. -Дополнительные сведения о телеметрии в средствах .NET Core см. по адресу https://aka.ms/dotnet-cli-telemetry. - -Настройка... -------------------- -Выполняется команда для изначального заполнения локального кэша пакетов, повышения скорости восстановления и обеспечения автономного доступа. Ее выполнение может занять до одной минуты и имеет единоразовый характер. +Дополнительные сведения о телеметрии в средствах .NET Core см. по адресу https://aka.ms/dotnet-cli-telemetry. @@ -36,9 +32,9 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + Идет настройка... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +Выполняется команда для изначального заполнения локального кэша пакетов, повышения скорости восстановления и обеспечения автономного доступа. Ее выполнение может занять до одной минуты и производится только раз. @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + Отменено разрешение на изменение папки "{0}". -Here are some options to fix this error: +Ниже приведено несколько способов устранения этой ошибки. --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. Повторно выполните эту команду с правами повышенного доступа. +2. Отключите возможность первого запуска, задав для переменной среды DOTNET_SKIP_FIRST_TIME_EXPERIENCE значение "true". +3. Скопируйте пакет SDK для .NET Core в незащищенное расположение и используйте его оттуда. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf index 33a88c8e1e..b5762bc81b 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf @@ -12,19 +12,15 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - .NET Core’a Hoş Geldiniz! + .NET Core’a Hoş Geldiniz! --------------------- -.NET Core hakkında daha fazla bilgiyi https://aka.ms/dotnet-docs adresinde bulabilirsiniz. Kullanılabilir komutları görmek için dotnet --help kullanın veya https://aka.ms/dotnet-cli-docs adresine gidin. +.NET Core hakkında daha fazla bilgi için bkz. https://aka.ms/dotnet-docs. Kullanılabilir komutları görmek için dotnet --help komutunu kullanın veya https://aka.ms/dotnet-cli-docs adresine gidin. Telemetri -------------- .NET Core araçları, deneyiminizi iyileştirmek için kullanım verileri toplar. Veriler anonimdir ve komut satırı bağımsız değişkenlerini içermez. Veriler Microsoft tarafından toplanır ve topluluk ile paylaşılır. -Sık kullandığınız kabuk aracılığıyla DOTNET_CLI_TELEMETRY_OPTOUT ortam değişkenini 1 değerine ayarlayarak telemetriyi geri çevirebilirsiniz. -.NET Core araç telemetrisi hakkında daha faza bilgiyi https://aka.ms/dotnet-cli-telemetry adresinde bulabilirsiniz. - -Yapılandırılıyor... -------------------- -Yerel paket önbelleğinizi başlangıçta doldurmak, geri yükleme hızını artırmak ve çevrimdışı erişimi etkinleştirmek için bir komut çalıştırılıyor. Bu komutun tamamlanması yaklaşık bir dakika sürer ve bu işlem yalnızca bir kez gerçekleştirilir. +Sık kullandığınız kabuk aracılığıyla DOTNET_CLI_TELEMETRY_OPTOUT ortam değişkenini 1 değerine ayarlayarak telemetri toplanmasını geri çevirebilirsiniz. +.NET Core araçları telemetrisi hakkında daha faza bilgi için bkz. https://aka.ms/dotnet-cli-telemetry. @@ -36,9 +32,9 @@ Yerel paket önbelleğinizi başlangıçta doldurmak, geri yükleme hızını ar Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + Yapılandırılıyor... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +Yerel paket önbelleğinizi başlangıçta doldurmak, geri yükleme hızını artırmak ve çevrimdışı erişimi etkinleştirmek için bir komut çalıştırılıyor. Bu komutun tamamlanması yaklaşık bir dakika sürer ve bu işlem yalnızca bir kez gerçekleştirilir. @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + '{0}' klasörünü değiştirme izni verilmedi. -Here are some options to fix this error: +Bu hatayı düzeltmek için bazı seçenekler: --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. Bu komutu yükseltilmiş erişim ile yeniden çalıştırın. +2. DOTNET_SKIP_FIRST_TIME_EXPERIENCE ortam değişkenini true olarak ayarlayarak ilk çalıştırma deneyimini devre dışı bırakın. +3. .NET Core SDK’sını korumasız bir konuma kopyalayarak oradan kullanın. diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf index 99f5c4d5cd..7c5bfae32b 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf @@ -12,7 +12,7 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - 欢迎使用 .NET Core! + 欢迎使用 .NET Core! --------------------- 若要详细了解 .NET Core，请访问 https://aka.ms/dotnet-docs。使用 dotnet --help 查看可用的命令或转到 https://aka.ms/dotnet-cli-docs。 @@ -20,11 +20,7 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te -------------- .NET Core 收集使用情况数据，以便改善用户体验。数据是匿名的且不包含命令行参数。数据由 Microsoft 收集，并与社区共享。 可选择使用你最喜爱的 shell 将 DOTNET_CLI_TELEMETRY_OPTOUT 环境变量设置为 1，从而退出遥测。 -若要深入了解 .NET Core 工具遥测，请访问 https://aka.ms/dotnet-cli-telemetry。 - -正在配置... -------------------- -正在运行一项命令，以初步填充本地包缓存，从而提高还原速度并启用脱机访问。此命令最长需要一分钟才能完成，且仅可运行一次。 +若要深入了解 .NET Core 工具遥测，请访问 https://aka.ms/dotnet-cli-telemetry。 @@ -36,9 +32,9 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + 正在配置... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +正在运行一项命令，以初步填充本地包缓存，从而提高还原速度并启用脱机访问。此命令最长需要一分钟才能完成，且仅可运行一次。 @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + 修改“{0}”文件夹的权限被拒绝。 -Here are some options to fix this error: +以下是修复该错误的选项: --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. 以提升的访问权限重新运行该命令。 +2. 通过将环境变量 DOTNET_SKIP_FIRST_TIME_EXPERIENCE 设置为 true，禁用首次运行体验。 +3. 将 .NET Core SDK 复制到未受保护的位置并从该位置使用。 diff --git a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf index be7388cbcd..5efc8642e3 100644 --- a/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf @@ -12,19 +12,15 @@ Telemetry The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. - 歡迎使用 .NET Core! + 歡迎使用 .NET Core! --------------------- -深入了解 .NET Core @ https://aka.ms/dotnet-docs。使用 dotnet --help 查看可用的命令，或前往 https://aka.ms/dotnet-cli-docs。 +深入了解 .NET Core @ https://aka.ms/dotnet-docs。使用 dotnet --help 可查看可用的命令，或前往 https://aka.ms/dotnet-cli-docs。 遙測 -------------- -.NET Core 工具會收集使用方式資料以改善您的體驗。資料為匿名且不含命令列引數。資料由 Microsoft 收集並與社群共用。 -您可選擇退出遙測，方法是使用您慣用的殼層將 DOTNET_CLI_TELEMETRY_OPTOUT 環境變數設為 1。 -您可深入閱讀 .NET Core 工具遙測 @ https://aka.ms/dotnet-cli-telemetry。 - -正在設定... -------------------- -正在執行命令以初始將您的本機套件快取填入，進而改善還原速度並啟用離線存取。此命令最多需要一分鐘完成，且只會進行一次。 +.NET Core 工具會收集使用方式資料，以改善您的體驗。資料為匿名形式，且不含命令列引數。資料由 Microsoft 收集並會與社群共用。 +使用您慣用的殼層，將 DOTNET_CLI_TELEMETRY_OPTOUT 環境變數設定為 1，即可退出遙測。 +您可深入閱讀 .NET Core 工具遙測 @ https://aka.ms/dotnet-cli-telemetry。 @@ -36,9 +32,9 @@ You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-te Configuring... ------------------- A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. - Configuring... + 正在設定... ------------------- -A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once. +執行命令以初步填入您的本機套件快取，以改善還原速度並允許離線存取。此命令最長需要一分鐘的時間才可完成，且只會進行一次。 @@ -50,13 +46,13 @@ Here are some options to fix this error: 2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. 3. Copy the .NET Core SDK to a non-protected location and use it from there. - Permission denied to modify the '{0}' folder. + 權限無法修改 '{0}' 資料夾。 -Here are some options to fix this error: +以下為修正此錯誤的一些選項: --------------------- -1. Re-run this command with elevated access. -2. Disabled the first run experience by setting the environment variable DOTNET_SKIP_FIRST_TIME_EXPERIENCE to true. -3. Copy the .NET Core SDK to a non-protected location and use it from there. +1. 利用較高的存取權再次執行此命令。 +2. 將環境變數 DOTNET_SKIP_FIRST_TIME_EXPERIENCE 設定為 true，停用第一次的執行體驗。 +3. 將 .NET Core SDK 複製到不受保護的位置，並於該處使用此 SDK。 diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.cs.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.cs.xlf index 622b7940d3..529936172e 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.cs.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + Příkaz {0} přijímá pouze jediný argument, ale bylo zadáno více argumentů ({1}). Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + Příkaz {0} přijímá pouze jediný příkaz v podnabídce, ale bylo zadáno více příkazů v podnabídce: {1}. File does not exist: {0} - File does not exist: {0} + Neexistující soubor: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + Pro možnost {0} nejsou argumenty povoleny. Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + Možnost {0} přijímá pouze jediný argument, ale bylo zadáno více argumentů ({1}). Required argument missing for command: {0} - Required argument missing for command: {0} + Chybí povinný argument pro příkaz: {0}. Required argument missing for option: {0} - Required argument missing for option: {0} + Chybí povinný argument pro možnost: {0}. Required command was not provided. - Required command was not provided. + Požadovaný příkaz nebyl zadán. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + Argument {0} nebyl rozpoznán. Musí se jednat o jeden z těchto argumentů: {1}. Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + Nerozpoznaný příkaz nebo argument: {0} Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + Možnost {0} nebyla rozpoznána. Musí se jednat o jednu z těchto možností: {1}. diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.de.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.de.xlf index 1e28688723..d291993ff9 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.de.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + Der Befehl "{0}" akzeptiert nur ein einzelnes Argument, es wurden aber {1} angegeben. Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + Der Befehl "{0}" akzeptiert nur einen einzelnen Unterbefehl, es wurden aber mehrere angegeben: {1} File does not exist: {0} - File does not exist: {0} + Die Datei ist nicht vorhanden: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + Nicht zulässige Argumente für die Option: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + Die Option "{0}" akzeptiert nur ein einzelnes Argument, es wurden aber {1} angegeben. Required argument missing for command: {0} - Required argument missing for command: {0} + Ein erforderliches Argument fehlt für den Befehl: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + Ein erforderliches Argument fehlt für die Option: {0} Required command was not provided. - Required command was not provided. + Der erforderliche Befehl wurde nicht bereitgestellt. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + Das Argument "{0}" wurde nicht erkannt. Folgendes ist erforderlich: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + Befehl oder Argument "{0}" nicht erkannt Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + Die Option "{0}" wurde nicht erkannt. Folgendes ist erforderlich: {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.es.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.es.xlf index 91c19f65cc..e8bf947f7f 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.es.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + El comando "{0}" solo acepta un argumento, pero se proporcionaron {1}. Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + El comando "{0}" solo acepta un subcomando, pero se proporcionaron varios: {1}. File does not exist: {0} - File does not exist: {0} + El archivo no existe: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + No se permiten argumentos para la opción: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + La opción "{0}" solo acepta un argumento, pero se proporcionaron {1}. Required argument missing for command: {0} - Required argument missing for command: {0} + Falta un argumento necesario para el comando: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + Falta un argumento necesario para la opción: {0} Required command was not provided. - Required command was not provided. + No se proporcionó el comando requerido. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + No se reconoce el argumento "{0}". Debe ser uno de: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + No se reconoce el comando o el argumento "{0}" Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + No se reconoce la opción "{0}". Debe ser una de: {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.fr.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.fr.xlf index 82bf12a4ac..c788f87f07 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.fr.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + La commande '{0}' n'accepte qu'un seul argument mais {1} d'entre eux ont été fournis. Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + La commande '{0}' n'accepte qu'une seule sous-commande mais plusieurs d'entre elles ont été fournies : {1} File does not exist: {0} - File does not exist: {0} + Le fichier n'existe pas : {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + Arguments non autorisés pour l'option : {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + L'option '{0}' n'accepte qu'un seul argument mais {1} d'entre eux ont été fournis. Required argument missing for command: {0} - Required argument missing for command: {0} + Argument obligatoire manquant pour la commande : {0} Required argument missing for option: {0} - Required argument missing for option: {0} + Argument obligatoire manquant pour l'option : {0} Required command was not provided. - Required command was not provided. + La commande nécessaire n'a pas été fournie. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + Argument '{0}' non reconnu. Il doit faire partie de : {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + Commande ou argument non reconnu : '{0}' Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + Option '{0}' non reconnue. Elle doit faire partie de : {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.it.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.it.xlf index 493367cf55..14961a2637 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.it.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + Il comando '{0}' accetta un solo argomento, ma ne sono stati forniti {1}. Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + Il comando '{0}' accetta un solo sottocomando, ma ne è stato fornito più di uno: {1} File does not exist: {0} - File does not exist: {0} + Il file {0} non esiste Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + Argomenti non consentiti per l'opzione: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + L'opzione '{0}' accetta un solo argomento, ma ne sono stati forniti {1}. Required argument missing for command: {0} - Required argument missing for command: {0} + Manca l'argomento obbligatorio per il comando: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + Manca l'argomento obbligatorio per l'opzione: {0} Required command was not provided. - Required command was not provided. + Il comando obbligatorio non è stato specificato. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + L'argomento '{0}' non è riconosciuto. Deve essere uno dei seguenti: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + Il comando o l'argomento '{0}' non è stato riconosciuto Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + L'opzione '{0}' non è riconosciuta. Deve essere una delle seguenti: {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.ja.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.ja.xlf index b4a5170a37..50971bca94 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.ja.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + コマンド '{0}' は 1 つの引数のみを受け入れますが、{1} が指定されました。 Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + コマンド '{0}' は 1 つのサブコマンドのみを受け入れますが、複数指定されました: {1} File does not exist: {0} - File does not exist: {0} + ファイルが存在しません: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + 引数をオプションで使用できません: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + オプション '{0}' は 1 つの引数のみを受け入れますが、{1} 個指定されました。 Required argument missing for command: {0} - Required argument missing for command: {0} + 必要な引数がコマンドにありません: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + 必要な引数がオプションにありません: {0} Required command was not provided. - Required command was not provided. + 必要なコマンドが指定されませんでした。 Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + 引数 '{0}' は認識されません。次のいずれかである必要があります: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + 認識されないコマンドまたは引数 '{0}' Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + オプション '{0}' は認識されません。次のいずれかである必要があります: {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.ko.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.ko.xlf index 26aaf3874a..31d7d28bb4 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.ko.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + ‘{0}’ 명령은 단일 인수만 허용하는데, {1}이(가) 제공되었습니다. Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + ‘{0}’ 명령은 단일 하위 명령만 허용하는데, 여러 하위 명령이 제공되었습니다. {1} File does not exist: {0} - File does not exist: {0} + 파일이 없습니다. {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + 옵션에 대해 인수가 허용되지 않습니다. {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + '{0}' 옵션은 단일 인수만 허용하는데, {1}이(가) 제공되었습니다. Required argument missing for command: {0} - Required argument missing for command: {0} + 명령 {0}에 대한 필수 인수가 없습니다. Required argument missing for option: {0} - Required argument missing for option: {0} + 옵션 {0}에 대한 필수 인수가 없습니다. Required command was not provided. - Required command was not provided. + 필수 명령을 제공하지 않았습니다. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + '{0}' 인수를 인식할 수 없습니다. 다음 중 하나여야 합니다. {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + 인식할 수 없는 명령 또는 인수 '{0}' Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + '{0}' 옵션을 인식할 수 없습니다. 다음 중 하나여야 합니다. {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.pl.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.pl.xlf index e10b05fff9..4b588e0db1 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.pl.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + Polecenie „{0}” przyjmuje tylko jeden argument, a podano {1}. Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + Polecenie „{0}” przyjmuje tylko jedno polecenie podrzędne, a podano ich wiele: {1}. File does not exist: {0} - File does not exist: {0} + Plik nie istnieje: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + Dla tej opcji nie są dozwolone argumenty: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + Opcja „{0}” przyjmuje tylko jeden argument, a podano {1}. Required argument missing for command: {0} - Required argument missing for command: {0} + Brakuje argumentu wymaganego polecenia: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + Brakuje argumentu wymaganego opcji: {0} Required command was not provided. - Required command was not provided. + Nie podano wymaganego polecenia. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + Nie rozpoznano argumentu „{0}”. Musi on być jednym z tych: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + Nierozpoznane polecenie lub argument „{0}” Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + Nie rozpoznano opcji „{0}”. Musi ona być jedną z tych: {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.pt-BR.xlf index 6f35e631e3..474492f364 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.pt-BR.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + O comando '{0}' aceita somente um único argumento, mas {1} foram fornecidos. Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + O comando '{0}' aceita somente um único subcomando, mas vários foram fornecidos: {1} File does not exist: {0} - File does not exist: {0} + O arquivo não existe: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + Argumentos não permitidos para a opção: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + A opção '{0}' aceita somente um único argumento, mas {1} foram fornecidos. Required argument missing for command: {0} - Required argument missing for command: {0} + Argumento obrigatório ausente para o comando: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + Argumento obrigatório ausente para a opção: {0} Required command was not provided. - Required command was not provided. + O comando necessário não foi fornecido. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + Argumento '{0}' não reconhecido. Ele deve ser um dos seguintes: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + Comando ou argumento '{0}' não reconhecido Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + Opção '{0}' não reconhecida. Ela deve ser uma das seguintes: {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.ru.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.ru.xlf index 7b7c028e01..2565938b99 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.ru.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + Команда "{0}" принимает только один аргумент, но указано несколько аргументов: {1}. Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + Команда "{0}" принимает только одну подкоманду, но указано несколько подкоманд: {1}. File does not exist: {0} - File does not exist: {0} + Файл не существует: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + Аргументы для параметра не допускаются: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + Параметр "{0}" принимает только один аргумент, но указано несколько аргументов: {1}. Required argument missing for command: {0} - Required argument missing for command: {0} + Отсутствует обязательный аргумент для команды: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + Отсутствует обязательный аргумент для параметра: {0} Required command was not provided. - Required command was not provided. + Обязательная команда не указана. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + Аргумент "{0}" не распознан. Он должен быть одним из следующих: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + Нераспознанная команда или аргумент "{0}" Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + Параметр "{0}" не распознан. Он должен быть одним из следующих: {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.tr.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.tr.xlf index 6d6076ba0c..ac2ef1d795 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.tr.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + '{0}' komutu yalnızca bir bağımsız değişken kabul ediyor ancak {1} bağımsız değişken sağlandı. Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + '{0}' komutu yalnızca bir alt komut kabul ediyor ancak birden çok sağlandı: {1} File does not exist: {0} - File does not exist: {0} + Dosya yok: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + Seçenek için bağımsız değişkenlere izin verilmiyor: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + '{0}' seçeneği yalnızca bir bağımsız değişken kabul ediyor ancak {1} bağımsız değişken sağlandı. Required argument missing for command: {0} - Required argument missing for command: {0} + Komut için gerekli bağımsız değişken eksik: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + Seçenek için gerekli bağımsız değişken eksik: {0} Required command was not provided. - Required command was not provided. + Gerekli komut sağlanmadı. Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + '{0}' bağımsız değişkeni tanınmıyor. Şunlardan biri olmalıdır: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + Tanınmayan komut veya bağımsız değişken: '{0}' Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + '{0}' seçeneği tanınmıyor. Şunlardan biri olmalıdır: {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.zh-Hans.xlf index 5963fa8e32..1df688e04b 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.zh-Hans.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + 命令“{0}”仅接受一个参数但 {1} 已提供。 Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + 命令“{0}”仅接受一个子命令但已提供多个子命令: {1} File does not exist: {0} - File does not exist: {0} + 文件不存在: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + 选项不允许参数: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + 选项“{0}”仅接受一个参数但 {1} 已提供。 Required argument missing for command: {0} - Required argument missing for command: {0} + 命令缺少所需参数: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + 选项缺少所需参数: {0} Required command was not provided. - Required command was not provided. + 未提供必需的命令。 Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + 未识别参数“{0}”。必须为一个: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + 未识别命令或参数“{0}” Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + 未识别选项“{0}”。必须为一个: {1} diff --git a/src/dotnet/CommandLine/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/CommandLine/xlf/LocalizableStrings.zh-Hant.xlf index d343b4a275..f3ed08ca12 100644 --- a/src/dotnet/CommandLine/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/CommandLine/xlf/LocalizableStrings.zh-Hant.xlf @@ -109,57 +109,57 @@ Command '{0}' only accepts a single argument but {1} were provided. - Command '{0}' only accepts a single argument but {1} were provided. + 命令 '{0}' 只接受單一引數，但提供了 {1} 個引數。 Command '{0}' only accepts a single subcommand but multiple were provided: {1} - Command '{0}' only accepts a single subcommand but multiple were provided: {1} + 命令 '{0}' 只接受單一子命令，但提供了多個子命令: {1} File does not exist: {0} - File does not exist: {0} + 檔案不存在: {0} Arguments not allowed for option: {0} - Arguments not allowed for option: {0} + 選項不允許的引數: {0} Option '{0}' only accepts a single argument but {1} were provided. - Option '{0}' only accepts a single argument but {1} were provided. + 選項 '{0}' 只接受單一引數，但提供了 {1} 個引數。 Required argument missing for command: {0} - Required argument missing for command: {0} + 命令遺漏必要引數: {0} Required argument missing for option: {0} - Required argument missing for option: {0} + 選項遺漏必要引數: {0} Required command was not provided. - Required command was not provided. + 未提供所需的命令。 Argument '{0}' not recognized. Must be one of: {1} - Argument '{0}' not recognized. Must be one of: {1} + 無法辨識引數 '{0}'。必須為下列之一: {1} Unrecognized command or argument '{0}' - Unrecognized command or argument '{0}' + 無法辨識的命令或引數 '{0}' Option '{0}' not recognized. Must be one of: {1} - Option '{0}' not recognized. Must be one of: {1} + 無法辨識選項 '{0}'。必須為下列之一: {1} diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index 44c2d22e4f..54fcd62ea1 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -59,7 +59,7 @@ SOURCE - SOURCE + ORIGEN diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index 3777834fde..f99ea83f15 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -54,7 +54,7 @@ FRAMEWORK - ESTRUTURA + FRAMEWORK diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-proj/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-proj/xlf/LocalizableStrings.ru.xlf index ccb84c150b..e609e17f9c 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-proj/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-proj/xlf/LocalizableStrings.ru.xlf @@ -4,7 +4,7 @@ .NET Add Project to Solution Command - Команда "Добавить проект в решение" .NET + Команда .NET "Добавить проект в решение" diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf index 7234a47cde..b81b235b4c 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/xlf/LocalizableStrings.ja.xlf @@ -4,7 +4,7 @@ .NET Add Project to Project reference Command - .NET プロジェクト間参照を追加するコマンド + .NET Add Project to Project reference コマンド @@ -14,7 +14,7 @@ Project to project references to add - 追加する Project to project 参照 + 追加するプロジェクト間参照 diff --git a/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.fr.xlf index ac2186f411..1d50fcdbc6 100644 --- a/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.fr.xlf @@ -29,7 +29,7 @@ OUTPUT_DIR - RÉP_SORTIE + OUTPUT_DIR diff --git a/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.pt-BR.xlf index 2a607edf97..7ae9fc8b4f 100644 --- a/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.pt-BR.xlf @@ -29,7 +29,7 @@ OUTPUT_DIR - DIRETÓRIO_DE_SAÍDA + OUTPUT_DIR diff --git a/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.tr.xlf index 2037ff0f10..c521f83017 100644 --- a/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-build/xlf/LocalizableStrings.tr.xlf @@ -29,7 +29,7 @@ OUTPUT_DIR - OUTPUT_DIR + ÇIKIŞ_DİZİNİ diff --git a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.fr.xlf index cfc4117613..79ec56b2c3 100644 --- a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ OUTPUT_DIR - RÉP_SORTIE + OUTPUT_DIR diff --git a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ko.xlf index b685c57d5e..923339cc73 100644 --- a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.ko.xlf @@ -19,7 +19,7 @@ Directory in which the build outputs have been placed. - 빌드 출력이 배치된 디렉터리입니다. + 빌드 출력이 위치한 디렉터리입니다. diff --git a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf index 1265f03abf..7a60fa0468 100644 --- a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ OUTPUT_DIR - DIRETÓRIO_DE_SAÍDA + OUTPUT_DIR diff --git a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.tr.xlf index de5fca02b8..25d13051e1 100644 --- a/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-clean/xlf/LocalizableStrings.tr.xlf @@ -14,7 +14,7 @@ OUTPUT_DIR - OUTPUT_DIR + ÇIKIŞ_DİZİNİ diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf index d1fdf28067..86d28776a5 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf @@ -39,7 +39,7 @@ Show help. - Zobrazit nápovědu + Zobrazí nápovědu. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf index 18dd0f719b..419026640d 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf @@ -39,7 +39,7 @@ Show help. - Hilfe anzeigen + Hilfe anzeigen. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf index 0559b4ff9f..a4ae3a445b 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf @@ -39,7 +39,7 @@ Show help. - Muestra la ayuda + Muestra la ayuda. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf index 95dc8ac4b8..62ac2526ee 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf @@ -39,7 +39,7 @@ Show help. - Afficher l'aide + Affichez l'aide. @@ -204,7 +204,7 @@ Run 'dotnet COMMAND --help' for more information on a command. - Exécutez 'dotnet COMMANDE --help' pour plus d'informations sur une commande. + Exécutez 'dotnet COMMAND --help' pour plus d'informations sur une commande. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf index f03ab92a78..5e5d2bd4f4 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf @@ -39,7 +39,7 @@ Show help. - Mostra la Guida + Visualizza la Guida. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf index 404389240c..d262204396 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf @@ -39,7 +39,7 @@ Show help. - ヘルプを表示する + ヘルプを表示します。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf index 563eb3340f..e31fcdf827 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf @@ -39,7 +39,7 @@ Show help. - 도움말 표시 + 도움말을 표시합니다. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf index 482131988f..66792532ca 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf @@ -39,7 +39,7 @@ Show help. - Wyświetl pomoc + Pokaż pomoc. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf index 80ba7e0d72..738bb37349 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf @@ -39,7 +39,7 @@ Show help. - Mostrar ajuda + Mostrar ajuda. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf index acc1c73bb2..a4ce7b2307 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf @@ -39,7 +39,7 @@ Show help. - Показать справку + Показать справку. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf index 63404e19aa..55ef67760e 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf @@ -39,7 +39,7 @@ Show help. - Yardımı göster + Yardımı gösterir. diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf index 18a5654b0e..b2d8cfd42f 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf @@ -39,7 +39,7 @@ Show help. - 显示帮助 + 显示帮助。 diff --git a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf index 6fd38b7c9b..19f53ffe6a 100644 --- a/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf @@ -39,7 +39,7 @@ Show help. - 顯示說明 + 顯示說明。 diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.cs.xlf index 0bf4a6f2fd..f3ad5910e5 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.cs.xlf @@ -16,7 +16,7 @@ There are no {0} references in project {1}. {0} is the type of the item being requested (project, package, p2p) and {1} is the object operated on (a project file or a solution file). Projekt {1} neobsahuje odkazy na {0}. -{0} je typ požadované položky (projekt, balíček, p2p) a {1} je používaný objekt (soubor projektu nebo soubor řešení). +{0} je typ požadované položky (projekt, balíček, p2p) a {1} je používaný objekt (soubor projektu nebo soubor řešení). diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ko.xlf index dc88f5a165..9b0d8960fd 100644 --- a/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-list/dotnet-list-reference/xlf/LocalizableStrings.ko.xlf @@ -16,7 +16,7 @@ There are no {0} references in project {1}. {0} is the type of the item being requested (project, package, p2p) and {1} is the object operated on (a project file or a solution file). {1} 프로젝트에 {0} 참조가 없습니다. -{0}은(는) 요청한 항목의 형식(프로젝트, 패키지, p2p)이고 {1}은(는) 작업 중인 개체(프로젝트 파일 또는 솔루션 파일)입니다. +{0}은(는) 요청한 항목의 형식(프로젝트, 패키지, p2p)이고 {1}은(는) 작업 중인 개체(프로젝트 파일 또는 솔루션 파일)입니다. diff --git a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf index 70e0aca265..d01c0c3622 100644 --- a/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-list/xlf/LocalizableStrings.ru.xlf @@ -4,7 +4,7 @@ .NET List Command - Команда "Список" .NET + Команда .NET "Список" diff --git a/src/dotnet/commands/dotnet-migrate/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-migrate/xlf/LocalizableStrings.fr.xlf index d3a076965d..dc14acdd16 100644 --- a/src/dotnet/commands/dotnet-migrate/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-migrate/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ PROJECT_JSON/GLOBAL_JSON/SOLUTION_FILE/PROJECT_DIR - PROJECT_JSON/GLOBAL_JSON/FICHIER_SOLUTION/RÉP_PROJET + PROJECT_JSON/GLOBAL_JSON/SOLUTION_FILE/PROJECT_DIR diff --git a/src/dotnet/commands/dotnet-migrate/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-migrate/xlf/LocalizableStrings.ko.xlf index cd767d3ad6..f053d9f348 100644 --- a/src/dotnet/commands/dotnet-migrate/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-migrate/xlf/LocalizableStrings.ko.xlf @@ -64,7 +64,7 @@ Defaults to current directory if nothing is specified. Skip moving project.json, global.json, and *.xproj to a `backup` directory after successful migration. - 마이그레이션을 완료한 후 project.json, global.json 및 *.xproj를 `백업` 디렉터리로 이동하는 작업을 건너뜁니다. + 마이그레이션을 완료한 후 project.json, global.json 및 *.xproj를 '백업' 디렉터리로 이동하는 작업을 건너뜁니다. diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf index 5ddd4fa1be..e309345478 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ OUTPUT_DIR - RÉP_SORTIE + OUTPUT_DIR @@ -44,7 +44,7 @@ PROJECT - PROJET + PROJECT diff --git a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf index 48e2fba143..fd7dd4b596 100644 --- a/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-pack/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ OUTPUT_DIR - DIRETÓRIO_DE_SAÍDA + OUTPUT_DIR @@ -44,7 +44,7 @@ PROJECT - PROJETO + PROJECT diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf index 9f122136b0..44a8f8c736 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.fr.xlf @@ -19,7 +19,7 @@ OUTPUT_DIR - RÉP_SORTIE + OUTPUT_DIR diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf index 93077e97ed..81a53b9d7a 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.pt-BR.xlf @@ -9,7 +9,7 @@ FRAMEWORK - ESTRUTURA + FRAMEWORK @@ -19,7 +19,7 @@ OUTPUT_DIR - DIRETÓRIO_DE_SAÍDA + OUTPUT_DIR diff --git a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf index 5df719a31b..cc3c5ae9dc 100644 --- a/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-publish/xlf/LocalizableStrings.tr.xlf @@ -19,7 +19,7 @@ OUTPUT_DIR - OUTPUT_DIR + ÇIKIŞ_DİZİNİ diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/xlf/LocalizableStrings.ru.xlf index 80712f0c0d..eba7b97ec7 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-proj/xlf/LocalizableStrings.ru.xlf @@ -4,7 +4,7 @@ .NET Remove Project from Solution Command - Команда "Удалить проект из решения" .NET + Команда .NET "Удалить проект из решения" diff --git a/src/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ko.xlf index 632f434652..1c9c4c102f 100644 --- a/src/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.ko.xlf @@ -4,7 +4,7 @@ .NET Remove Command - .NET Remove 명령 + .NET 제거 명령 diff --git a/src/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.pt-BR.xlf index d35bf59a0f..e8c924e2c6 100644 --- a/src/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-remove/xlf/LocalizableStrings.pt-BR.xlf @@ -4,7 +4,7 @@ .NET Remove Command - Comando .NET Remove + Comando Remover do .NET diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf index 5403acc295..be695d6e94 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + Tento příznak nastavte, pokud chcete vynutit vyřešení všech závislostí, i když poslední obnovení proběhlo úspěšně. Jedná se o ekvivalent odstranění project.assets.json. diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf index a85f474a91..30e5229540 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + Legen Sie dieses Flag fest, damit alle Abhängigkeiten aufgelöst werden, auch wenn die letzte Wiederherstellung erfolgreich war. Dies entspricht dem Löschen von "project.assets.json". diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf index 7b9e4405fc..d764815a87 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf @@ -14,7 +14,7 @@ PROJECT - PROJECT + PROYECTO @@ -24,7 +24,7 @@ SOURCE - SOURCE + ORIGEN @@ -34,7 +34,7 @@ PACKAGES_DIRECTORY - PACKAGES_DIRECTORY + DIRECTORIO_DE:PAQUETES @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + Establezca este indicador para forzar la resolución de todas las dependencias aunque la última restauración se haya realizado correctamente. Esta acción es equivalente a eliminar project.assets.json. diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf index ecda81b368..2c1ce9af2c 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ PROJECT - PROJET + PROJECT @@ -34,7 +34,7 @@ PACKAGES_DIRECTORY - RÉPERTOIRE_PACKAGES + PACKAGES_DIRECTORY @@ -49,7 +49,7 @@ FILE - FICHIER + FILE @@ -74,7 +74,7 @@ RUNTIME_IDENTIFIER - IDENTIFICATEUR_RUNTIME + RUNTIME_IDENTIFIER @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + Définissez cet indicateur pour forcer la résolution de toutes les dépendances même si la dernière restauration a réussi. Cela équivaut à supprimer project.assets.json. diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf index ac76dcce9e..96abe7bcb3 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + Impostare questo flag per forzare la risoluzione di tutte le dipendenze anche se l'ultimo ripristino è riuscito. Equivale a eliminare project.assets.json. diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf index 36b83bb384..cbc28f6b4e 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + このフラグを設定すると、最後に行われた復元が成功した場合でも強制的にすべての依存関係を解決します。これは、project.assets.json を削除することと同じです。 diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf index c70d614c8d..80a9d98270 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + 마지막 복원이 성공적인 경우에도 이 플래그를 설정하여 모든 종속성을 확인합니다. project.assets.json을 삭제하는 것과 동일합니다. diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf index 406fa78bd3..33a127ce7f 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + Ustaw tę flagę, aby wymusić rozstrzygnięcie wszystkich zależności nawet w przypadku, gdy ostatnie przywracanie się powiodło. Jest to równoważne usunięciu pliku project.assets.json. diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf index 8d283ee51a..ee738e5143 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ PROJECT - PROJETO + PROJECT @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + Defina este sinalizador para forçar todas as dependências a serem resolvidas, mesmo que a última restauração tenha tido êxito. Isso equivale a excluir o project.assets.json. diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf index 7506c70c9e..6347123ac5 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + Задайте этот флаг, чтобы принудительно разрешать все зависимости даже в случае успеха последнего восстановления. Это эквивалентно удалению project.assets.json. diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf index 0e384ac011..2c1803906e 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf @@ -14,7 +14,7 @@ PROJECT - PROJECT + PROJE @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + Son geri yükleme başarılı olsa bile tüm bağımlılıkların çözümlenmesini zorlamak için bu bayrağı ayarlayın. Bu, project.assets.json öğesini silmeyle eşdeğerdir. diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf index 38df9541b6..1379e94c05 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + 设置此标志以强制解析所有依赖项，即使最后一次还原已经成功。这等效于删除 project.assets.json。 diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf index 6b7cca78fb..d691230eb0 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf @@ -84,7 +84,7 @@ Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. - Set this flag to force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + 設定此旗標可在即使上次還原已成功的情況下，仍然強制解決所有相依性。如此等同於刪除 project.assets.json。 diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf index 5563eace5d..60ce2ef7b8 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.cs.xlf @@ -72,73 +72,73 @@ Aktuální {1} je {2}. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + Název profilu spuštění (pokud existuje), který se má použít při spuštění aplikace. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + Ke konfiguraci aplikace nepoužívejte launchSettings.json. The specified launch profile could not be located. - The specified launch profile could not be located. + Zadaný profil spuštění se nenašel. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + Profil spuštění {0} se nedá použít. {1} (Default) - (Default) + (výchozí) Using launch settings from {0}... - Using launch settings from {0}... + Použití nastavení spuštění z {0}... Launch profile is not a JSON object. - Launch profile is not a JSON object. + Profil spuštění není objektem JSON. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + Typ profilu spuštění {0} se nepodporuje. A usable launch profile could not be located. - A usable launch profile could not be located. + Nenašel se použitelný profil spuštění. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + Při zpracování nastavení spuštění došlo k neočekávané výjimce: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + Vlastnost profiles v dokumentu nastavení spuštění není objektem JSON. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + Při načítání launchSettings.json došlo k chybě. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + {0} není platný soubor projektu. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf index 6e89d875e3..2349aafdca 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.de.xlf @@ -72,73 +72,73 @@ Ein ausführbares Projekt sollte ein ausführbares TFM (z.B. netcoreapp2.0) verw The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + Der Name des Startprofils (sofern vorhanden), das beim Starten der Anwendung verwendet werden soll. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + Versuchen Sie nicht, "launchSettings.json" zum Konfigurieren der Anwendung zu verwenden. The specified launch profile could not be located. - The specified launch profile could not be located. + Das angegebene Startprofil wurde nicht gefunden. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + Das Startprofil "{0}" konnte nicht angewendet werden. {1} (Default) - (Default) + (Standard) Using launch settings from {0}... - Using launch settings from {0}... + Die Starteinstellungen von {0} werden verwendet… Launch profile is not a JSON object. - Launch profile is not a JSON object. + Das Startprofil ist kein JSON-Objekt. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + Der Startprofiltyp "{0}" wird nicht unterstützt. A usable launch profile could not be located. - A usable launch profile could not be located. + Es wurde kein verwendbares Startprofil gefunden. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + Beim Verarbeiten der Starteinstellungen ist ein unerwarteter Fehler aufgetreten: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + Die Eigenschaft "Profile" des Starteigenschaftendokuments ist kein JSON-Objekt. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + Beim Lesen von "launchSettings.json" ist ein Fehler aufgetreten. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + "{0}" ist keine gültige Projektdatei. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf index d22b48eea0..4c05cc1449 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.es.xlf @@ -57,7 +57,7 @@ The current {1} is '{2}'. No se puede ejecutar el proyecto. Asegúrese de tener un tipo de proyecto ejecutable y asegúrese de que "{0}" admita este proyecto. Un proyecto ejecutable debe tener como destino un TFM ejecutable (por ejemplo, netcoreapp2.0) y tener OutputType "Exe". -El actual {1} es '{2}'. +El actual {1} es "{2}". @@ -72,73 +72,73 @@ El actual {1} es '{2}'. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + El nombre del perfil de inicio (si lo hay) que se usará al iniciar la aplicación. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + No intente usar launchSettings.json para configurar la aplicación. The specified launch profile could not be located. - The specified launch profile could not be located. + No se ha podido encontrar el perfil de inicio especificado. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + No se ha podido aplicar el perfil de inicio "{0}". {1} (Default) - (Default) + (Predeterminada) Using launch settings from {0}... - Using launch settings from {0}... + Usando la configuración de inicio de {0}... Launch profile is not a JSON object. - Launch profile is not a JSON object. + El perfil de inicio no es un objeto JSON. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + No se admite el tipo de perfil de inicio "{0}". A usable launch profile could not be located. - A usable launch profile could not be located. + No se ha podido encontrar un perfil de inicio que se pueda usar. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + Excepción inesperada al procesar la configuración de inicio: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + La propiedad "profiles" del documento de configuración de inicio no es un objeto JSON. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + Se produjo un error al leer launchSettings.json. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + "{0}" no es un archivo de proyecto válido. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf index 10a724eeda..f62af586a9 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.fr.xlf @@ -72,73 +72,73 @@ Le {1} actuel est '{2}'. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + Nom du profil de lancement (le cas échéant) à utiliser au lancement de l'application. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + N'essayez pas d'utiliser launchSettings.json pour configurer l'application. The specified launch profile could not be located. - The specified launch profile could not be located. + Le profil de lancement spécifié est introuvable. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + Impossible d'appliquer le profil de lancement "{0}". {1} (Default) - (Default) + (Par défaut) Using launch settings from {0}... - Using launch settings from {0}... + Utilisation des paramètres de lancement à partir de {0}... Launch profile is not a JSON object. - Launch profile is not a JSON object. + Le profil de lancement n'est pas un objet JSON. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + Le type de profil de lancement '{0}' n'est pas pris en charge. A usable launch profile could not be located. - A usable launch profile could not be located. + Impossible de localiser un profil de lancement utilisable. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + Une exception inattendue s'est produite durant le traitement des paramètres de lancement : {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + La propriété 'profiles' du document de paramètres de lancement n'est pas un objet JSON. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + Une erreur s'est produite durant la lecture de launchSettings.json. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + '{0}' n'est pas un fichier projet valide. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf index 530b36790b..ba75128230 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.it.xlf @@ -67,78 +67,78 @@ Il valore corrente di {1} è '{2}'. Specify which project file to use because {0} contains more than one project file. - Specificare il file di progetto da usare perché questo file perché {0} contiene più file di progetto. + Specificare il file di progetto da usare perché l'elemento {0} contiene più file di progetto. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + Nome dell'eventuale profilo di avvio da usare all'avvio dell'applicazione. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + Non prova a usare launchSettings.json per configurare l'applicazione. The specified launch profile could not be located. - The specified launch profile could not be located. + Il profilo di avvio specificato non è stato trovato. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + Non è stato possibile applicare il profilo di avvio "{0}". {1} (Default) - (Default) + (Predefinito) Using launch settings from {0}... - Using launch settings from {0}... + Uso delle impostazioni di avvio di {0}... Launch profile is not a JSON object. - Launch profile is not a JSON object. + Il profilo di avvio non è un oggetto JSON. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + Il tipo '{0}' del profilo di avvio non è supportato. A usable launch profile could not be located. - A usable launch profile could not be located. + Non è stato trovato alcun profilo di avvio utilizzabile. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + Si è verificata un'eccezione imprevista durante l'elaborazione delle impostazioni di avvio: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + La proprietà 'profiles' del documento delle impostazioni di avvio non è un oggetto JSON. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + È stato rilevato un errore durante la lettura di launchSettings.json. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + '{0}' non è un file di progetto valido. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf index e7fd39294b..fa08955eeb 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ja.xlf @@ -72,73 +72,73 @@ The current {1} is '{2}'. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + アプリケーションを起動するときに使用する起動プロファイルの名前 (存在する場合)。 Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + launchSettings.json の使用によるアプリケーションの構成は行わないでください。 The specified launch profile could not be located. - The specified launch profile could not be located. + 指定された起動プロファイルが見つかりませんでした。 The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + 起動プロファイル "{0}" を適用できませんでした。 {1} (Default) - (Default) + (既定) Using launch settings from {0}... - Using launch settings from {0}... + {0} からの起動設定を使用中... Launch profile is not a JSON object. - Launch profile is not a JSON object. + 起動プロファイルが JSON オブジェクトではありません。 The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + 起動プロファイルの種類 '{0}' はサポートされていません。 A usable launch profile could not be located. - A usable launch profile could not be located. + 使用可能な起動プロファイルが見つかりませんでした。 An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + 起動設定の処理中に予期しない例外が発生しました: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + 起動設定のドキュメントの 'profiles' プロパティが JSON オブジェクトではありません。 An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + launchSettings.json を読み取るときにエラーが発生しました。 {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + '{0}' は有効なプロジェクト ファイルではありません。 diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf index 7ea03bad9f..41a2ec94e3 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ko.xlf @@ -72,73 +72,73 @@ The current {1} is '{2}'. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + 응용 프로그램을 시작할 때 사용하는 시작 프로필(있는 경우)의 이름입니다. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + launchSettings.json을 사용하여 응용 프로그램을 구성하지 마세요. The specified launch profile could not be located. - The specified launch profile could not be located. + 지정한 시작 프로필을 찾을 수 없습니다. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + 시작 프로필 "{0}"을(를) 적용할 수 없습니다. {1} (Default) - (Default) + (기본값) Using launch settings from {0}... - Using launch settings from {0}... + {0}의 시작 설정을 사용하는 중... Launch profile is not a JSON object. - Launch profile is not a JSON object. + 시작 프로필이 JSON 개체가 아닙니다. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + 시작 프로필 형식 '{0}'은(는) 지원되지 않습니다. A usable launch profile could not be located. - A usable launch profile could not be located. + 사용할 수 있는 시작 프로필을 찾을 수 없습니다. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + 시작 설정을 처리하는 동안 예기치 않은 예외가 발생했습니다. {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + 시작 설정 문서의 '프로필' 속성이 JSON 개체가 아닙니다. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + launchSettings.json을 읽는 동안 오류가 발생했습니다. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + '{0}'은(는) 유효한 프로젝트 파일이 아닙니다. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf index f1a3f0adad..aab3a49133 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pl.xlf @@ -72,73 +72,73 @@ Bieżący element {1}: „{2}”. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + Nazwa profilu uruchamiania (jeśli istnieje), który ma być używany podczas uruchamiania aplikacji. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + Nie próbuj konfigurować aplikacji za pomocą pliku launchSettings.json. The specified launch profile could not be located. - The specified launch profile could not be located. + Nie można odnaleźć określonego profilu uruchamiania. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + Nie można zastosować profilu uruchamiania „{0}”. {1} (Default) - (Default) + (Domyślne) Using launch settings from {0}... - Using launch settings from {0}... + Używanie ustawień uruchamiania z profilu {0}... Launch profile is not a JSON object. - Launch profile is not a JSON object. + Profil uruchamiania nie jest obiektem JSON. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + Typ profilu uruchamiania „{0}” nie jest obsługiwany. A usable launch profile could not be located. - A usable launch profile could not be located. + Nie można odnaleźć nadającego się do użytku profilu uruchamiania. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + Wystąpił nieoczekiwany wyjątek podczas przetwarzania ustawień uruchamiania: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + Właściwość „profiles” dokumentu ustawień uruchamiania nie jest obiektem JSON. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + Wystąpił błąd podczas odczytywania pliku launchSettings.json. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + „{0}” nie jest prawidłowym plikiem projektu. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf index e14a569d91..2843c82ef0 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.pt-BR.xlf @@ -72,73 +72,73 @@ O {1} atual é '{2}'. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + O nome do perfil de inicialização (se houver) a ser usado ao iniciar o aplicativo. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + Não tente usar o launchSettings.json para configurar o aplicativo. The specified launch profile could not be located. - The specified launch profile could not be located. + O perfil de inicialização especificado não pôde ser localizado. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + O perfil de inicialização "{0}" não pôde ser aplicado. {1} (Default) - (Default) + (Padrão) Using launch settings from {0}... - Using launch settings from {0}... + Usando as configurações de inicialização de {0}... Launch profile is not a JSON object. - Launch profile is not a JSON object. + O perfil de inicialização não é um objeto JSON. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + Não há suporte para o tipo de perfil de inicialização '{0}'. A usable launch profile could not be located. - A usable launch profile could not be located. + Um perfil de inicialização utilizável não pôde ser localizado. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + Ocorreu uma exceção inesperada durante o processamento das configurações de inicialização: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + A propriedade 'perfis' do documento de configurações de inicialização não é um objeto JSON. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + Um erro foi encontrado durante a leitura do launchSettings.json. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + '{0}' não é um arquivo de projeto válido. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf index cae65a320d..95b1e04004 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.ru.xlf @@ -72,73 +72,73 @@ The current {1} is '{2}'. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + Имя профиля запуска (если он есть), используемое при запуске приложения. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + Не используйте launchSettings.json для настройки приложения. The specified launch profile could not be located. - The specified launch profile could not be located. + Не удалось найти указанный профиль запуска. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + Не удалось применить профиль запуска "{0}". {1} (Default) - (Default) + (По умолчанию) Using launch settings from {0}... - Using launch settings from {0}... + Используются параметры запуска из {0}... Launch profile is not a JSON object. - Launch profile is not a JSON object. + Профиль запуска не является объектом JSON. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + Тип профиля запуска "{0}" не поддерживается. A usable launch profile could not be located. - A usable launch profile could not be located. + Не удалось найти подходящий для использования профиль запуска. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + При обработке параметров запуска возникло непредвиденное исключение: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + Свойство "profiles" документа параметров запуска не является объектом JSON. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + При чтении launchSettings.json обнаружена ошибка. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + "{0}" не является допустимым файлом проекта. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf index 0c58521c8b..a3a9211fba 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.tr.xlf @@ -14,7 +14,7 @@ Build and run the app using the specified framework. The framework has to be specified in the project file. - Uygulamayı belirtilen çerçeveyi kullanarak derleyin ve çalıştırın. Çerçevenin proje dosyasında belirtilmesi gerekir. + Uygulamayı belirtilen çerçeveyi kullanarak derleyin ve çalıştırın. Çerçevenin proje dosyasında belirtilmesi gerekir. @@ -72,73 +72,73 @@ Geçerli {1}: '{2}'. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + Uygulama başlatılırken kullanılacak başlatma profilinin (varsa) adı. Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + Uygulamayı yapılandırmak için launchSettings.json kullanmayı denemeyin. The specified launch profile could not be located. - The specified launch profile could not be located. + Belirtilen başlatma profili bulunamadı. The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + "{0}" başlatma profili uygulanamadı. {1} (Default) - (Default) + (Varsayılan) Using launch settings from {0}... - Using launch settings from {0}... + {0} içindeki başlatma ayarları kullanılıyor... Launch profile is not a JSON object. - Launch profile is not a JSON object. + Başlatma profili bir JSON nesnesi değil. The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + '{0}' başlatma profili türü desteklenmiyor. A usable launch profile could not be located. - A usable launch profile could not be located. + Kullanılabilir bir başlatma profili bulunamadı. An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + Başlatma ayarları işlenirken beklenmeyen bir özel durum oluştu: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + Başlatma ayarları belgesinin 'profiles' özelliği bir JSON nesnesi değil. An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + launchSettings.json okunurken bir hatayla karşılaşıldı. {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + '{0}' geçerli bir proje dosyası değil. diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf index 45c212b36d..a4b5c43c2c 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hans.xlf @@ -72,73 +72,73 @@ The current {1} is '{2}'. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + 启动应用程序时使用的启动配置文件名称（如果有）。 Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + 请勿尝试使用 launchSettings.json 配置应用程序。 The specified launch profile could not be located. - The specified launch profile could not be located. + 找不到指定的启动配置文件。 The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + 无法应用启动配置文件“{0}”。 {1} (Default) - (Default) + (默认值) Using launch settings from {0}... - Using launch settings from {0}... + 从 {0} 使用启动设置... Launch profile is not a JSON object. - Launch profile is not a JSON object. + 启动配置文件不是 JSON 对象。 The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + 不支持启动配置文件类型“{0}”。 A usable launch profile could not be located. - A usable launch profile could not be located. + 找不到可用的启动配置文件。 An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + 处理启动设置时出现意外异常: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + 启动设置文档的“profiles”属性不是 JSON 对象。 An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + 读取 launchSettings.json 时发生错误。 {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + “{0}”不是有效的项目文件。 diff --git a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf index bdc29aff79..b9bd6e9c3c 100644 --- a/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-run/xlf/LocalizableStrings.zh-Hant.xlf @@ -72,73 +72,73 @@ The current {1} is '{2}'. The name of the launch profile (if any) to use when launching the application. - The name of the launch profile (if any) to use when launching the application. + 啟動應用程式時，所要使用的啟動設定檔 (若有) 名稱。 Do not attempt to use launchSettings.json to configure the application. - Do not attempt to use launchSettings.json to configure the application. + 請勿嘗試使用 launchSettings.json 設定該應用程式。 The specified launch profile could not be located. - The specified launch profile could not be located. + 找不到指定的啟動設定檔。 The launch profile "{0}" could not be applied. {1} - The launch profile "{0}" could not be applied. + 無法套用啟動設定檔 "{0}"。 {1} (Default) - (Default) + (預設) Using launch settings from {0}... - Using launch settings from {0}... + 使用來自 {0} 的啟動設定... Launch profile is not a JSON object. - Launch profile is not a JSON object. + 啟動設定檔並非 JSON 物件。 The launch profile type '{0}' is not supported. - The launch profile type '{0}' is not supported. + 不支援啟動設定檔類型 '{0}'。 A usable launch profile could not be located. - A usable launch profile could not be located. + 找不到可用的啟動設定檔。 An unexpected exception occurred while processing launch settings: {0} - An unexpected exception occurred while processing launch settings: + 處理啟動設定時發生未預期的例外狀況: {0} The 'profiles' property of the launch settings document is not a JSON object. - The 'profiles' property of the launch settings document is not a JSON object. + 啟動設定文件的 'profiles' 屬性並非 JSON 物件。 An error was encountered when reading launchSettings.json. {0} - An error was encountered when reading launchSettings.json. + 讀取 launchSettings.json 時發生錯誤。 {0} '{0}' is not a valid project file. - '{0}' is not a valid project file. + '{0}' 並非有效的專案名稱。 diff --git a/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.fr.xlf index aea4a6373b..3c982c3d3a 100644 --- a/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.fr.xlf @@ -9,7 +9,7 @@ OUTPUT_DIR - RÉP_SORTIE + OUTPUT_DIR diff --git a/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.pt-BR.xlf index 0125f59703..e9ff5a1134 100644 --- a/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.pt-BR.xlf @@ -9,7 +9,7 @@ OUTPUT_DIR - DIRETÓRIO_DE_SAÍDA + OUTPUT_DIR diff --git a/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.tr.xlf index 2d31d47d14..8c17f8dc95 100644 --- a/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-store/xlf/LocalizableStrings.tr.xlf @@ -9,7 +9,7 @@ OUTPUT_DIR - OUTPUT_DIR + ÇIKIŞ_DİZİNİ diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf index 2c643dd525..d50458ccca 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.es.xlf @@ -24,7 +24,7 @@ SETTINGS_FILE - SETTINGS_FILE + ARCHIVO_CONFIGURACIÓN @@ -39,7 +39,7 @@ EXPRESSION - EXPRESSION + EXPRESIÓN @@ -63,7 +63,7 @@ Use custom adapters from the given path in the test run. Example: --test-adapter-path <PATH_TO_ADAPTER> Indica que se usen adaptadores personalizados de la ruta de acceso dada en la serie de pruebas. - Ejemplo: --test-adapter-path <RUTA_ACCESO_ADAPTADOR> + Ejemplo: --test-adapter-path <RUTA_DE_ADAPTADOR> @@ -87,7 +87,7 @@ Configuration to use for building the project. Default for most projects is "Debug". - Configuración para usar para crear el proyecto. El valor predeterminado para la mayoría de los proyectos es "Depurar". + Configuración que se usará para crear el proyecto. El valor predeterminado para la mayoría de los proyectos es "Debug". @@ -129,19 +129,19 @@ PATH_TO_ADAPTER - PATH_TO_ADAPTER + RUTA_DE_ADAPTADOR The directory where the test results are going to be placed. The specified directory will be created if it does not exist. Example: --results-directory <PATH_TO_RESULTS_DIRECTORY> El directorio donde se van a colocar los resultados de prueba. Si no existe, se creará el directorio especificado. - Ejemplo: --results-directory <PATH_TO_RESULTS_DIRECTORY> + Ejemplo: --results-directory <RUTA_DE_DIRECTORIO_DE_RESULTADOS> PATH_TO_RESULTS_DIRECTORY - PATH_TO_RESULTS_DIRECTORY + RUTA_DE_DIRECTORIO_DE_RESULTADOS @@ -163,7 +163,7 @@ Argumentos RunSettings: DATA_COLLECTOR_FRIENDLY_NAME - DATA_COLLECTOR_FRIENDLY_NAME + NOMBRE_DESCRIPTIVO_DE_RECOPILADOR_DE_DATOS diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf index 79b7392d56..488c2a39ad 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ PROJECT - PROJET + PROJECT @@ -24,7 +24,7 @@ SETTINGS_FILE - FICHIER_PARAMÈTRES + SETTINGS_FILE @@ -102,7 +102,7 @@ OUTPUT_DIR - RÉP_SORTIE + OUTPUT_DIR @@ -112,7 +112,7 @@ PATH_TO_FILE - CHEMIN_FICHIER + PATH_TO_FILE diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf index 5bd0d2355c..18139bb2a0 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ja.xlf @@ -118,8 +118,8 @@ Enable verbose logs for test platform. Logs are written to the provided file. - テスト プラットフォームの詳細ログを有効にする - ログは指定されたファイルに書き込まれます。 + "テスト プラットフォームの詳細ログを有効にします。 + ログは指定されたファイルに書き込まれます。" diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf index e946009c20..76e80193bc 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.ko.xlf @@ -52,9 +52,9 @@ 지정된 식과 일치하는 테스트를 실행합니다. 예: - 우선 순위를 1로 설정하여 테스트 실행: --filter "Priority = 1" - 지정된 전체 이름으로 테스트 실행: --filter "FullyQualifiedName=Namespace.ClassName.MethodName" - 지정된 이름을 포함하는 테스트 실행: --filter "FullyQualifiedName~Namespace.Class" + 우선 순위가 1로 설정된 테스트 실행: --filter ""Priority = 1"" + 지정된 전체 이름이 있는 테스트 실행: --filter ""FullyQualifiedName=Namespace.ClassName.MethodName"" + 지정된 이름을 포함하는 테스트 실행: --filter ""FullyQualifiedName~Namespace.Class"" 필터링 지원에 대한 추가 정보: https://aka.ms/vstest-filtering diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf index 5b1399c489..eb78cae413 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pl.xlf @@ -87,7 +87,7 @@ Configuration to use for building the project. Default for most projects is "Debug". - Konfiguracja do użycia na potrzeby kompilacji projektu. W przypadku większości projektów ustawienie domyślne to „Debug”. + Konfiguracja do użycia na potrzeby kompilacji projektu. W przypadku większości projektów ustawienie domyślne to „Debugowanie”. @@ -169,7 +169,7 @@ Argumenty RunSettings: Enables data collector for the test run. More info here : https://aka.ms/vstest-collect - Włącza moduł zbierający dane dla uruchomienia testu. + Włącza moduł zbierający dane dotyczące uruchomienia testu. Więcej informacji można znaleźć tutaj: https://aka.ms/vstest-collect diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf index 2769a6b99f..24ab9fbb7d 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ PROJECT - PROJETO + PROJECT @@ -24,7 +24,7 @@ SETTINGS_FILE - ARQUIVO_CONFIGURAÇÕES + SETTINGS_FILE @@ -39,7 +39,7 @@ EXPRESSION - EXPRESSÃO + EXPRESSION @@ -82,7 +82,7 @@ CONFIGURATION - CONFIGURAÇÃO + CONFIGURATION @@ -92,7 +92,7 @@ FRAMEWORK - ESTRUTURA + FRAMEWORK @@ -102,7 +102,7 @@ OUTPUT_DIR - DIRETÓRIO_DE_SAÍDA + OUTPUT_DIR @@ -112,7 +112,7 @@ PATH_TO_FILE - CAMINHO_PARA_ARQUIVO + PATH_TO_FILE diff --git a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf index f6db89c8e3..a6d961ac21 100644 --- a/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-test/xlf/LocalizableStrings.tr.xlf @@ -24,7 +24,7 @@ SETTINGS_FILE - SETTINGS_FILE + AYAR_DOSYASI @@ -39,7 +39,7 @@ EXPRESSION - EXPRESSION + İFADE @@ -102,7 +102,7 @@ OUTPUT_DIR - OUTPUT_DIR + ÇIKIŞ_DİZİNİ @@ -112,7 +112,7 @@ PATH_TO_FILE - PATH_TO_FILE + DOSYA_YOLU diff --git a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf index 1160093e93..56caa7e297 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.cs.xlf @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + Při spuštění příkazu neprovede implicitní obnovení. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf index b5ca6f0720..b2c179985a 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.de.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.de.xlf @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + Führt beim Ausführen des Befehls keine implizite Wiederherstellung durch. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf index 91daeeb066..f1a9c64029 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.es.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.es.xlf @@ -4,27 +4,27 @@ Could not find any project in `{0}`. - No se encuentra ningún proyecto en `{0}`. + No se encuentra ningún proyecto en "{0}". Found more than one project in `{0}`. Please specify which one to use. - Se han encontrado varios proyectos en `{0}`. Especifique el que debe usarse. + Se han encontrado varios proyectos en "{0}". Especifique el que debe usarse. Project already has a reference to `{0}`. - El proyecto ya tiene una referencia a `{0}`. + El proyecto ya tiene una referencia a "{0}". Project reference `{0}` could not be found. - No se encuentra la referencia de proyecto `{0}`. + No se encuentra la referencia de proyecto "{0}". Project reference `{0}` removed. - La referencia de proyecto `{0}` se ha quitado. + La referencia de proyecto "{0}" se ha quitado. @@ -104,7 +104,7 @@ Reference `{0}` added to the project. - Se ha agregado la referencia `{0}` al proyecto. + Se ha agregado la referencia "{0}" al proyecto. @@ -214,12 +214,12 @@ {0} `{1}` found but is invalid. - Se ha encontrado el {0} `{1}`, pero no es válido. + Se ha encontrado el {0} "{1}", pero no es válido. `{0}` found but is invalid. - Se ha encontrado `{0}`, pero no es válido. + Se ha encontrado "{0}", pero no es válido. @@ -244,12 +244,12 @@ {0} or {1} not found in `{2}`. - No se encuentran {0} ni {1} en `{2}`. + No se encuentran {0} ni {1} en "{2}". File `{0}` not found. - No se encuentra el archivo `{0}`. + No se encuentra el archivo "{0}". @@ -274,7 +274,7 @@ {0} already contains {1} `{2}`. - {0} ya contiene un {1} `{2}`. + {0} ya contiene un {1} "{2}". @@ -284,7 +284,7 @@ {0} already has {1} `{2}`. - {0} ya tiene el {1} `{2}`. + {0} ya tiene el {1} "{2}". @@ -329,17 +329,17 @@ Could not find project or directory `{0}`. - No se encuentra el proyecto o directorio `{0}`. + No se encuentra el proyecto o directorio "{0}". Found a project `{0}` but it is invalid. - Se ha encontrado el proyecto `{0}`, pero no es válido. + Se ha encontrado el proyecto "{0}", pero no es válido. Invalid project `{0}`. - El proyecto `{0}` no es válido. + El proyecto "{0}" no es válido. @@ -349,7 +349,7 @@ Could not find solution or directory `{0}`. - No se encuentra la solución o el directorio `{0}`. + No se encuentra la solución o el directorio "{0}". @@ -359,7 +359,7 @@ Reference `{0}` is invalid. - La referencia `{0}` no es válida. + La referencia "{0}" no es válida. @@ -369,12 +369,12 @@ Package reference `{0}` does not exist. - La referencia de paquete `{0}` no existe. + La referencia de paquete "{0}" no existe. Package reference `{0}` is invalid. - La referencia de paquete `{0}` no es válida. + La referencia de paquete "{0}" no es válida. @@ -384,12 +384,12 @@ Package reference `{0}` added to the project. - Se ha agregado la referencia de paquete `{0}` al proyecto. + Se ha agregado la referencia de paquete "{0}" al proyecto. Project {0} already has a reference `{1}`. - El proyecto {0} ya tiene una referencia `{1}`. + El proyecto {0} ya tiene una referencia "{1}". @@ -399,12 +399,12 @@ Project `{0}` does not exist. - El proyecto `{0}` no existe. + El proyecto "{0}" no existe. Project `{0}` is invalid. - El proyecto `{0}` no es válido. + El proyecto "{0}" no es válido. @@ -414,7 +414,7 @@ Project `{0}` added to the solution. - Se ha agregado el proyecto `{0}` a la solución. + Se ha agregado el proyecto "{0}" a la solución. @@ -424,7 +424,7 @@ Reference `{0}` deleted from the project. - Se ha eliminado la referencia “{0}” del proyecto. + Se ha eliminado la referencia "{0}" del proyecto. @@ -439,12 +439,12 @@ Package reference `{0}` could not be found in the project. - No se encuentra la referencia de paquete `{0}` en el proyecto. + No se encuentra la referencia de paquete "{0}" en el proyecto. Reference `{0}` deleted from the project. - Se ha eliminado la referencia “{0}” del proyecto. + Se ha eliminado la referencia "{0}" del proyecto. @@ -454,17 +454,17 @@ Package reference `{0}` deleted. - Se ha eliminado la referencia de paquete `{0}`. + Se ha eliminado la referencia de paquete "{0}". Project `{0}` could not be found in the solution. - No se encuentra el proyecto `{0}` en la solución. + No se encuentra el proyecto "{0}" en la solución. Project `{0}` removed from solution. - Se ha quitado el proyecto `{0}` de la solución. + Se ha quitado el proyecto "{0}" de la solución. @@ -474,7 +474,7 @@ Project `{0}` deleted from solution. - Se ha eliminado el proyecto `{0}` de la solución. + Se ha eliminado el proyecto "{0}" de la solución. @@ -509,17 +509,17 @@ Version of package `{0}` updated to `{1}`. - La versión del paquete `{0}` se ha actualizado a `{1}`. + La versión del paquete "{0}" se ha actualizado a "{1}". Version of package `{0}` updated. - Se ha actualizado la versión del paquete `{0}`. + Se ha actualizado la versión del paquete "{0}". Could not update the version of the package `{0}`. - No se puede actualizar la versión del paquete `{0}`. + No se puede actualizar la versión del paquete "{0}". @@ -656,7 +656,7 @@ Configuration to use for building the project. Default for most projects is "Debug". - Configuración que se usará para compilar el proyecto. El valor predeterminado para la mayoría de los proyectos es "Depurar". + Configuración que se usará para crear el proyecto. El valor predeterminado para la mayoría de los proyectos es "Debug". @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + No realiza una restauración implícita al ejecutar el comando. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf index 0d4bea569f..b33c6611e5 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.fr.xlf @@ -631,7 +631,7 @@ PROJECT - PROJET + PROJECT @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + Ne fait pas de restauration implicite durant l'exécution de la commande. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf index 327d4020ec..b1714f3e5f 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.it.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.it.xlf @@ -479,7 +479,7 @@ There are no {0} references in project {1}. ;; {0} is the type of the item being requested (project, package, p2p) and {1} is the object operated on (a project file or a solution file). - Non ci sono riferimenti a {0} nel progetto {1}. ;; {0} è il tipo dell'elemento richiesto (progetto, pacchetto o P2P) e {1} è l'oggetto su cui si interviene (file di progetto o di soluzione). + Non ci sono riferimenti a {0} nel progetto {1}. ;; {0} è il tipo dell'elemento richiesto (progetto, pacchetto o P2P) e {1} è l'oggetto su cui si interviene (file di progetto o di soluzione). @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + Non esegue un ripristino implicito durante l'esecuzione del comando. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf index 160c55a32b..f95dbf451e 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ja.xlf @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + コマンドを実行するときに暗黙的復元を行いません。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf index 8ff1ae7e60..029bc8c0cc 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ko.xlf @@ -4,27 +4,27 @@ Could not find any project in `{0}`. - `{0}`에서 프로젝트를 찾을 수 없습니다. + '{0}'에서 프로젝트를 찾을 수 없습니다. Found more than one project in `{0}`. Please specify which one to use. - `{0}`에서 프로젝트를 두 개 이상 찾았습니다. 사용할 파일을 지정하세요. + '{0}'에서 프로젝트를 두 개 이상 찾았습니다. 사용할 파일을 지정하세요. Project already has a reference to `{0}`. - 프로젝트에 이미 `{0}`에 대한 참조가 있습니다. + 프로젝트에 이미 '{0}'에 대한 참조가 있습니다. Project reference `{0}` could not be found. - 프로젝트 참조 `{0}`을(를) 찾을 수 없습니다. + 프로젝트 참조 '{0}'을(를) 찾을 수 없습니다. Project reference `{0}` removed. - 프로젝트 참조 `{0}`이(가) 제거되었습니다. + 프로젝트 참조 '{0}'이(가) 제거되었습니다. @@ -104,7 +104,7 @@ Reference `{0}` added to the project. - 프로젝트에 `{0}` 참조가 추가되었습니다. + 프로젝트에 '{0}' 참조가 추가되었습니다. @@ -214,7 +214,7 @@ {0} `{1}` found but is invalid. - {0} `{1}`이(가) 있지만 잘못되었습니다. + {0} '{1}'이(가) 있지만 잘못되었습니다. @@ -244,12 +244,12 @@ {0} or {1} not found in `{2}`. - `{2}`에서 '{0}' 또는 {1}을(를) 찾을 수 없습니다. + '{2}'에서 '{0}' 또는 {1}을(를) 찾을 수 없습니다. File `{0}` not found. - `{0}` 파일을 찾을 수 없습니다. + '{0}' 파일을 찾을 수 없습니다. @@ -259,7 +259,7 @@ {0} `{1}` does not exist. - {0} `{1}`이(가) 없습니다. + {0} '{1}'이(가) 없습니다. @@ -274,7 +274,7 @@ {0} already contains {1} `{2}`. - {0}에 {1} `{2}`이(가) 이미 있습니다. + {0}에 {1} '{2}'이(가) 이미 있습니다. @@ -284,7 +284,7 @@ {0} already has {1} `{2}`. - {0}에 {1} `{2}`이(가) 이미 있습니다. + {0}에 {1} '{2}'이(가) 이미 있습니다. @@ -334,12 +334,12 @@ Found a project `{0}` but it is invalid. - `{0}` 프로젝트가 있지만 잘못되었습니다. + '{0}' 프로젝트가 있지만 잘못되었습니다. Invalid project `{0}`. - `{0}` 프로젝트가 잘못되었습니다. + '{0}' 프로젝트가 잘못되었습니다. @@ -349,7 +349,7 @@ Could not find solution or directory `{0}`. - 솔루션 또는 디렉터리 `{0}`을(를) 찾을 수 없습니다. + 솔루션 또는 디렉터리 '{0}'을(를) 찾을 수 없습니다. @@ -359,7 +359,7 @@ Reference `{0}` is invalid. - `{0}` 참조가 잘못되었습니다. + '{0}' 참조가 잘못되었습니다. @@ -369,12 +369,12 @@ Package reference `{0}` does not exist. - 패키지 참조 `{0}`이(가) 없습니다. + 패키지 참조 '{0}'이(가) 없습니다. Package reference `{0}` is invalid. - 패키지 참조 `{0}`이(가) 잘못되었습니다. + 패키지 참조 '{0}'이(가) 잘못되었습니다. @@ -384,12 +384,12 @@ Package reference `{0}` added to the project. - 프로젝트에 패키지 참조 `{0}`이(가) 추가되었습니다. + 프로젝트에 패키지 참조 '{0}'이(가) 추가되었습니다. Project {0} already has a reference `{1}`. - {0} 프로젝트에 이미 `{1}` 참조가 있습니다. + {0} 프로젝트에 이미 '{1}' 참조가 있습니다. @@ -399,12 +399,12 @@ Project `{0}` does not exist. - `{0}` 프로젝트가 없습니다. + '{0}' 프로젝트가 없습니다. Project `{0}` is invalid. - `{0}` 프로젝트가 잘못되었습니다. + '{0}' 프로젝트가 잘못되었습니다. @@ -414,7 +414,7 @@ Project `{0}` added to the solution. - `{0}` 프로젝트가 솔루션에 추가되었습니다. + '{0}' 프로젝트가 솔루션에 추가되었습니다. @@ -424,7 +424,7 @@ Reference `{0}` deleted from the project. - `{0}` 참조가 프로젝트에서 삭제되었습니다. + '{0}' 참조가 프로젝트에서 삭제되었습니다. @@ -434,17 +434,17 @@ Reference `{0}` deleted. - `{0}` 참조가 삭제되었습니다. + '{0}' 참조가 삭제되었습니다. Package reference `{0}` could not be found in the project. - 프로젝트에서 패키지 참조 `{0}`을(를) 찾을 수 없습니다. + 프로젝트에서 패키지 참조 '{0}'을(를) 찾을 수 없습니다. Reference `{0}` deleted from the project. - `{0}` 참조가 프로젝트에서 삭제되었습니다. + '{0}' 참조가 프로젝트에서 삭제되었습니다. @@ -454,17 +454,17 @@ Package reference `{0}` deleted. - 패키지 참조 `{0}`이(가) 삭제되었습니다. + 패키지 참조 '{0}'이(가) 삭제되었습니다. Project `{0}` could not be found in the solution. - 솔루션에서 `{0}` 프로젝트를 찾을 수 없습니다. + 솔루션에서 '{0}' 프로젝트를 찾을 수 없습니다. Project `{0}` removed from solution. - `{0}` 프로젝트가 솔루션에서 제거되었습니다. + '{0}' 프로젝트가 솔루션에서 제거되었습니다. @@ -474,7 +474,7 @@ Project `{0}` deleted from solution. - `{0}` 프로젝트가 솔루션에서 삭제되었습니다. + '{0}' 프로젝트가 솔루션에서 삭제되었습니다. @@ -509,17 +509,17 @@ Version of package `{0}` updated to `{1}`. - `{0}` 패키지의 버전이 `{1}`(으)로 업데이트되었습니다. + '{0}' 패키지의 버전이 '{1}'(으)로 업데이트되었습니다. Version of package `{0}` updated. - `{0}` 패키지의 버전이 업데이트되었습니다. + '{0}' 패키지의 버전이 업데이트되었습니다. Could not update the version of the package `{0}`. - `{0}` 패키지의 버전을 업데이트할 수 없습니다. + '{0}' 패키지의 버전을 업데이트할 수 없습니다. @@ -569,7 +569,7 @@ Found more than one solution file in {0}. Please specify which one to use. - {0}에서 솔루션 파일이 두 개 이상 있습니다. 사용할 파일을 지정하세요. + {0}에서 솔루션 파일을 두 개 이상 찾았습니다. 사용할 파일을 지정하세요. @@ -611,7 +611,7 @@ Invalid solution `{0}`. {1}. - `{0}` 솔루션이 잘못되었습니다. {1} + '{0}' 솔루션이 잘못되었습니다. {1} @@ -636,7 +636,7 @@ Invalid project `{0}`. {1}. - `{0}` 프로젝트가 잘못되었습니다. {1}. + '{0}' 프로젝트가 잘못되었습니다. {1}. @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + 명령을 실행할 때 암시적 복원을 수행하지 않습니다. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf index 687827cffd..1db654dd85 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pl.xlf @@ -656,7 +656,7 @@ Configuration to use for building the project. Default for most projects is "Debug". - Konfiguracja do użycia na potrzeby kompilacji projektu. Opcją domyślną w przypadku większości projektów jest „Debug”. + Konfiguracja do użycia na potrzeby kompilacji projektu. W przypadku większości projektów ustawienie domyślne to „Debugowanie”. @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + Nie wykonuje niejawnego przywracania podczas wykonywania polecenia. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf index cdcbb7c0bf..89cc1e55d8 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf @@ -569,7 +569,7 @@ Found more than one solution file in {0}. Please specify which one to use. - Foi encontrado mais de um arquivo de solução em {0}. Especifique qual deles deve ser usado. + Foi encontrado mais de um arquivo de solução em {0}. Especifique qual deve ser usado. @@ -584,7 +584,7 @@ FRAMEWORK - ESTRUTURA + FRAMEWORK @@ -631,7 +631,7 @@ PROJECT - PROJETO + PROJECT @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + Não faz uma restauração implícita ao executar o comando. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf index b605492e3e..a63e439a02 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.ru.xlf @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + Не выполняет неявное восстановление при выполнении команды. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf index 85d37b1f27..6584fc018b 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.tr.xlf @@ -584,7 +584,7 @@ FRAMEWORK - FRAMEWORK + ÇERÇEVE @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + Komut yürütülürken örtük geri yükleme gerçekleştirmez. diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf index e593eef528..2fdb31f549 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + 请勿在执行命令时进行隐式还原。 diff --git a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf index 3fa8984d14..2e0845e403 100644 --- a/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf @@ -671,7 +671,7 @@ Does not do an implicit restore when executing the command. - Does not do an implicit restore when executing the command. + 執行此命令時，請勿進行隱含還原。 diff --git a/src/dotnet/xlf/LocalizableStrings.es.xlf b/src/dotnet/xlf/LocalizableStrings.es.xlf index f58ba7e002..3b0543881b 100644 --- a/src/dotnet/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/xlf/LocalizableStrings.es.xlf @@ -5,27 +5,27 @@ Could not find any project in `{0}`. - No se encuentra ningún proyecto en `{0}`. + No se encuentra ningún proyecto en "{0}". Found more than one project in `{0}`. Please specify which one to use. - Se han encontrado varios proyectos en `{0}`. Especifique el que debe usarse. + Se han encontrado varios proyectos en "{0}". Especifique el que debe usarse. Project already has a reference to `{0}`. - El proyecto ya tiene una referencia a `{0}`. + El proyecto ya tiene una referencia a "{0}". Project reference `{0}` could not be found. - No se encuentra la referencia de proyecto `{0}`. + No se encuentra la referencia de proyecto "{0}". Project reference `{0}` removed. - La referencia de proyecto `{0}` se ha quitado. + La referencia de proyecto "{0}" se ha quitado. @@ -225,12 +225,12 @@ {0} `{1}` found but is invalid. - Se ha encontrado el {0} `{1}`, pero no es válido. + Se ha encontrado el {0} "{1}", pero no es válido. `{0}` found but is invalid. - Se ha encontrado `{0}`, pero no es válido. + Se ha encontrado "{0}", pero no es válido. @@ -255,12 +255,12 @@ {0} or {1} not found in `{2}`. - No se encuentran {0} ni {1} en `{2}`. + No se encuentran {0} ni {1} en "{2}". File `{0}` not found. - No se encuentra el archivo `{0}`. + No se encuentra el archivo "{0}". @@ -285,7 +285,7 @@ {0} already contains {1} `{2}`. - {0} ya contiene un {1} `{2}`. + {0} ya contiene un {1} "{2}". @@ -295,7 +295,7 @@ {0} already has {1} `{2}`. - {0} ya tiene el {1} `{2}`. + {0} ya tiene el {1} "{2}". @@ -340,27 +340,27 @@ Could not find any project in `{0}`. - No se encuentra ningún proyecto en `{0}`. + No se encuentra ningún proyecto en "{0}". Could not find project or directory `{0}`. - No se encuentra el proyecto o directorio `{0}`. + No se encuentra el proyecto o directorio "{0}". Found more than one project in `{0}`. Please specify which one to use. - Se han encontrado varios proyectos en `{0}`. Especifique el que debe usarse. + Se han encontrado varios proyectos en "{0}". Especifique el que debe usarse. Found a project `{0}` but it is invalid. - Se ha encontrado el proyecto `{0}`, pero no es válido. + Se ha encontrado el proyecto "{0}", pero no es válido. Invalid project `{0}`. - El proyecto `{0}` no es válido. + El proyecto "{0}" no es válido. @@ -370,7 +370,7 @@ Could not find solution or directory `{0}`. - No se encuentra la solución o el directorio `{0}`. + No se encuentra la solución o el directorio "{0}". @@ -405,7 +405,7 @@ Reference `{0}` is invalid. - La referencia `{0}` no es válida. + La referencia "{0}" no es válida. @@ -415,22 +415,22 @@ Reference `{0}` added to the project. - Se ha agregado la referencia `{0}` al proyecto. + Se ha agregado la referencia "{0}" al proyecto. Project {0} already has a reference `{1}`. - El proyecto {0} ya tiene una referencia `{1}`. + El proyecto {0} ya tiene una referencia "{1}". Package reference `{0}` does not exist. - La referencia de paquete `{0}` no existe. + La referencia de paquete "{0}" no existe. Package reference `{0}` is invalid. - La referencia de paquete `{0}` no es válida. + La referencia de paquete "{0}" no es válida. @@ -440,12 +440,12 @@ Package reference `{0}` added to the project. - Se ha agregado la referencia de paquete `{0}` al proyecto. + Se ha agregado la referencia de paquete "{0}" al proyecto. Project {0} already has a reference `{1}`. - El proyecto {0} ya tiene una referencia `{1}`. + El proyecto {0} ya tiene una referencia "{1}". @@ -455,12 +455,12 @@ Project `{0}` does not exist. - El proyecto `{0}` no existe. + El proyecto "{0}" no existe. Project `{0}` is invalid. - El proyecto `{0}` no es válido. + El proyecto "{0}" no es válido. @@ -470,7 +470,7 @@ Project `{0}` added to the solution. - Se ha agregado el proyecto `{0}` a la solución. + Se ha agregado el proyecto "{0}" a la solución. @@ -485,7 +485,7 @@ Reference `{0}` deleted from the project. - Se ha eliminado la referencia “{0}” del proyecto. + Se ha eliminado la referencia "{0}" del proyecto. @@ -505,12 +505,12 @@ Package reference `{0}` could not be found in the project. - No se encuentra la referencia de paquete `{0}` en el proyecto. + No se encuentra la referencia de paquete "{0}" en el proyecto. Reference `{0}` deleted from the project. - Se ha eliminado la referencia “{0}” del proyecto. + Se ha eliminado la referencia "{0}" del proyecto. @@ -520,7 +520,7 @@ Package reference `{0}` deleted. - Se ha eliminado la referencia de paquete `{0}`. + Se ha eliminado la referencia de paquete "{0}". @@ -530,12 +530,12 @@ Project `{0}` could not be found in the solution. - No se encuentra el proyecto `{0}` en la solución. + No se encuentra el proyecto "{0}" en la solución. Project `{0}` removed from solution. - Se ha quitado el proyecto `{0}` de la solución. + Se ha quitado el proyecto "{0}" de la solución. @@ -545,7 +545,7 @@ Project `{0}` deleted from solution. - Se ha eliminado el proyecto `{0}` de la solución. + Se ha eliminado el proyecto "{0}" de la solución. @@ -585,17 +585,17 @@ Version of package `{0}` updated to `{1}`. - La versión del paquete `{0}` se ha actualizado a `{1}`. + La versión del paquete "{0}" se ha actualizado a "{1}". Version of package `{0}` updated. - Se ha actualizado la versión del paquete `{0}`. + Se ha actualizado la versión del paquete "{0}". Could not update the version of the package `{0}`. - No se puede actualizar la versión del paquete `{0}`. + No se puede actualizar la versión del paquete "{0}". diff --git a/src/dotnet/xlf/LocalizableStrings.ko.xlf b/src/dotnet/xlf/LocalizableStrings.ko.xlf index 9ea49568ca..8cd26acff7 100644 --- a/src/dotnet/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/xlf/LocalizableStrings.ko.xlf @@ -5,27 +5,27 @@ Could not find any project in `{0}`. - `{0}`에서 프로젝트를 찾을 수 없습니다. + '{0}'에서 프로젝트를 찾을 수 없습니다. Found more than one project in `{0}`. Please specify which one to use. - `{0}`에서 프로젝트를 두 개 이상 찾았습니다. 사용할 파일을 지정하세요. + '{0}'에서 프로젝트를 두 개 이상 찾았습니다. 사용할 파일을 지정하세요. Project already has a reference to `{0}`. - 프로젝트에 이미 `{0}`에 대한 참조가 있습니다. + 프로젝트에 이미 '{0}'에 대한 참조가 있습니다. Project reference `{0}` could not be found. - 프로젝트 참조 `{0}`을(를) 찾을 수 없습니다. + 프로젝트 참조 '{0}'을(를) 찾을 수 없습니다. Project reference `{0}` removed. - 프로젝트 참조 `{0}`이(가) 제거되었습니다. + 프로젝트 참조 '{0}'이(가) 제거되었습니다. @@ -225,7 +225,7 @@ {0} `{1}` found but is invalid. - {0} `{1}`이(가) 있지만 잘못되었습니다. + {0} '{1}'이(가) 있지만 잘못되었습니다. @@ -255,12 +255,12 @@ {0} or {1} not found in `{2}`. - `{2}`에서 '{0}' 또는 {1}을(를) 찾을 수 없습니다. + '{2}'에서 '{0}' 또는 {1}을(를) 찾을 수 없습니다. File `{0}` not found. - `{0}` 파일을 찾을 수 없습니다. + '{0}' 파일을 찾을 수 없습니다. @@ -270,7 +270,7 @@ {0} `{1}` does not exist. - {0} `{1}`이(가) 없습니다. + {0} '{1}'이(가) 없습니다. @@ -285,7 +285,7 @@ {0} already contains {1} `{2}`. - {0}에 {1} `{2}`이(가) 이미 있습니다. + {0}에 {1} '{2}'이(가) 이미 있습니다. @@ -295,7 +295,7 @@ {0} already has {1} `{2}`. - {0}에 {1} `{2}`이(가) 이미 있습니다. + {0}에 {1} '{2}'이(가) 이미 있습니다. @@ -340,7 +340,7 @@ Could not find any project in `{0}`. - `{0}`에서 프로젝트를 찾을 수 없습니다. + '{0}'에서 프로젝트를 찾을 수 없습니다. @@ -350,17 +350,17 @@ Found more than one project in `{0}`. Please specify which one to use. - `{0}`에서 프로젝트를 두 개 이상 찾았습니다. 사용할 파일을 지정하세요. + '{0}'에서 프로젝트를 두 개 이상 찾았습니다. 사용할 파일을 지정하세요. Found a project `{0}` but it is invalid. - `{0}` 프로젝트가 있지만 잘못되었습니다. + '{0}' 프로젝트가 있지만 잘못되었습니다. Invalid project `{0}`. - `{0}` 프로젝트가 잘못되었습니다. + '{0}' 프로젝트가 잘못되었습니다. @@ -370,7 +370,7 @@ Could not find solution or directory `{0}`. - 솔루션 또는 디렉터리 `{0}`을(를) 찾을 수 없습니다. + 솔루션 또는 디렉터리 '{0}'을(를) 찾을 수 없습니다. @@ -385,7 +385,7 @@ Invalid solution `{0}`. - `{0}` 솔루션이 잘못되었습니다. + '{0}' 솔루션이 잘못되었습니다. @@ -405,7 +405,7 @@ Reference `{0}` is invalid. - `{0}` 참조가 잘못되었습니다. + '{0}' 참조가 잘못되었습니다. @@ -415,22 +415,22 @@ Reference `{0}` added to the project. - 프로젝트에 `{0}` 참조가 추가되었습니다. + 프로젝트에 '{0}' 참조가 추가되었습니다. Project {0} already has a reference `{1}`. - {0} 프로젝트에 이미 `{1}` 참조가 있습니다. + {0} 프로젝트에 이미 '{1}' 참조가 있습니다. Package reference `{0}` does not exist. - 패키지 참조 `{0}`이(가) 없습니다. + 패키지 참조 '{0}'이(가) 없습니다. Package reference `{0}` is invalid. - 패키지 참조 `{0}`이(가) 잘못되었습니다. + 패키지 참조 '{0}'이(가) 잘못되었습니다. @@ -440,12 +440,12 @@ Package reference `{0}` added to the project. - 프로젝트에 패키지 참조 `{0}`이(가) 추가되었습니다. + 프로젝트에 패키지 참조 '{0}'이(가) 추가되었습니다. Project {0} already has a reference `{1}`. - {0} 프로젝트에 이미 `{1}` 참조가 있습니다. + {0} 프로젝트에 이미 '{1}' 참조가 있습니다. @@ -455,12 +455,12 @@ Project `{0}` does not exist. - `{0}` 프로젝트가 없습니다. + '{0}' 프로젝트가 없습니다. Project `{0}` is invalid. - `{0}` 프로젝트가 잘못되었습니다. + '{0}' 프로젝트가 잘못되었습니다. @@ -470,7 +470,7 @@ Project `{0}` added to the solution. - `{0}` 프로젝트가 솔루션에 추가되었습니다. + '{0}' 프로젝트가 솔루션에 추가되었습니다. @@ -485,7 +485,7 @@ Reference `{0}` deleted from the project. - `{0}` 참조가 프로젝트에서 삭제되었습니다. + '{0}' 참조가 프로젝트에서 삭제되었습니다. @@ -495,7 +495,7 @@ Reference `{0}` deleted. - `{0}` 참조가 삭제되었습니다. + '{0}' 참조가 삭제되었습니다. @@ -505,12 +505,12 @@ Package reference `{0}` could not be found in the project. - 프로젝트에서 패키지 참조 `{0}`을(를) 찾을 수 없습니다. + 프로젝트에서 패키지 참조 '{0}'을(를) 찾을 수 없습니다. Reference `{0}` deleted from the project. - `{0}` 참조가 프로젝트에서 삭제되었습니다. + '{0}' 참조가 프로젝트에서 삭제되었습니다. @@ -520,7 +520,7 @@ Package reference `{0}` deleted. - 패키지 참조 `{0}`이(가) 삭제되었습니다. + 패키지 참조 '{0}'이(가) 삭제되었습니다. @@ -530,12 +530,12 @@ Project `{0}` could not be found in the solution. - 솔루션에서 `{0}` 프로젝트를 찾을 수 없습니다. + 솔루션에서 '{0}' 프로젝트를 찾을 수 없습니다. Project `{0}` removed from solution. - `{0}` 프로젝트가 솔루션에서 제거되었습니다. + '{0}' 프로젝트가 솔루션에서 제거되었습니다. @@ -545,7 +545,7 @@ Project `{0}` deleted from solution. - `{0}` 프로젝트가 솔루션에서 삭제되었습니다. + '{0}' 프로젝트가 솔루션에서 삭제되었습니다. @@ -585,17 +585,17 @@ Version of package `{0}` updated to `{1}`. - `{0}` 패키지의 버전이 `{1}`(으)로 업데이트되었습니다. + '{0}' 패키지의 버전이 '{1}'(으)로 업데이트되었습니다. Version of package `{0}` updated. - `{0}` 패키지의 버전이 업데이트되었습니다. + '{0}' 패키지의 버전이 업데이트되었습니다. Could not update the version of the package `{0}`. - `{0}` 패키지의 버전을 업데이트할 수 없습니다. + '{0}' 패키지의 버전을 업데이트할 수 없습니다. diff --git a/src/dotnet/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/xlf/LocalizableStrings.pt-BR.xlf index ada5a7d272..6a4311c6a2 100644 --- a/src/dotnet/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/xlf/LocalizableStrings.pt-BR.xlf @@ -375,7 +375,7 @@ Found more than one solution file in {0}. Please specify which one to use. - Foi encontrado mais de um arquivo de solução em {0}. Especifique qual usar. + Foi encontrado mais de um arquivo de solução em {0}. Especifique qual deve ser usado. diff --git a/src/dotnet/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/xlf/LocalizableStrings.zh-Hans.xlf index 0add891413..70cc1c5047 100644 --- a/src/dotnet/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/xlf/LocalizableStrings.zh-Hans.xlf @@ -375,7 +375,7 @@ Found more than one solution file in {0}. Please specify which one to use. - {0} 中找到多个解决方案文件。请指定使用哪一个。 + 在 {0} 中找到多个解决方案文件。请指定使用哪一个。 From 57ef63f4919ccfaec3cd478261651b4547b761cd Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Fri, 14 Jul 2017 18:07:31 +0000 Subject: [PATCH 074/128] Update CoreSetup to preview3-25514-02 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e1b14db590..3719c49869 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25513-02 + 2.0.0-preview3-25514-02 15.3.406 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170710-283 1.0.0-beta2-20170713-286 1.0.0-beta2-20170713-286 - 2.0.0-preview3-25513-02 - 2.0.0-preview3-25513-02 + 2.0.0-preview3-25514-02 + 2.0.0-preview3-25514-02 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From 0f0d87a6156644bb9e3203832579091a0bd8906c Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 14 Jul 2017 12:26:57 -0700 Subject: [PATCH 075/128] Trivial changes to the readme.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index ed403e3a7a..6e00014608 100644 --- a/README.md +++ b/README.md @@ -91,11 +91,9 @@ Reference notes: >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* [version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/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/release/2.0.0/win_x64_Release_version_badge.svg - [coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.coherent.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/release/2.0.0/win_x64_Release_version_badge.svg [coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg [win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe From 48285bafaf9a312049c6b99a66237b1c938189a2 Mon Sep 17 00:00:00 2001 From: seancpeters Date: Fri, 14 Jul 2017 15:28:30 -0700 Subject: [PATCH 076/128] Update to Coherence 26318 - templating build 287 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3719c49869..dd721f6185 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,8 +23,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170710-283 - 1.0.0-beta2-20170713-286 - 1.0.0-beta2-20170713-286 + 1.0.0-beta2-20170714-287 + 1.0.0-beta2-20170714-287 2.0.0-preview3-25514-02 2.0.0-preview3-25514-02 0.1.1-alpha-167 @@ -39,7 +39,7 @@ 2.0.0 rtm 2.0.0 - 26239 + 26318 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 762709d1484cbb32340d14c4d2a898b8dbb48777 Mon Sep 17 00:00:00 2001 From: seancpeters Date: Fri, 14 Jul 2017 15:45:14 -0700 Subject: [PATCH 077/128] updating the template engine version also --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index dd721f6185..52abd13218 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,7 +22,7 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170710-283 + 1.0.0-beta2-20170714-287 1.0.0-beta2-20170714-287 1.0.0-beta2-20170714-287 2.0.0-preview3-25514-02 From 8d0b1e610693fe09b593a863edbe398777c06881 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Sun, 16 Jul 2017 17:27:22 +0000 Subject: [PATCH 078/128] Update CoreSetup to preview3-25516-01 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 52abd13218..b13c38d674 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25514-02 + 2.0.0-preview3-25516-01 15.3.406 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170714-287 1.0.0-beta2-20170714-287 1.0.0-beta2-20170714-287 - 2.0.0-preview3-25514-02 - 2.0.0-preview3-25514-02 + 2.0.0-preview3-25516-01 + 2.0.0-preview3-25516-01 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From 97f527d661ac8b4c207ec7c193b27f84296ee70c Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 17 Jul 2017 10:31:25 -0700 Subject: [PATCH 079/128] If "ReleaseSuffix" is already set, honor that value. --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 97a01c36e1..ff1c1f5ff9 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ 2 0 0 - preview3 + preview3 $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix) $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount) From 399e3f636c49c37c0944e6c6a9c97806877307a5 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Mon, 17 Jul 2017 13:46:45 -0500 Subject: [PATCH 080/128] MSBuild 15.3.407 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 92f5f6b6b0..0197010efa 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.406 + 15.3.407 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 1.1.0-alpha-20170713-1 From 689148b133609dbd305ca3b9841a2fdeaa4b25c5 Mon Sep 17 00:00:00 2001 From: "Rohit Agrawal (NUGET)" Date: Mon, 17 Jul 2017 12:28:43 -0700 Subject: [PATCH 081/128] update nuget to 4.3.0-rtm-4294 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 52abd13218..a89f5c83c3 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.0-preview3-20170703-2 $(CLI_NETSDK_Version) - 4.3.0-preview4-4273 + 4.3.0-rtm-4294 2.0.0-preview2-25331-02 2.0.0-rel-20170629-588 15.3.0-preview-20170628-02 From dd47000924932933872bff2cb57b7207a1779115 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Mon, 17 Jul 2017 13:44:57 -0500 Subject: [PATCH 082/128] MSBuild 15.3.407 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5464dd8b36..ce92dc789d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0-preview3-25516-01 - 15.3.406 + 15.3.407 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 1.6.0-beta2-25304 From 3c4be26876da32e52a5ce8461b9fa784a5d9a9d9 Mon Sep 17 00:00:00 2001 From: seancpeters Date: Mon, 17 Jul 2017 14:01:01 -0700 Subject: [PATCH 083/128] updating to coherence 26343 & templating build 288 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5464dd8b36..b182a11036 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,8 +23,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170714-287 - 1.0.0-beta2-20170714-287 - 1.0.0-beta2-20170714-287 + 1.0.0-beta2-20170717-288 + 1.0.0-beta2-20170717-288 2.0.0-preview3-25516-01 2.0.0-preview3-25516-01 0.1.1-alpha-167 @@ -39,7 +39,7 @@ 2.0.0 rtm 2.0.0 - 26318 + 26343 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 7eb8260a2f8a16a1430cc66d5d371c9497e4468d Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Fri, 14 Jul 2017 10:19:39 -0700 Subject: [PATCH 084/128] Update the .NET Framework Support package Need to update in order to get the fix https://github.com/dotnet/corefx/pull/22248 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5464dd8b36..cfcd4b0e81 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -16,7 +16,7 @@ $(CLI_NETSDK_Version) 4.3.0-rtm-4294 - 2.0.0-preview2-25331-02 + 2.0.0-preview3-25514-04 2.0.0-rel-20170629-588 15.3.0-preview-20170628-02 $(CLI_SharedFrameworkVersion) From b606267b0d990d537591aecb081b96a5134b1228 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 17 Jul 2017 16:16:14 -0700 Subject: [PATCH 085/128] Update dotnet/sdk to latest --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cbc5872773..843e0759a2 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.0-preview3-20170703-2 + 2.0.0-preview3-20170717-1 $(CLI_NETSDK_Version) 4.3.0-preview4-4258 From 6de76e047b62e521db52cc07fd5af1f7bf936d0d Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Mon, 17 Jul 2017 17:03:51 -0700 Subject: [PATCH 086/128] Update dotnet/sdk to latest --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e4462e085b..9d8544a6fb 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.0-preview3-20170703-2 + 2.0.0-preview3-20170717-1 $(CLI_NETSDK_Version) 4.3.0-rtm-4294 From 33b12c9fe46ac9ad6ba2352d280935d8ee7ed74e Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Tue, 18 Jul 2017 17:36:33 +0000 Subject: [PATCH 087/128] Update CoreSetup to preview3-25518-01 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0df98d3190..c12b02d357 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25516-01 + 2.0.0-preview3-25518-01 15.3.407 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170714-287 1.0.0-beta2-20170717-288 1.0.0-beta2-20170717-288 - 2.0.0-preview3-25516-01 - 2.0.0-preview3-25516-01 + 2.0.0-preview3-25518-01 + 2.0.0-preview3-25518-01 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From 79ff758a4315c319491e46f60fb456299c3badbe Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 18 Jul 2017 11:17:45 -0700 Subject: [PATCH 088/128] Use docker image for opensuse 13.2 from runtime --- scripts/docker/opensuse.13.2/Dockerfile | 32 +++---------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/scripts/docker/opensuse.13.2/Dockerfile b/scripts/docker/opensuse.13.2/Dockerfile index 83244ea3c1..c3cb77eb43 100644 --- a/scripts/docker/opensuse.13.2/Dockerfile +++ b/scripts/docker/opensuse.13.2/Dockerfile @@ -3,37 +3,11 @@ # Licensed under the MIT license. See LICENSE file in the project root for full license information. # -FROM opensuse:13.2 +FROM microsoft/dotnet-buildtools-prereqs:opensuse132_prereqs_v4 -# Install the base toolchain we need to build anything (clang, cmake, make and the like) -# this does not include libraries that we need to compile different projects, we'd like -# them in a different layer. -RUN zypper -n install binutils \ - cmake \ - which \ - gcc \ - llvm-clang \ - tar \ - ncurses-utils \ - curl \ - git \ - sudo && \ - ln -s /usr/bin/clang++ /usr/bin/clang++-3.5 && \ +RUN zypper -n install sudo \ + ncurses-utils && \ zypper clean -a - -# Dependencies of CoreCLR and CoreFX. We need to add an additional repository to get lttng. -RUN zypper addrepo -G http://download.opensuse.org/repositories/devel:/tools:/lttng/openSUSE_13.2/devel:tools:lttng.repo && \ - zypper refresh && \ - zypper -n remove krb5-mini && \ - zypper -n install libunwind \ - libicu \ - lttng-ust \ - libuuid1 \ - libopenssl1_0_0 \ - libcurl4 \ - krb5 && \ - zypper clean -a - # Setup User to match Host User, and give superuser permissions ARG USER_ID=0 RUN useradd -m code_executor -u ${USER_ID} -g wheel From 6e49d10bbc841a6d42fd12954c4e89fdb4754aeb Mon Sep 17 00:00:00 2001 From: Livar Date: Tue, 18 Jul 2017 15:48:52 -0700 Subject: [PATCH 089/128] Update NuGet to 4.3.0-rtm-4294 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 0197010efa..1bd7963f44 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,7 +6,7 @@ 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 1.1.0-alpha-20170713-1 - 4.3.0-preview4-4273 + 4.3.0-rtm-4294 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta2-20170629-269 From 60e26371436a595f71e574d4814027cef7f7590e Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 28 Jun 2017 18:09:12 -0700 Subject: [PATCH 090/128] Allow CLI UI language to be overridden by an environment variable --- src/dotnet/Program.cs | 3 ++ src/dotnet/UILanguageOverride.cs | 76 ++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 src/dotnet/UILanguageOverride.cs diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 51704ece6d..08a711f933 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -198,6 +198,9 @@ private static void InitializeProcess() // by default, .NET Core doesn't have all code pages needed for Console apps. // see the .NET Core Notes in https://msdn.microsoft.com/en-us/library/system.diagnostics.process(v=vs.110).aspx Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + + // Honor UI language customization + UILanguageOverride.Setup(); } internal static bool TryGetBuiltInCommand(string commandName, out BuiltInCommandMetadata builtInCommand) diff --git a/src/dotnet/UILanguageOverride.cs b/src/dotnet/UILanguageOverride.cs new file mode 100644 index 0000000000..00282389b8 --- /dev/null +++ b/src/dotnet/UILanguageOverride.cs @@ -0,0 +1,76 @@ +// Copyright (c) .NET 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.Globalization; + +namespace Microsoft.DotNet.Cli +{ + internal static class UILanguageOverride + { + private const string DOTNET_CLI_UI_LANGUAGE = nameof(DOTNET_CLI_UI_LANGUAGE); + private const string VSLANG = nameof(VSLANG); + private const string PreferredUILang = nameof(PreferredUILang); + + public static void Setup() + { + CultureInfo language = GetOverriddenUILanguage(); + if (language == null) + { + return; + } + + // Make the current process respect the override. + CultureInfo.DefaultThreadCurrentUICulture = language; + + // Pass down the override to other processes that we start via appropriate environment variables + // Do not override any environment variables that are already set as we do not want to clobber a more granular setting with our global setting. + SetIfNotAlreadySet(DOTNET_CLI_UI_LANGUAGE, language.Name); + SetIfNotAlreadySet(VSLANG, language.LCID); // for tools following VS guidelines to just work in CLI + SetIfNotAlreadySet(PreferredUILang, language.Name); // for C#/VB targets that pass $(PreferredUILang) to compiler + } + + private static CultureInfo GetOverriddenUILanguage() + { + // DOTNET_CLI_UI_LANGUAGE= is the main way for users to customize the CLI's UI language. + string dotnetCliLanguage = Environment.GetEnvironmentVariable(DOTNET_CLI_UI_LANGUAGE); + if (dotnetCliLanguage != null) + { + try + { + return new CultureInfo(dotnetCliLanguage); + } + catch (CultureNotFoundException) { } + } + + // VSLANG= is set by VS and we respect that as well so that we will respect the VS + // language preference if we're invoked by VS. + string vsLang = Environment.GetEnvironmentVariable(VSLANG); + if (vsLang != null && int.TryParse(VSLANG, out int vsLcid)) + { + try + { + return new CultureInfo(vsLcid); + } + catch (ArgumentOutOfRangeException) { } + catch (CultureNotFoundException) { } + } + + return null; + } + + private static void SetIfNotAlreadySet(string environmentVariableName, string value) + { + string currentValue = Environment.GetEnvironmentVariable(environmentVariableName); + if (currentValue == null) + { + Environment.SetEnvironmentVariable(environmentVariableName, value); + } + } + + private static void SetIfNotAlreadySet(string environmentVariableName, int value) + { + SetIfNotAlreadySet(environmentVariableName, value.ToString()); + } + } +} From a1c423c0f64c49cf5b1050bc34a31a49baaa63ee Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 18 Jul 2017 08:34:08 -0700 Subject: [PATCH 091/128] Honor UI language override in test runs Also fix some incorrect unlocalized test expectations that slipped in. --- .../dotnet-cli-build/EnvironmentVariableFilter.cs | 1 + src/Microsoft.DotNet.Cli.Utils/Product.cs | 2 +- .../TestBase.cs | 10 ++++++++++ test/dotnet-new.Tests/NewCommandTests.cs | 12 +++++++++--- test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs | 12 +++++++----- .../ParserTests/ValdidationMessageTests.cs | 2 -- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs b/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs index 432f303863..6071d07659 100644 --- a/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs +++ b/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs @@ -28,6 +28,7 @@ public class EnvironmentFilter private IEnumerable _environmentVariablesToKeep = new string [] { "DOTNET_CLI_TELEMETRY_SESSIONID", + "DOTNET_CLI_UI_LANGUAGE", "DOTNET_MULTILEVEL_LOOKUP", "DOTNET_RUNTIME_ID", "DOTNET_SKIP_FIRST_TIME_EXPERIENCE", diff --git a/src/Microsoft.DotNet.Cli.Utils/Product.cs b/src/Microsoft.DotNet.Cli.Utils/Product.cs index 023004ce4b..8811847b37 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Product.cs +++ b/src/Microsoft.DotNet.Cli.Utils/Product.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Utils { public class Product { - public static readonly string LongName = LocalizableStrings.DotNetCommandLineTools; + public static string LongName => LocalizableStrings.DotNetCommandLineTools; public static readonly string Version = GetProductVersion(); private static string GetProductVersion() diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs index e2e1269a6b..b377b4331a 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -23,6 +24,15 @@ public abstract class TestBase : IDisposable private TempRoot _temp; private static TestAssets s_testAssets; + static TestBase() + { + // set culture of test process to match CLI sub-processes when the UI language is overriden. + string overriddenUILanguage = Environment.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE"); + if (overriddenUILanguage != null) + { + CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo(overriddenUILanguage); + } + } protected static string RepoRoot { diff --git a/test/dotnet-new.Tests/NewCommandTests.cs b/test/dotnet-new.Tests/NewCommandTests.cs index 45eccf5c7c..e22cb821c8 100644 --- a/test/dotnet-new.Tests/NewCommandTests.cs +++ b/test/dotnet-new.Tests/NewCommandTests.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.New.Tests { - public class NewCommandTests + public class NewCommandTests : TestBase { [Fact] public void WhenSwitchIsSkippedThenItPrintsError() @@ -16,7 +16,10 @@ public void WhenSwitchIsSkippedThenItPrintsError() cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().StartWith("No templates matched the input template name: Web1.1."); + if (!DotnetUnderTest.IsLocalized()) + { + cmd.StdErr.Should().StartWith("No templates matched the input template name: Web1.1."); + } } [Fact] @@ -26,7 +29,10 @@ public void WhenTemplateNameIsNotUniquelyMatchedThenItIndicatesProblemToUser() cmd.ExitCode.Should().NotBe(0); - cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: c."); + if (!DotnetUnderTest.IsLocalized()) + { + cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: c."); + } } } } diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs index 36a0d3fde6..5fa67328e6 100644 --- a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs +++ b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs @@ -7,6 +7,8 @@ using Microsoft.DotNet.Tools.Test.Utilities; using Xunit; +using LocalizableStrings = Microsoft.DotNet.Tools.Run.LocalizableStrings; + namespace Microsoft.DotNet.Cli.Run.Tests { public class GivenDotnetRunBuildsCsproj : TestBase @@ -280,7 +282,7 @@ public void ItGivesAnErrorWhenAttemptingToUseALaunchProfileThatDoesNotExistWhenT .ExecuteWithCapturedOutput("--launch-profile test") .Should().Pass() .And.HaveStdOutContaining("Hello World!") - .And.HaveStdErrContaining("The specified launch profile could not be located."); + .And.HaveStdErrContaining(LocalizableStrings.RunCommandExceptionCouldNotLocateALaunchSettingsFile); } [Fact] @@ -368,7 +370,7 @@ public void ItGivesAnErrorWhenTheLaunchProfileNotFound() .ExecuteWithCapturedOutput("--launch-profile Third") .Should().Pass() .And.HaveStdOutContaining("(NO MESSAGE)") - .And.HaveStdErrContaining("The launch profile \"Third\" could not be applied."); + .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, "Third", "").Trim()); } [Fact] @@ -396,7 +398,7 @@ public void ItGivesAnErrorWhenTheLaunchProfileCanNotBeHandled() .ExecuteWithCapturedOutput("--launch-profile \"IIS Express\"") .Should().Pass() .And.HaveStdOutContaining("(NO MESSAGE)") - .And.HaveStdErrContaining("The launch profile \"IIS Express\" could not be applied."); + .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, "IIS Express", "").Trim()); } [Fact] @@ -485,7 +487,7 @@ public void ItSkipsLaunchProfilesWhenThereIsNoUsableDefault() cmd.Should().Pass() .And.HaveStdOutContaining("(NO MESSAGE)") - .And.HaveStdErrContaining("The launch profile \"(Default)\" could not be applied."); + .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, LocalizableStrings.DefaultLaunchProfileDisplayName, "").Trim()); } [Fact] @@ -514,7 +516,7 @@ public void ItPrintsAnErrorWhenLaunchSettingsAreCorrupted() cmd.Should().Pass() .And.HaveStdOutContaining("(NO MESSAGE)") - .And.HaveStdErrContaining("The launch profile \"(Default)\" could not be applied."); + .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, LocalizableStrings.DefaultLaunchProfileDisplayName, "").Trim()); } } } diff --git a/test/dotnet.Tests/ParserTests/ValdidationMessageTests.cs b/test/dotnet.Tests/ParserTests/ValdidationMessageTests.cs index 60b65fb291..41d184d6a4 100644 --- a/test/dotnet.Tests/ParserTests/ValdidationMessageTests.cs +++ b/test/dotnet.Tests/ParserTests/ValdidationMessageTests.cs @@ -11,8 +11,6 @@ namespace Microsoft.DotNet.Tests.ParserTests { public class ValidationMessageTests { - private readonly ITestOutputHelper output; - [Fact] public void ValidationMessagesFormatCorrectly() { From aed35f482d524a3d26242615029bc5871333715b Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 19 Jul 2017 14:40:15 +0100 Subject: [PATCH 092/128] Update SPA templates to 1.0.0-preview-000409 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c12b02d357..400da8023c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -30,7 +30,7 @@ 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 - 1.0.0-preview-000403 + 1.0.0-preview-000409 0.2.0-beta-000042 From 8fe8095970b132d6b8d4d9df87afe25ea3d5654b Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 19 Jul 2017 10:37:19 -0700 Subject: [PATCH 093/128] Update to Coherence 26380 --- build/DependencyVersions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c12b02d357..e5e639bf54 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,9 +22,9 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170714-287 - 1.0.0-beta2-20170717-288 - 1.0.0-beta2-20170717-288 + 1.0.0-beta2-20170719-291 + 1.0.0-beta2-20170719-291 + 1.0.0-beta2-20170719-291 2.0.0-preview3-25518-01 2.0.0-preview3-25518-01 0.1.1-alpha-167 @@ -39,7 +39,7 @@ 2.0.0 rtm 2.0.0 - 26343 + 26380 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 85573db000f82a3510010f8ced945083e74b5606 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 19 Jul 2017 10:25:45 -0700 Subject: [PATCH 094/128] Respond to PR feedback: use method names not comments --- src/dotnet/Program.cs | 1 - src/dotnet/UILanguageOverride.cs | 13 +++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 08a711f933..4611ec7b72 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -199,7 +199,6 @@ private static void InitializeProcess() // see the .NET Core Notes in https://msdn.microsoft.com/en-us/library/system.diagnostics.process(v=vs.110).aspx Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); - // Honor UI language customization UILanguageOverride.Setup(); } diff --git a/src/dotnet/UILanguageOverride.cs b/src/dotnet/UILanguageOverride.cs index 00282389b8..b93547b746 100644 --- a/src/dotnet/UILanguageOverride.cs +++ b/src/dotnet/UILanguageOverride.cs @@ -15,15 +15,20 @@ internal static class UILanguageOverride public static void Setup() { CultureInfo language = GetOverriddenUILanguage(); - if (language == null) + if (language != null) { - return; + ApplyOverrideToCurrentProcess(language); + FlowOverrideToChildProcesses(language); } + } - // Make the current process respect the override. + private static void ApplyOverrideToCurrentProcess(CultureInfo language) + { CultureInfo.DefaultThreadCurrentUICulture = language; + } - // Pass down the override to other processes that we start via appropriate environment variables + private static void FlowOverrideToChildProcesses(CultureInfo language) + { // Do not override any environment variables that are already set as we do not want to clobber a more granular setting with our global setting. SetIfNotAlreadySet(DOTNET_CLI_UI_LANGUAGE, language.Name); SetIfNotAlreadySet(VSLANG, language.LCID); // for tools following VS guidelines to just work in CLI From 368531715e2b1a8bf7abac3e9bc5047a8bd709f4 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 19 Jul 2017 11:51:38 -0700 Subject: [PATCH 095/128] Fix VSLANG handling typo --- src/dotnet/UILanguageOverride.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/UILanguageOverride.cs b/src/dotnet/UILanguageOverride.cs index b93547b746..5e44e56ccd 100644 --- a/src/dotnet/UILanguageOverride.cs +++ b/src/dotnet/UILanguageOverride.cs @@ -51,7 +51,7 @@ private static CultureInfo GetOverriddenUILanguage() // VSLANG= is set by VS and we respect that as well so that we will respect the VS // language preference if we're invoked by VS. string vsLang = Environment.GetEnvironmentVariable(VSLANG); - if (vsLang != null && int.TryParse(VSLANG, out int vsLcid)) + if (vsLang != null && int.TryParse(vsLang, out int vsLcid)) { try { From 28c51d2eaaa408a04019a6d6adab6affe7ade661 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Wed, 19 Jul 2017 13:58:06 -0700 Subject: [PATCH 096/128] Localize first-run "Expanding" and "Decompressing" --- .../CompressionUtility.cs | 2 +- .../IndexedArchive.cs | 2 +- .../LocalizableStrings.resx | 126 ++++++++++++++++++ .../Microsoft.DotNet.Archive.csproj | 5 + .../xlf/LocalizableStrings.cs.xlf | 17 +++ .../xlf/LocalizableStrings.de.xlf | 17 +++ .../xlf/LocalizableStrings.es.xlf | 17 +++ .../xlf/LocalizableStrings.fr.xlf | 17 +++ .../xlf/LocalizableStrings.it.xlf | 17 +++ .../xlf/LocalizableStrings.ja.xlf | 17 +++ .../xlf/LocalizableStrings.ko.xlf | 17 +++ .../xlf/LocalizableStrings.pl.xlf | 17 +++ .../xlf/LocalizableStrings.pt-BR.xlf | 17 +++ .../xlf/LocalizableStrings.ru.xlf | 17 +++ .../xlf/LocalizableStrings.tr.xlf | 17 +++ .../xlf/LocalizableStrings.zh-Hans.xlf | 17 +++ .../xlf/LocalizableStrings.zh-Hant.xlf | 17 +++ 17 files changed, 354 insertions(+), 2 deletions(-) create mode 100644 src/Microsoft.DotNet.Archive/LocalizableStrings.resx create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.cs.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.de.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.es.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.fr.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.it.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ja.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ko.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pl.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pt-BR.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ru.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.tr.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hans.xlf create mode 100644 src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hant.xlf diff --git a/src/Microsoft.DotNet.Archive/CompressionUtility.cs b/src/Microsoft.DotNet.Archive/CompressionUtility.cs index 0b4e937dc6..285799116b 100644 --- a/src/Microsoft.DotNet.Archive/CompressionUtility.cs +++ b/src/Microsoft.DotNet.Archive/CompressionUtility.cs @@ -98,7 +98,7 @@ public static void Decompress(Stream inStream, Stream outStream, IProgress { extractOperation.DoOperation(); - progress.Report("Expanding", Interlocked.Increment(ref opsExecuted), extractOperations.Count); + progress.Report(LocalizableStrings.Expanding, Interlocked.Increment(ref opsExecuted), extractOperations.Count); }); } } diff --git a/src/Microsoft.DotNet.Archive/LocalizableStrings.resx b/src/Microsoft.DotNet.Archive/LocalizableStrings.resx new file mode 100644 index 0000000000..9f9b5a9e7d --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LocalizableStrings.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Expanding + + + Decompressing + + \ 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 9a2cd2cdfe..04b8f25be4 100644 --- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj +++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj @@ -10,8 +10,13 @@ true + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.cs.xlf new file mode 100644 index 0000000000..c732705224 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.cs.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.de.xlf new file mode 100644 index 0000000000..96d5d68ca0 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.de.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.es.xlf new file mode 100644 index 0000000000..926da184e7 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.es.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.fr.xlf new file mode 100644 index 0000000000..5524d98217 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.fr.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.it.xlf new file mode 100644 index 0000000000..6c1c155338 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.it.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ja.xlf new file mode 100644 index 0000000000..e00b949fb2 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ja.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ko.xlf new file mode 100644 index 0000000000..fb515905db --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ko.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pl.xlf new file mode 100644 index 0000000000..bfe8b9a350 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pl.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pt-BR.xlf new file mode 100644 index 0000000000..9e6cb642c1 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pt-BR.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ru.xlf new file mode 100644 index 0000000000..c09a74f617 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ru.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.tr.xlf new file mode 100644 index 0000000000..8be3dbe6a6 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.tr.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hans.xlf new file mode 100644 index 0000000000..aab479ac3f --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hans.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hant.xlf new file mode 100644 index 0000000000..a333565e15 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hant.xlf @@ -0,0 +1,17 @@ + + + + + + Expanding + Expanding + + + + Decompressing + Decompressing + + + + + \ No newline at end of file From 68f1e6a9defd5b04d44d533e71b440c514c03d03 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 20 Jul 2017 11:32:03 -0700 Subject: [PATCH 097/128] Changing the 'coherent' badge value. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e00014608..bc7661d1a3 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Reference notes: [coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.coherent.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/release/2.0.0/win_x64_Release_version_badge.svg -[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_coherent_badge.svg +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x86_Release_coherent_badge.svg [win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe [win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe.sha From fcf44afcc7bb89c3755bf95b6b5df1e75b4ef523 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 20 Jul 2017 11:55:36 -0700 Subject: [PATCH 098/128] Update the SDK to 1.1.0-alpha-20170719-3 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 1bd7963f44..1a14d1ac93 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.407 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 - 1.1.0-alpha-20170713-1 + 1.1.0-alpha-20170719-3 4.3.0-rtm-4294 1.0.0-alpha-20170516-2-509 15.0.0 From 6da75e02a40be8aa5bbca7f0ff0318bd1bb64dae Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Thu, 20 Jul 2017 12:48:04 -0700 Subject: [PATCH 099/128] Insert NuGet Build 4.3.0-rtm-4315 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3a8e2c4610..e6b42f8ccf 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.0-preview3-20170717-1 $(CLI_NETSDK_Version) - 4.3.0-rtm-4294 + 4.3.0-rtm-4315 2.0.0-preview3-25514-04 2.0.0-rel-20170629-588 15.3.0-preview-20170628-02 From d67e1f14db815fbb75761e370a045d24ec9a9524 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 20 Jul 2017 11:33:31 -0700 Subject: [PATCH 100/128] Update SdkBrandName --- build/Branding.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Branding.props b/build/Branding.props index cf466be506..e573b26b44 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,6 +1,6 @@ - Microsoft .NET Core SDK - 2.0.0 Preview 2 + Microsoft .NET Core SDK - 2.0.0 Microsoft .NET Core MSBuild Extensions - 2.0.0 Preview 2 Microsoft .NET Core Runtime - 2.0.0 Microsoft .NET Core Host - 2.0.0 From 7108da71705f534d529ee78863f2c3e5146964e1 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Fri, 21 Jul 2017 00:26:04 +0000 Subject: [PATCH 101/128] Update CoreSetup to preview3-25510-01 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3a8e2c4610..302cbce69b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview3-25518-01 + 2.0.0 15.3.407 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 @@ -25,8 +25,8 @@ 1.0.0-beta2-20170719-291 1.0.0-beta2-20170719-291 1.0.0-beta2-20170719-291 - 2.0.0-preview3-25518-01 - 2.0.0-preview3-25518-01 + 2.0.0 + 2.0.0 0.1.1-alpha-167 1.2.1-alpha-002133 0.2.0 From c45fca648c8e379c2f29c8e05dc963b79b62243d Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 20 Jul 2017 17:49:45 -0700 Subject: [PATCH 102/128] Updating SDK to 2.0.0-preview3-20170721-1 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3a8e2c4610..9170a28193 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.0-preview3-20170717-1 + 2.0.0-preview3-20170721-1 $(CLI_NETSDK_Version) 4.3.0-rtm-4294 From 126da7ab6a04495b7c5131b52637f72a5ab82a27 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 20 Jul 2017 21:23:01 -0700 Subject: [PATCH 103/128] Update NuGet to 4.3.0-rtm-4315 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 1a14d1ac93..f22abc2831 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,7 +6,7 @@ 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 1.1.0-alpha-20170719-3 - 4.3.0-rtm-4294 + 4.3.0-rtm-4315 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta2-20170629-269 From 08d6a0618e4673eeed6685e069dd537877ce0e1b Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 20 Jul 2017 23:28:49 -0700 Subject: [PATCH 104/128] Update to coherence 26412 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 427875445f..623bbc0084 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,8 +23,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170719-291 - 1.0.0-beta2-20170719-291 - 1.0.0-beta2-20170719-291 + 1.0.0-beta2-20170720-295 + 1.0.0-beta2-20170720-295 2.0.0-preview3-25518-01 2.0.0-preview3-25518-01 0.1.1-alpha-167 @@ -39,7 +39,7 @@ 2.0.0 rtm 2.0.0 - 26380 + 26412 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From e0ff36ba8e90ca1a1d67fceda0d22d127ce1acb6 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 21 Jul 2017 10:22:52 -0500 Subject: [PATCH 105/128] MSBuild 15.3.409 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 427875445f..21a792a516 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0-preview3-25518-01 - 15.3.407 + 15.3.409 2.3.0-beta4-61830-03 2.3.0-pre-20170624-6 1.6.0-beta2-25304 From 3a6c895aec6db975416ab68f7f3946161836ae99 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 21 Jul 2017 10:23:16 -0500 Subject: [PATCH 106/128] MSBuild 15.3.409 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 1a14d1ac93..0a5c4a8919 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.407 + 15.3.409 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 1.1.0-alpha-20170719-3 From ab5130d7d94bca3e5d5b41486a59dc2a8bdfd774 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 21 Jul 2017 10:17:32 -0700 Subject: [PATCH 107/128] Revert "Updating SDK to 2.0.0-preview3-20170721-1" This reverts commit c45fca648c8e379c2f29c8e05dc963b79b62243d. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 427875445f..e6b42f8ccf 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.0-preview3-20170721-1 + 2.0.0-preview3-20170717-1 $(CLI_NETSDK_Version) 4.3.0-rtm-4315 From d07a5021ac4a57df980abcefd249973a9f8ca779 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Jul 2017 12:31:54 -0700 Subject: [PATCH 108/128] Updating SDK to 2.0.0-preview3-20170721-5 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 37c3ab9b6f..aceb68783f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.0-preview3-20170717-1 + 2.0.0-preview3-20170721-5 $(CLI_NETSDK_Version) 4.3.0-rtm-4315 From ebd2a31031e9bfe4918b70e03eb53c2e965f57ee Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 21 Jul 2017 12:39:18 -0700 Subject: [PATCH 109/128] Update SDK to 1.1.0-alpha-20170721-6 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 9179ecc771..624db2804b 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -5,7 +5,7 @@ 15.3.409 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 - 1.1.0-alpha-20170719-3 + 1.1.0-alpha-20170721-6 4.3.0-rtm-4315 1.0.0-alpha-20170516-2-509 15.0.0 From dfb88456ba89fc3f8e0f50bae04f324a708a79e3 Mon Sep 17 00:00:00 2001 From: Livar Date: Fri, 21 Jul 2017 14:42:05 -0700 Subject: [PATCH 110/128] Updating SDK to 2.0.0-preview3-20170721-7 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0c5434bd09..23cbbe6a04 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.0-preview3-20170721-5 + 2.0.0-preview3-20170721-7 $(CLI_NETSDK_Version) 4.3.0-rtm-4315 From 1de47f5704a4f3c260880e5dec335b17afa7c928 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 21 Jul 2017 15:24:59 -0700 Subject: [PATCH 111/128] Producing a nupkg for Microsoft.NET.MSBuildResolver. Note that this package contains only the Resolver dll. The hostfxr dll will still have to be acquired separately. --- build/package/Nupkg.targets | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/package/Nupkg.targets b/build/package/Nupkg.targets index e3eb97faf4..9158c2143d 100644 --- a/build/package/Nupkg.targets +++ b/build/package/Nupkg.targets @@ -11,6 +11,10 @@ Microsoft.DotNet.Cli.Utils $(SdkNugetVersion) + + Microsoft.DotNet.MSBuildSdkResolver + $(SdkNugetVersion) + From 2848037380ccdf57d83083c1432429b56c993620 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Fri, 21 Jul 2017 19:01:49 -0700 Subject: [PATCH 112/128] Update to Coherence 26424 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0c5434bd09..ab026253fd 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,8 +23,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170719-291 - 1.0.0-beta2-20170720-295 - 1.0.0-beta2-20170720-295 + 1.0.0-beta2-20170721-296 + 1.0.0-beta2-20170721-296 2.0.0 2.0.0 0.1.1-alpha-167 @@ -39,7 +39,7 @@ 2.0.0 rtm 2.0.0 - 26412 + 26424 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 81b9379536fecc26a6823fb3defbcdb628ce46b2 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Sun, 23 Jul 2017 16:23:47 -0700 Subject: [PATCH 113/128] Insert NuGet Build 4.3.0-rtm-4324 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c6413f77f3..0113080791 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.0-preview3-20170721-7 $(CLI_NETSDK_Version) - 4.3.0-rtm-4315 + 4.3.0-rtm-4324 2.0.0-preview3-25514-04 2.0.0-rel-20170629-588 15.3.0-preview-20170628-02 From 24eccf13e7ff2c5319e89ab31cd135c2b198aff7 Mon Sep 17 00:00:00 2001 From: Ashley Hauck Date: Mon, 24 Jul 2017 09:18:15 -0700 Subject: [PATCH 114/128] Update Roslyn to 2.3.1-beta1-61919-01 in 1.1.0 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 624db2804b..b98daae278 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -3,7 +3,7 @@ 1.1.2 15.3.409 - 2.3.0-beta4-61830-03 + 2.3.2-beta1-61921-05 4.2.0-rc-170630-0 1.1.0-alpha-20170721-6 4.3.0-rtm-4315 From 9ff5da4dd26ce264428e9d84255188e808f1fab5 Mon Sep 17 00:00:00 2001 From: Ashley Hauck Date: Mon, 24 Jul 2017 09:23:24 -0700 Subject: [PATCH 115/128] Update Roslyn to 2.3.2-beta1-61921-05 in 2.0.0 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index c6413f77f3..875ae7a20b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,7 +3,7 @@ 2.0.0 15.3.409 - 2.3.0-beta4-61830-03 + 2.3.2-beta1-61921-05 2.3.0-pre-20170624-6 1.6.0-beta2-25304 4.2.0-rc-170630-0 From 1c1a6f2981813f65667be19673858dbb8204bf10 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 24 Jul 2017 11:49:26 -0700 Subject: [PATCH 116/128] Trivial change. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 984eb555bb..1d1a9e2ab7 100644 --- a/README.md +++ b/README.md @@ -91,8 +91,8 @@ Reference notes: [version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version [coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.coherent.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/win_x64_Release_version_badge.svg -[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_coherent_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x86_Release_version_badge.svg +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x86_Release_coherent_badge.svg [win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe [win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe.sha From f1d1ff5272abfcf615fbfd895da1c32ee3c80332 Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 25 Jul 2017 08:27:23 -0700 Subject: [PATCH 117/128] typo --- src/Microsoft.DotNet.Archive/IndexedArchive.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Archive/IndexedArchive.cs b/src/Microsoft.DotNet.Archive/IndexedArchive.cs index fb0ef22f6b..245c2e5956 100644 --- a/src/Microsoft.DotNet.Archive/IndexedArchive.cs +++ b/src/Microsoft.DotNet.Archive/IndexedArchive.cs @@ -73,7 +73,7 @@ public void CopyTo(Stream destination) static string[] ZipExtensions = new[] { ".zip", ".nupkg" }; static string IndexFileName = "index.txt"; - // maps file hash to archve path + // maps file hash to archive path // $ prefix indicates that the file is not in the archive and path is a hash private Dictionary _archiveFiles = new Dictionary(); // maps file hash to external path From e7d5c6891bfae4fe1a4f0425b0cb57dc16fb0eee Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 25 Jul 2017 12:24:33 -0700 Subject: [PATCH 118/128] Updating the build definition URLs. --- README.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 1d1a9e2ab7..196f42dbbc 100644 --- a/README.md +++ b/README.md @@ -27,32 +27,32 @@ Build Status |:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| |[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-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 +[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6902/badge +[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6902 -[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5450/badge -[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5450 +[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6901/badge +[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6901 -[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5445/badge -[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5445 +[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6900/badge +[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6900 -[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5603/badge -[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5603 +[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6899/badge +[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6899 -[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5447/badge -[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5447 +[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6905/badge +[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6905 -[ubuntu-16.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5448/badge -[ubuntu-16.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5448 +[ubuntu-16.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6904/badge +[ubuntu-16.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6904 -[ubuntu-16.10-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5760/badge -[ubuntu-16.10-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5760 +[ubuntu-16.10-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6903/badge +[ubuntu-16.10-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6903 -[debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5442/badge -[debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5442 +[debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6898/badge +[debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6898 -[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 +[rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6906/badge +[rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=6906 Installers and Binaries ----------------------- From 70d18839af8753c436158415d2f6c26a6f2bf22d Mon Sep 17 00:00:00 2001 From: seancpeters Date: Tue, 25 Jul 2017 15:39:33 -0700 Subject: [PATCH 119/128] updating to coherence 26452 & templating build 300 --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 875ae7a20b..3f78c5cbdd 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -23,8 +23,8 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) 1.0.0-beta2-20170719-291 - 1.0.0-beta2-20170721-296 - 1.0.0-beta2-20170721-296 + 1.0.0-beta2-20170725-300 + 1.0.0-beta2-20170725-300 2.0.0 2.0.0 0.1.1-alpha-167 @@ -39,7 +39,7 @@ 2.0.0 rtm 2.0.0 - 26424 + 26452 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) From 685d28436c5b0f9f40a4366f9997c08b0c75e39e Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Tue, 25 Jul 2017 16:09:54 -0700 Subject: [PATCH 120/128] Use 2.1 builds for stage0 of 2.1 builds --- run-build.ps1 | 4 ++-- run-build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run-build.ps1 b/run-build.ps1 index d3bb1152b1..137c93d650 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1 # install a stage0 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1" -Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" -Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Write-Output "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Invoke-Expression "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index 95154cdf6c..547c304444 100755 --- a/run-build.sh +++ b/run-build.sh @@ -155,7 +155,7 @@ export VSTEST_TRACE_BUILD=1 export DOTNET_MULTILEVEL_LOOKUP=0 # Install a stage 0 -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) +(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "master" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then From f4d774b58c39d268117add5cb6545e22ffac616b Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 25 Jul 2017 20:54:44 -0700 Subject: [PATCH 121/128] Switch to picking up the no-timestamp runtime store and package cache --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e7e80f72af..3c2f93ce8c 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -34,7 +34,7 @@ 0.2.0-beta-000042 - timestamped + notimestamp 2.0.0 rtm From 9db89e5268bc90cd09fc20bca0c690d01b1a79ec Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Wed, 26 Jul 2017 09:50:17 -0500 Subject: [PATCH 122/128] Disable security build task that remove non-CLI assemblies. (#3) This change disables security build task that remove non-CLI assemblies. Thereby, all assemblies are scanned, and issues logged through TSA. This means issues in assemblies not owned or produced by CLI, have to be resolved as Won't Fix so that TSA will not re-create these issues in future scans. --- build/buildpipeline/security/DotNet-CLI-Security-Windows.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json index 2198083370..9d0bfc5b58 100644 --- a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json +++ b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json @@ -193,7 +193,7 @@ } }, { - "enabled": true, + "enabled": false, "continueOnError": true, "alwaysRun": false, "displayName": "Remove non-CLI files", From cd97cce6e534f2b75df679d4f7472399c041c492 Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Wed, 5 Jul 2017 10:50:32 -0500 Subject: [PATCH 123/128] Security build definition merge. (#2) --- .../security/DotNet-CLI-Security-Windows.json | 718 ++++++++++++++++++ build/buildpipeline/security/dir.props | 4 + build/buildpipeline/security/pipeline.json | 22 + build/buildpipeline/security/syncAzure.proj | 21 + .../buildpipeline/security/syncAzure.targets | 31 + 5 files changed, 796 insertions(+) create mode 100644 build/buildpipeline/security/DotNet-CLI-Security-Windows.json create mode 100644 build/buildpipeline/security/dir.props create mode 100644 build/buildpipeline/security/pipeline.json create mode 100644 build/buildpipeline/security/syncAzure.proj create mode 100644 build/buildpipeline/security/syncAzure.targets diff --git a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json new file mode 100644 index 0000000000..2198083370 --- /dev/null +++ b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json @@ -0,0 +1,718 @@ +{ + "build": [ + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Clone Core-Setup", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_Git)", + "arguments": "clone $(CoreSetupUrl) core-setup", + "workingFolder": "$(Build.SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Checkout Core-Setup master", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_Git)", + "arguments": "checkout master", + "workingFolder": "$(build.SourcesDirectory)\\core-setup", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Run init-tools.cmd", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "init-tools.cmd", + "arguments": "", + "workingFolder": "$(Build.SourcesDirectory)\\core-setup", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Delete CLI dir.props", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-path \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param ($path)\ngci \"$path\\dir.props\" | Remove-Item -Force", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Download blobs from container $(PB_CloudDropAccountName)", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(Build.SourcesDirectory)\\build\\buildpipeline\\security\\syncAzure.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", + "platform": "x64", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/p:AzureAccount=\"$(PB_CloudDropAccountName)\" /p:AzureToken=\"$(PB_CloudDropAccessToken)\" /p:BlobName=\"$(PB_BlobNameFilter)\" /verbosity:diag", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Copy downloaded packages to security folder", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "PowerShell_23", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$pkgDir = \"$SrcDir\\core-setup\\packages\\AzureTransfer\"\nCopy-Item \"$pkgDir \" \"$secDir\" -Force -Recurse\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Extract downloaded packages", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\ngci \"$secDir\\*.zip\" | % {\n$dstDir = Join-Path \"$secDir\" $($_.BaseName)\nExpand-Archive -Path $($_.FullName) -DestinationPath \"$dstDir\" -Force\nWrite-Host \"Expanded: $($_.FullName)\"\nRemove-Item $_.FullName -Force\n}\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "List all files", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "$(Build.SourcesDirectory)", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Workaround for long path - DELETE files with path length greater than or equal to 240 characters", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "Task_10", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$longPath = New-Object System.Collections.ArrayList\ngci \"$SrcDir\\*\" -recurse | where {!$_.PSIsContainer} | % {\nif ($($_.FullName.Length) -ge 240)\n{\n$longPath.Add($($_.Directory.FullName)) | Out-Null\n}\n}\n$longPath | % {\nStart-Process \"cmd\" -ArgumentList \"/c rd /S /Q $_\" -Wait\nWrite-Host \"DELETED $_\"\n}\n", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Remove non-CLI files", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "PowerShell_22", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$f=\"dotnet\", \"Microsoft.DotNet.Archive\", \"Microsoft.DotNet.Cli.Sln.Internal\", \"Microsoft.DotNet.Cli.Utils\", \"Microsoft.DotNet.Configurer\", \"Microsoft.DotNet.InternalAbstractions\", \"Microsoft.DotNet.TestFramework\"\ngci \"$secDir\" -recurse | where {!$_.PSIsContainer} | % {\nif ($f -inotcontains $_.BaseName) {\nif ($_.Extension -ine \".exe\" -and $_.Name -ine \"latest.version\") { \nRemove-Item $_.FullName\nWrite-Host \"Removed: $($_.FullName)\"\n}}}", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "List all files - post delete", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "Task_11", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "$(Build.SourcesDirectory)", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run BinSkim ", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "3056813a-40e9-4b2f-8f6b-612d1bc4e045", + "versionSpec": "3.*", + "definitionType": "task" + }, + "inputs": { + "InputType": "CommandLine", + "arguments": "analyze $(Build.SourcesDirectory)\\security\\*.dll $(Build.SourcesDirectory)\\security\\*.exe --recurse --sympath $(Build.SourcesDirectory)\\security\\*.pdb --verbose --statistics", + "Function": "analyze", + "AnalyzeTarget": "$(Build.ArtifactStagingDirectory)", + "AnalyzeSymPath": "", + "AnalyzeConfigPath": "default", + "AnalyzePluginPath": "", + "AnalyzeRecurse": "true", + "AnalyzeVerbose": "true", + "AnalyzeHashes": "true", + "AnalyzeStatistics": "false", + "AnalyzeEnvironment": "false", + "ExportRulesOutputType": "SARIF", + "DumpTarget": "$(Build.ArtifactStagingDirectory)", + "DumpRecurse": "true", + "DumpVerbose": "true", + "toolVersion": "Latest" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run APIScan", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "9adea2b1-3752-438c-80c6-a6f0a812abdd", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "targetMode": "binarysym", + "softwareFolder": "$(Build.SourcesDirectory)\\security", + "mpdFolder": "", + "softwareName": "CLI", + "softwareVersionNum": "$(PB_BuildNumber)", + "softwareBuildNum": "$(PB_BuildNumber)", + "modeType": "prerelease", + "noCopySymbols": "false", + "noCopyBinaries": "false", + "noDecompress": "true", + "exclusionList": "", + "email": "", + "symbolsFolder": "$(Build.SourcesDirectory)\\security", + "preBbtBinariesFolder": "", + "preBbtSymbolsFolder": "", + "isLargeApp": "false", + "analyzerTimeout": "00:00:00", + "preserveTempFiles": "false", + "toolVersion": "Latest" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Checkout CLI at SHA listed in latest.version", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\" -git \"$(PB_Git)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir, $git)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$shaFile= Join-Path \"$secDir\" \"latest.version\"\n$sha = gc \"$shaFile\" -first 1\n\nif ([string]::IsNullOrWhiteSpace($sha))\n{ Write-Error \"Unable to determine latest commit SHA.\" }\n\nStart-Process \"$git\" -ArgumentList \"clean -df\" -Wait -Verbose -ErrorAction Stop\nStart-Process \"$git\" -ArgumentList \"checkout $sha\" -Wait -Verbose -ErrorAction Stop\nWrite-Host \"Checked out at $sha\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run Core-Setup clean.cmd", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "clean.cmd", + "arguments": "-all", + "workingFolder": "$(Build.SourcesDirectory)\\core-setup", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Delete Core-Setup folder", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-path \"$(Build.SourcesDirectory)\\core-setup\"", + "workingFolder": "", + "inlineScript": "param ($path)\nRemove-Item \"$path\" -Force -Recurse -ErrorAction Continue\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "List all files - post checkout", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "$(Build.SourcesDirectory)", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run CredScan", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "ea576cd4-c61f-48f8-97e7-a3cb07b90a6f", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "outputFormat": "pre", + "toolVersion": "Latest", + "scanFolder": "$(Build.SourcesDirectory)", + "searchersFileType": "Default", + "searchersFile": "", + "suppressionsFile": "", + "suppressAsError": "false", + "batchSize": "" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run PoliCheck", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d785890c-0d0d-46bd-8167-8fa9d49990c7", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "inputType": "Basic", + "cmdLineArgs": "/F:$(Build.SourcesDirectory) /T:9 /O:PoliCheck.xml", + "targetType": "F", + "targetArgument": "$(Build.SourcesDirectory)", + "importEx": "0", + "termTypeT": "0029a9", + "termTypeTCustom": "9", + "termTypeK": "", + "termTypeL": "", + "EXGT": "false", + "result": "PoliCheck.xml", + "optionsFC": "1", + "optionsXS": "1", + "optionsCTGLEN": "", + "optionsSEV": "", + "optionsPE": "", + "optionsHMENABLE": "", + "optionsHPATH": "", + "optionsHVER": "", + "optionsRulesDBPath": "", + "optionsRule": "", + "optionsXCLASS": "", + "optionsTASKNAME": "", + "optionsWORKINGDIRECTORY": "", + "optionsFTPATH": "", + "optionsD": "", + "optionsB1": "", + "optionsB2": "", + "optionsB3": "", + "optionsOCDB": "", + "toolVersion": "Latest" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Post Analysis", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "f5679091-e6da-4974-a8dc-0eec03a8ea63", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "APIScan": "true", + "BinScope": "false", + "BinSkim": "true", + "BinSkimBreakOn": "Error", + "CredScan": "true", + "FortifySCA": "false", + "FxCop": "false", + "FxCopBreakOn": "ErrorAbove", + "ModernCop": "false", + "ModernCopBreakOn": "Error", + "PoliCheck": "true", + "PoliCheckBreakOn": "Severity1", + "SDLNativeRules": "false", + "TSLint": "false", + "TSLintBreakOn": "Error" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Publish Security Analysis Logs", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "4096c760-3a8a-435d-9689-88c0311bbc0e", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "ArtifactName": "CodeAnalysisLogs", + "ArtifactType": "Container", + "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)", + "RvName": "", + "ProductComponentName": "", + "ProductVersionNumber": "", + "PlatformName": "", + "SDLToolName": "", + "SDLToolResultFile": "" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "TSA upload to Codebase: DotNet-CLI-Trusted_$(CodeBase) Stamp: Azure", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "3da26988-bb64-4a23-8f06-45531d297dae", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "codebase": "NewOrUpdate", + "tsaStamp": "Azure", + "tsaWebApiUrl": "$(TSAStamp)", + "codeBaseName": "DotNet-CLI-Trusted_$(CodeBase)", + "notificationAlias": "$(NotificationAlias)", + "codeBaseAdmins": "NORTHAMERICA\\raeda", + "instanceUrlAzure": "MSAZURE", + "instanceUrlBing": "", + "instanceUrlCarbon": "", + "instanceUrlDevDiv": "DEVDIV", + "instanceUrlSkype": "", + "instanceUrlTsa": "", + "instanceUrlPpe": "", + "projectNameDAIPVSTF": "", + "projectNameDYNAMICSCRM": "", + "projectNameMSAZURE": "One", + "projectNameMSDYENG": "", + "projectNameMSECG": "", + "projectNameIDENTITYDIVISION": "Code Scan - TSA", + "projectNameVSTFRD": "", + "projectNameMSASG": "", + "projectNameMICROSOFTVSTS": "", + "projectNameMSDATA": "", + "projectNameMSENG": "", + "projectNameDEVDIV": "DevDiv", + "projectNameSKYPETEST2": "", + "projectNameONEDRIVE": "", + "projectNameSQLBUVSTS": "", + "projectNamePOWERBI": "", + "projectNameAZUREVSTFPPE": "", + "projectNameSKYPE": "", + "projectNameDOMOREEXP": "", + "projectNameSQLBUVSTSTEST": "", + "areaPath": "One\\DevDiv\\DotNetCore", + "iterationPath": "One", + "uploadAPIScan": "true", + "uploadBinScope": "false", + "uploadBinSkim": "true", + "uploadCredScan": "true", + "uploadFortifySCA": "false", + "uploadFxCop": "false", + "uploadModernCop": "false", + "uploadPoliCheck": "true", + "uploadPREfast": "false", + "validateToolOutput": "Warning", + "validateCompatibility": "Error", + "uploadAsync": "true" + } + } + ], + "options": [ + { + "enabled": false, + "definition": { + "id": "5bc3cfb7-6b54-4a4b-b5d2-a3905949f8a6" + }, + "inputs": {} + }, + { + "enabled": false, + "definition": { + "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" + }, + "inputs": { + "multipliers": "[]", + "parallel": "false", + "continueOnError": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" + }, + "inputs": { + "workItemType": "234347", + "assignToRequestor": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" + }, + "inputs": {} + }, + { + "enabled": false, + "definition": { + "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" + }, + "inputs": { + "branchFilters": "[\"+refs/heads/*\"]", + "additionalFields": "{}" + } + } + ], + "variables": { + "system.debug": { + "value": "false" + } + }, + "demands": [ + "Agent.OS -equals windows_nt", + "msbuild" + ], + "retentionRules": [ + { + "branches": [ + "+refs/heads/*" + ], + "artifacts": [ + "build.SourceLabel" + ], + "artifactTypesToDelete": [], + "daysToKeep": 10, + "minimumToKeep": 1, + "deleteBuildRecord": true, + "deleteTestResults": true + } + ], + "_links": { + "self": { + "href": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661" + }, + "web": { + "href": "https://devdiv.visualstudio.com/_permalink/_build/index?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" + }, + "editor": { + "href": "https://devdiv.visualstudio.com/_permalink/_build/definitionEditor?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" + }, + "badge": { + "href": "https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6661/badge" + } + }, + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", + "jobAuthorizationScope": 1, + "jobTimeoutInMinutes": 600, + "jobCancelTimeoutInMinutes": 5, + "badgeEnabled": true, + "repository": { + "properties": { + "cleanOptions": "3", + "labelSources": "0", + "labelSourcesFormat": "$(build.buildNumber)", + "reportBuildStatus": "true", + "gitLfsSupport": "false", + "skipSyncSource": "false", + "checkoutNestedSubmodules": "false", + "fetchDepth": "0" + }, + "id": "ceac4423-53f8-4c97-bc62-173630412581", + "type": "TfsGit", + "name": "DotNet-Cli-Trusted", + "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Cli-Trusted", + "defaultBranch": "refs/heads/master", + "clean": "true", + "checkoutSubmodules": false + }, + "processParameters": {}, + "quality": "definition", + "authoredBy": { + "id": "9d5fdf9f-36b6-4d0c-a12e-2737a673af94", + "displayName": "Ravi Eda", + "uniqueName": "raeda@microsoft.com", + "url": "https://app.vssps.visualstudio.com/Aa44b2c06-f247-425c-8464-4a0676af910a/_apis/Identities/9d5fdf9f-36b6-4d0c-a12e-2737a673af94", + "imageUrl": "https://devdiv.visualstudio.com/_api/_common/identityImage?id=9d5fdf9f-36b6-4d0c-a12e-2737a673af94" + }, + "queue": { + "id": 36, + "name": "DotNet-Build", + "pool": { + "id": 39, + "name": "DotNet-Build" + } + }, + "id": 6661, + "name": "DotNet-CLI-Security-Windows", + "url": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661", + "uri": "vstfs:///Build/Definition/6661", + "path": "\\", + "type": 2, + "revision": 6, + "createdDate": "2017-06-21T21:58:12.397Z", + "project": { + "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "name": "DevDiv", + "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", + "url": "https://devdiv.visualstudio.com/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "state": "wellFormed", + "revision": 418097676, + "visibility": 0 + } +} diff --git a/build/buildpipeline/security/dir.props b/build/buildpipeline/security/dir.props new file mode 100644 index 0000000000..3e28b4a52a --- /dev/null +++ b/build/buildpipeline/security/dir.props @@ -0,0 +1,4 @@ + + + + diff --git a/build/buildpipeline/security/pipeline.json b/build/buildpipeline/security/pipeline.json new file mode 100644 index 0000000000..dbac3626b0 --- /dev/null +++ b/build/buildpipeline/security/pipeline.json @@ -0,0 +1,22 @@ +{ + "Repository": "cli", + "Definitions": { + "Path": ".", + "Type": "VSTS", + "BaseUrl": "https://devdiv.visualstudio.com/DefaultCollection", + "SkipBranchAndVersionOverrides": "false" + }, + "Pipelines": [ + { + "Name": "Security Build for Windows", + "Parameters": { + "TreatWarningsAsErrors": "false" + }, + "Definitions": [ + { + "Name": "DotNet-CLI-Security-Windows" + } + ] + } + ] +} diff --git a/build/buildpipeline/security/syncAzure.proj b/build/buildpipeline/security/syncAzure.proj new file mode 100644 index 0000000000..45d7657ebd --- /dev/null +++ b/build/buildpipeline/security/syncAzure.proj @@ -0,0 +1,21 @@ + + + + + + $(BuildToolsTaskDesktopDir)Microsoft.DotNet.Build.CloudTestTasks.dll + dotnet + $(PackagesDir)AzureTransfer + + + + + + + + + + + + + diff --git a/build/buildpipeline/security/syncAzure.targets b/build/buildpipeline/security/syncAzure.targets new file mode 100644 index 0000000000..4cc360a11c --- /dev/null +++ b/build/buildpipeline/security/syncAzure.targets @@ -0,0 +1,31 @@ + + + + + + + $(PackagesDir)/AzureTransfer + + + + + + + + + <_OSFilteredBlobNames Include="@(_BlobList)" + Condition="'$(OSGroup)' == 'Windows_NT' AND + ('%(_BlobList.Extension)' == '.zip' OR '%(_BlobList.Extension)' == '.exe' OR '%(_BlobList.Extension)' == '.version')" /> + + + + + From 1bd48fde5cdaa7eb344484e883fd841ef5f22b9c Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 26 Jul 2017 10:34:50 -0700 Subject: [PATCH 124/128] Passwords/keys should not be passed in the environment via a docker file. --- scripts/dockerrun.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh index abdaec636e..7f64935828 100755 --- a/scripts/dockerrun.sh +++ b/scripts/dockerrun.sh @@ -115,24 +115,20 @@ echo "Running command: $BUILD_COMMAND" echo "Using code from: $DOCKER_HOST_SHARE_DIR" [ -z "$INTERACTIVE" ] || echo "Running Interactive" +# Note: passwords/keys should not be passed in the environment docker run $INTERACTIVE -t --rm --sig-proxy=true \ --name $DOTNET_BUILD_CONTAINER_NAME \ -v $DOCKER_HOST_SHARE_DIR:/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 \ -e CLIBUILD_SKIP_TESTS \ @@ -141,10 +137,7 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e RELEASESUFFIX \ -e COREFXAZURECONTAINER \ -e AZUREACCOUNTNAME \ - -e AZUREACCESSTOKEN \ - -e VSOPASSWORD \ -e RELEASETOOLSGITURL \ -e CORESETUPBLOBROOTURL \ - -e CORESETUPBLOBACCESSTOKEN \ $DOTNET_BUILD_CONTAINER_TAG \ $BUILD_COMMAND "$@" From f5b3d03cc89f36fda1c3fc270db28a5d89d3f61c Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Thu, 27 Jul 2017 09:50:58 -0500 Subject: [PATCH 125/128] Scan assemblies in sdk folder only. (#4) --- .../security/DotNet-CLI-Security-Windows.json | 283 +++++++++--------- 1 file changed, 142 insertions(+), 141 deletions(-) diff --git a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json index 9d0bfc5b58..7b1edd40a9 100644 --- a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json +++ b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json @@ -171,13 +171,14 @@ } }, { + "environment": {}, "enabled": true, "continueOnError": true, "alwaysRun": false, - "displayName": "Workaround for long path - DELETE files with path length greater than or equal to 240 characters", + "displayName": "Remove non-CLI folders", "timeoutInMinutes": 0, "condition": "succeeded()", - "refName": "Task_10", + "refName": "PowerShell_22", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -188,7 +189,7 @@ "scriptName": "", "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", "workingFolder": "$(Build.SourcesDirectory)", - "inlineScript": "param($SrcDir)\n$longPath = New-Object System.Collections.ArrayList\ngci \"$SrcDir\\*\" -recurse | where {!$_.PSIsContainer} | % {\nif ($($_.FullName.Length) -ge 240)\n{\n$longPath.Add($($_.Directory.FullName)) | Out-Null\n}\n}\n$longPath | % {\nStart-Process \"cmd\" -ArgumentList \"/c rd /S /Q $_\" -Wait\nWrite-Host \"DELETED $_\"\n}\n", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n\ngci \"$secDir\" | where {$_.PSIsContainer} | % {\n gci $_.FullName | where {$_.PSIsContainer} | % {\n if ($_.BaseName -ine \"sdk\" -and $_.BaseName -notmatch \"symbols\")\n {\n Remove-Item $_.FullName -Recurse -Force -ErrorAction Continue\n Write-Host \"Removed $($_.FullName)\"\n }\n }\n}", "failOnStandardError": "false" } }, @@ -196,10 +197,10 @@ "enabled": false, "continueOnError": true, "alwaysRun": false, - "displayName": "Remove non-CLI files", + "displayName": "Workaround for long path - DELETE files with path length greater than or equal to 240 characters", "timeoutInMinutes": 0, "condition": "succeeded()", - "refName": "PowerShell_22", + "refName": "Task_10", "task": { "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", "versionSpec": "1.*", @@ -210,7 +211,7 @@ "scriptName": "", "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", "workingFolder": "$(Build.SourcesDirectory)", - "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$f=\"dotnet\", \"Microsoft.DotNet.Archive\", \"Microsoft.DotNet.Cli.Sln.Internal\", \"Microsoft.DotNet.Cli.Utils\", \"Microsoft.DotNet.Configurer\", \"Microsoft.DotNet.InternalAbstractions\", \"Microsoft.DotNet.TestFramework\"\ngci \"$secDir\" -recurse | where {!$_.PSIsContainer} | % {\nif ($f -inotcontains $_.BaseName) {\nif ($_.Extension -ine \".exe\" -and $_.Name -ine \"latest.version\") { \nRemove-Item $_.FullName\nWrite-Host \"Removed: $($_.FullName)\"\n}}}", + "inlineScript": "param($SrcDir)\n$longPath = New-Object System.Collections.ArrayList\ngci \"$SrcDir\\*\" -recurse | where {!$_.PSIsContainer} | % {\nif ($($_.FullName.Length) -ge 240)\n{\n$longPath.Add($($_.Directory.FullName)) | Out-Null\n}\n}\n$longPath | % {\nStart-Process \"cmd\" -ArgumentList \"/c rd /S /Q $_\" -Wait\nWrite-Host \"DELETED $_\"\n}\n", "failOnStandardError": "false" } }, @@ -570,109 +571,109 @@ } } ], - "options": [ - { - "enabled": false, - "definition": { - "id": "5bc3cfb7-6b54-4a4b-b5d2-a3905949f8a6" - }, - "inputs": {} - }, - { - "enabled": false, - "definition": { - "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" - }, - "inputs": { - "multipliers": "[]", - "parallel": "false", - "continueOnError": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" - }, - "inputs": { - "workItemType": "234347", - "assignToRequestor": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" - }, - "inputs": {} - }, - { - "enabled": false, - "definition": { - "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" - }, - "inputs": { - "branchFilters": "[\"+refs/heads/*\"]", - "additionalFields": "{}" - } - } - ], - "variables": { - "system.debug": { - "value": "false" - } + "options": [ + { + "enabled": false, + "definition": { + "id": "5bc3cfb7-6b54-4a4b-b5d2-a3905949f8a6" + }, + "inputs": {} + }, + { + "enabled": false, + "definition": { + "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" + }, + "inputs": { + "multipliers": "[]", + "parallel": "false", + "continueOnError": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" + }, + "inputs": { + "workItemType": "234347", + "assignToRequestor": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" + }, + "inputs": {} + }, + { + "enabled": false, + "definition": { + "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" + }, + "inputs": { + "branchFilters": "[\"+refs/heads/*\"]", + "additionalFields": "{}" + } + } + ], + "variables": { + "system.debug": { + "value": "false" + } + }, + "demands": [ + "Agent.OS -equals windows_nt", + "msbuild" + ], + "retentionRules": [ + { + "branches": [ + "+refs/heads/*" + ], + "artifacts": [ + "build.SourceLabel" + ], + "artifactTypesToDelete": [], + "daysToKeep": 10, + "minimumToKeep": 1, + "deleteBuildRecord": true, + "deleteTestResults": true + } + ], + "_links": { + "self": { + "href": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661" + }, + "web": { + "href": "https://devdiv.visualstudio.com/_permalink/_build/index?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" }, - "demands": [ - "Agent.OS -equals windows_nt", - "msbuild" - ], - "retentionRules": [ - { - "branches": [ - "+refs/heads/*" - ], - "artifacts": [ - "build.SourceLabel" - ], - "artifactTypesToDelete": [], - "daysToKeep": 10, - "minimumToKeep": 1, - "deleteBuildRecord": true, - "deleteTestResults": true - } - ], - "_links": { - "self": { - "href": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661" - }, - "web": { - "href": "https://devdiv.visualstudio.com/_permalink/_build/index?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" - }, - "editor": { - "href": "https://devdiv.visualstudio.com/_permalink/_build/definitionEditor?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" - }, - "badge": { - "href": "https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6661/badge" - } + "editor": { + "href": "https://devdiv.visualstudio.com/_permalink/_build/definitionEditor?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" + }, + "badge": { + "href": "https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6661/badge" + } + }, + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", + "jobAuthorizationScope": 1, + "jobTimeoutInMinutes": 600, + "jobCancelTimeoutInMinutes": 5, + "badgeEnabled": true, + "repository": { + "properties": { + "cleanOptions": "3", + "labelSources": "0", + "labelSourcesFormat": "$(build.buildNumber)", + "reportBuildStatus": "true", + "gitLfsSupport": "false", + "skipSyncSource": "false", + "checkoutNestedSubmodules": "false", + "fetchDepth": "0" }, - "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", - "jobAuthorizationScope": 1, - "jobTimeoutInMinutes": 600, - "jobCancelTimeoutInMinutes": 5, - "badgeEnabled": true, - "repository": { - "properties": { - "cleanOptions": "3", - "labelSources": "0", - "labelSourcesFormat": "$(build.buildNumber)", - "reportBuildStatus": "true", - "gitLfsSupport": "false", - "skipSyncSource": "false", - "checkoutNestedSubmodules": "false", - "fetchDepth": "0" - }, "id": "ceac4423-53f8-4c97-bc62-173630412581", "type": "TfsGit", "name": "DotNet-Cli-Trusted", @@ -681,38 +682,38 @@ "clean": "true", "checkoutSubmodules": false }, - "processParameters": {}, - "quality": "definition", - "authoredBy": { - "id": "9d5fdf9f-36b6-4d0c-a12e-2737a673af94", - "displayName": "Ravi Eda", - "uniqueName": "raeda@microsoft.com", - "url": "https://app.vssps.visualstudio.com/Aa44b2c06-f247-425c-8464-4a0676af910a/_apis/Identities/9d5fdf9f-36b6-4d0c-a12e-2737a673af94", - "imageUrl": "https://devdiv.visualstudio.com/_api/_common/identityImage?id=9d5fdf9f-36b6-4d0c-a12e-2737a673af94" - }, - "queue": { - "id": 36, - "name": "DotNet-Build", - "pool": { - "id": 39, - "name": "DotNet-Build" - } - }, - "id": 6661, - "name": "DotNet-CLI-Security-Windows", - "url": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661", - "uri": "vstfs:///Build/Definition/6661", - "path": "\\", - "type": 2, - "revision": 6, - "createdDate": "2017-06-21T21:58:12.397Z", - "project": { - "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "name": "DevDiv", - "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", - "url": "https://devdiv.visualstudio.com/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "state": "wellFormed", - "revision": 418097676, - "visibility": 0 - } + "processParameters": {}, + "quality": "definition", + "authoredBy": { + "id": "9d5fdf9f-36b6-4d0c-a12e-2737a673af94", + "displayName": "Ravi Eda", + "uniqueName": "raeda@microsoft.com", + "url": "https://app.vssps.visualstudio.com/Aa44b2c06-f247-425c-8464-4a0676af910a/_apis/Identities/9d5fdf9f-36b6-4d0c-a12e-2737a673af94", + "imageUrl": "https://devdiv.visualstudio.com/_api/_common/identityImage?id=9d5fdf9f-36b6-4d0c-a12e-2737a673af94" + }, + "queue": { + "id": 36, + "name": "DotNet-Build", + "pool": { + "id": 39, + "name": "DotNet-Build" + } + }, + "id": 6733, + "name": "DotNet-CLI-Security-Windows", + "url": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661", + "uri": "vstfs:///Build/Definition/6733", + "path": "\\", + "type": 2, + "revision": 6, + "createdDate": "2017-06-21T21:58:12.397Z", + "project": { + "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "name": "DevDiv", + "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", + "url": "https://devdiv.visualstudio.com/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "state": "wellFormed", + "revision": 418097676, + "visibility": 0 + } } From 6e5769c16c52acad59b39ebbd0d4f86b245265c6 Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Wed, 5 Jul 2017 10:50:32 -0500 Subject: [PATCH 126/128] Security build definition merge. (#2) --- .../security/DotNet-CLI-Security-Windows.json | 718 ++++++++++++++++++ build/buildpipeline/security/dir.props | 4 + build/buildpipeline/security/pipeline.json | 22 + build/buildpipeline/security/syncAzure.proj | 21 + .../buildpipeline/security/syncAzure.targets | 31 + 5 files changed, 796 insertions(+) create mode 100644 build/buildpipeline/security/DotNet-CLI-Security-Windows.json create mode 100644 build/buildpipeline/security/dir.props create mode 100644 build/buildpipeline/security/pipeline.json create mode 100644 build/buildpipeline/security/syncAzure.proj create mode 100644 build/buildpipeline/security/syncAzure.targets diff --git a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json new file mode 100644 index 0000000000..2198083370 --- /dev/null +++ b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json @@ -0,0 +1,718 @@ +{ + "build": [ + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Clone Core-Setup", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_Git)", + "arguments": "clone $(CoreSetupUrl) core-setup", + "workingFolder": "$(Build.SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Checkout Core-Setup master", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_Git)", + "arguments": "checkout master", + "workingFolder": "$(build.SourcesDirectory)\\core-setup", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Run init-tools.cmd", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "init-tools.cmd", + "arguments": "", + "workingFolder": "$(Build.SourcesDirectory)\\core-setup", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Workaround for BuildTools - Delete CLI dir.props", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-path \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param ($path)\ngci \"$path\\dir.props\" | Remove-Item -Force", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Download blobs from container $(PB_CloudDropAccountName)", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(Build.SourcesDirectory)\\build\\buildpipeline\\security\\syncAzure.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", + "platform": "x64", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/p:AzureAccount=\"$(PB_CloudDropAccountName)\" /p:AzureToken=\"$(PB_CloudDropAccessToken)\" /p:BlobName=\"$(PB_BlobNameFilter)\" /verbosity:diag", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Copy downloaded packages to security folder", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "PowerShell_23", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$pkgDir = \"$SrcDir\\core-setup\\packages\\AzureTransfer\"\nCopy-Item \"$pkgDir \" \"$secDir\" -Force -Recurse\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Extract downloaded packages", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\ngci \"$secDir\\*.zip\" | % {\n$dstDir = Join-Path \"$secDir\" $($_.BaseName)\nExpand-Archive -Path $($_.FullName) -DestinationPath \"$dstDir\" -Force\nWrite-Host \"Expanded: $($_.FullName)\"\nRemove-Item $_.FullName -Force\n}\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "List all files", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "$(Build.SourcesDirectory)", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Workaround for long path - DELETE files with path length greater than or equal to 240 characters", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "Task_10", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$longPath = New-Object System.Collections.ArrayList\ngci \"$SrcDir\\*\" -recurse | where {!$_.PSIsContainer} | % {\nif ($($_.FullName.Length) -ge 240)\n{\n$longPath.Add($($_.Directory.FullName)) | Out-Null\n}\n}\n$longPath | % {\nStart-Process \"cmd\" -ArgumentList \"/c rd /S /Q $_\" -Wait\nWrite-Host \"DELETED $_\"\n}\n", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Remove non-CLI files", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "PowerShell_22", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$f=\"dotnet\", \"Microsoft.DotNet.Archive\", \"Microsoft.DotNet.Cli.Sln.Internal\", \"Microsoft.DotNet.Cli.Utils\", \"Microsoft.DotNet.Configurer\", \"Microsoft.DotNet.InternalAbstractions\", \"Microsoft.DotNet.TestFramework\"\ngci \"$secDir\" -recurse | where {!$_.PSIsContainer} | % {\nif ($f -inotcontains $_.BaseName) {\nif ($_.Extension -ine \".exe\" -and $_.Name -ine \"latest.version\") { \nRemove-Item $_.FullName\nWrite-Host \"Removed: $($_.FullName)\"\n}}}", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "List all files - post delete", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "refName": "Task_11", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "$(Build.SourcesDirectory)", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run BinSkim ", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "3056813a-40e9-4b2f-8f6b-612d1bc4e045", + "versionSpec": "3.*", + "definitionType": "task" + }, + "inputs": { + "InputType": "CommandLine", + "arguments": "analyze $(Build.SourcesDirectory)\\security\\*.dll $(Build.SourcesDirectory)\\security\\*.exe --recurse --sympath $(Build.SourcesDirectory)\\security\\*.pdb --verbose --statistics", + "Function": "analyze", + "AnalyzeTarget": "$(Build.ArtifactStagingDirectory)", + "AnalyzeSymPath": "", + "AnalyzeConfigPath": "default", + "AnalyzePluginPath": "", + "AnalyzeRecurse": "true", + "AnalyzeVerbose": "true", + "AnalyzeHashes": "true", + "AnalyzeStatistics": "false", + "AnalyzeEnvironment": "false", + "ExportRulesOutputType": "SARIF", + "DumpTarget": "$(Build.ArtifactStagingDirectory)", + "DumpRecurse": "true", + "DumpVerbose": "true", + "toolVersion": "Latest" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run APIScan", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "9adea2b1-3752-438c-80c6-a6f0a812abdd", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "targetMode": "binarysym", + "softwareFolder": "$(Build.SourcesDirectory)\\security", + "mpdFolder": "", + "softwareName": "CLI", + "softwareVersionNum": "$(PB_BuildNumber)", + "softwareBuildNum": "$(PB_BuildNumber)", + "modeType": "prerelease", + "noCopySymbols": "false", + "noCopyBinaries": "false", + "noDecompress": "true", + "exclusionList": "", + "email": "", + "symbolsFolder": "$(Build.SourcesDirectory)\\security", + "preBbtBinariesFolder": "", + "preBbtSymbolsFolder": "", + "isLargeApp": "false", + "analyzerTimeout": "00:00:00", + "preserveTempFiles": "false", + "toolVersion": "Latest" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Checkout CLI at SHA listed in latest.version", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-SrcDir \"$(Build.SourcesDirectory)\" -git \"$(PB_Git)\"", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir, $git)\n$secDir = Join-Path \"$SrcDir\" \"security\"\n$shaFile= Join-Path \"$secDir\" \"latest.version\"\n$sha = gc \"$shaFile\" -first 1\n\nif ([string]::IsNullOrWhiteSpace($sha))\n{ Write-Error \"Unable to determine latest commit SHA.\" }\n\nStart-Process \"$git\" -ArgumentList \"clean -df\" -Wait -Verbose -ErrorAction Stop\nStart-Process \"$git\" -ArgumentList \"checkout $sha\" -Wait -Verbose -ErrorAction Stop\nWrite-Host \"Checked out at $sha\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run Core-Setup clean.cmd", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "clean.cmd", + "arguments": "-all", + "workingFolder": "$(Build.SourcesDirectory)\\core-setup", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Delete Core-Setup folder", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "-path \"$(Build.SourcesDirectory)\\core-setup\"", + "workingFolder": "", + "inlineScript": "param ($path)\nRemove-Item \"$path\" -Force -Recurse -ErrorAction Continue\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "List all files - post checkout", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "scriptType": "inlineScript", + "scriptName": "", + "arguments": "$(Build.SourcesDirectory)", + "workingFolder": "$(Build.SourcesDirectory)", + "inlineScript": "param($SrcDir)\n$fileCount = 0\ngci $SrcDir -recurse | % {\nWrite-Host $($_.FullName)\n$fileCount += 1\n}\nWrite-Host \"File Count: $fileCount\"\n", + "failOnStandardError": "true" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run CredScan", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "ea576cd4-c61f-48f8-97e7-a3cb07b90a6f", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "outputFormat": "pre", + "toolVersion": "Latest", + "scanFolder": "$(Build.SourcesDirectory)", + "searchersFileType": "Default", + "searchersFile": "", + "suppressionsFile": "", + "suppressAsError": "false", + "batchSize": "" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Run PoliCheck", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d785890c-0d0d-46bd-8167-8fa9d49990c7", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "inputType": "Basic", + "cmdLineArgs": "/F:$(Build.SourcesDirectory) /T:9 /O:PoliCheck.xml", + "targetType": "F", + "targetArgument": "$(Build.SourcesDirectory)", + "importEx": "0", + "termTypeT": "0029a9", + "termTypeTCustom": "9", + "termTypeK": "", + "termTypeL": "", + "EXGT": "false", + "result": "PoliCheck.xml", + "optionsFC": "1", + "optionsXS": "1", + "optionsCTGLEN": "", + "optionsSEV": "", + "optionsPE": "", + "optionsHMENABLE": "", + "optionsHPATH": "", + "optionsHVER": "", + "optionsRulesDBPath": "", + "optionsRule": "", + "optionsXCLASS": "", + "optionsTASKNAME": "", + "optionsWORKINGDIRECTORY": "", + "optionsFTPATH": "", + "optionsD": "", + "optionsB1": "", + "optionsB2": "", + "optionsB3": "", + "optionsOCDB": "", + "toolVersion": "Latest" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Post Analysis", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "f5679091-e6da-4974-a8dc-0eec03a8ea63", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "APIScan": "true", + "BinScope": "false", + "BinSkim": "true", + "BinSkimBreakOn": "Error", + "CredScan": "true", + "FortifySCA": "false", + "FxCop": "false", + "FxCopBreakOn": "ErrorAbove", + "ModernCop": "false", + "ModernCopBreakOn": "Error", + "PoliCheck": "true", + "PoliCheckBreakOn": "Severity1", + "SDLNativeRules": "false", + "TSLint": "false", + "TSLintBreakOn": "Error" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Publish Security Analysis Logs", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "4096c760-3a8a-435d-9689-88c0311bbc0e", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "ArtifactName": "CodeAnalysisLogs", + "ArtifactType": "Container", + "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)", + "RvName": "", + "ProductComponentName": "", + "ProductVersionNumber": "", + "PlatformName": "", + "SDLToolName": "", + "SDLToolResultFile": "" + } + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "TSA upload to Codebase: DotNet-CLI-Trusted_$(CodeBase) Stamp: Azure", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "3da26988-bb64-4a23-8f06-45531d297dae", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "codebase": "NewOrUpdate", + "tsaStamp": "Azure", + "tsaWebApiUrl": "$(TSAStamp)", + "codeBaseName": "DotNet-CLI-Trusted_$(CodeBase)", + "notificationAlias": "$(NotificationAlias)", + "codeBaseAdmins": "NORTHAMERICA\\raeda", + "instanceUrlAzure": "MSAZURE", + "instanceUrlBing": "", + "instanceUrlCarbon": "", + "instanceUrlDevDiv": "DEVDIV", + "instanceUrlSkype": "", + "instanceUrlTsa": "", + "instanceUrlPpe": "", + "projectNameDAIPVSTF": "", + "projectNameDYNAMICSCRM": "", + "projectNameMSAZURE": "One", + "projectNameMSDYENG": "", + "projectNameMSECG": "", + "projectNameIDENTITYDIVISION": "Code Scan - TSA", + "projectNameVSTFRD": "", + "projectNameMSASG": "", + "projectNameMICROSOFTVSTS": "", + "projectNameMSDATA": "", + "projectNameMSENG": "", + "projectNameDEVDIV": "DevDiv", + "projectNameSKYPETEST2": "", + "projectNameONEDRIVE": "", + "projectNameSQLBUVSTS": "", + "projectNamePOWERBI": "", + "projectNameAZUREVSTFPPE": "", + "projectNameSKYPE": "", + "projectNameDOMOREEXP": "", + "projectNameSQLBUVSTSTEST": "", + "areaPath": "One\\DevDiv\\DotNetCore", + "iterationPath": "One", + "uploadAPIScan": "true", + "uploadBinScope": "false", + "uploadBinSkim": "true", + "uploadCredScan": "true", + "uploadFortifySCA": "false", + "uploadFxCop": "false", + "uploadModernCop": "false", + "uploadPoliCheck": "true", + "uploadPREfast": "false", + "validateToolOutput": "Warning", + "validateCompatibility": "Error", + "uploadAsync": "true" + } + } + ], + "options": [ + { + "enabled": false, + "definition": { + "id": "5bc3cfb7-6b54-4a4b-b5d2-a3905949f8a6" + }, + "inputs": {} + }, + { + "enabled": false, + "definition": { + "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" + }, + "inputs": { + "multipliers": "[]", + "parallel": "false", + "continueOnError": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" + }, + "inputs": { + "workItemType": "234347", + "assignToRequestor": "true", + "additionalFields": "{}" + } + }, + { + "enabled": false, + "definition": { + "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" + }, + "inputs": {} + }, + { + "enabled": false, + "definition": { + "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" + }, + "inputs": { + "branchFilters": "[\"+refs/heads/*\"]", + "additionalFields": "{}" + } + } + ], + "variables": { + "system.debug": { + "value": "false" + } + }, + "demands": [ + "Agent.OS -equals windows_nt", + "msbuild" + ], + "retentionRules": [ + { + "branches": [ + "+refs/heads/*" + ], + "artifacts": [ + "build.SourceLabel" + ], + "artifactTypesToDelete": [], + "daysToKeep": 10, + "minimumToKeep": 1, + "deleteBuildRecord": true, + "deleteTestResults": true + } + ], + "_links": { + "self": { + "href": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661" + }, + "web": { + "href": "https://devdiv.visualstudio.com/_permalink/_build/index?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" + }, + "editor": { + "href": "https://devdiv.visualstudio.com/_permalink/_build/definitionEditor?collectionId=011b8bdf-6d56-4f87-be0d-0092136884d9&projectId=0bdbc590-a062-4c3f-b0f6-9383f67865ee&definitionId=6661" + }, + "badge": { + "href": "https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6661/badge" + } + }, + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", + "jobAuthorizationScope": 1, + "jobTimeoutInMinutes": 600, + "jobCancelTimeoutInMinutes": 5, + "badgeEnabled": true, + "repository": { + "properties": { + "cleanOptions": "3", + "labelSources": "0", + "labelSourcesFormat": "$(build.buildNumber)", + "reportBuildStatus": "true", + "gitLfsSupport": "false", + "skipSyncSource": "false", + "checkoutNestedSubmodules": "false", + "fetchDepth": "0" + }, + "id": "ceac4423-53f8-4c97-bc62-173630412581", + "type": "TfsGit", + "name": "DotNet-Cli-Trusted", + "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Cli-Trusted", + "defaultBranch": "refs/heads/master", + "clean": "true", + "checkoutSubmodules": false + }, + "processParameters": {}, + "quality": "definition", + "authoredBy": { + "id": "9d5fdf9f-36b6-4d0c-a12e-2737a673af94", + "displayName": "Ravi Eda", + "uniqueName": "raeda@microsoft.com", + "url": "https://app.vssps.visualstudio.com/Aa44b2c06-f247-425c-8464-4a0676af910a/_apis/Identities/9d5fdf9f-36b6-4d0c-a12e-2737a673af94", + "imageUrl": "https://devdiv.visualstudio.com/_api/_common/identityImage?id=9d5fdf9f-36b6-4d0c-a12e-2737a673af94" + }, + "queue": { + "id": 36, + "name": "DotNet-Build", + "pool": { + "id": 39, + "name": "DotNet-Build" + } + }, + "id": 6661, + "name": "DotNet-CLI-Security-Windows", + "url": "https://devdiv.visualstudio.com/0bdbc590-a062-4c3f-b0f6-9383f67865ee/_apis/build/Definitions/6661", + "uri": "vstfs:///Build/Definition/6661", + "path": "\\", + "type": 2, + "revision": 6, + "createdDate": "2017-06-21T21:58:12.397Z", + "project": { + "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "name": "DevDiv", + "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", + "url": "https://devdiv.visualstudio.com/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", + "state": "wellFormed", + "revision": 418097676, + "visibility": 0 + } +} diff --git a/build/buildpipeline/security/dir.props b/build/buildpipeline/security/dir.props new file mode 100644 index 0000000000..3e28b4a52a --- /dev/null +++ b/build/buildpipeline/security/dir.props @@ -0,0 +1,4 @@ + + + + diff --git a/build/buildpipeline/security/pipeline.json b/build/buildpipeline/security/pipeline.json new file mode 100644 index 0000000000..dbac3626b0 --- /dev/null +++ b/build/buildpipeline/security/pipeline.json @@ -0,0 +1,22 @@ +{ + "Repository": "cli", + "Definitions": { + "Path": ".", + "Type": "VSTS", + "BaseUrl": "https://devdiv.visualstudio.com/DefaultCollection", + "SkipBranchAndVersionOverrides": "false" + }, + "Pipelines": [ + { + "Name": "Security Build for Windows", + "Parameters": { + "TreatWarningsAsErrors": "false" + }, + "Definitions": [ + { + "Name": "DotNet-CLI-Security-Windows" + } + ] + } + ] +} diff --git a/build/buildpipeline/security/syncAzure.proj b/build/buildpipeline/security/syncAzure.proj new file mode 100644 index 0000000000..45d7657ebd --- /dev/null +++ b/build/buildpipeline/security/syncAzure.proj @@ -0,0 +1,21 @@ + + + + + + $(BuildToolsTaskDesktopDir)Microsoft.DotNet.Build.CloudTestTasks.dll + dotnet + $(PackagesDir)AzureTransfer + + + + + + + + + + + + + diff --git a/build/buildpipeline/security/syncAzure.targets b/build/buildpipeline/security/syncAzure.targets new file mode 100644 index 0000000000..4cc360a11c --- /dev/null +++ b/build/buildpipeline/security/syncAzure.targets @@ -0,0 +1,31 @@ + + + + + + + $(PackagesDir)/AzureTransfer + + + + + + + + + <_OSFilteredBlobNames Include="@(_BlobList)" + Condition="'$(OSGroup)' == 'Windows_NT' AND + ('%(_BlobList.Extension)' == '.zip' OR '%(_BlobList.Extension)' == '.exe' OR '%(_BlobList.Extension)' == '.version')" /> + + + + + From a86584ea20a082468783c46eb443ccde7229b311 Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Wed, 26 Jul 2017 09:50:17 -0500 Subject: [PATCH 127/128] Disable security build task that remove non-CLI assemblies. (#3) This change disables security build task that remove non-CLI assemblies. Thereby, all assemblies are scanned, and issues logged through TSA. This means issues in assemblies not owned or produced by CLI, have to be resolved as Won't Fix so that TSA will not re-create these issues in future scans. --- build/buildpipeline/security/DotNet-CLI-Security-Windows.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json index 2198083370..9d0bfc5b58 100644 --- a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json +++ b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json @@ -193,7 +193,7 @@ } }, { - "enabled": true, + "enabled": false, "continueOnError": true, "alwaysRun": false, "displayName": "Remove non-CLI files", From 9ea8d17a87ee18c522bda2ee5777c65404a2f7a0 Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Wed, 5 Jul 2017 10:50:32 -0500 Subject: [PATCH 128/128] Security build definition merge. (#2) --- build/buildpipeline/security/DotNet-CLI-Security-Windows.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json index 9d0bfc5b58..2198083370 100644 --- a/build/buildpipeline/security/DotNet-CLI-Security-Windows.json +++ b/build/buildpipeline/security/DotNet-CLI-Security-Windows.json @@ -193,7 +193,7 @@ } }, { - "enabled": false, + "enabled": true, "continueOnError": true, "alwaysRun": false, "displayName": "Remove non-CLI files",