Skip to content

Commit d654a68

Browse files
josesimoesjosesimoes
authored
Rework packaging (#116)
1 parent 7fd9723 commit d654a68

File tree

2 files changed

+92
-123
lines changed

2 files changed

+92
-123
lines changed

‎azure-pipelines.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,11 @@ jobs:
326326
eq(variables['UPDATE_DEPENDENTS'], 'false')
327327
)
328328
329-
# publish artifacts (only possible if this is not a PR originated on a fork)
329+
# publish artifacts
330330
- task: PublishBuildArtifacts@1
331331
condition: >-
332332
and(
333333
succeeded(),
334-
ne(variables['system.pullrequest.isfork'], true),
335334
eq(variables['UPDATE_DEPENDENTS'], 'false')
336335
)
337336
displayName: Publish deployables artifacts

‎nanoFirmwareFlasher/nanoFirmwareFlasher.csproj‎

Lines changed: 91 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,103 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33

4-
<PropertyGroup>
5-
<OutputType>Exe</OutputType>
6-
<ToolCommandName>nanoff</ToolCommandName>
7-
<PackageOutputPath>../../artifacts</PackageOutputPath>
8-
<RootNamespace>nanoFramework.Tools.FirmwareFlasher</RootNamespace>
9-
<AssemblyName>nanoff</AssemblyName>
10-
<PackageId>nanoFramework.Tools.FirmwareFlasher</PackageId>
11-
<Authors>nanoframework</Authors>
12-
<Product>.NET nanoFramework Firmware Flasher</Product>
13-
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
14-
<Company>.NET nanoFramework</Company>
15-
<RepositoryType>git</RepositoryType>
16-
<RepositoryUrl>https://github.com/nanoframework/nanoFirmwareFlasher</RepositoryUrl>
17-
<PackageProjectUrl>https://github.com/nanoframework/nanoFirmwareFlasher</PackageProjectUrl>
18-
<PackageIconUrl></PackageIconUrl>
19-
<Description>.NET nanoFirmwareFlasher tool to flash firmware images to target devices.</Description>
20-
<!-- need this to allow async Main() -->
21-
<LangVersion>latest</LangVersion>
22-
<TargetFrameworks>netcoreapp6;net48</TargetFrameworks>
23-
<Platforms>x64;x86;anycpu</Platforms>
24-
<RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
25-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
26-
</PropertyGroup>
4+
<PropertyGroup>
5+
<OutputType>Exe</OutputType>
6+
<ToolCommandName>nanoff</ToolCommandName>
7+
<PackageOutputPath>../../artifacts</PackageOutputPath>
8+
<RootNamespace>nanoFramework.Tools.FirmwareFlasher</RootNamespace>
9+
<AssemblyName>nanoff</AssemblyName>
10+
<PackageId>nanoFramework.Tools.FirmwareFlasher</PackageId>
11+
<Authors>nanoframework</Authors>
12+
<Product>.NET nanoFramework Firmware Flasher</Product>
13+
<Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
14+
<Company>.NET nanoFramework</Company>
15+
<RepositoryType>git</RepositoryType>
16+
<RepositoryUrl>https://github.com/nanoframework/nanoFirmwareFlasher</RepositoryUrl>
17+
<PackageProjectUrl>https://github.com/nanoframework/nanoFirmwareFlasher</PackageProjectUrl>
18+
<PackageIconUrl></PackageIconUrl>
19+
<Description>.NET nanoFirmwareFlasher tool to flash firmware images to target devices.</Description>
20+
<!-- need this to allow async Main() -->
21+
<LangVersion>latest</LangVersion>
22+
<TargetFrameworks>netcoreapp6;net48</TargetFrameworks>
23+
<Platforms>x64;x86;anycpu</Platforms>
24+
<RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
25+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
26+
</PropertyGroup>
2727

28-
<PropertyGroup Condition="'$(PackGlobalTool)' != true">
29-
<TargetFrameworks>netcoreapp6</TargetFrameworks>
30-
<PlatformTarget>anycpu</PlatformTarget>
31-
</PropertyGroup>
28+
<PropertyGroup Condition="'$(PackGlobalTool)' != true">
29+
<TargetFrameworks>netcoreapp6</TargetFrameworks>
30+
<PlatformTarget>anycpu</PlatformTarget>
31+
</PropertyGroup>
3232

33-
<PropertyGroup Condition="'$(PackGlobalTool)' == true">
34-
<PackAsTool>true</PackAsTool>
35-
<TargetFrameworks>netcoreapp6</TargetFrameworks>
36-
<PackageId>nanoff</PackageId>
37-
<PlatformTarget>x64</PlatformTarget>
38-
</PropertyGroup>
33+
<PropertyGroup Condition="'$(PackGlobalTool)' == true">
34+
<PackAsTool>true</PackAsTool>
35+
<TargetFrameworks>netcoreapp6</TargetFrameworks>
36+
<PackageId>nanoff</PackageId>
37+
<PlatformTarget>x64</PlatformTarget>
38+
</PropertyGroup>
3939

40-
<PropertyGroup>
41-
<!-- disable NuGet warning for DLLs outside the lib folder and for SemVer 2 package reference -->
42-
<NoWarn>$(NoWarn);NU5100;NU5105</NoWarn>
43-
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
44-
<PackageIcon>images\nf-logo.png</PackageIcon>
45-
<PackageTags>nanoFramework, nano Framework, NETNF, NETMF, Micro Framework, .net</PackageTags>
46-
<PackageReadmeFile>README.md</PackageReadmeFile>
47-
</PropertyGroup>
48-
49-
<ItemGroup>
50-
<PackageReference Include="CommandLineParser" Version="2.8.0" />
51-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
52-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="All" />
53-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
54-
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
55-
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
56-
<PackageReference Include="System.Management" Version="6.0.0" />
57-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
58-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
59-
</ItemGroup>
40+
<PropertyGroup>
41+
<!-- disable NuGet warning for DLLs outside the lib folder and for SemVer 2 package reference -->
42+
<NoWarn>$(NoWarn);NU5100;NU5105</NoWarn>
43+
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
44+
<PackageIcon>images\nf-logo.png</PackageIcon>
45+
<PackageTags>nanoFramework, nano Framework, NETNF, NETMF, Micro Framework, .net</PackageTags>
46+
<PackageReadmeFile>README.md</PackageReadmeFile>
47+
</PropertyGroup>
6048

61-
<ItemGroup>
62-
<None Include="..\README.md">
63-
<Pack>True</Pack>
64-
<PackagePath>\</PackagePath>
65-
</None>
66-
<None Include="..\assets\nf-logo.png">
67-
<Pack>True</Pack>
68-
<PackagePath>images</PackagePath>
69-
</None>
70-
<None Include="..\lib\stdfu\**" Link="stdfu\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
71-
<Pack>true</Pack>
72-
<PackagePath>content\stdfu</PackagePath>
73-
</None>
74-
<None Include="..\LICENSE.md">
75-
<Pack>True</Pack>
76-
<PackagePath></PackagePath>
77-
</None>
78-
</ItemGroup>
49+
<ItemGroup>
50+
<PackageReference Include="CommandLineParser" Version="2.8.0" PrivateAssets="All" />
51+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="All" />
52+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="All"/>
53+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="All" />
54+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" PrivateAssets="All" />
55+
<PackageReference Include="System.IO.Ports" Version="6.0.0" PrivateAssets="All" />
56+
<PackageReference Include="System.Management" Version="6.0.0" PrivateAssets="All" />
57+
<PackageReference Include="System.Net.Http" Version="4.3.4" PrivateAssets="All" />
58+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" PrivateAssets="All" />
59+
</ItemGroup>
7960

80-
<ItemGroup>
81-
<None Include="..\lib\esptool\**" Link="esptool\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
82-
<Pack>true</Pack>
83-
<PackagePath>content\esptool</PackagePath>
84-
</None>
85-
<None Include="..\lib\esptool\esptoolMac\**" Link="esptool\esptoolMac\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
86-
<Pack>true</Pack>
87-
<PackagePath>content\esptool\esptoolMac</PackagePath>
88-
</None>
89-
<None Include="..\lib\esptool\esptoolWin\**" Link="esptool\esptoolWin\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
90-
<Pack>true</Pack>
91-
<PackagePath>content\esptool\esptoolWin</PackagePath>
92-
</None>
93-
<None Include="..\lib\esptool\esptoolLinux\**" Link="esptool\esptooLinux\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
94-
<Pack>true</Pack>
95-
<PackagePath>content\esptool\esptoolWin</PackagePath>
96-
</None>
97-
</ItemGroup>
61+
<ItemGroup>
62+
<None Include="..\README.md">
63+
<Pack>True</Pack>
64+
<PackagePath>\</PackagePath>
65+
</None>
66+
<None Include="..\assets\nf-logo.png">
67+
<Pack>True</Pack>
68+
<PackagePath>images</PackagePath>
69+
</None>
70+
<None Include="..\LICENSE.md">
71+
<Pack>True</Pack>
72+
<PackagePath></PackagePath>
73+
</None>
74+
</ItemGroup>
9875

99-
<ItemGroup>
100-
<None Include="..\lib\esp32bootloader\**" Link="esp32bootloader\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
101-
<Pack>true</Pack>
102-
<PackagePath>content\esp32bootloader</PackagePath>
103-
</None>
104-
</ItemGroup>
105-
<ItemGroup>
106-
<None Include="..\lib\esp32s2bootloader\**" Link="esp32s2bootloader\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
107-
<Pack>true</Pack>
108-
<PackagePath>content\esp32s2bootloader</PackagePath>
109-
</None>
110-
</ItemGroup>
111-
<ItemGroup>
112-
<None Include="..\lib\stlink\**" Link="stlink\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
113-
<Pack>true</Pack>
114-
<PackagePath>content\stlink</PackagePath>
115-
</None>
116-
<None Include="..\lib\stlinkMac\**" Link="stlinkMac\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
117-
<Pack>true</Pack>
118-
<PackagePath>content\stlinkMac</PackagePath>
119-
</None>
120-
<None Include="..\lib\stlinkLinux\**" Link="stlinkLinux\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
121-
<Pack>true</Pack>
122-
<PackagePath>content\stlinkLinux</PackagePath>
123-
</None>
124-
</ItemGroup>
76+
<ItemGroup>
77+
<None Include="..\lib\esptool\**" Link="esptool\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
78+
</None>
79+
</ItemGroup>
12580

126-
<ItemGroup>
127-
<None Include="..\lib\uniflash\**" Link="uniflash\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
128-
<Pack>true</Pack>
129-
<PackagePath>content\uniflash</PackagePath>
130-
</None>
131-
</ItemGroup>
81+
<ItemGroup>
82+
<None Include="..\lib\esp32bootloader\**" Link="esp32bootloader\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
83+
</None>
84+
</ItemGroup>
85+
<ItemGroup>
86+
<None Include="..\lib\esp32s2bootloader\**" Link="esp32s2bootloader\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
87+
</None>
88+
</ItemGroup>
89+
<ItemGroup>
90+
<None Include="..\lib\stlink\**" Link="stlink\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
91+
</None>
92+
<None Include="..\lib\stlinkMac\**" Link="stlinkMac\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
93+
</None>
94+
<None Include="..\lib\stlinkLinux\**" Link="stlinkLinux\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
95+
</None>
96+
</ItemGroup>
97+
98+
<ItemGroup>
99+
<None Include="..\lib\uniflash\**" Link="uniflash\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="Always">
100+
</None>
101+
</ItemGroup>
132102

133103
</Project>

0 commit comments

Comments
 (0)