diff --git a/.gitignore b/.gitignore index 3b36b84..85e7030 100644 --- a/.gitignore +++ b/.gitignore @@ -398,408 +398,7 @@ FodyWeavers.xsd *.sln.iml .idea/ -# User define - -## 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/main/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.tlog -*.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 - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# 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 -# Note: 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 -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/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 -*.appx -*.appxbundle -*.appxupload - -# 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 - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# 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 -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# 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 6 auto-generated project file (contains which files were open etc.) -*.vbp - -# Visual Studio 6 workspace and project file (working project files containing files to include in project) -*.dsw -*.dsp - -# Visual Studio 6 technical files -*.ncb -*.aps - -# 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/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# Visual Studio History (VSHistory) files -.vshistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -# VS Code files for those working on multiple tools -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -*.code-workspace - -# Local History for Visual Studio Code -.history/ - -# Windows Installer files from build outputs -*.cab -*.msi -*.msix -*.msm -*.msp - -# JetBrains Rider -*.sln.iml -.idea/ - # User Define build/ -nuget.config \ No newline at end of file +nuget.config +*.[Dd]esigner.cs \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index d336885..f6fcf75 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,9 @@ - ../build/temp/bin - ../build/temp/obj - ../build/temp/obj + enable + ../build/$(MSBuildProjectName)/bin + ../build/$(MSBuildProjectName)/obj + $(BaseIntermediateOutputPath) nsnail NSExt © 2006-2022 nsnail @@ -11,11 +12,9 @@ true true Git - true true snupkg MIT https://github.com/nsnail/ns-ext.git - ../build/nupkgs \ No newline at end of file diff --git a/NSExt.sln b/NSExt.sln index e03403c..4e16c72 100644 --- a/NSExt.sln +++ b/NSExt.sln @@ -5,6 +5,25 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSExt", "src\NSExt.csproj", "{70DD1C27-7ACB-4BE0-A9CD-D781E4050DE5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{85E669CB-FC0A-4C1D-92DE-38D0662C257D}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + .gitattributes = .gitattributes + .gitignore = .gitignore + .tgitconfig = .tgitconfig + add-meta-files-to-sln.csx = add-meta-files-to-sln.csx + code-cleanup-on-save.csx = code-cleanup-on-save.csx + code-format.cmd = code-format.cmd + Directory.Build.props = Directory.Build.props + dot.sln.DotSettings = dot.sln.DotSettings + dotnet-tools.json = dotnet-tools.json + git-clean.ps1 = git-clean.ps1 + global.json = global.json + LICENSE = LICENSE + push2nuget.ps1 = push2nuget.ps1 + README.md = README.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/add-meta-files-to-sln.csx b/add-meta-files-to-sln.csx new file mode 100644 index 0000000..b378f00 --- /dev/null +++ b/add-meta-files-to-sln.csx @@ -0,0 +1,14 @@ +using System.Text.RegularExpressions; + +var slnFile = Directory.GetFiles(@".", "*.sln").First(); + var content = File.ReadAllText(slnFile); + content = Regex.Replace(content,@"ProjectSection\(SolutionItems\) = preProject(?:.|\n)*?EndProjectSection", + $""" +ProjectSection(SolutionItems) = preProject +{string.Join('\n', + Directory.GetFiles(@".", "*").Where(x => !x.EndsWith(".sln")) + .Select(x=>$"\t\t{Path.GetFileName(x)} = {Path.GetFileName(x)}"))} +{'\t'}EndProjectSection +"""); + Console.WriteLine(content); + File.WriteAllText(slnFile, content); \ No newline at end of file diff --git a/build.cake b/build.cake new file mode 100644 index 0000000..fd2513c --- /dev/null +++ b/build.cake @@ -0,0 +1,131 @@ +var target = Argument("target", "Default"); +var configuration = Argument("configuration", "Release"); +var pkgOutPath = $"./build/NSExt/pkg/{configuration}"; + +//////////////////////////////////////////////////////////////// +// Tasks + +Task("Clean") + .Does(context => +{ + context.CleanDirectory(pkgOutPath); +}); + +Task("Build") + .IsDependentOn("Clean") + .Does(context => +{ + DotNetBuild("./NSExt.sln", new DotNetBuildSettings { + Configuration = configuration, + NoIncremental = context.HasArgument("rebuild"), + MSBuildSettings = new DotNetMSBuildSettings() + .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) + }); +}); + + +Task("Test") + .IsDependentOn("Build") + .Does(context => +{ + DotNetTest("./test/Spectre.Console.Tests/Spectre.Console.Tests.csproj", new DotNetTestSettings { + Configuration = configuration, + NoRestore = true, + NoBuild = true, + }); + + DotNetTest("./test/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj", new DotNetTestSettings { + Configuration = configuration, + NoRestore = true, + NoBuild = true, + }); + + DotNetTest("./test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj", new DotNetTestSettings { + Configuration = configuration, + NoRestore = true, + NoBuild = true, + }); +}); + +Task("Package") + .IsDependentOn("Build") + .Does(context => +{ + context.DotNetPack("./NSExt.sln", new DotNetPackSettings { + Configuration = configuration, + NoRestore = true, + NoBuild = true, + OutputDirectory = pkgOutPath, + MSBuildSettings = new DotNetMSBuildSettings() + .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) + }); +}); + +Task("Publish-GitHub") + .WithCriteria(ctx => BuildSystem.IsRunningOnGitHubActions, "Not running on GitHub Actions") + .IsDependentOn("Package") + .Does(context => +{ + var apiKey = Argument("github-key", null); + if(string.IsNullOrWhiteSpace(apiKey)) { + throw new CakeException("No GitHub API key was provided."); + } + + // Publish to GitHub Packages + var exitCode = 0; + foreach(var file in context.GetFiles("./.artifacts/*.nupkg")) + { + context.Information("Publishing {0}...", file.GetFilename().FullPath); + exitCode += StartProcess("dotnet", + new ProcessSettings { + Arguments = new ProcessArgumentBuilder() + .Append("gpr") + .Append("push") + .AppendQuoted(file.FullPath) + .AppendSwitchSecret("-k", " ", apiKey) + } + ); + } + + if(exitCode != 0) + { + throw new CakeException("Could not push GitHub packages."); + } +}); + +Task("Publish-NuGet") + .WithCriteria(ctx => BuildSystem.IsRunningOnGitHubActions, "Not running on GitHub Actions") + .IsDependentOn("Package") + .Does(context => +{ + var apiKey = Argument("nuget-key", null); + if(string.IsNullOrWhiteSpace(apiKey)) { + throw new CakeException("No NuGet API key was provided."); + } + + // Publish to GitHub Packages + foreach(var file in context.GetFiles("./.artifacts/*.nupkg")) + { + context.Information("Publishing {0}...", file.GetFilename().FullPath); + DotNetNuGetPush(file.FullPath, new DotNetNuGetPushSettings + { + Source = "https://api.nuget.org/v3/index.json", + ApiKey = apiKey, + }); + } +}); + +//////////////////////////////////////////////////////////////// +// Targets + +Task("Publish") + .IsDependentOn("Publish-GitHub") + .IsDependentOn("Publish-NuGet"); + +Task("Default") + .IsDependentOn("Package"); + +//////////////////////////////////////////////////////////////// +// Execution + +RunTarget(target) \ No newline at end of file diff --git a/code-cleanup-on-save.csx b/code-cleanup-on-save.csx new file mode 100644 index 0000000..d0c39a5 --- /dev/null +++ b/code-cleanup-on-save.csx @@ -0,0 +1,16 @@ +var path = Directory.GetFiles(@".idea", "workspace.xml", SearchOption.AllDirectories).First(); + const string findStr = """ +"keyToString": { +"""; + const string replaceStr = """ +"keyToString": { + "rider.code.cleanup.on.save": "true", +"""; + var content = File.ReadAllText(path); + if(content.Contains("rider.code.cleanup.on.save")){ + Console.WriteLine("alreay added"); + return; + } + content = content.Replace(findStr, replaceStr); + Console.WriteLine(content); + File.WriteAllText(path, content); \ No newline at end of file diff --git a/dotnet-tools.json b/dotnet-tools.json new file mode 100644 index 0000000..55de44c --- /dev/null +++ b/dotnet-tools.json @@ -0,0 +1,7 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + + } +} \ No newline at end of file diff --git a/src/NSExt.csproj b/src/NSExt.csproj index e0f4c95..010dd8d 100644 --- a/src/NSExt.csproj +++ b/src/NSExt.csproj @@ -2,12 +2,14 @@ net6.0;net7.0 - enable - 1.0.8 + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +