From adf37f11452e127bd41e4d091b97134a6cc91266 Mon Sep 17 00:00:00 2001 From: Robert Coltheart Date: Wed, 17 Feb 2021 21:14:01 +0800 Subject: [PATCH] Update template --- GitVersion.yml | 2 - build.cmd | 4 - build/build.cs | 106 +++---- build/build.csproj | 8 +- src/Prefab/templates/prefab/.gitattributes | 63 ---- src/Prefab/templates/prefab/.gitignore | 288 ------------------ src/Prefab/templates/prefab/GitVersion.yml | 1 - src/Prefab/templates/prefab/build/build.cs | 76 +++++ .../templates/prefab/build/build.csproj | 14 + tools/packages.config | 4 - 10 files changed, 144 insertions(+), 422 deletions(-) delete mode 100644 build.cmd delete mode 100644 src/Prefab/templates/prefab/.gitattributes delete mode 100644 src/Prefab/templates/prefab/.gitignore create mode 100644 src/Prefab/templates/prefab/build/build.cs create mode 100644 src/Prefab/templates/prefab/build/build.csproj delete mode 100644 tools/packages.config diff --git a/GitVersion.yml b/GitVersion.yml index 9c8f1f6..0db940d 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,2 @@ -next-version: 1.0.0 mode: ContinuousDelivery commit-message-incrementing: Disabled -legacy-semver-padding: 0 diff --git a/build.cmd b/build.cmd deleted file mode 100644 index 0b45782..0000000 --- a/build.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -pushd %~dp0 - -@powershell -ExecutionPolicy Bypass ./build.ps1 %* diff --git a/build/build.cs b/build/build.cs index 02ca20f..a74faae 100644 --- a/build/build.cs +++ b/build/build.cs @@ -4,68 +4,62 @@ using static Bullseye.Targets; using static SimpleExec.Command; -public class build +var version = GetGitVersion(); + +Target("clean", () => { - public static void Main(string[] args) + Run("dotnet", "clean"); + + if (Directory.Exists("artifacts")) { - var version = GetGitVersion(); - - Target("clean", () => - { - Run("dotnet", "clean"); - - if (Directory.Exists("artifacts")) - { - Directory.Delete("artifacts", true); - } - }); - - Target("restore", DependsOn("clean"), () => - { - Run("dotnet", "restore"); - }); - - Target("build", DependsOn("restore"), () => - { - Run("dotnet", "build " + - "--no-restore " + - "--configuration Release " + - $"/p:Version={version.SemVer} " + - $"/p:AssemblyVersion={version.AssemblySemVer} " + - $"/p:FileVersion={version.AssemblySemFileVer} " + - $"/p:InformationalVersion={version.InformationalVersion}"); - }); - - Target("test", DependsOn("build"), () => - { - Run("dotnet", "test --configuration Release --no-restore --no-build"); - }); - - Target("package", DependsOn("build", "test"), () => - { - Run("dotnet", $"pack --configuration Release --no-restore --no-build --output artifacts /p:Version={version.SemVer}"); - }); - - Target("publish", DependsOn("package"), () => - { - var apiKey = Environment.GetEnvironmentVariable("NUGET_API_KEY"); - - Run("dotnet", $"nuget push {Path.Combine("artifacts", "*.nupkg")} --api-key {apiKey} --source https://api.nuget.org/v3/index.json"); - }); - - Target("default", DependsOn("package")); - - RunTargetsAndExit(args); + Directory.Delete("artifacts", true); } +}); - private static GitVersion GetGitVersion() - { - Run("dotnet", "tool restore"); +Target("restore", DependsOn("clean"), () => +{ + Run("dotnet", "restore"); +}); - var value = Read("dotnet", "dotnet-gitversion"); +Target("build", DependsOn("restore"), () => +{ + Run("dotnet", "build " + + "--no-restore " + + "--configuration Release " + + $"/p:Version={version.SemVer} " + + $"/p:AssemblyVersion={version.AssemblySemVer} " + + $"/p:FileVersion={version.AssemblySemFileVer} " + + $"/p:InformationalVersion={version.InformationalVersion}"); +}); + +Target("test", DependsOn("build"), () => +{ + Run("dotnet", "test --configuration Release --no-restore --no-build"); +}); - return JsonSerializer.Deserialize(value); - } +Target("package", DependsOn("build", "test"), () => +{ + Run("dotnet", $"pack --configuration Release --no-restore --no-build --output artifacts /p:Version={version.SemVer}"); +}); + +Target("publish", DependsOn("package"), () => +{ + var apiKey = Environment.GetEnvironmentVariable("NUGET_API_KEY"); + + Run("dotnet", $"nuget push {Path.Combine("artifacts", "*.nupkg")} --api-key {apiKey} --source https://api.nuget.org/v3/index.json"); +}); + +Target("default", DependsOn("package")); + +RunTargetsAndExit(args); + +GitVersion GetGitVersion() +{ + Run("dotnet", "tool restore"); + + var value = Read("dotnet", "dotnet-gitversion"); + + return JsonSerializer.Deserialize(value); } public class GitVersion diff --git a/build/build.csproj b/build/build.csproj index 9feba04..46bfab2 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp3.1 + net50 - - - + + + diff --git a/src/Prefab/templates/prefab/.gitattributes b/src/Prefab/templates/prefab/.gitattributes deleted file mode 100644 index 1ff0c42..0000000 --- a/src/Prefab/templates/prefab/.gitattributes +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain diff --git a/src/Prefab/templates/prefab/.gitignore b/src/Prefab/templates/prefab/.gitignore deleted file mode 100644 index 65429c6..0000000 --- a/src/Prefab/templates/prefab/.gitignore +++ /dev/null @@ -1,288 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ -**/Properties/launchSettings.json - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Typescript v1 declaration files -typings/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -tools/** -!tools/packages.config - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs diff --git a/src/Prefab/templates/prefab/GitVersion.yml b/src/Prefab/templates/prefab/GitVersion.yml index 0b22b6d..0db940d 100644 --- a/src/Prefab/templates/prefab/GitVersion.yml +++ b/src/Prefab/templates/prefab/GitVersion.yml @@ -1,3 +1,2 @@ -next-version: 0.1.0 mode: ContinuousDelivery commit-message-incrementing: Disabled diff --git a/src/Prefab/templates/prefab/build/build.cs b/src/Prefab/templates/prefab/build/build.cs new file mode 100644 index 0000000..a74faae --- /dev/null +++ b/src/Prefab/templates/prefab/build/build.cs @@ -0,0 +1,76 @@ +using System; +using System.IO; +using System.Text.Json; +using static Bullseye.Targets; +using static SimpleExec.Command; + +var version = GetGitVersion(); + +Target("clean", () => +{ + Run("dotnet", "clean"); + + if (Directory.Exists("artifacts")) + { + Directory.Delete("artifacts", true); + } +}); + +Target("restore", DependsOn("clean"), () => +{ + Run("dotnet", "restore"); +}); + +Target("build", DependsOn("restore"), () => +{ + Run("dotnet", "build " + + "--no-restore " + + "--configuration Release " + + $"/p:Version={version.SemVer} " + + $"/p:AssemblyVersion={version.AssemblySemVer} " + + $"/p:FileVersion={version.AssemblySemFileVer} " + + $"/p:InformationalVersion={version.InformationalVersion}"); +}); + +Target("test", DependsOn("build"), () => +{ + Run("dotnet", "test --configuration Release --no-restore --no-build"); +}); + +Target("package", DependsOn("build", "test"), () => +{ + Run("dotnet", $"pack --configuration Release --no-restore --no-build --output artifacts /p:Version={version.SemVer}"); +}); + +Target("publish", DependsOn("package"), () => +{ + var apiKey = Environment.GetEnvironmentVariable("NUGET_API_KEY"); + + Run("dotnet", $"nuget push {Path.Combine("artifacts", "*.nupkg")} --api-key {apiKey} --source https://api.nuget.org/v3/index.json"); +}); + +Target("default", DependsOn("package")); + +RunTargetsAndExit(args); + +GitVersion GetGitVersion() +{ + Run("dotnet", "tool restore"); + + var value = Read("dotnet", "dotnet-gitversion"); + + return JsonSerializer.Deserialize(value); +} + +public class GitVersion +{ + public string SemVer { get; set; } + + public string AssemblySemVer { get; set; } + + public string AssemblySemFileVer { get; set; } + + public string InformationalVersion { get; set; } + + public string PreReleaseTag { get; set; } +} diff --git a/src/Prefab/templates/prefab/build/build.csproj b/src/Prefab/templates/prefab/build/build.csproj new file mode 100644 index 0000000..46bfab2 --- /dev/null +++ b/src/Prefab/templates/prefab/build/build.csproj @@ -0,0 +1,14 @@ + + + + Exe + net50 + + + + + + + + + diff --git a/tools/packages.config b/tools/packages.config deleted file mode 100644 index 0308983..0000000 --- a/tools/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - -