Skip to content

Commit

Permalink
Merge pull request #27 from MadL1me/release/8.0.0
Browse files Browse the repository at this point in the history
[Release/8.0.0] - .NET 8
  • Loading branch information
MadL1me authored May 18, 2024
2 parents fbafd56 + 673e69b commit b72eb5d
Show file tree
Hide file tree
Showing 52 changed files with 175 additions and 160 deletions.
9 changes: 4 additions & 5 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
TEST_PROJ_NAME:MyProject

TEMPL_DOTNET_NAME:asp-awesome-spa
TEMPL_NAME:Asp.AwesomeTemplates.Spa
NUGET_FILE:Asp.AwesomeTemplates.Spa.0.3.2.nupkg
TEST_PROJ_NAME=MyProject
TEMPL_DOTNET_NAME=aspnext
NUGET_FILE=Aspnext.Template.8.0.0.nupkg
NUGET_API_KEY=<YOUR_NUGET_API_KEY>
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ Level X/nupkg
.env.prod
Asp.AwesomeTemplates.Spa/nupkg
Asp.AwesomeTemplates.Spa/Template/react-vite/node_modules
**/.DS_Store
experiments
25 changes: 0 additions & 25 deletions Asp.AwesomeTemplates.Spa/Template/_AWESOME_SPA_/.dockerignore

This file was deleted.

20 changes: 0 additions & 20 deletions Asp.AwesomeTemplates.Spa/Template/_AWESOME_SPA_/Dockerfile

This file was deleted.

31 changes: 31 additions & 0 deletions Aspnext.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspnext.Template", "src\template\Aspnext.Template.csproj", "{768CB4F3-FE8B-4865-B3B2-015B2A23262C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{303FD465-E4F3-446F-9F1D-A4CE5E08E2D7}"
ProjectSection(SolutionItems) = preProject
Makefile = Makefile
.env.prod = .env.prod
.env = .env
README.md = README.md
.gitignore = .gitignore
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{768CB4F3-FE8B-4865-B3B2-015B2A23262C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{768CB4F3-FE8B-4865-B3B2-015B2A23262C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{768CB4F3-FE8B-4865-B3B2-015B2A23262C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{768CB4F3-FE8B-4865-B3B2-015B2A23262C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
52 changes: 52 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Define environment variables
TEMPL_DIR := src/template
DOTENV := .env.prod
include $(DOTENV)
export $(shell sed 's/=.*//' $(DOTENV))

.PHONY: remove create create_release install new run-dotnet run all list info deploy

clean:
cd experiments && \
rm -rf *

install:
dotnet new install ./

uninstall:
dotnet new uninstall ./

remove:
cd $(TEMPL_DIR)/nupkg && \
pwd && \
dotnet new --uninstall $$TEMPL_NAME && \
rm -rf *

pack:
cd $(TEMPL_DIR) && \
dotnet pack

pack-release:
cd $(TEMPL_DIR) && \
dotnet pack --configuration Release

new:
cd $(TEMPL_DIR)/nupkg && \
dotnet new $$TEMPL_DOTNET_NAME -o $$TEST_PROJ_NAME

run-dotnet:
cd $(TEMPL_DIR)/nupkg/$(TEST_PROJ_NAME) && \
dotnet run

run:
cd $(TEMPL_DIR)/nupkg/$(TEST_PROJ_NAME)/$(TEST_PROJ_NAME) && \
docker compose up

all: remove pack install new

info:
dotnet new $$TEMPL_DOTNET_NAME -h

deploy: remove pack-release
cd $(TEMPL_DIR)/nupkg && \
dotnet nuget push $(NUGET_FILE) --api-key $(NUGET_API_KEY) --source https://api.nuget.org/v3/index.json
70 changes: 0 additions & 70 deletions Taskfile.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,28 @@

<PropertyGroup>
<PackageType>Template</PackageType>
<PackageVersion>0.3.2</PackageVersion>
<PackageId>Asp.AwesomeTemplates.Spa</PackageId>
<Title>ASP.NET 6 awesome SPA template</Title>
<PackageVersion>8.0.0</PackageVersion>
<PackageId>Aspnext.Template</PackageId>
<Title>ASP.NET 8 awesome SPA template</Title>
<Authors>Ilya Klimenko (MadL1me)</Authors>
<Description>ASP.NET 6 Easy-to-use, modern and awesome template.</Description>
<PackageTags>dotnet-new;templates;aspnet;ez-template;webapp;aspnet-react;aspnet-vue</PackageTags>
<TargetFramework>net6.0</TargetFramework>
<Description>ASP.NET 8 Easy-to-use, modern and awesome template.</Description>
<PackageTags>dotnet-new;templates;aspnet;webapp;aspnet-react;aspnet-next;aspnext;template</PackageTags>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IncludeContentInPack>true</IncludeContentInPack>
<IncludeBuildOutput>false</IncludeBuildOutput>
<ContentTargetFolders>content</ContentTargetFolders>
<PackageOutputPath>./nupkg</PackageOutputPath>
<RootNamespace>AspnextTemplate</RootNamespace>
</PropertyGroup>


<ItemGroup>
<Content Include="Template\**\*" Exclude="Template\**\bin\**;Template\**\obj\**" />
<Compile Remove="**\*" />
</ItemGroup>


<ItemGroup>
<Folder Include="nupkg\" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
{
"$schema": "http://json.schemastore.org/template",
"author": "Ilya Klimenko (MadL1me)",
"classifications": ["Webapp", "Asp net 6"],
"identity": "Asp.AwesomeTemplates.Spa.CSharp",
"name": "ASP.NET 6 Easy-to-use, modern and awesome template",
"shortName": "asp-awesome-spa",
"sourceName": "_AWESOME_SPA_",
"classifications": ["WebApp", "ASP.NET 8", ".NET 8"],
"identity": "Aspnext.Template",
"name": "ASP.NET 8 Easy-to-use and modern template",
"shortName": "aspnext",
"sourceName": "AspnextTemplate",
"tags": {
"type": "project",
"type": "solution",
"language": "C#"
},
"guids": [
"753473BB-FF9B-49A5-8FBA-976C4C9A1BD4"
],
"symbols": {
"UseExamples": {
"type": "parameter",
Expand Down Expand Up @@ -85,13 +88,13 @@
},
{
"condition": "(!UseExamples)",
"exclude": ["_AWESOME_SPA_/Controllers/ExampleController.cs"]
"exclude": ["AspnextTemplate/Controllers/ExampleController.cs"]
},
{
"condition": "(!UsePostgreSql)",
"exclude": [
"_AWESOME_SPA_/Data/Asp.AwesomeTemplateDbContext.cs",
"_AWESOME_SPA_/DB/**"
"AspnextTemplate/Data/Asp.AwesomeTemplateDbContext.cs",
"AspnextTemplate/DB/**"
]
}
]
Expand Down
21 changes: 21 additions & 0 deletions src/template/Template/AspnextTemplate.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspnextTemplate", "src\AspnextTemplate.csproj", "{753473BB-FF9B-49A5-8FBA-976C4C9A1BD4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{753473BB-FF9B-49A5-8FBA-976C4C9A1BD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{753473BB-FF9B-49A5-8FBA-976C4C9A1BD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{753473BB-FF9B-49A5-8FBA-976C4C9A1BD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{753473BB-FF9B-49A5-8FBA-976C4C9A1BD4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# _AWESOME_SPA_ Project
# AspnextTemplate Project

## Develop

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ tasks:

init/backend:
desc: Initialize the back-end project
dir: _AWESOME_SPA_
dir: AspnextTemplate
cmds:
- dotnet restore
- docker compose build

init/db:
desc: Initialize the database
dir: _AWESOME_SPA_/DB
dir: AspnextTemplate/DB
cmds:
- docker compose build

init/certs:
desc: Generate self-signed certificates
cmds:
- dotnet dev-certs https -ep ${HOME}/.aspnet/https/_AWESOME_SPA_.pfx -p PASSWORD
- dotnet dev-certs https -ep ${HOME}/.aspnet/https/AspnextTemplate.pfx -p PASSWORD
- dotnet dev-certs https --trust
# - openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes -subj "/CN=localhost"

run/backend:
desc: Run the backend
dir: _AWESOME_SPA_
dir: AspnextTemplate
cmds:
//#if(UsePostgreSql)
- task: run/db
Expand All @@ -50,7 +50,7 @@ tasks:
//#if(UsePostgreSql)
run/db:
desc: Rund the database
dir: _AWESOME_SPA_/DB
dir: AspnextTemplate/DB
cmds:
- docker compose up --no-recreate -d
//#endif
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "_AWESOME_SPA_-next",
"name": "AspnextTemplate-next",
"version": "0.1.0",
"private": true,
"scripts": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "_AWESOME_SPA_-vite",
"name": "AspnextTemplate-vite",
"private": true,
"version": "0.0.0",
"type": "module",
Expand Down
File renamed without changes.
Loading

0 comments on commit b72eb5d

Please sign in to comment.