Skip to content

[Templates] Fix template scripts, make them more flexible and robust #57841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 18, 2024
Merged

[Templates] Fix template scripts, make them more flexible and robust #57841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a315d25
Fix template scripts, make them more flexible and robust
javiercn Sep 12, 2024
19c6942
Update blazor wasm script
javiercn Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 70 additions & 3 deletions src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,78 @@

# This script packages, installs and creates a template to help with rapid iteration in the templating area.
[CmdletBinding(PositionalBinding = $false)]
param()
param(
[ValidateSet("net9.0", "net10.0")]
[string] $Framework = "net9.0",
[Parameter(Mandatory = $false)]
[switch] $NoRestore,
[Parameter(Mandatory = $false)]
[switch] $ExcludeLaunchSettings,
[Parameter(Mandatory = $false)]
[switch] $Empty,
[Parameter(Mandatory = $false)]
[ValidateSet("None", "Individual")]
[string] $Auth = "None",
[Parameter(Mandatory = $false)]
[switch] $NoHttps,
[Parameter(Mandatory = $false)]
[switch] $UseProgramMain,
[Parameter(Mandatory = $false)]
[string] $Authority,
[Parameter(Mandatory = $false)]
[string] $ClientId,
[switch] $Pwa,
[Parameter(ValueFromRemainingArguments = $true)]
[string[]] $Args
)

Set-StrictMode -Version 2
$ErrorActionPreference = 'Stop'

. $PSScriptRoot\Test-Template.ps1
$templateArguments = @("blazorwasm");

Test-Template "blazorwasm" "blazorwasm --hosted --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $true
if ($ExcludeLaunchSettings) {
$templateArguments += "--exclude-launch-settings"
}

if ($Empty) {
$templateArguments += "-e"
}

if ($Auth) {
$templateArguments += "--auth";
$templateArguments += $Auth;
}

$mainProjectRelativePath = $null;

if ($NoHttps) {
$templateArguments += "--no-https"
}

if ($Authority) {
$templateArguments += "--authority"
$templateArguments += $Authority
}

if ($ClientId) {
$templateArguments += "--client-id"
$templateArguments += $ClientId
}

if ($Pwa) {
$templateArguments += "--pwa"
}

if ($UseProgramMain) {
$templateArguments += "--use-program-main"
}

Import-Module -Name .\Test-Template.psm1;

Test-Template `
-TemplateName "MyBlazorWasmApp" `
-TemplateArguments $templateArguments `
-MainProjectRelativePath $mainProjectRelativePath `
-TargetFramework $Framework `
-Verbose:$VerbosePreference;
84 changes: 78 additions & 6 deletions src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,84 @@
#requires -version 4

# This script packages, installs and creates a template to help with rapid iteration in the templating area.
[CmdletBinding(PositionalBinding = $false)]
param()
[CmdletBinding(PositionalBinding = $false)]
param(
[Parameter(Mandatory = $false, Position = 0)]
[ValidateSet("net9.0", "net10.0")]
[string] $Framework = "net9.0",
[Parameter(Mandatory = $false)]
[switch] $NoRestore,
[Parameter(Mandatory = $false)]
[switch] $ExcludeLaunchSettings,
[Parameter(Mandatory = $false)]
[ValidateSet("None", "Server", "WebAssembly", "Auto")]
[string] $Interactivity = "Server",
[Parameter(Mandatory = $false)]
[switch] $Empty,
[Parameter(Mandatory = $false)]
[ValidateSet("None", "Individual")]
[string] $Auth = "None",
[Parameter(Mandatory = $false)]
[switch] $UseLocalDb,
[Parameter(Mandatory = $false)]
[switch] $AllInteractive,
[Parameter(Mandatory = $false)]
[switch] $NoHttps,
[Parameter(Mandatory = $false)]
[switch] $UseProgramMain,
[Parameter(ValueFromRemainingArguments = $true)]
[string[]] $Args
)

Set-StrictMode -Version 2
$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2
$ErrorActionPreference = 'Stop'

. $PSScriptRoot\Test-Template.ps1
$templateArguments = @("blazor");

Test-Template "MyBlazorApp" "blazor" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $true
if ($ExcludeLaunchSettings) {
$templateArguments += "--exclude-launch-settings"
}

if ($Interactivity) {
$templateArguments += "--interactivity"
$templateArguments += $Interactivity;
}

if ($Empty) {
$templateArguments += "-e"
}

if ($Auth) {
$templateArguments += "--auth";
$templateArguments += $Auth;
}

$mainProjectRelativePath = $null;
if($Interactivity -in @("Auto", "WebAssembly")){
$mainProjectRelativePath = "MyBlazorApp";
}

if ($UseLocalDb) {
$templateArguments += "-uld"
}

if ($AllInteractive) {
$templateArguments += "-ai"
}

if ($NoHttps) {
$templateArguments += "--no-https"
}

if ($UseProgramMain) {
$templateArguments += "--use-program-main"
}

Import-Module -Name .\Test-Template.psm1;

Test-Template `
-TemplateName "MyBlazorApp" `
-TemplateArguments $templateArguments `
-MainProjectRelativePath $mainProjectRelativePath `
-TargetFramework $Framework `
-Verbose:$VerbosePreference;
56 changes: 52 additions & 4 deletions src/ProjectTemplates/scripts/Run-Razor-Locally.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,57 @@
#!/usr/bin/env powershell
#!/usr/bin/env pwsh
#requires -version 4

# This script packages, installs and creates a template to help with rapid iteration in the templating area.
[CmdletBinding(PositionalBinding = $false)]
param()
param(
[Parameter(Mandatory = $false, Position = 0)]
[ValidateSet("net9.0", "net10.0")]
[string] $Framework = "net9.0",
[Parameter(Mandatory = $false)]
[switch] $ExcludeLaunchSettings,
[Parameter(Mandatory = $false)]
[ValidateSet("None", "Individual")]
[string] $Auth = "None",
[Parameter(Mandatory = $false)]
[switch] $UseLocalDb,
[Parameter(Mandatory = $false)]
[switch] $NoHttps,
[Parameter(Mandatory = $false)]
[switch] $UseProgramMain,
Comment on lines +6 to +20
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future reference, I asked copilot to generate this, as well as the code that maps it into the variable by giving the output from dotnet new <<template>> -h. In case someone wants to update other scripts in the future.

[Parameter(ValueFromRemainingArguments = $true)]
[string[]] $Args
)

. $PSScriptRoot\Test-Template.ps1
Set-StrictMode -Version 2
$ErrorActionPreference = 'Stop'

Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
$templateArguments = @("webapp");

if ($ExcludeLaunchSettings) {
$templateArguments += "--exclude-launch-settings"
}

if ($Auth) {
$templateArguments += "--auth";
$templateArguments += $Auth;
}

if ($UseLocalDb) {
$templateArguments += "-uld"
}

if ($NoHttps) {
$templateArguments += "--no-https"
}

if ($UseProgramMain) {
$templateArguments += "--use-program-main"
}

Import-Module -Name .\Test-Template.psm1;

Test-Template `
-TemplateName "MyWebApp" `
-TemplateArguments $templateArguments `
-TargetFramework $Framework `
-Verbose:$VerbosePreference;
51 changes: 48 additions & 3 deletions src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,57 @@
#!/usr/bin/env pwsh
#requires -version 4

# This script packages, installs and creates a template to help with rapid iteration in the templating area.
[CmdletBinding(PositionalBinding = $false)]
param()
param(
[Parameter(Mandatory = $false, Position = 0)]
[ValidateSet("net9.0", "net10.0")]
[string] $Framework = "net9.0",
[Parameter(Mandatory = $false)]
[switch] $ExcludeLaunchSettings,
[Parameter(Mandatory = $false)]
[ValidateSet("None", "Individual")]
[string] $Auth = "None",
[Parameter(Mandatory = $false)]
[switch] $UseLocalDb,
[Parameter(Mandatory = $false)]
[switch] $NoHttps,
[Parameter(Mandatory = $false)]
[switch] $UseProgramMain,
[Parameter(ValueFromRemainingArguments = $true)]
[string[]] $Args
)

Set-StrictMode -Version 2
$ErrorActionPreference = 'Stop'

. $PSScriptRoot\Test-Template.ps1
$templateArguments = @("mvc");

Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false
if ($ExcludeLaunchSettings) {
$templateArguments += "--exclude-launch-settings"
}

if ($Auth) {
$templateArguments += "--auth";
$templateArguments += $Auth;
}

if ($UseLocalDb) {
$templateArguments += "-uld"
}

if ($NoHttps) {
$templateArguments += "--no-https"
}

if ($UseProgramMain) {
$templateArguments += "--use-program-main"
}

Import-Module -Name .\Test-Template.psm1;

Test-Template `
-TemplateName "MyMvcApp" `
-TemplateArguments $templateArguments `
-TargetFramework $Framework `
-Verbose:$VerbosePreference;
Loading
Loading