NewLife/X

修改自动复制dll以及tt文件设置,初步通过测试
xxred authored at 2019-03-10 14:44:01
8ebf78d
Tree
1 Parent(s) 03345d4
Summary: 4 changed files with 36 additions and 7 deletions.
Modified +6 -0
Modified +2 -2
Modified +1 -1
Modified +27 -4
Modified +6 -0
diff --git a/NewLife.Core/NewLife.Core.csproj b/NewLife.Core/NewLife.Core.csproj
index 5b7d9e4..c0c85e4 100644
--- a/NewLife.Core/NewLife.Core.csproj
+++ b/NewLife.Core/NewLife.Core.csproj
@@ -12,6 +12,12 @@
     <Deterministic>false</Deterministic>
     <Version>8.1.2019.0310</Version>
     <RepositoryUrl>https://github.com/NewLifeX/X</RepositoryUrl>
+    <!--包含符号-->
+    <!--<IncludeSymbols>true</IncludeSymbols>-->
+    <!--包含源码-->
+    <IncludeSource>true</IncludeSource>
+    <!--编译时生成Nuget包-->
+    <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
     <RepositoryType>git</RepositoryType>
     <OutputPath>..\..\Bin</OutputPath>
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
Modified +2 -2
diff --git a/XCode/build/NewLife.XCode.props b/XCode/build/NewLife.XCode.props
index 1d482ed..8de6d02 100644
--- a/XCode/build/NewLife.XCode.props
+++ b/XCode/build/NewLife.XCode.props
@@ -63,11 +63,11 @@
                 var coreMatch = Regex.Match(result, string.Format(pkgRgx, corePkgName.Replace(".", "\\.")));
                 var xcodeMatch = Regex.Match(result, string.Format(pkgRgx, xcodePkgName.Replace(".", "\\.")));
 
-                if (!coreMatch.Success || !xcodeMatch.Success)
+                if (!coreMatch.Success)
                 {
                     throw new Exception("依赖库libraries中找不到" + corePkgName);
                 }
-                if (!coreMatch.Success || !xcodeMatch.Success)
+                if (!xcodeMatch.Success)
                 {
                     throw new Exception("依赖库libraries中找不到" + xcodePkgName);
                 }
Modified +1 -1
diff --git a/XCode/tools/install.ps1 b/XCode/tools/install.ps1
index 1e92375..df09cad 100644
--- a/XCode/tools/install.ps1
+++ b/XCode/tools/install.ps1
@@ -31,7 +31,7 @@ try
     
     
     # 包内路径
-    $pPath = "lib/net40/";
+    $pPath = "lib/net45/";
 
       # 文件名
     $coreDllName = "NewLife.Core.dll"
Modified +27 -4
diff --git a/XCode/XCode.csproj b/XCode/XCode.csproj
index 2f3855a..4fff9db 100644
--- a/XCode/XCode.csproj
+++ b/XCode/XCode.csproj
@@ -1,18 +1,37 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <!--Nuget包ID-->
+    <PackageId>NewLife.XCode</PackageId>
+    <!--Nuget包版本-->
+    <!-- <PackageVersion>9.10.2019.0310</PackageVersion> -->
     <AssemblyName>XCode</AssemblyName>
     <RootNamespace>XCode</RootNamespace>
     <AssemblyTitle>数据中间件</AssemblyTitle>
     <Description>数据中间件,MySQL、SQLite、SqlServer、Oracle</Description>
+    <Authors>新生命开发团队</Authors>
     <Company>新生命开发团队</Company>
     <Copyright>©2002-2019 新生命开发团队</Copyright>
     <FileVersion>9.10.2019.0310</FileVersion>
     <AssemblyVersion>9.10.*</AssemblyVersion>
     <Deterministic>false</Deterministic>
     <Version>9.10.2019.0310</Version>
+    <!--是否要求接受许可-->
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/NewLifeX/X/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/NewLifeX</PackageProjectUrl>
+    <PackageIconUrl>http://www.NewLifeX.com/favicon.ico</PackageIconUrl>
+    <PackageTags>新生命团队;X组件;NewLife;XCode</PackageTags>
+    <PackageReleaseNotes>https://github.com/NewLifeX/X/releases</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/NewLifeX/X</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+    <!--包含符号-->
+    <!--<IncludeSymbols>true</IncludeSymbols>-->
+    <!--包含源码-->
+    <IncludeSource>true</IncludeSource>
+    <!--编译时生成Nuget包-->
+    <!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
+    <Trademark>四叶草</Trademark>
     <OutputPath>..\..\Bin</OutputPath>
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <DefineConstants>TRACE</DefineConstants>
@@ -56,16 +75,20 @@
   <ItemGroup>
     <Content Include="Build.tt">
       <Pack>true</Pack>
-      <PackagePath>Entity\</PackagePath>
+      <PackagePath>content\</PackagePath>
     </Content>
-    <Content Include="Model.xml" >
+    <Content Include="Model.xml">
       <Pack>true</Pack>
-      <PackagePath>Entity\</PackagePath>
+      <PackagePath>content\</PackagePath>
     </Content>
-    <Content Include="tools\install.ps1" >
+    <Content Include="tools\install.ps1">
       <Pack>true</Pack>
       <PackagePath>tools\</PackagePath>
     </Content>
+    <Content Include="build\NewLife.XCode.props">
+      <Pack>true</Pack>
+      <PackagePath>build\</PackagePath>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>