diff --git a/src/Templating/build/dependencies.props b/src/Templating/build/dependencies.props index 54615c9179..3955eec3d7 100644 --- a/src/Templating/build/dependencies.props +++ b/src/Templating/build/dependencies.props @@ -1,36 +1,20 @@  + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 0.9.9 - 3.0.0-preview-181109-02 - 3.0.0-alpha1-20181017.4 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 + 3.0.0-preview-19065-0365 + 3.0.0-preview-19059-0307 + 3.0.0-preview-19059-0307 3.0.0-preview-19064-0342 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 - 3.0.0-alpha1-10742 + 3.0.0-preview-19059-0307 + 3.0.0-preview-19059-0307 + 3.0.0-preview-19059-0307 + 3.0.0-preview-19059-0307 + 3.0.0-preview-19059-0307 + 3.0.0-preview-19059-0307 3.0.0-preview-181113-11 - 3.0.0-preview-181109-02 - 3.0.0-preview-181109-02 - 3.0.0-preview-181109-02 - 3.0.0-preview-181113-11 - 3.0.0-preview1-26907-05 - 3.0.0-preview-19057-06 - 15.6.1 - 3.12.1 - 17.17134.0 - 3.12.1 - 4.6.0-preview1-26907-04 - 0.10.0 - 2.3.1 - 2.4.0 diff --git a/src/Templating/scripts/Run-Starterweb-Locally.ps1 b/src/Templating/scripts/Run-Starterweb-Locally.ps1 index 4eeff2e81b..a309da7e8a 100644 --- a/src/Templating/scripts/Run-Starterweb-Locally.ps1 +++ b/src/Templating/scripts/Run-Starterweb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-alpha1.nupkg" $false +Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-preview-t000.nupkg" $false diff --git a/src/Templating/scripts/Test-Template.ps1 b/src/Templating/scripts/Test-Template.ps1 index bb9b028a6f..a575a6be80 100644 --- a/src/Templating/scripts/Test-Template.ps1 +++ b/src/Templating/scripts/Test-Template.ps1 @@ -2,8 +2,7 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) { $tmpDir = "$PSScriptRoot/$templateName" Remove-Item -Path $tmpDir -Recurse -ErrorAction Ignore - & "$PSScriptRoot/../build.cmd" /t:Package - Run-DotnetNew "--install", "$PSScriptRoot/../artifacts/build/$templateNupkg" + Run-DotnetNew "--install", "$PSScriptRoot/../../../artifacts/Debug/packages/product/$templateNupkg" New-Item -ErrorAction Ignore -Path $tmpDir -ItemType Directory Push-Location $tmpDir @@ -20,14 +19,14 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) { $proj = "$tmpDir/$templateName.$extension" $projContent = Get-Content -Path $proj -Raw $projContent = $projContent -replace ('', " - + ") $projContent | Set-Content $proj dotnet publish --configuration Release - dotnet bin\Release\netcoreapp2.2\publish\$templateName.dll + dotnet bin\Release\netcoreapp3.0\publish\$templateName.dll } finally { Pop-Location diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index c6fbbb7bf0..90f8ee0044 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -26,6 +26,7 @@ + diff --git a/src/Templating/test/GenerateTestProps.targets b/src/Templating/test/GenerateTestProps.targets index f61f5b8188..43733858d0 100644 --- a/src/Templating/test/GenerateTestProps.targets +++ b/src/Templating/test/GenerateTestProps.targets @@ -1,12 +1,12 @@ + RestoreSources=$([MSBuild]::Escape($(RestoreSources))); RuntimeFrameworkVersion=$(RuntimeFrameworkVersion); MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion); - BundledAspNetCoreAppTargetFrameworkVersion=$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[0]).$(MicrosoftAspNetCoreAppPackageVersion.Split('.')[1]); - BundledAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion) + MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion) diff --git a/src/Templating/test/TemplateTests.props.in b/src/Templating/test/TemplateTests.props.in index 28a81cda23..89994217b7 100644 --- a/src/Templating/test/TemplateTests.props.in +++ b/src/Templating/test/TemplateTests.props.in @@ -4,7 +4,13 @@ ${RestoreSources} ${RuntimeFrameworkVersion} ${MicrosoftNETSdkRazorPackageVersion} - ${BundledAspNetCoreAppTargetFrameworkVersion} - ${BundledAspNetCoreAppPackageVersion} + + + + diff --git a/src/Templating/test/Templates.Test/Helpers/MondoHelpers.cs b/src/Templating/test/Templates.Test/Helpers/MondoHelpers.cs new file mode 100644 index 0000000000..c501e2ea55 --- /dev/null +++ b/src/Templating/test/Templates.Test/Helpers/MondoHelpers.cs @@ -0,0 +1,44 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.IO; + +namespace Templates.Test.Helpers +{ + public static class MondoHelpers + { + public static string[] GetNupkgFiles() + { + var mondoRoot = GetMondoRepoRoot(); +#if DEBUG + var configuration = "Debug"; +#else + var configuration = "Release"; +#endif + + return Directory.GetFiles(Path.Combine(mondoRoot, "artifacts", configuration, "packages"), "*.nupkg", SearchOption.AllDirectories); + } + + private static string GetMondoRepoRoot() + { + return FindAncestorDirectoryContaining(".gitmodules"); + } + + private static string FindAncestorDirectoryContaining(string filename) + { + var dir = AppContext.BaseDirectory; + while (dir != null) + { + if (File.Exists(Path.Combine(dir, filename))) + { + return dir; + } + + dir = Directory.GetParent(dir)?.FullName; + } + + throw new InvalidOperationException($"Could not find any ancestor directory containing {filename} at or above {AppContext.BaseDirectory}"); + } + } +} diff --git a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs index 304bfb3dd5..54915f3d8a 100644 --- a/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs +++ b/src/Templating/test/Templates.Test/Helpers/TemplatePackageInstaller.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -70,7 +70,7 @@ namespace Templates.Test.Helpers public static ProcessEx RunDotNetNew(ITestOutputHelper output, string arguments, bool assertSuccess) { - lock(DotNetNewLock) + lock (DotNetNewLock) { var proc = ProcessEx.Run( output, @@ -100,10 +100,7 @@ namespace Templates.Test.Helpers VerifyCannotFindTemplate(output, "reactredux"); VerifyCannotFindTemplate(output, "angular"); - // Locate the artifacts directory containing the built template packages - var solutionDir = FindAncestorDirectoryContaining("Templating.sln"); - var artifactsDir = Path.Combine(solutionDir, "artifacts", "build"); - var builtPackages = Directory.GetFiles(artifactsDir, "*.nupkg"); + var builtPackages = MondoHelpers.GetNupkgFiles(); foreach (var packagePath in builtPackages) { if (_templatePackages.Any(name => Path.GetFileName(packagePath).StartsWith(name, StringComparison.OrdinalIgnoreCase))) @@ -146,21 +143,5 @@ namespace Templates.Test.Helpers Directory.Delete(tempDir, recursive: true); } } - - private static string FindAncestorDirectoryContaining(string filename) - { - var dir = AppContext.BaseDirectory; - while (dir != null) - { - if (File.Exists(Path.Combine(dir, filename))) - { - return dir; - } - - dir = Directory.GetParent(dir)?.FullName; - } - - throw new InvalidOperationException($"Could not find any ancestor directory containing {filename} at or above {AppContext.BaseDirectory}"); - } } }