diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 502ee2d36fa8..74a1bed72c1e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,62 +6,62 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.25563.105 - 18.1.0-preview-25563-105 - 18.1.0-preview-25563-105 - 7.1.0-preview.1.6405 - 5.3.0-1.25563.105 - 5.3.0-1.25563.105 - 5.3.0-1.25563.105 - 5.3.0-1.25563.105 - 5.3.0-1.25563.105 - 5.3.0-1.25563.105 - 5.3.0-1.25563.105 - 5.3.0-1.25563.105 - 10.0.0-preview.25563.105 - 5.3.0-1.25563.105 - 5.3.0-1.25563.105 - 10.0.0-beta.25563.105 - 10.0.0-beta.25563.105 - 10.0.0-beta.25563.105 - 10.0.0-beta.25563.105 - 10.0.0-beta.25563.105 - 10.0.0-beta.25563.105 - 10.0.0-beta.25563.105 - 10.0.0-beta.25563.105 - 15.0.200-servicing.25563.105 - 5.3.0-1.25563.105 - 5.3.0-1.25563.105 + 10.0.0-preview.25568.105 + 18.1.0-preview-25568-105 + 18.1.0-preview-25568-105 + 7.1.0-preview.1.6905 + 5.3.0-1.25568.105 + 5.3.0-1.25568.105 + 5.3.0-1.25568.105 + 5.3.0-1.25568.105 + 5.3.0-1.25568.105 + 5.3.0-1.25568.105 + 5.3.0-1.25568.105 + 5.3.0-1.25568.105 + 10.0.0-preview.25568.105 + 5.3.0-1.25568.105 + 5.3.0-1.25568.105 + 10.0.0-beta.25568.105 + 10.0.0-beta.25568.105 + 10.0.0-beta.25568.105 + 10.0.0-beta.25568.105 + 10.0.0-beta.25568.105 + 10.0.0-beta.25568.105 + 10.0.0-beta.25568.105 + 10.0.0-beta.25568.105 + 15.0.200-servicing.25568.105 + 5.3.0-1.25568.105 + 5.3.0-1.25568.105 10.0.0-preview.7.25377.103 - 10.0.0-preview.25563.105 - 18.1.0-preview-25563-105 - 10.0.100-rc.2.25563.105 - 10.0.100-rc.2.25563.105 - 10.0.100-rc.2.25563.105 - 10.0.100-rc.2.25563.105 - 10.0.100-rc.2.25563.105 - 10.0.100-rc.2.25563.105 - 10.0.100-rc.2.25563.105 - 10.0.100-rc.2.25563.105 - 10.0.100-rc.2.25563.105 - 18.1.0-preview-25563-105 - 18.1.0-preview-25563-105 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 - 7.1.0-preview.1.6405 + 10.0.0-preview.25568.105 + 18.1.0-preview-25568-105 + 10.0.200-preview.25568.105 + 10.0.200-preview.25568.105 + 10.0.200-preview.25568.105 + 10.0.200-preview.25568.105 + 10.0.200-preview.25568.105 + 10.0.200-preview.25568.105 + 10.0.200-preview.25568.105 + 10.0.200-preview.25568.105 + 10.0.200-preview.25568.105 + 18.1.0-preview-25568-105 + 18.1.0-preview-25568-105 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 + 7.1.0-preview.1.6905 10.0.0-rc.2.25502.107 10.0.0-rc.2.25502.107 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f7e3e849a49..fb685fe90b6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -371,25 +371,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -515,43 +515,43 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 89c8f6a112d37d2ea8b77821e56d170a1bccdc5a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a - + https://github.com/dotnet/dotnet - b8dba9bcdc30ab52b64295249a16f36fa1f13ce9 + 30f0638d1c0413878f282c0aeb4bead28497955a https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 569695dfb65f..06b44de78709 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -306,7 +306,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { @@ -560,25 +560,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index 8ea18b9200a3..f7079a67917a 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25563.105", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25563.105", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25568.105", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25568.105", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" diff --git a/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj b/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj index a2e1cf8bf60a..361b5e101143 100644 --- a/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj +++ b/test/Microsoft.DotNet.HotReload.Watch.Aspire.Tests/Microsoft.DotNet.HotReload.Watch.Aspire.Tests.csproj @@ -12,8 +12,4 @@ - - - - diff --git a/test/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/test/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj index 61b427736b8f..eaa6fc0caa85 100644 --- a/test/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ b/test/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -12,6 +12,8 @@ $(LatestRuntimeIdentifiers) true true + + NU1903;NU1902 diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallPackageAvailableFromBuiltInsWithForce.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallPackageAvailableFromBuiltInsWithForce.verified.txt index 9ee051e49339..50bba7e0c220 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallPackageAvailableFromBuiltInsWithForce.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallPackageAvailableFromBuiltInsWithForce.verified.txt @@ -1,11 +1,11 @@ The following template packages will be installed: - Microsoft.DotNet.Common.ItemTemplates::%VERSION% + Microsoft.DotNet.Common.ItemTemplates@%VERSION% Installing the template package(s) will override the available template package(s). The following template package(s) are already available: Microsoft.DotNet.Common.ItemTemplates@%VERSION% -Success: Microsoft.DotNet.Common.ItemTemplates::6.0.100 installed the following templates: +Success: Microsoft.DotNet.Common.ItemTemplates@6.0.100 installed the following templates: Template Name Short Name Language Tags ------------------------------- ------------- -------- -------- dotnet gitignore file gitignore Config diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallSameSourceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallSameSourceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt index c01cc68e6335..ef375b01e68b 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallSameSourceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallSameSourceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt @@ -1,9 +1,9 @@ The following template packages will be installed: - Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 + Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 Microsoft.DotNet.Common.ProjectTemplates.5.0 (version 5.0.0) is already installed, it will be replaced with version 5.0.0. -Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 was successfully uninstalled. -Success: Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 installed the following templates: +Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 was successfully uninstalled. +Success: Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 installed the following templates: Template Name Short Name Language Tags ------------------- ---------- ---------- -------------- Class library classlib [C#],F#,VB Common/Library diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowDeprecationMessage_WhenLegacyCommandIsUsed_common.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowDeprecationMessage_WhenLegacyCommandIsUsed_common.verified.txt index 640aab54d053..a95637c2cde9 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowDeprecationMessage_WhenLegacyCommandIsUsed_common.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowDeprecationMessage_WhenLegacyCommandIsUsed_common.verified.txt @@ -3,9 +3,9 @@ For more information, run: dotnet new install -h The following template packages will be installed: - Microsoft.DotNet.Web.ItemTemplates::5.0.0 + Microsoft.DotNet.Web.ItemTemplates@5.0.0 -Success: Microsoft.DotNet.Web.ItemTemplates::5.0.0 installed the following templates: +Success: Microsoft.DotNet.Web.ItemTemplates@5.0.0 installed the following templates: Template Name Short Name Language Tags -------------------- -------------- -------- ----------- MVC ViewImports viewimports [C#] Web/ASP.NET diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallMultiplePackageAvailableFromBuiltIns.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallMultiplePackageAvailableFromBuiltIns.verified.txt index a82dac7da80f..33c9ec6a9d9a 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallMultiplePackageAvailableFromBuiltIns.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallMultiplePackageAvailableFromBuiltIns.verified.txt @@ -3,6 +3,6 @@ The following template package(s) are already available: Microsoft.DotNet.Common.ItemTemplates@%VERSION% To install the template package(s) anyway, apply '--force' option: - dotnet new install Microsoft.DotNet.Common.ItemTemplates::6.0.100 Microsoft.DotNet.Web.ItemTemplates::5.0.0 --force + dotnet new install Microsoft.DotNet.Common.ItemTemplates@6.0.100 Microsoft.DotNet.Web.ItemTemplates@5.0.0 --force For details on the exit code, refer to https://aka.ms/templating-exit-codes#106 \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallPackageAvailableFromBuiltIns.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallPackageAvailableFromBuiltIns.verified.txt index 1006e1eb33c6..38a53afd87f6 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallPackageAvailableFromBuiltIns.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallPackageAvailableFromBuiltIns.verified.txt @@ -3,6 +3,6 @@ The following template package(s) are already available: Microsoft.DotNet.Common.ItemTemplates@%VERSION% To install the template package(s) anyway, apply '--force' option: - dotnet new install Microsoft.DotNet.Common.ItemTemplates::6.0.100 --force + dotnet new install Microsoft.DotNet.Common.ItemTemplates@6.0.100 --force For details on the exit code, refer to https://aka.ms/templating-exit-codes#106 \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallSameSourceTwice_NuGet.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallSameSourceTwice_NuGet.verified.txt index 199105c985c4..22cd4ccffc53 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallSameSourceTwice_NuGet.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallSameSourceTwice_NuGet.verified.txt @@ -1,5 +1,5 @@ -Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 is already installed. +Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 is already installed. To reinstall the same version of the template package, use '--force' option: - dotnet new install Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 --force + dotnet new install Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 --force For details on the exit code, refer to https://aka.ms/templating-exit-codes#106 \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.DoNotShowDeprecationMessage_WhenNewCommandIsUsed.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.DoNotShowDeprecationMessage_WhenNewCommandIsUsed.verified.txt index d5ea8c4c265f..c7807f2c1c62 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.DoNotShowDeprecationMessage_WhenNewCommandIsUsed.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.DoNotShowDeprecationMessage_WhenNewCommandIsUsed.verified.txt @@ -1,7 +1,7 @@ The following template packages will be installed: - Microsoft.DotNet.Web.ItemTemplates::5.0.0 + Microsoft.DotNet.Web.ItemTemplates@5.0.0 -Success: Microsoft.DotNet.Web.ItemTemplates::5.0.0 installed the following templates: +Success: Microsoft.DotNet.Web.ItemTemplates@5.0.0 installed the following templates: Template Name Short Name Language Tags -------------------- -------------- -------- ----------- MVC ViewImports viewimports [C#] Web/ASP.NET diff --git a/test/dotnet-new.IntegrationTests/DotnetNewInstallTests.cs b/test/dotnet-new.IntegrationTests/DotnetNewInstallTests.cs index 1b90e9d43929..653d2f7998d8 100644 --- a/test/dotnet-new.IntegrationTests/DotnetNewInstallTests.cs +++ b/test/dotnet-new.IntegrationTests/DotnetNewInstallTests.cs @@ -36,7 +36,7 @@ public void CanInstallRemoteNuGetPackage(string commandName) .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Web\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Web\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("web") .And.HaveStdOutContaining("blazorwasm"); } @@ -85,7 +85,7 @@ public void CanInstallRemoteNuGetPackage_LatestVariations() .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("console") .And.NotHaveStdOutContaining("web"); } @@ -93,7 +93,7 @@ public void CanInstallRemoteNuGetPackage_LatestVariations() // Install command are expected to output the requested version literaly as they got it on input, // but otherwise the outputs are expected to be equal string? command3Out = command3.StdOut?.Replace( - "Microsoft.DotNet.Common.ProjectTemplates.5.0::*", + "Microsoft.DotNet.Common.ProjectTemplates.5.0@*", "Microsoft.DotNet.Common.ProjectTemplates.5.0"); Assert.Equal(command1.StdOut, command2.StdOut); @@ -105,7 +105,7 @@ public void CanInstallRemoteNuGetPackage_LatestVariations() [InlineData("install")] public void CanInstallRemoteNuGetPackageWithVersion(string commandName) { - new DotnetNewCommand(_log, commandName, "Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, commandName, "Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") .WithCustomHive(CreateTemporaryFolder(folderName: "Home")) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -115,8 +115,8 @@ public void CanInstallRemoteNuGetPackageWithVersion(string commandName) .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutContaining("Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") - .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0 installed the following templates:") + .And.HaveStdOutContaining("Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") + .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0 installed the following templates:") .And.HaveStdOutContaining("web") .And.HaveStdOutContaining("blazorwasm"); } @@ -144,7 +144,7 @@ public void CanInstallRemoteNuGetPackageWithVersionWildcard(string commandName) .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::5\\.0([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@5\\.0([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("console") .And.NotHaveStdOutContaining("web"); } @@ -152,11 +152,11 @@ public void CanInstallRemoteNuGetPackageWithVersionWildcard(string commandName) // Install command are expected to output the requested version literally as they got it on input, // but otherwise the outputs are expected to be equal string? command1Out = command1.StdOut?.Replace( - "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.*", + "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.*", "Microsoft.DotNet.Common.ProjectTemplates.5.0"); string? command2Out = command2.StdOut?.Replace( - "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.*", + "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.*", "Microsoft.DotNet.Common.ProjectTemplates.5.0"); Assert.Equal(command1Out, command2Out); @@ -165,7 +165,7 @@ public void CanInstallRemoteNuGetPackageWithVersionWildcard(string commandName) [Fact] public void CanInstallRemoteNuGetPackageWithPrereleaseVersion() { - new DotnetNewCommand(_log, "-i", "Microsoft.Azure.WebJobs.ProjectTemplates::4.0.1844-preview1", "--nuget-source", "https://api.nuget.org/v3/index.json") + new DotnetNewCommand(_log, "-i", "Microsoft.Azure.WebJobs.ProjectTemplates@4.0.1844-preview1", "--nuget-source", "https://api.nuget.org/v3/index.json") .WithCustomHive(CreateTemporaryFolder(folderName: "Home")) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -174,7 +174,7 @@ public void CanInstallRemoteNuGetPackageWithPrereleaseVersion() .And .NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft.Azure.WebJobs.ProjectTemplates::4.0.1844-preview1 installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft.Azure.WebJobs.ProjectTemplates@4.0.1844-preview1 installed the following templates:") .And.HaveStdOutContaining("func"); } @@ -193,7 +193,7 @@ public void CanInstallRemoteNuGetPackageWithNuGetSource(string commandName) .And .NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Take\\.Blip\\.Client\\.Templates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Take\\.Blip\\.Client\\.Templates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("blip-console"); new DotnetNewCommand(_log, commandName, "Take.Blip.Client.Templates", "--add-source", "https://api.nuget.org/v3/index.json") @@ -205,7 +205,7 @@ public void CanInstallRemoteNuGetPackageWithNuGetSource(string commandName) .And .NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Take\\.Blip\\.Client\\.Templates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Take\\.Blip\\.Client\\.Templates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("blip-console"); } @@ -223,7 +223,7 @@ public void CanInstallLocalNuGetPackage(string commandName) .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("TestAssets.TemplateWithTags") .And.HaveStdOutContaining("TestAssets.ConfigurationKitchenSink"); } @@ -243,7 +243,7 @@ public void CanPrintDebugOutputWhenInstalling(string commandName) .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Web\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Web\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("web") .And.HaveStdOutContaining("blazorwasm") .And.HaveStdOutMatching("\\[\\d{4}\\-\\d{2}\\-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{1,3}\\] " + Regex.Escape("[Debug] [Microsoft.TemplateEngine.Edge.Installers.NuGet.NuGetInstaller] => [Execute]: Microsoft.DotNet.Web.ProjectTemplates.5.0 is not a local NuGet package.")) @@ -323,12 +323,12 @@ public void CannotInstallRemotePackageWithIncorrectVersion(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, commandName, "Microsoft.DotNet.Web.ProjectTemplates.5.0::16.0.0") + new DotnetNewCommand(_log, commandName, "Microsoft.DotNet.Web.ProjectTemplates.5.0@16.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() .Should().Fail() - .And.HaveStdErrContaining("Microsoft.DotNet.Web.ProjectTemplates.5.0::16.0.0 could not be installed, the package does not exist"); + .And.HaveStdErrContaining("Microsoft.DotNet.Web.ProjectTemplates.5.0@16.0.0 could not be installed, the package does not exist"); } [Fact] @@ -384,7 +384,7 @@ public void CanUpdateSameSource_NuGet(string installCommandName, string uninstal { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -407,17 +407,17 @@ public void CanUpdateSameSource_NuGet(string installCommandName, string uninstal Assert.True(File.Exists(Path.Combine(home, "packages", "Microsoft.DotNet.Common.ProjectTemplates.5.0.5.0.0.nupkg"))); - new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.1") + new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.1") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.1") + .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.1") .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0 (version 5.0.0) is already installed, it will be replaced with version 5.0.1") - .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 was successfully uninstalled") - .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.1 installed the following templates:") + .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 was successfully uninstalled") + .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.1 installed the following templates:") .And.HaveStdOutContaining("console") .And.HaveStdOutContaining("classlib"); @@ -457,7 +457,7 @@ public async Task InstallingSamePackageFromRemoteUpdatesLocal(string installComm .Execute() .Should().ExitWith(0) .And.NotHaveStdErr() - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("console") .And.HaveStdOutContaining("classlib"); @@ -472,17 +472,17 @@ public async Task InstallingSamePackageFromRemoteUpdatesLocal(string installComm .And.HaveStdOutContaining("Version:") .And.NotHaveStdOutContaining("Version: 5.0.0"); - new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .And.HaveStdOutMatching("Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0 \\(version ([\\d\\.a-z-])+\\) is already installed, it will be replaced with version 5\\.0\\.0") - .And.HaveStdOutMatching("Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ was successfully uninstalled") - .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 installed the following templates:") + .And.HaveStdOutMatching("Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ was successfully uninstalled") + .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 installed the following templates:") .And.HaveStdOutContaining("console") .And.HaveStdOutContaining("classlib"); @@ -553,7 +553,7 @@ public void ReinstallDoesntRemoveTemplates() .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("TestAssets.TemplateWithTags") .And.HaveStdOutContaining("TestAssets.ConfigurationKitchenSink"); @@ -564,7 +564,7 @@ public void ReinstallDoesntRemoveTemplates() .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("TestAssets.TemplateWithTags") .And.HaveStdOutContaining("TestAssets.ConfigurationKitchenSink"); } diff --git a/test/dotnet-new.IntegrationTests/DotnetNewUninstallTests.cs b/test/dotnet-new.IntegrationTests/DotnetNewUninstallTests.cs index 99a793a56371..45dfb6217364 100644 --- a/test/dotnet-new.IntegrationTests/DotnetNewUninstallTests.cs +++ b/test/dotnet-new.IntegrationTests/DotnetNewUninstallTests.cs @@ -45,7 +45,7 @@ public void CanListInstalledSources_Folder(string commandName) public void CanListInstalledSources_NuGet(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "-i", "Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "-i", "Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -140,7 +140,7 @@ public void CanUninstall_Folder(string commandName) public void CanUninstall_NuGet(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "-i", "Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "-i", "Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -181,7 +181,7 @@ public void CanUninstall_NuGet(string commandName) .ExitWith(0) .And .NotHaveStdErr() - .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0 was uninstalled."); + .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0 was uninstalled."); new DotnetNewCommand(_log, commandName) .WithCustomHive(home) @@ -225,7 +225,7 @@ public void CanUninstallSeveralSources_LegacySyntax() .ExitWith(0) .And .NotHaveStdErr() - .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ was uninstalled\\.\\s*$", RegexOptions.Multiline) + .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ was uninstalled\\.\\s*$", RegexOptions.Multiline) .And.HaveStdOutContaining($"Success: {basicFSharp} was uninstalled."); new DotnetNewCommand(_log, "-u") @@ -271,7 +271,7 @@ public void CanUninstallSeveralSources() .ExitWith(0) .And .NotHaveStdErr() - .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ was uninstalled\\.\\s*$", RegexOptions.Multiline) + .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ was uninstalled\\.\\s*$", RegexOptions.Multiline) .And.HaveStdOutContaining($"Success: {basicFSharp} was uninstalled."); new DotnetNewCommand(_log, "uninstall") @@ -294,7 +294,7 @@ public void CanUninstallSeveralSources() public void CannotUninstallUnknownPackage(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -322,7 +322,7 @@ public void CannotUninstallUnknownPackage(string commandName) public void CannotUninstallByTemplateName(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -338,7 +338,7 @@ public void CannotUninstallByTemplateName(string commandName) .Should().Fail() .And.HaveStdErrContaining("The template package 'console' is not found") .And.HaveStdErrContaining("The template 'console' is included to the packages:") - .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 (contains 2 templates)") + .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 (contains 2 templates)") // .And.HaveStdErrContaining("To list the templates installed in a package, use dotnet new ") .And.HaveStdErrContaining("To uninstall the template package use:") .And.HaveStdErrContaining(" dotnet new uninstall Microsoft.DotNet.Common.ProjectTemplates.5.0"); @@ -350,7 +350,7 @@ public void CannotUninstallByTemplateName(string commandName) public void CannotUninstallByTemplateName_ShowsAllPackages(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -359,7 +359,7 @@ public void CannotUninstallByTemplateName_ShowsAllPackages(string commandName) .And .NotHaveStdErr(); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.3.1::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.3.1@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -375,8 +375,8 @@ public void CannotUninstallByTemplateName_ShowsAllPackages(string commandName) .Should().Fail() .And.HaveStdErrContaining("The template package 'console' is not found") .And.HaveStdErrContaining("The template 'console' is included to the packages:") - .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 (contains 2 templates)") - .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.3.1::5.0.0 (contains 2 templates)") + .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 (contains 2 templates)") + .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.3.1@5.0.0 (contains 2 templates)") .And.HaveStdErrContaining("To uninstall the template package use:") .And.HaveStdErrContaining(" dotnet new uninstall Microsoft.DotNet.Common.ProjectTemplates."); } diff --git a/test/dotnet-new.IntegrationTests/DotnetNewUpdateTests.cs b/test/dotnet-new.IntegrationTests/DotnetNewUpdateTests.cs index 61eaf09f8815..cdce076bdca9 100644 --- a/test/dotnet-new.IntegrationTests/DotnetNewUpdateTests.cs +++ b/test/dotnet-new.IntegrationTests/DotnetNewUpdateTests.cs @@ -19,7 +19,7 @@ public DotnetNewUpdateTests(ITestOutputHelper log) : base(log) public void CanCheckForUpdate(string testCase) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -52,7 +52,7 @@ public void ReportsErrorOnUpdateCheckOfLocalPackage() { string nugetName = "TestNupkgInstallTemplate"; string nugetVersion = "0.0.1"; - string nugetFullName = $"{nugetName}::{nugetVersion}"; + string nugetFullName = $"{nugetName}@{nugetVersion}"; string nugetFileName = $"{nugetName}.{nugetVersion}.nupkg"; string workingDirectory = CreateTemporaryFolder(); string home = CreateTemporaryFolder(folderName: "Home"); @@ -111,7 +111,7 @@ public void DoesNotShowUpdatesWhenAllTemplatesAreUpToDate(string testCase) public void PrintInfoOnUpdateOnCreation() { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -141,7 +141,7 @@ public void PrintInfoOnUpdateOnCreation() public void DoesNotPrintUpdateInfoOnCreation_WhenNoUpdateCheckOption() { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -251,7 +251,7 @@ public void DoNotShowDeprecationMessage_WhenNewCommandIsUsed_Check() public void CanApplyUpdates(string testCase) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -287,9 +287,9 @@ public void CanApplyUpdates(string testCase) .And .NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be updated:") - .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 was successfully uninstalled") - .And.NotHaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 is already installed and will be replaced with version") - .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:\\s*$", System.Text.RegularExpressions.RegexOptions.Multiline) + .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 was successfully uninstalled") + .And.NotHaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 is already installed and will be replaced with version") + .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:\\s*$", System.Text.RegularExpressions.RegexOptions.Multiline) .And.HaveStdOutContaining("console") .And.HaveStdOutContaining("Console App"); }