From 24ffea972c4d8b4778a9a281c2aee74a3b93946a Mon Sep 17 00:00:00 2001 From: Peter <61538034+PTKu@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:38:58 +0100 Subject: [PATCH 1/3] moves template folder out of CPM folder --- cake/BuildContext.cs | 14 ++++++++------ cake/Program.cs | 8 ++++---- publish-no-tests.ps1 | 2 +- .../working/AXSharp.templates.csproj | 0 .../working/AXSharp.templates.sln | 0 .../axsharpblazor/.config/dotnet-tools.json | 0 .../axsharpblazor/.template.config/template.json | 0 .../working/templates/axsharpblazor/README.md | 0 .../working/templates/axsharpblazor/ax/.gitignore | 0 .../axsharpblazor/ax/AXSharp.config.json | 0 .../templates/axsharpblazor/ax/apax-lock.json | 0 .../working/templates/axsharpblazor/ax/apax.yml | 0 .../axsharpblazor/ax/src/configuration.st | 0 .../templates/axsharpblazor/ax/src/counters.st | 0 .../templates/axsharpblazor/ax/src/program.st | 0 .../templates/axsharpblazor/ax/test/test.st | 0 .../axsharpblazor/axsharpblazor.app/App.razor | 0 .../Areas/Identity/Pages/Account/LogOut.cshtml | 0 .../Identity/Pages/Shared/_LoginPartial.cshtml | 0 ...lidatingIdentityAuthenticationStateProvider.cs | 0 .../Data/ApplicationDbContext.cs | 0 ...0000000000000_CreateIdentitySchema.Designer.cs | 0 .../00000000000000_CreateIdentitySchema.cs | 0 .../ApplicationDbContextModelSnapshot.cs | 0 .../axsharpblazor.app/Pages/Error.cshtml | 0 .../axsharpblazor.app/Pages/Error.cshtml.cs | 0 .../axsharpblazor.app/Pages/Index.razor | 0 .../axsharpblazor.app/Pages/Index.razor.css | 0 .../axsharpblazor.app/Pages/UI/AutoUI.razor | 0 .../axsharpblazor.app/Pages/UI/ManualUI.razor | 0 .../axsharpblazor.app/Pages/_Host.cshtml | 0 .../axsharpblazor/axsharpblazor.app/Program.cs | 0 .../Properties/launchSettings.json | 0 .../Properties/serviceDependencies.json | 0 .../Properties/serviceDependencies.local.json | 0 .../Shared/IAmHereIndicator.razor | 0 .../axsharpblazor.app/Shared/LoginDisplay.razor | 0 .../axsharpblazor.app/Shared/MainLayout.razor | 0 .../axsharpblazor.app/Shared/MainLayout.razor.css | 0 .../Shared/Menu/ExpandableMenuItem.razor | 0 .../Shared/Menu/ExpandableMenuItem.razor.css | 0 .../axsharpblazor.app/Shared/Menu/MenuItem.razor | 0 .../Shared/Menu/MenuItem.razor.css | 0 .../axsharpblazor.app/Shared/NavMenu.razor | 0 .../axsharpblazor.app/Shared/NavMenu.razor.css | 0 .../axsharpblazor.app/Shared/TopRow.razor | 0 .../axsharpblazor.app/Shared/TopRow.razor.css | 0 .../axsharpblazor.app/_Imports.razor | 0 .../appsettings.Development.json | 0 .../axsharpblazor.app/appsettings.json | 0 .../axsharpblazor.app/axsharpblazor.hmi.csproj | 0 .../wwwroot/css/bootstrap/bootstrap.min.css | 0 .../wwwroot/css/bootstrap/bootstrap.min.css.map | 0 .../wwwroot/css/open-iconic/FONT-LICENSE | 0 .../wwwroot/css/open-iconic/ICON-LICENSE | 0 .../wwwroot/css/open-iconic/README.md | 0 .../font/css/open-iconic-bootstrap.min.css | 0 .../css/open-iconic/font/fonts/open-iconic.eot | Bin .../css/open-iconic/font/fonts/open-iconic.otf | Bin .../css/open-iconic/font/fonts/open-iconic.svg | 0 .../css/open-iconic/font/fonts/open-iconic.ttf | Bin .../css/open-iconic/font/fonts/open-iconic.woff | Bin .../axsharpblazor.app/wwwroot/css/site.css | 0 .../axsharpblazor.app/wwwroot/favicon.png | Bin .../axsharpblazor.app/wwwroot/logo-header.svg | 0 .../wwwroot/logo-no-background.svg | 0 .../templates/axsharpblazor/axsharpblazor.sln | 0 .../axsharpblazor/axsharpblazor.twin/Entry.cs | 0 .../axsharpblazor.twin/axsharpblazor.csproj | 0 .../axsharpblazor.twin/axsharpblazor.twin.csproj | 0 .../working/templates/axsharpblazor/install.cmd | 0 .../working/templates/axsharpblazor/install.ps1 | 0 .../ixsharpblazor.twin/axsharpblazor.csproj | 0 .../axsharpconsole/.config/dotnet-tools.json | 0 .../axsharpconsole/.template.config/template.json | 0 .../working/templates/axsharpconsole/README.md | 0 .../templates/axsharpconsole/ax/.gitignore | 0 .../axsharpconsole/ax/.vscode/launch.json | 0 .../axsharpconsole/ax/AXSharp.config.json | 0 .../templates/axsharpconsole/ax/apax-lock.json | 0 .../working/templates/axsharpconsole/ax/apax.yml | 0 .../axsharpconsole/ax/src/configuration.st | 0 .../templates/axsharpconsole/ax/src/program.st | 0 .../templates/axsharpconsole/ax/test/test.st | 0 .../templates/axsharpconsole/axsharpconsole.sln | 0 .../axsharpconsole/axsharpconsole.twin/Entry.cs | 0 .../axsharpconsole.twin/axsharpconsole.csproj | 0 .../axsharpconsole/axsharpconsole/Program.cs | 0 .../axsharpconsole/axsharpconsole.app.csproj | 0 .../working/templates/axsharpconsole/install.cmd | 0 .../working/templates/axsharpconsole/install.ps1 | 0 91 files changed, 13 insertions(+), 11 deletions(-) rename {src/AXSharp.templates => templates}/working/AXSharp.templates.csproj (100%) rename {src/AXSharp.templates => templates}/working/AXSharp.templates.sln (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/.config/dotnet-tools.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/.template.config/template.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/README.md (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/ax/.gitignore (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/ax/AXSharp.config.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/ax/apax-lock.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/ax/apax.yml (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/ax/src/configuration.st (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/ax/src/counters.st (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/ax/src/program.st (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/ax/test/test.st (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/App.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Account/LogOut.cshtml (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Shared/_LoginPartial.cshtml (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Data/ApplicationDbContext.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/ApplicationDbContextModelSnapshot.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor.css (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/AutoUI.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/ManualUI.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Pages/_Host.cshtml (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Program.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Properties/launchSettings.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.local.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/IAmHereIndicator.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/LoginDisplay.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor.css (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor.css (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor.css (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor.css (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor.css (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/_Imports.razor (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/appsettings.Development.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/appsettings.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css.map (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/FONT-LICENSE (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/ICON-LICENSE (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/README.md (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.eot (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.otf (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.svg (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.woff (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/site.css (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/favicon.png (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-header.svg (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-no-background.svg (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.sln (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.twin/Entry.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/install.cmd (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/install.ps1 (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/.config/dotnet-tools.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/.template.config/template.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/README.md (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/ax/.gitignore (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/ax/.vscode/launch.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/ax/AXSharp.config.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/ax/apax-lock.json (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/ax/apax.yml (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/ax/src/configuration.st (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/ax/src/program.st (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/ax/test/test.st (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/axsharpconsole.sln (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/axsharpconsole.twin/Entry.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/axsharpconsole/Program.cs (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/install.cmd (100%) rename {src/AXSharp.templates => templates}/working/templates/axsharpconsole/install.ps1 (100%) diff --git a/cake/BuildContext.cs b/cake/BuildContext.cs index b8d656b7..dccd948e 100644 --- a/cake/BuildContext.cs +++ b/cake/BuildContext.cs @@ -41,6 +41,8 @@ public class BuildContext : FrostingContext public string ScrDir => Path.GetFullPath(Path.Combine(Environment.WorkingDirectory.FullPath, "..//src//")); + public string TemplatesDir => Path.GetFullPath(Path.Combine(Environment.WorkingDirectory.FullPath, "..//templates//")); + public Cake.Common.Tools.DotNet.Build.DotNetBuildSettings DotNetBuildSettings { get; } public DotNetRestoreSettings DotNetRestoreTemplatesSettings { get; } @@ -173,13 +175,13 @@ public void PushNugetPackages(string artifactDirectory) { var templates = new List<(string ax, string approject, string solution)>() { - (Path.Combine(this.ScrDir, "AXSharp.templates\\working\\templates\\axsharpblazor\\ax\\"), - Path.Combine(this.ScrDir,"AXSharp.templates\\working\\templates\\axsharpblazor\\axsharpblazor.app\\axsharpblazor.hmi.csproj"), - Path.Combine(this.ScrDir,"AXSharp.templates\\working\\templates\\axsharpblazor\\axsharpblazor.sln")), + (Path.Combine(this.TemplatesDir, "working\\templates\\axsharpblazor\\ax\\"), + Path.Combine(this.TemplatesDir,"working\\templates\\axsharpblazor\\axsharpblazor.app\\axsharpblazor.hmi.csproj"), + Path.Combine(this.TemplatesDir,"working\\templates\\axsharpblazor\\axsharpblazor.sln")), - (Path.Combine(this.ScrDir, "AXSharp.templates\\working\\templates\\axsharpconsole\\ax"), - Path.Combine(this.ScrDir,"AXSharp.templates\\working\\templates\\axsharpconsole\\axsharpconsole\\axsharpconsole.app.csproj"), - Path.Combine(this.ScrDir,"AXSharp.templates\\working\\templates\\axsharpconsole\\axsharpconsole.sln")) + (Path.Combine(this.TemplatesDir, "working\\templates\\axsharpconsole\\ax"), + Path.Combine(this.TemplatesDir,"working\\templates\\axsharpconsole\\axsharpconsole\\axsharpconsole.app.csproj"), + Path.Combine(this.TemplatesDir,"working\\templates\\axsharpconsole\\axsharpconsole.sln")) }; diff --git a/cake/Program.cs b/cake/Program.cs index 390620c9..a248cce8 100644 --- a/cake/Program.cs +++ b/cake/Program.cs @@ -317,7 +317,7 @@ public override void Run(BuildContext context) return; } - var templatesDirectory = Path.Combine(context.ScrDir, "AXSharp.templates\\working\\templates"); + var templatesDirectory = Path.Combine(context.TemplatesDir); var templateCsProjFiles = Directory.EnumerateFiles(templatesDirectory, "*.csproj", SearchOption.AllDirectories); foreach (var templateCsProjFile in templateCsProjFiles) @@ -369,8 +369,8 @@ public override void Run(BuildContext context) foreach (var template in context.GetTemplateProjects()) { - context.DotNetRestore(Path.Combine(context.ScrDir, template.solution), context.DotNetRestoreTemplatesSettings); - context.DotNetBuild(Path.Combine(context.ScrDir, template.solution), context.DotNetBuildSettings); + context.DotNetRestore(Path.Combine(context.TemplatesDir, template.solution), context.DotNetRestoreTemplatesSettings); + context.DotNetBuild(Path.Combine(context.TemplatesDir, template.solution), context.DotNetBuildSettings); } } } @@ -415,7 +415,7 @@ public override void Run(BuildContext context) } PackTemplatePackages(context, - Path.Combine(context.ScrDir, "AXSharp.templates\\working\\AXSharp.templates.sln")); + Path.Combine(context.TemplatesDir, "AXSharp.templates.sln")); context.PushNugetPackages("templates"); context.CheckLicenseComplianceInArtifacts(); diff --git a/publish-no-tests.ps1 b/publish-no-tests.ps1 index 6e517acd..0e88ffb7 100644 --- a/publish-no-tests.ps1 +++ b/publish-no-tests.ps1 @@ -1,4 +1,4 @@ # run build -dotnet run --project cake/Build.csproj --do-pack --do-publish --test-level 1 +dotnet run --project cake/Build.csproj --do-pack --do-publish --test-level 2 exit $LASTEXITCODE; \ No newline at end of file diff --git a/src/AXSharp.templates/working/AXSharp.templates.csproj b/templates/working/AXSharp.templates.csproj similarity index 100% rename from src/AXSharp.templates/working/AXSharp.templates.csproj rename to templates/working/AXSharp.templates.csproj diff --git a/src/AXSharp.templates/working/AXSharp.templates.sln b/templates/working/AXSharp.templates.sln similarity index 100% rename from src/AXSharp.templates/working/AXSharp.templates.sln rename to templates/working/AXSharp.templates.sln diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/.config/dotnet-tools.json b/templates/working/templates/axsharpblazor/.config/dotnet-tools.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/.config/dotnet-tools.json rename to templates/working/templates/axsharpblazor/.config/dotnet-tools.json diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/.template.config/template.json b/templates/working/templates/axsharpblazor/.template.config/template.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/.template.config/template.json rename to templates/working/templates/axsharpblazor/.template.config/template.json diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/README.md b/templates/working/templates/axsharpblazor/README.md similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/README.md rename to templates/working/templates/axsharpblazor/README.md diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/.gitignore b/templates/working/templates/axsharpblazor/ax/.gitignore similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/.gitignore rename to templates/working/templates/axsharpblazor/ax/.gitignore diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/AXSharp.config.json b/templates/working/templates/axsharpblazor/ax/AXSharp.config.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/AXSharp.config.json rename to templates/working/templates/axsharpblazor/ax/AXSharp.config.json diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/apax-lock.json b/templates/working/templates/axsharpblazor/ax/apax-lock.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/apax-lock.json rename to templates/working/templates/axsharpblazor/ax/apax-lock.json diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/apax.yml b/templates/working/templates/axsharpblazor/ax/apax.yml similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/apax.yml rename to templates/working/templates/axsharpblazor/ax/apax.yml diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/src/configuration.st b/templates/working/templates/axsharpblazor/ax/src/configuration.st similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/src/configuration.st rename to templates/working/templates/axsharpblazor/ax/src/configuration.st diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/src/counters.st b/templates/working/templates/axsharpblazor/ax/src/counters.st similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/src/counters.st rename to templates/working/templates/axsharpblazor/ax/src/counters.st diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/src/program.st b/templates/working/templates/axsharpblazor/ax/src/program.st similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/src/program.st rename to templates/working/templates/axsharpblazor/ax/src/program.st diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ax/test/test.st b/templates/working/templates/axsharpblazor/ax/test/test.st similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/ax/test/test.st rename to templates/working/templates/axsharpblazor/ax/test/test.st diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/App.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/App.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/App.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/App.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Account/LogOut.cshtml b/templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Account/LogOut.cshtml similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Account/LogOut.cshtml rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Account/LogOut.cshtml diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Shared/_LoginPartial.cshtml b/templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Shared/_LoginPartial.cshtml similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Shared/_LoginPartial.cshtml rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/Pages/Shared/_LoginPartial.cshtml diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Areas/Identity/RevalidatingIdentityAuthenticationStateProvider.cs diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/ApplicationDbContext.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Data/ApplicationDbContext.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/ApplicationDbContext.cs rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Data/ApplicationDbContext.cs diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Data/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml.cs rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Error.cshtml.cs diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor.css similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor.css rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/Index.razor.css diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/AutoUI.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/AutoUI.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/AutoUI.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/AutoUI.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/ManualUI.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/ManualUI.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/ManualUI.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/UI/ManualUI.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/_Host.cshtml b/templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/_Host.cshtml similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/_Host.cshtml rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Pages/_Host.cshtml diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Program.cs b/templates/working/templates/axsharpblazor/axsharpblazor.app/Program.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Program.cs rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Program.cs diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/launchSettings.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/launchSettings.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/launchSettings.json rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/launchSettings.json diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.json rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.json diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.local.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.local.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.local.json rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Properties/serviceDependencies.local.json diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/IAmHereIndicator.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/IAmHereIndicator.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/IAmHereIndicator.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/IAmHereIndicator.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/LoginDisplay.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/LoginDisplay.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/LoginDisplay.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/LoginDisplay.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor.css similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor.css rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/MainLayout.razor.css diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor.css similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor.css rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/ExpandableMenuItem.razor.css diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor.css similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor.css rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/Menu/MenuItem.razor.css diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor.css similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor.css rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/NavMenu.razor.css diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor.css similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor.css rename to templates/working/templates/axsharpblazor/axsharpblazor.app/Shared/TopRow.razor.css diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/_Imports.razor b/templates/working/templates/axsharpblazor/axsharpblazor.app/_Imports.razor similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/_Imports.razor rename to templates/working/templates/axsharpblazor/axsharpblazor.app/_Imports.razor diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.Development.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.Development.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.Development.json rename to templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.Development.json diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.json b/templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.json rename to templates/working/templates/axsharpblazor/axsharpblazor.app/appsettings.json diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj rename to templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css.map b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css.map rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/FONT-LICENSE b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/FONT-LICENSE rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/ICON-LICENSE b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/ICON-LICENSE rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/README.md b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/README.md similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/README.md rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/README.md diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/site.css b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/site.css similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/site.css rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/css/site.css diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/favicon.png b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/favicon.png similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/favicon.png rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/favicon.png diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-header.svg b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-header.svg similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-header.svg rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-header.svg diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-no-background.svg b/templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-no-background.svg similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-no-background.svg rename to templates/working/templates/axsharpblazor/axsharpblazor.app/wwwroot/logo-no-background.svg diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.sln b/templates/working/templates/axsharpblazor/axsharpblazor.sln similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.sln rename to templates/working/templates/axsharpblazor/axsharpblazor.sln diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/Entry.cs b/templates/working/templates/axsharpblazor/axsharpblazor.twin/Entry.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/Entry.cs rename to templates/working/templates/axsharpblazor/axsharpblazor.twin/Entry.cs diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj rename to templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj rename to templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/install.cmd b/templates/working/templates/axsharpblazor/install.cmd similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/install.cmd rename to templates/working/templates/axsharpblazor/install.cmd diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/install.ps1 b/templates/working/templates/axsharpblazor/install.ps1 similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/install.ps1 rename to templates/working/templates/axsharpblazor/install.ps1 diff --git a/src/AXSharp.templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj rename to templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/.config/dotnet-tools.json b/templates/working/templates/axsharpconsole/.config/dotnet-tools.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/.config/dotnet-tools.json rename to templates/working/templates/axsharpconsole/.config/dotnet-tools.json diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/.template.config/template.json b/templates/working/templates/axsharpconsole/.template.config/template.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/.template.config/template.json rename to templates/working/templates/axsharpconsole/.template.config/template.json diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/README.md b/templates/working/templates/axsharpconsole/README.md similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/README.md rename to templates/working/templates/axsharpconsole/README.md diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/.gitignore b/templates/working/templates/axsharpconsole/ax/.gitignore similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/.gitignore rename to templates/working/templates/axsharpconsole/ax/.gitignore diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/.vscode/launch.json b/templates/working/templates/axsharpconsole/ax/.vscode/launch.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/.vscode/launch.json rename to templates/working/templates/axsharpconsole/ax/.vscode/launch.json diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/AXSharp.config.json b/templates/working/templates/axsharpconsole/ax/AXSharp.config.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/AXSharp.config.json rename to templates/working/templates/axsharpconsole/ax/AXSharp.config.json diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/apax-lock.json b/templates/working/templates/axsharpconsole/ax/apax-lock.json similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/apax-lock.json rename to templates/working/templates/axsharpconsole/ax/apax-lock.json diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/apax.yml b/templates/working/templates/axsharpconsole/ax/apax.yml similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/apax.yml rename to templates/working/templates/axsharpconsole/ax/apax.yml diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/src/configuration.st b/templates/working/templates/axsharpconsole/ax/src/configuration.st similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/src/configuration.st rename to templates/working/templates/axsharpconsole/ax/src/configuration.st diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/src/program.st b/templates/working/templates/axsharpconsole/ax/src/program.st similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/src/program.st rename to templates/working/templates/axsharpconsole/ax/src/program.st diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/ax/test/test.st b/templates/working/templates/axsharpconsole/ax/test/test.st similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/ax/test/test.st rename to templates/working/templates/axsharpconsole/ax/test/test.st diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.sln b/templates/working/templates/axsharpconsole/axsharpconsole.sln similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.sln rename to templates/working/templates/axsharpconsole/axsharpconsole.sln diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/Entry.cs b/templates/working/templates/axsharpconsole/axsharpconsole.twin/Entry.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/Entry.cs rename to templates/working/templates/axsharpconsole/axsharpconsole.twin/Entry.cs diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj rename to templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/Program.cs b/templates/working/templates/axsharpconsole/axsharpconsole/Program.cs similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/Program.cs rename to templates/working/templates/axsharpconsole/axsharpconsole/Program.cs diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj b/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj rename to templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/install.cmd b/templates/working/templates/axsharpconsole/install.cmd similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/install.cmd rename to templates/working/templates/axsharpconsole/install.cmd diff --git a/src/AXSharp.templates/working/templates/axsharpconsole/install.ps1 b/templates/working/templates/axsharpconsole/install.ps1 similarity index 100% rename from src/AXSharp.templates/working/templates/axsharpconsole/install.ps1 rename to templates/working/templates/axsharpconsole/install.ps1 From 15bf6eaa54cecb0f09f3f37b1229d1a437fdf03a Mon Sep 17 00:00:00 2001 From: Peter <61538034+PTKu@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:54:49 +0100 Subject: [PATCH 2/3] version bump 0.16+ --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index 3cca9f29..b0fa2437 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,5 +1,5 @@ mode: ContinuousDeployment -next-version: 0.15.0 +next-version: 0.16.0 branches: main: regex: ^master$|^main$ From 68a3bf3302a6a206d70909ebb45976996799c682 Mon Sep 17 00:00:00 2001 From: Peter <61538034+PTKu@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:09:24 +0100 Subject: [PATCH 3/3] asp --- global.json | 6 +++++ templates/working/AXSharp.templates.csproj | 25 ++++++------------- .../axsharpblazor/.config/dotnet-tools.json | 2 +- .../axsharpblazor.hmi.csproj | 4 +-- .../axsharpblazor.twin/axsharpblazor.csproj | 6 ++--- .../axsharpblazor.twin.csproj | 8 +++--- .../ixsharpblazor.twin/axsharpblazor.csproj | 6 ++--- .../axsharpconsole/.config/dotnet-tools.json | 2 +- .../axsharpconsole.twin/axsharpconsole.csproj | 8 +++--- .../axsharpconsole/axsharpconsole.app.csproj | 2 +- 10 files changed, 33 insertions(+), 36 deletions(-) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 00000000..062f5fef --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "8.0.100" + } + } + \ No newline at end of file diff --git a/templates/working/AXSharp.templates.csproj b/templates/working/AXSharp.templates.csproj index 855daf23..cd978920 100644 --- a/templates/working/AXSharp.templates.csproj +++ b/templates/working/AXSharp.templates.csproj @@ -1,15 +1,12 @@ - - + - Template + net8.0 + Template AXSharp.templates AXSharp templates PTKu AXSharp project templates. simatic-ax;axsharp;templates - - - true false content @@ -20,20 +17,14 @@ git https://github.com/ix-ax/axsharp - - - - True - \ - - - True - \ - - + + + + + \ No newline at end of file diff --git a/templates/working/templates/axsharpblazor/.config/dotnet-tools.json b/templates/working/templates/axsharpblazor/.config/dotnet-tools.json index 3674cc18..90df7d13 100644 --- a/templates/working/templates/axsharpblazor/.config/dotnet-tools.json +++ b/templates/working/templates/axsharpblazor/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "AXSharp.ixc": { - "version": "0.14.0-alpha.74", + "version": "0.16.0-move-template-to-separate-dir.168", "commands": [ "ixc" ] diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj index 977705c7..b4adffa7 100644 --- a/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj +++ b/templates/working/templates/axsharpblazor/axsharpblazor.app/axsharpblazor.hmi.csproj @@ -1,6 +1,6 @@ - + net8.0 enable enable aspnet-ixsharpblazor-hmi-ee3150da-5237-49bc-b265-f512331ded6c @@ -17,7 +17,7 @@ - + diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj index 26f1cd7c..927fa7bb 100644 --- a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj +++ b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.csproj @@ -1,12 +1,12 @@ - + net8.0 enable enable - - + + diff --git a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj index 0ede0c67..8d010fd4 100644 --- a/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj +++ b/templates/working/templates/axsharpblazor/axsharpblazor.twin/axsharpblazor.twin.csproj @@ -1,13 +1,13 @@ - + net8.0 enable enable - - - + + + diff --git a/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj b/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj index 26f1cd7c..927fa7bb 100644 --- a/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj +++ b/templates/working/templates/axsharpblazor/ixsharpblazor.twin/axsharpblazor.csproj @@ -1,12 +1,12 @@ - + net8.0 enable enable - - + + diff --git a/templates/working/templates/axsharpconsole/.config/dotnet-tools.json b/templates/working/templates/axsharpconsole/.config/dotnet-tools.json index 3674cc18..90df7d13 100644 --- a/templates/working/templates/axsharpconsole/.config/dotnet-tools.json +++ b/templates/working/templates/axsharpconsole/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "AXSharp.ixc": { - "version": "0.14.0-alpha.74", + "version": "0.16.0-move-template-to-separate-dir.168", "commands": [ "ixc" ] diff --git a/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj index 0ede0c67..8d010fd4 100644 --- a/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj +++ b/templates/working/templates/axsharpconsole/axsharpconsole.twin/axsharpconsole.csproj @@ -1,13 +1,13 @@ - + net8.0 enable enable - - - + + + diff --git a/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj b/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj index 1625976a..dc533c69 100644 --- a/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj +++ b/templates/working/templates/axsharpconsole/axsharpconsole/axsharpconsole.app.csproj @@ -1,7 +1,7 @@ Exe - + net8.0 enable enable