Skip to content

Commit 351f342

Browse files
authored
Allow nanoff to load in arm64 systems (#165)
1 parent 9de264d commit 351f342

File tree

3 files changed

+28
-1475
lines changed

3 files changed

+28
-1475
lines changed

nanoFirmwareFlasher.Library/nanoFirmwareFlasher.Library.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>library</OutputType>
55
<TargetFrameworks>net6.0;net472</TargetFrameworks>
6-
<PlatformTarget>anycpu</PlatformTarget>
6+
<PlatformTarget>AnyCPU</PlatformTarget>
77
<LangVersion>latest</LangVersion>
88
<RootNamespace>nanoFramework.Tools.FirmwareFlasher</RootNamespace>
99
<PackageOutputPath>../</PackageOutputPath>
@@ -23,6 +23,7 @@
2323
<PackageIcon>images\nf-logo.png</PackageIcon>
2424
<PackageTags>nanoFramework, nano Framework, NETNF, NETMF, Micro Framework, .net</PackageTags>
2525
<PackageReadmeFile>README.md</PackageReadmeFile>
26+
<Platforms>AnyCPU;x64</Platforms>
2627
</PropertyGroup>
2728

2829
<PropertyGroup>

nanoFirmwareFlasher.Tool/nanoFirmwareFlasher.Tool.csproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,22 @@
1919
<Description>.NET nanoFirmwareFlasher tool to flash firmware images to target devices.</Description>
2020
<!-- need this to allow async Main() -->
2121
<LangVersion>latest</LangVersion>
22-
<TargetFrameworks>netcoreapp6;net472</TargetFrameworks>
2322
<PackAsTool>true</PackAsTool>
24-
<PlatformTarget>x64</PlatformTarget>
25-
<Platforms>x64;x86;anycpu</Platforms>
26-
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
23+
<PlatformTarget>AnyCPU</PlatformTarget>
24+
<Platforms>AnyCPU;x64</Platforms>
25+
<RuntimeIdentifiers>any</RuntimeIdentifiers>
2726
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2827
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
28+
<RestoreLockedMode>true</RestoreLockedMode>
2929
</PropertyGroup>
3030

31+
<PropertyGroup Condition="$(VSCodeExtensionBuild) == '' or $(VSCodeExtensionBuild) == 'False'">
32+
<TargetFrameworks>net6.0</TargetFrameworks>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="$(VSCodeExtensionBuild) == 'True'">
35+
<TargetFrameworks>net472</TargetFrameworks>
36+
</PropertyGroup>
37+
3138
<PropertyGroup>
3239
<!-- disable NuGet warning for DLLs outside the lib folder and for SemVer 2 package reference -->
3340
<NoWarn>$(NoWarn);NU5100;NU5105</NoWarn>

0 commit comments

Comments
 (0)