升级X组件到0822版

This commit is contained in:
大石头 2019-09-08 12:12:16 +08:00
parent b30b546c1d
commit d44f51377a
9 changed files with 41 additions and 43 deletions

View File

@ -6,8 +6,8 @@
<Description>分布式任务调度系统纯NET打造的重量级大数据实时计算平台万亿级调度经验积累面向1000作业以内中小企业大数据分析场景。</Description>
<Company>新生命开发团队</Company>
<Copyright>版权所有(C) 新生命开发团队 2019</Copyright>
<Version>1.0.2019.0409</Version>
<FileVersion>1.0.2019.0409</FileVersion>
<Version>1.0.2019.0908</Version>
<FileVersion>1.0.2019.0908</FileVersion>
<AssemblyVersion>1.0.*</AssemblyVersion>
<Deterministic>false</Deterministic>
</PropertyGroup>
@ -36,8 +36,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="8.1.2019.407" />
<PackageReference Include="NewLife.XCode" Version="9.11.2019.407" />
<PackageReference Include="NewLife.Core" Version="8.3.2019.822" />
<PackageReference Include="NewLife.XCode" Version="9.14.2019.822" />
</ItemGroup>
<ItemGroup>

View File

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net45;netstandard2.0;net40</TargetFrameworks>
<AssemblyTitle>蚂蚁调度系统扩展</AssemblyTitle>
<Description>分布式任务调度系统纯NET打造的重量级大数据实时计算平台万亿级调度经验积累面向1000作业以内中小企业大数据分析场景。</Description>
<Company>新生命开发团队</Company>
<Copyright>版权所有(C) 新生命开发团队 2019</Copyright>
<Version>1.0.2019.0331</Version>
<FileVersion>1.0.2019.0331</FileVersion>
<Version>1.0.2019.0908</Version>
<FileVersion>1.0.2019.0908</FileVersion>
<AssemblyVersion>1.0.*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
@ -32,7 +32,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
<PackageReference Include="NewLife.Core" Version="8.1.2019.415" />
<PackageReference Include="NewLife.Core" Version="8.3.2019.822" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
@ -48,7 +48,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="9.11.2019.415" />
<PackageReference Include="NewLife.XCode" Version="9.14.2019.822" />
</ItemGroup>
<ItemGroup>

View File

@ -7,20 +7,14 @@
<Description>分布式任务调度系统纯NET打造的重量级大数据实时计算平台万亿级调度经验积累面向1000作业以内中小企业大数据分析场景。</Description>
<Company>新生命开发团队</Company>
<Copyright>版权所有(C) 新生命开发团队 2019</Copyright>
<Version>1.0.2019.0331</Version>
<FileVersion>1.0.2019.0331</FileVersion>
<Version>1.0.2019.0908</Version>
<FileVersion>1.0.2019.0908</FileVersion>
<AssemblyVersion>1.0.*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
<PackageReference Include="NewLife.Core" Version="8.1.2019.415" />
<PackageReference Include="NewLife.XCode" Version="9.11.2019.415" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
<DefineConstants>$(DefineConstants);NETSTANDARD2_0;__CORE__</DefineConstants>
</PropertyGroup>
@ -33,8 +27,19 @@
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="8.3.2019.822" />
<PackageReference Include="NewLife.XCode" Version="9.14.2019.822" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="NewLife.Agent">
<Version>8.3.2019.822</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net45' or '$(TargetFramework)'=='net40'">
<Reference Include="System.ServiceProcess" />
</ItemGroup>
<ItemGroup>
@ -42,7 +47,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="NewLife.Agent" Version="*" />
<PackageReference Include="NewLife.Agent" Version="8.3.2019.822" />
</ItemGroup>
</Project>

View File

@ -46,8 +46,8 @@
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="NewLife.Core, Version=8.1.7044.42314, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NewLife.Core.8.1.2019.415\lib\net45\NewLife.Core.dll</HintPath>
<Reference Include="NewLife.Core, Version=8.3.7183.41839, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NewLife.Core.8.3.2019.822\lib\net45\NewLife.Core.dll</HintPath>
</Reference>
<Reference Include="NewLife.Cube, Version=2.7.7044.43070, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NewLife.Cube.2.7.7044.43070\lib\net45\NewLife.Cube.dll</HintPath>
@ -80,8 +80,8 @@
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="XCode, Version=9.11.7044.42317, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NewLife.XCode.9.11.2019.415\lib\net45\XCode.dll</HintPath>
<Reference Include="XCode, Version=9.14.7183.41843, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NewLife.XCode.9.14.2019.822\lib\net45\XCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

View File

@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
// 可以指定所有值,也可以使用“修订号”和“内部版本号”的默认值,
// 方法是按如下所示使用 "*":
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("1.0.2019.0409")]
[assembly: AssemblyFileVersion("1.0.2019.0908")]

View File

@ -7,7 +7,7 @@
<package id="Microsoft.AspNet.WebPages" version="3.2.6" targetFramework="net461" />
<package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.6" targetFramework="net461" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
<package id="NewLife.Core" version="8.1.2019.415" targetFramework="net461" />
<package id="NewLife.Core" version="8.3.2019.822" targetFramework="net461" />
<package id="NewLife.Cube" version="2.7.7044.43070" targetFramework="net461" />
<package id="NewLife.XCode" version="9.11.2019.415" targetFramework="net461" />
<package id="NewLife.XCode" version="9.14.2019.822" targetFramework="net461" />
</packages>

View File

@ -1,17 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net45;netstandard2.0;net40</TargetFrameworks>
<AssemblyTitle>蚂蚁调度系统</AssemblyTitle>
<Description>分布式任务调度系统纯NET打造的重量级大数据实时计算平台万亿级调度经验积累面向1000作业以内中小企业大数据分析场景。</Description>
<Company>新生命开发团队</Company>
<Copyright>版权所有(C) 新生命开发团队 2019</Copyright>
<Version>1.0.2019.0407</Version>
<FileVersion>1.0.2019.0407</FileVersion>
<Version>1.0.2019.0908</Version>
<FileVersion>1.0.2019.0908</FileVersion>
<AssemblyVersion>1.0.*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\Bin</OutputPath>
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<DebugType>pdbonly</DebugType>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
@ -32,27 +33,19 @@
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All" />
<PackageReference Include="NewLife.Core" Version="8.1.2019.407" />
<PackageReference Include="NewLife.Core" Version="8.3.2019.822" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<DefineConstants>$(DefineConstants);NETSTANDARD2_0;__CORE__</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
<PropertyGroup Condition="'$(TargetFramework)'=='net45' or '$(TargetFramework)'=='net40'">
<DefineConstants>$(DefineConstants);__WIN__</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

View File

@ -32,8 +32,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="NewLife.Core, Version=8.1.7044.42314, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\NewLife.Core.8.1.2019.415\lib\net45\NewLife.Core.dll</HintPath>
<Reference Include="NewLife.Core, Version=8.3.7183.41839, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\NewLife.Core.8.3.2019.822\lib\net45\NewLife.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NewLife.Core" version="8.1.2019.415" targetFramework="net45" />
<package id="NewLife.Core" version="8.3.2019.822" targetFramework="net45" />
</packages>