Skip to content

Commit ebe4717

Browse files
neolithosneolithos
committed
Chg: Build process
1 parent 5dc394c commit ebe4717

11 files changed

+69
-80
lines changed

‎LuaDLR.sln

+8-5
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ VisualStudioVersion = 15.0.27004.2002
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoLua", "NeoLua\NeoLua.csproj", "{09AEBB35-719E-4E32-9836-F57D7D6F1607}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeoLua.Test", "NeoLua.Test\NeoLua.Test.csproj", "{A25A607C-AEFE-491A-A3D3-0C934DD53B3C}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoLua.Test", "NeoLua.Test\NeoLua.Test.csproj", "{A25A607C-AEFE-491A-A3D3-0C934DD53B3C}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeoCmd", "NeoCmd\NeoCmd.csproj", "{AFDB9919-9FED-45E9-8843-A731F822B98A}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoCmd", "NeoCmd\NeoCmd.csproj", "{AFDB9919-9FED-45E9-8843-A731F822B98A}"
1111
EndProject
1212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeoSpeed", "NeoSpeed\NeoSpeed.csproj", "{B57F94E3-E256-4CE2-B907-FF8B0E0E2683}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeoLua.MSBuild", "NeoLua.MSBuild\NeoLua.MSBuild.csproj", "{B7A49C98-073D-498C-8FD8-69E0468DF6D5}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoLua.MSBuild", "NeoLua.MSBuild\NeoLua.MSBuild.csproj", "{B7A49C98-073D-498C-8FD8-69E0468DF6D5}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeoLua.Dbg", "NeoLua.Dbg\NeoLua.Dbg.csproj", "{64E0E32C-0BC4-413E-832E-1574506E4088}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoLua.Dbg", "NeoLua.Dbg\NeoLua.Dbg.csproj", "{64E0E32C-0BC4-413E-832E-1574506E4088}"
1717
EndProject
1818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtTest", "ExtTest\ExtTest.csproj", "{AE970FAD-2DDB-4FE5-A1B3-8C5E318823D4}"
1919
EndProject
@@ -46,9 +46,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{DE128F74-1BF
4646
doc\07_neocmd.md = doc\07_neocmd.md
4747
EndProjectSection
4848
EndProject
49-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeoLua.NuGet", "NeoLua.NuGet\NeoLua.NuGet.csproj", "{0451BAEF-DF2E-4B98-8644-94EE9415E389}"
49+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeoLua.NuGet", "NeoLua.NuGet\NeoLua.NuGet.csproj", "{0451BAEF-DF2E-4B98-8644-94EE9415E389}"
5050
ProjectSection(ProjectDependencies) = postProject
51+
{AFDB9919-9FED-45E9-8843-A731F822B98A} = {AFDB9919-9FED-45E9-8843-A731F822B98A}
52+
{64E0E32C-0BC4-413E-832E-1574506E4088} = {64E0E32C-0BC4-413E-832E-1574506E4088}
5153
{09AEBB35-719E-4E32-9836-F57D7D6F1607} = {09AEBB35-719E-4E32-9836-F57D7D6F1607}
54+
{B7A49C98-073D-498C-8FD8-69E0468DF6D5} = {B7A49C98-073D-498C-8FD8-69E0468DF6D5}
5255
EndProjectSection
5356
EndProject
5457
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{04B05807-3B3E-4046-AB83-BEEF739C2315}"

‎NeoCmd/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
55
</startup>
66
</configuration>

‎NeoCmd/NeoCmd.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<RootNamespace>NeoCmd</RootNamespace>
5-
<TargetFramework>net45</TargetFramework>
5+
<TargetFramework>net47</TargetFramework>
66
<ApplicationIcon />
77
<OutputType>Exe</OutputType>
88
<StartupObject />

‎NeoLua.Dbg/NeoLua.Dbg.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4+
<AssemblyName>Neo.Lua.Dbg</AssemblyName>
45
<RootNamespace>Neo.IronLua</RootNamespace>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
57
<TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
68
<SignAssembly>true</SignAssembly>
79
<AssemblyOriginatorKeyFile>NeoLua.snk</AssemblyOriginatorKeyFile>

‎NeoLua.NuGet/NeoLua.NuGet.csproj

+7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3+
<Import Project="Package.targets" />
34
<PropertyGroup>
45
<RootNamespace>NeoLua.NuGet</RootNamespace>
56
<AssemblyName>NeoLua.NuGet</AssemblyName>
67
<TargetFramework>net45</TargetFramework>
78
</PropertyGroup>
9+
<ItemGroup>
10+
<PackageReference Include="MSBuildTasks" Version="1.5.0.235">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
13+
</PackageReference>
14+
</ItemGroup>
815
</Project>

‎NeoLua.NuGet/build.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
& 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\msbuild.exe' /t:Restore`;Push /p:Configuration=Debug

‎NeoLua.NuGet/common.targets

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
<RepositoryType>git</RepositoryType>
1313

1414
<AssemblyVersion>5.3.0.0</AssemblyVersion>
15-
<FileVersion>1.2.25.0</FileVersion>
15+
<FileVersion>1.3.0.0</FileVersion>
1616

1717
<VersionAdd>beta</VersionAdd>
1818
<SimpleVersionPattern>^(\d+)\.(\d+)\.(\d+)</SimpleVersionPattern>
1919
<SimpleVersion>$([System.Text.RegularExpressions.Regex]::Match($(FileVersion), $(SimpleVersionPattern)))</SimpleVersion>
2020

2121
<PackageVersion Condition="'$(VersionAdd)' == ''">$(SimpleVersion)</PackageVersion>
2222
<PackageVersion Condition="'$(VersionAdd)' != ''">$(SimpleVersion)-$(VersionAdd)</PackageVersion>
23+
24+
<PackageOutputPath>$(MSBuildThisFileDirectory)bin\$(SimpleVersion)</PackageOutputPath>
2325
</PropertyGroup>
2426
</Project>

‎NeoLua.NuGet/package.targets

+40-64
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,64 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Skd="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\..\packages\MSBuildTasks.1.4.0.88\tools</MSBuildCommunityTasksPath>
5-
<TargetDir>$(MSBuildProjectDirectory)\bin</TargetDir>
4+
<MSBuildCommunityTasksPath>$(USERPROFILE)\.nuget\packages\msbuildtasks\1.5.0.235\tools</MSBuildCommunityTasksPath>
65
</PropertyGroup>
76

87
<Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets" Condition="Exists('$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.Targets')" />
8+
<Import Project="common.targets" />
99
<Import Project="package.apikey.targets" />
1010

1111
<ItemGroup>
12-
<!--<ZipFile Include="$(MSBuildProjectDirectory)\..\NeoLuaD\bin\Release\Neo.Lua.*" />
13-
<ZipFile Include="$(MSBuildProjectDirectory)\..\NeoLuaD\bin\Release\de\*" />
12+
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\net47\NeoCmd.exe" />
13+
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\net47\NeoCmd.exe.config" />
14+
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\net47\Neo.Lua.dll" />
15+
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\net47\Neo.Lua.Dbg.dll" />
16+
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\net47\Microsoft.Dynamic.dll" />
17+
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\net47\Microsoft.Scripting.dll" />
18+
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\net47\Microsoft.Scripting.Metadata.dll" />
19+
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\net47\de\*" />
20+
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\Samples\*.lua" />
21+
</ItemGroup>
1422

15-
<ZipFileDbg Include="$(MSBuildProjectDirectory)\..\NeoLua.Dbg\bin\Release\Microsoft.Dynamic.dll" />
16-
<ZipFileDbg Include="$(MSBuildProjectDirectory)\..\NeoLua.Dbg\bin\Release\Microsoft.Scripting.dll" />
17-
<ZipFileDbg Include="$(MSBuildProjectDirectory)\..\NeoLua.Dbg\bin\Release\Microsoft.Scripting.Metadata.dll" />
18-
<ZipFileDbg Include="$(MSBuildProjectDirectory)\..\NeoLua.Dbg\bin\Release\Neo.Lua.Dbg.*" />
23+
<ItemGroup>
24+
<Project Include="..\NeoLua\NeoLua.csproj">
25+
<Package>true</Package>
26+
</Project>
27+
<Project Include="..\NeoLua.Dbg\NeoLua.Dbg.csproj">
28+
<Package>true</Package>
29+
</Project>
30+
<Project Include="..\NeoLua.MSBuild\NeoLua.MSBuild.csproj">
31+
<Package>true</Package>
32+
</Project>
33+
<Project Include="..\NeoCmd\NeoCmd.csproj">
34+
<Package>false</Package>
35+
</Project>
36+
</ItemGroup>
1937

20-
<ZipFileMSB Include="$(MSBuildProjectDirectory)\..\NeoLua.MSBuild\bin\Release\de\*" />
21-
<ZipFileMSB Include="$(MSBuildProjectDirectory)\..\NeoLua.MSBuild\bin\Release\Neo.Lua.dll" />
22-
<ZipFileMSB Include="$(MSBuildProjectDirectory)\..\NeoLua.MSBuild\bin\Release\Neo.Lua.Desktop.dll" />
23-
<ZipFileMSB Include="$(MSBuildProjectDirectory)\..\NeoLua.MSBuild\bin\Release\Neo.Lua.MSBuild.dll" />
38+
<Target Name="PrepareOutput">
39+
<MakeDir Directories="$(TargetDir)\$(Version)" />
40+
</Target>
2441

25-
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\NeoCmd.exe" />
26-
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\Neo.Lua.dll" />
27-
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\Neo.Lua.Desktop.dll" />
28-
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\Neo.Lua.Dbg.dll" />
29-
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\Microsoft.Dynamic.dll" />
30-
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\Microsoft.Scripting.dll" />
31-
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\Microsoft.Scripting.Metadata.dll" />
32-
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\de\*" />
33-
<ZipFileCmd Include="$(MSBuildProjectDirectory)\..\NeoCmd\Samples\*.lua" />-->
34-
</ItemGroup>
35-
36-
<Target Name="PrepareVersion">
37-
<ReadLinesFromFile File="$(MSBuildProjectDirectory)\..\NeoLua\Properties\AssemblyInfoGlobal.cs">
38-
<Output TaskParameter="Lines" ItemName="AssemblyInfoGlobalContent" />
39-
</ReadLinesFromFile>
40-
<PropertyGroup>
41-
<AssemblyInfoGlobalLines>@(AssemblyInfoGlobalContent)</AssemblyInfoGlobalLines>
42-
</PropertyGroup>
43-
<PropertyGroup>
44-
<Pattern2>\;\[assembly: AssemblyConfiguration\(.(\w*)</Pattern2>
45-
<AssemblyConfig>$([System.Text.RegularExpressions.Regex]::Match($(AssemblyInfoGlobalLines), $(Pattern2)))</AssemblyConfig>
46-
<VersionAdd>$(AssemblyConfig.Remove(0, 35))</VersionAdd>
47-
</PropertyGroup>
48-
<PropertyGroup>
49-
<Pattern1>\[assembly: AssemblyFileVersion\(.(\d+)\.(\d+)\.(\d+)</Pattern1>
50-
<AssemblyVersionLine>$([System.Text.RegularExpressions.Regex]::Match($(AssemblyInfoGlobalLines), $(Pattern1)))</AssemblyVersionLine>
51-
<Version Condition="'$(VersionAdd)' != ''">$(AssemblyVersionLine.Remove(0, 32))-$(VersionAdd)</Version>
52-
<Version Condition="'$(VersionAdd)' == ''">$(AssemblyVersionLine.Remove(0, 32))</Version>
53-
</PropertyGroup>
54-
<Message Text="Version: $(Version)" />
42+
<Target Name="CompileProjects">
43+
<MSBuild Targets="Restore;Build;Pack" Projects="@(Project)" Properties="Platform=AnyCPU;Configuration=Release" Condition="%(Project.Package) == true" />
44+
<MSBuild Targets="Restore;Build" Projects="@(Project)" Properties="Platform=AnyCPU;Configuration=Release" Condition="%(Project.Package) == false" />
5545
</Target>
5646

57-
<Target Name="CleanCore">
47+
<Target Name="ZipFiles">
48+
<Zip Files="@(ZipFileCmd)" WorkingDirectory="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release\net47" ZipFileName="$(PackageOutputPath)\NeoLuaCmd-$(PackageVersion).zip" />
49+
</Target>
5850

51+
<Target Name="PushCore" Condition="'$(Configuration)'=='Release'">
52+
<Exec Command="c:\Tools\NuGet.exe push $(PackageOutputPath)\NeoLua.$(PackageVersion).nupkg -source https://api.nuget.org/v3/index.json -ApiKey $(NugetApiKey)" />
53+
<Exec Command="c:\Tools\NuGet.exe push $(PackageOutputPath)\NeoLuaDebug.$(PackageVersion).nupkg -source https://api.nuget.org/v3/index.json -ApiKey $(NugetApiKey)" />
5954
</Target>
60-
<Target Name="BuildCore" DependsOnTargets="PrepareVersion" Condition=" '$(Configuration)' == 'Release' ">
61-
<!-- Create Directory -->
62-
<MakeDir Directories="$(TargetDir)\$(Version)" />
6355

64-
<!-- Zip
65-
<Zip Files="@(ZipFile)" WorkingDirectory="$(MSBuildProjectDirectory)\..\NeoLuaD\bin\Release" ZipFileName="$(TargetDir)\$(Version)\NeoLua-$(Version).zip" />
66-
<Zip Files="@(ZipFileMSB)" WorkingDirectory="$(MSBuildProjectDirectory)\..\NeoLua.MSBuild\bin\Release" ZipFileName="$(TargetDir)\$(Version)\NeoLuaMSBuild-$(Version).zip" />
67-
<Zip Files="@(ZipFileDbg)" WorkingDirectory="$(MSBuildProjectDirectory)\..\NeoLua.Dbg\bin\Release" ZipFileName="$(TargetDir)\$(Version)\NeoLuaDbg-$(Version).zip" />
68-
<Zip Files="@(ZipFileCmd)" WorkingDirectory="$(MSBuildProjectDirectory)\..\NeoCmd\bin\Release" ZipFileName="$(TargetDir)\$(Version)\NeoLuaCmd-$(Version).zip" /> -->
56+
<Target Name="Push" DependsOnTargets="PrepareOutput;CompileProjects;ZipFiles;PushCore">
57+
</Target>
6958

7059
<!-- Create NuGet Package
7160
<Exec Command="c:\Tools\NuGet.exe pack NeoLua.nuspec -OutputDirectory $(TargetDir)\$(Version) -Version $(Version)" />
7261
<Exec Command="c:\Tools\NuGet.exe pack NeoLuaDebug.nuspec -OutputDirectory $(TargetDir)\$(Version) -Version $(Version)" />
7362
<Exec Command="c:\Tools\NuGet.exe push $(TargetDir)\$(Version)\NeoLua.$(Version).nupkg -source https://api.nuget.org/v3/index.json -ApiKey $(NugetApiKey)" />
7463
<Exec Command="c:\Tools\NuGet.exe push $(TargetDir)\$(Version)\NeoLuaDebug.$(Version).nupkg -source https://api.nuget.org/v3/index.json -ApiKey $(NugetApiKey)" /> -->
75-
</Target>
7664
</Project>
77-
<!--<Target Name="ZipLua" Condition=" '$(Configuration)' == 'Release' ">
78-
<CreateItem Include="$(TargetDir)\Neo.Lua.MSBuild.dll;$(TargetDir)\Neo.Lua.dll;$(TargetDir)\de\*">
79-
<Output ItemName="ZipFile" TaskParameter="Include" />
80-
</CreateItem>
81-
<Zip Files="@(ZipFile)" WorkingDirectory="$(TargetDir)" ZipFileName="$(TargetDir)\NeoLuaMSBuild-$(Version).zip" />
82-
</Target>
83-
<Target Name="NuGet" Condition=" '$(Configuration)' == 'Release' ">
84-
<Exec Command="c:\Projects\Bin\NuGet.exe pack NeoLuaMSBuild.nuspec -OutputDirectory $(TargetDir) -Version $(Version)" />
85-
-->
86-
<!--<Exec Command="c:\Projects\Bin\NuGet.exe push $(TargetDir)NeoLuaMSBuild.$(Version).nupkg" />-->
87-
<!--
88-
</Target>-->

‎NeoLua.NuGet/push.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
& 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\msbuild.exe' /t:Restore`;Push /p:Configuration=Release

‎NeoLua/NeoLua.csproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net45;net47;netstandard2.0;netcoreapp2.0</TargetFrameworks>
4+
<AssemblyName>Neo.Lua</AssemblyName>
55
<RootNamespace>Neo.IronLua</RootNamespace>
6+
<TargetFrameworks>net45;net47;netstandard2.0;netcoreapp2.0</TargetFrameworks>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
68
<Description>A Lua implementation for the Dynamic Language Runtime (DLR).</Description>
79
<PackageId>NeoLua</PackageId>
810
<PackageReleaseNotes>A Lua implementation for the Dynamic Language Runtime (DLR).
@@ -20,9 +22,9 @@ This library contains the desktop parts of the lua implementation.</PackageRelea
2022
</PropertyGroup>
2123
<Import Project="..\NeoLua.NuGet\common.nupkg.targets" />
2224
<ItemGroup>
23-
<None Remove="NeoLua.snk" />
25+
<None Remove="NeoLua.snk" />
2426
</ItemGroup>
25-
<ItemGroup>
27+
<ItemGroup>
2628
<EmbeddedResource Include="NeoLua.snk" />
2729
</ItemGroup>
2830
<ItemGroup>

‎packages/repositories.config

-5
This file was deleted.

0 commit comments

Comments
 (0)