Skip to content

Commit 04d19ef

Browse files
JeffreySuJeffreySu
committed
modify project file to .net core format(still run .net 4.5)
1 parent 081aaca commit 04d19ef

File tree

4 files changed

+57
-96
lines changed

4 files changed

+57
-96
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -260,3 +260,4 @@ paket-files/
260260
__pycache__/
261261
*.pyc
262262
/src/DPB.Tests/OutputDir
263+
/BuildOutPut

‎src/DPB.Tests/ManifestTests.cs

+1-12
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,7 @@ public void BuildTest()
111111
});
112112

113113
LetsGo letsGo = new LetsGo(manifest);
114-
var build = letsGo.Build();
115-
116-
while (!build.IsCompleted && !build.IsCanceled && !build.IsFaulted)
117-
{
118-
//Console.WriteLine($"{letsGo.FinishedFilesCount} / {letsGo.AllFilesCount}");
119-
}
120-
121-
122-
Console.WriteLine("Exception:"+build.Exception);
123-
124-
Console.WriteLine("finished");
125-
Console.WriteLine($"IsCanceled:{build.IsCanceled}, IsCompleted:{build.IsCompleted}, IsFaulted: {build.IsFaulted}");
114+
letsGo.Build();
126115
}
127116
}
128117
}

‎src/DPB/DPB.csproj

+55-48
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,70 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{2469ED76-CB41-4117-8DD9-447398FBFF92}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>DPB</RootNamespace>
4+
<TargetFrameworks>net45</TargetFrameworks>
5+
<Version>0.3.2.1</Version>
116
<AssemblyName>DPB</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
7+
<RootNamespace>DPB</RootNamespace>
8+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
9+
10+
<Description>
11+
DPB is a tool that allows developers to automatically generate project code.
12+
13+
You can add annotations to the code templates, and use DPB to automatically filter or generate code to build a complete new project.
14+
</Description>
15+
<Copyright>Senparc Copyright © 2004~2018</Copyright>
16+
<PackageTags>dynamic,builder,project,build,C#,automation</PackageTags>
17+
18+
19+
<Authors>Senparc</Authors>
20+
<Owners>Senparc</Owners>
21+
<PackageLicenseUrl>https://github.com/Senparc/DPB/blob/master/LICENSE</PackageLicenseUrl>
22+
<ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
23+
<Title>DPB: Dynamic Project Builder</Title>
24+
25+
<Summary>DPB is a tool that allows developers to automatically generate project code.
26+
27+
You can add annotations to the code templates, and use DPB to automatically filter or generate code to build a complete new project.</Summary>
28+
<PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
29+
<PackageIconUrl>http://sdk.weixin.senparc.com/Images/Logo.jpg</PackageIconUrl>
30+
<PackageReleaseNotes>
31+
DPB
32+
</PackageReleaseNotes>
33+
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
2434
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
35+
36+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
37+
<OutputPath>..\..\BuildOutPut</OutputPath>
2938
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
<DocumentationFile>bin\Release\DPB.xml</DocumentationFile>
3339
</PropertyGroup>
34-
<ItemGroup>
35-
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
36-
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
37-
</Reference>
38-
<Reference Include="Senparc.CO2NET, Version=0.2.16.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>packages\Senparc.CO2NET.0.2.16\lib\net45\Senparc.CO2NET.dll</HintPath>
40-
</Reference>
41-
<Reference Include="System" />
42-
<Reference Include="System.Configuration" />
40+
41+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
42+
<OutputPath>..\..\BuildOutPut\</OutputPath>
43+
<DocumentationFile>..\..\BuildOutPut\net45\DPB.xml</DocumentationFile>
44+
</PropertyGroup>
45+
46+
47+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
4348
<Reference Include="System.Core" />
49+
<Reference Include="System.Data" />
50+
<Reference Include="System.Data.DataSetExtensions" />
51+
<Reference Include="System.Net.Http" />
4452
<Reference Include="System.Runtime.Serialization" />
4553
<Reference Include="System.Web" />
4654
<Reference Include="System.Web.Extensions" />
47-
<Reference Include="System.Xml.Linq" />
48-
<Reference Include="System.Data.DataSetExtensions" />
49-
<Reference Include="Microsoft.CSharp" />
50-
<Reference Include="System.Data" />
51-
<Reference Include="System.Net.Http" />
5255
<Reference Include="System.Xml" />
56+
<Reference Include="System.Xml.Linq" />
5357
</ItemGroup>
58+
5459
<ItemGroup>
55-
<Compile Include="LetsGo.cs" />
56-
<Compile Include="Models\Manifest.cs" />
57-
<Compile Include="Properties\AssemblyInfo.cs" />
60+
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
61+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
62+
<PackageReference Include="Senparc.CO2NET" Version="0.2.16" />
5863
</ItemGroup>
64+
5965
<ItemGroup>
60-
<None Include="packages.config" />
66+
<Folder Include="Properties\" />
6167
</ItemGroup>
62-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
63-
</Project>
68+
69+
</Project>
70+

‎src/DPB/Properties/AssemblyInfo.cs

-36
This file was deleted.

0 commit comments

Comments
 (0)