删除不再使用的文件
This commit is contained in:
parent
d71b9adff0
commit
97ff57b063
|
@ -1,25 +0,0 @@
|
|||
**/.classpath
|
||||
**/.dockerignore
|
||||
**/.env
|
||||
**/.git
|
||||
**/.gitignore
|
||||
**/.project
|
||||
**/.settings
|
||||
**/.toolstarget
|
||||
**/.vs
|
||||
**/.vscode
|
||||
**/*.*proj.user
|
||||
**/*.dbmdl
|
||||
**/*.jfm
|
||||
**/azds.yaml
|
||||
**/bin
|
||||
**/charts
|
||||
**/docker-compose*
|
||||
**/Dockerfile*
|
||||
**/node_modules
|
||||
**/npm-debug.log
|
||||
**/obj
|
||||
**/secrets.dev.yaml
|
||||
**/values.dev.yaml
|
||||
LICENSE
|
||||
README.md
|
|
@ -1,4 +1,4 @@
|
|||
# EditorConfig is awesome:http://EditorConfig.org
|
||||
# EditorConfig is awesome:http://EditorConfig.org
|
||||
# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
|
||||
|
||||
# top-most EditorConfig file
|
||||
|
@ -43,7 +43,7 @@ csharp_indent_labels = flush_left
|
|||
#csharp_space_between_method_call_parameter_list_parentheses = true
|
||||
#csharp_space_between_parentheses = control_flow_statements, type_casts
|
||||
|
||||
# 单行放置代码
|
||||
# 单行放置代码
|
||||
csharp_preserve_single_line_statements = true
|
||||
csharp_preserve_single_line_blocks = true
|
||||
|
||||
|
@ -96,7 +96,7 @@ csharp_style_pattern_local_over_anonymous_function = true:suggestion
|
|||
csharp_style_throw_expression = true:suggestion
|
||||
csharp_style_conditional_delegate_call = true:suggestion
|
||||
|
||||
# 单行不需要大括号
|
||||
# 单行不需要大括号
|
||||
csharp_prefer_braces = false:suggestion
|
||||
|
||||
# Newline settings
|
||||
|
|
|
@ -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
|
181
发布NuGet.cs
181
发布NuGet.cs
|
@ -1,181 +0,0 @@
|
|||
//assembly=DLL\NuGet.exe
|
||||
//assembly=System.ComponentModel.DataAnnotations
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Xml;
|
||||
using System.Xml.Serialization;
|
||||
using NewLife.Log;
|
||||
using NewLife.Xml;
|
||||
using NuGet;
|
||||
|
||||
namespace NewLife.Reflection
|
||||
{
|
||||
public class ScriptEngine
|
||||
{
|
||||
static void Main()
|
||||
{
|
||||
//PathHelper.BaseDirectory = @"E:\X\Src\NewLife.Cube";
|
||||
XTrace.Debug = true;
|
||||
XTrace.UseConsole();
|
||||
|
||||
var dir = ".".GetBasePath().AsDirectory();
|
||||
|
||||
// 查找NuGet.exe
|
||||
var ng = "..\\DLL\\NuGet.exe".GetBasePath();
|
||||
|
||||
//"cmd".Run("/c del *.nuspec /f/q");
|
||||
foreach(var item in dir.GetAllFiles("*.nuspec"))
|
||||
{
|
||||
Console.WriteLine("删除 {0}", item);
|
||||
item.Delete();
|
||||
}
|
||||
// 找到名称
|
||||
var proj = dir.FullName.EnsureEnd("\\");
|
||||
|
||||
Console.WriteLine("proj项目:{0}", proj);
|
||||
|
||||
var name = "NewLife.Cube";
|
||||
Console.WriteLine("项目名称:{0}", name);
|
||||
proj = dir.GetAllFiles("*.csproj").FirstOrDefault().FullName;
|
||||
var spec = name + ".nuspec";
|
||||
var specFile = spec.GetBasePath();
|
||||
|
||||
if (!File.Exists(specFile))
|
||||
{
|
||||
var tar = "..\\..\\Bin\\" + name + ".dll";
|
||||
tar = tar.GetBasePath();
|
||||
if (!File.Exists(tar))
|
||||
{
|
||||
Console.WriteLine("只能找项目文件了,总得做点啥不是");
|
||||
//编译当前工程
|
||||
"msbuild".Run(proj + " /t:Rebuild /p:Configuration=Release /p:VisualStudioVersion=15.0 /noconlog /nologo", 8000);
|
||||
//"NuGet".Run("spec -f -a " + name, 5000);
|
||||
return;
|
||||
}
|
||||
Console.WriteLine("目标 {0}", tar);
|
||||
ng.Run("spec -Force -a " + tar, 5000);
|
||||
/*var sCmd = new NuGet.CommandLine.SpecCommand();
|
||||
sCmd.Force = true;
|
||||
sCmd.AssemblyPath = tar;
|
||||
sCmd.ExecuteCommand();*/
|
||||
|
||||
var spec2 = dir.GetAllFiles(spec).First().Name;
|
||||
if (!spec.EqualIgnoreCase(spec2)) File.Move(spec2, spec);
|
||||
}
|
||||
|
||||
// 部分项目加上前缀
|
||||
var name2 = name.EnsureStart("NewLife.");
|
||||
|
||||
var ms = new MemoryStream(File.ReadAllBytes(specFile));
|
||||
var cfg = Manifest.ReadFrom(ms, false);
|
||||
// 修改配置文件
|
||||
cfg.Metadata.Id = name2;
|
||||
cfg.Metadata.LicenseUrl = "http://www.NewLifeX.com";
|
||||
cfg.Metadata.ProjectUrl = "https://github.com/NewLifeX";
|
||||
cfg.Metadata.IconUrl = "http://www.NewLifeX.com/favicon.ico";
|
||||
cfg.Metadata.Copyright = "Copyright 2002-{0} 新生命开发团队 http://www.NewLifeX.com".F(DateTime.Now.Year);
|
||||
cfg.Metadata.Tags = "新生命团队 X组件 NewLife " + name;
|
||||
cfg.Metadata.ReleaseNotes = "https://github.com/NewLifeX";
|
||||
//cfg.Metadata.Authors="新生命开发团队";
|
||||
//cfg.Metadata.Owners="新生命开发团队";
|
||||
|
||||
/*var rep = new RepositoryMetadata();
|
||||
rep.Type = "git";
|
||||
rep.Url = "https://github.com/NewLifeX/X.git";
|
||||
cfg.Metadata.Repository = rep;*/
|
||||
|
||||
// 清空依赖
|
||||
var dgs = cfg.Metadata.DependencySets;
|
||||
if (dgs != null) dgs.Clear();
|
||||
//var dgs = cfg.Metadata.DependencyGroups;
|
||||
//dps.RemoveAll(e => e.Id == "SampleDependency");
|
||||
|
||||
//var fx = new NuGet.Frameworks.NuGet.Frameworks1094018.NuGetFramework(".NETFramework4.5");
|
||||
//var dg = new PackageDependencyGroup(fx, new PackageDependency[0]);
|
||||
//dgs.Add(dk);
|
||||
|
||||
// 自动添加所有文件
|
||||
if (cfg.Files == null) cfg.Files = new List<ManifestFile>();
|
||||
cfg.Files.Clear();
|
||||
if (cfg.Files.Count == 0)
|
||||
{
|
||||
AddFile(cfg, name, "dll;xml;pdb;exe", @"..\..\Bin", @"lib\net45");
|
||||
AddFile(cfg, name, "dll;xml;pdb;exe", @"..\..\Bin4", @"lib\net40");
|
||||
AddFile(cfg, name, "dll;xml;pdb;exe", @"..\Bin\netcoreapp3.0", @"lib\netcoreapp3.0");
|
||||
AddFile(cfg, name + ".Views", "dll;xml;pdb;exe", @"..\Bin\netcoreapp3.0", @"lib\netcoreapp3.0");
|
||||
|
||||
if (name == "XCode") AddFile(cfg, null, "*.ps1", @"tools", @"tools");
|
||||
}
|
||||
|
||||
ms = new MemoryStream();
|
||||
cfg.Save(ms);
|
||||
File.WriteAllBytes(specFile, ms.ToArray());
|
||||
|
||||
//var pack = "pack {0} -IncludeReferencedProjects -Build -Prop Configuration={1} -Exclude **\\*.txt;**\\*.png;content\\*.xml";
|
||||
// *\\*.*干掉下级的所有文件
|
||||
var pack = "pack {0} -IncludeReferencedProjects -Exclude **\\*.txt;**\\*.png;*.jpg";
|
||||
Console.WriteLine("打包:{0}", proj);
|
||||
//"cmd".Run("/c del *.nupkg /f/q");
|
||||
foreach(var item in dir.GetAllFiles("*.nupkg"))
|
||||
{
|
||||
Console.WriteLine("删除 {0}", item);
|
||||
item.Delete();
|
||||
}
|
||||
ng.Run(pack.F(proj), 30000);
|
||||
var fi = dir.GetAllFiles("*.nupkg").FirstOrDefault();
|
||||
if (fi != null)
|
||||
{
|
||||
var nupkg = fi.Name;
|
||||
Console.WriteLine("发布:{0}", nupkg);
|
||||
ng.Run("push {0} {1} -Source https://www.nuget.org -Verbosity detailed".F(nupkg, File.ReadAllText("..\\..\\nuget.key")), 30000);
|
||||
}
|
||||
}
|
||||
|
||||
//static ManifestDependency _md;
|
||||
static void AddFile(Manifest cfg, String name, String exts, String src, String target)
|
||||
{
|
||||
if (!name.IsNullOrEmpty()) exts = exts.Split(";").Select(e=>name + "." + e).Join(";");
|
||||
var fs = src.AsDirectory().GetAllFiles(exts).ToList();
|
||||
//XTrace.WriteLine("目录:{0} 文件:{1}", src.AsDirectory().FullName, fs.Count);
|
||||
if(fs.Count == 0) return;
|
||||
|
||||
var dgs = cfg.Metadata.DependencySets;
|
||||
var dg = new ManifestDependencySet();
|
||||
switch(target.Substring(@"\"))
|
||||
{
|
||||
case "net20": dg.TargetFramework = ".NETFramework2.0"; break;
|
||||
case "net40": dg.TargetFramework = ".NETFramework4.0"; break;
|
||||
case "net45": dg.TargetFramework = ".NETFramework4.5"; break;
|
||||
case "netstandard2.0": dg.TargetFramework = ".NETStandard2.0"; break;
|
||||
case "netcoreapp3.0": dg.TargetFramework = "netcoreapp3.0"; break;
|
||||
}
|
||||
|
||||
dg.Dependencies = new List<ManifestDependency>();
|
||||
|
||||
/*if(_md == null)
|
||||
{
|
||||
var md = new ManifestDependency();
|
||||
md.Id = "NewLife.Core";
|
||||
md.Version = "7.0.6706.20578";
|
||||
md.Exclude = "Build,Analyzers";
|
||||
|
||||
_md = md;
|
||||
dg.Dependencies.Add(md);
|
||||
}*/
|
||||
|
||||
if(!dg.TargetFramework.IsNullOrEmpty()) dgs.Add(dg);
|
||||
|
||||
XTrace.WriteLine("目录:{0} 框架:{1} 文件:{2}", src, dg.TargetFramework, fs.Count);
|
||||
|
||||
foreach(var item in fs)
|
||||
{
|
||||
var mf = new ManifestFile();
|
||||
mf.Source = item.FullName;
|
||||
mf.Target = @"{0}\{1}".F(target, item.Name);
|
||||
cfg.Files.Add(mf);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue