From a3422a18bf9dc951c0dcdfaadf06f4e5e7b65470 Mon Sep 17 00:00:00 2001
From: Frans van Dorsselaer <17404029+dorssel@users.noreply.github.com>
Date: Sun, 19 Nov 2023 04:20:58 +0100
Subject: [PATCH] Use Native AOT
---
Directory.Build.props | 9 ++++++++-
Installer/Installer.wixproj | 6 +++---
NetStandard.props | 1 +
Usbipd.Automation/Usbipd.Automation.csproj | 5 ++++-
Usbipd.PowerShell/Usbipd.PowerShell.csproj | 4 ----
.../Properties/PublishProfiles/InputForInstaller.pubxml | 7 +++----
Usbipd/Usbipd.csproj | 9 ++++++++-
7 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index a47c7434..5cc2a1ef 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -15,9 +15,10 @@ SPDX-License-Identifier: GPL-3.0-only
+ net8.0-windows10.0.17763
net8.0-windows10.0.17763
true
-
+
12.0
enable
@@ -42,8 +43,14 @@ SPDX-License-Identifier: GPL-3.0-only
Copyright (C) $([System.DateTime]::UtcNow.ToString("yyyy")) $(Company)
+
+ none
+ false
+
+
+ TargetFramework=net6.0
all
diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
index 2f54f3f5..5aac0015 100644
--- a/Installer/Installer.wixproj
+++ b/Installer/Installer.wixproj
@@ -6,11 +6,12 @@ SPDX-License-Identifier: GPL-3.0-only
-->
+
false
false
usbipd-win
..\Usbipd\bin\publish
- ..\Usbipd.PowerShell\bin\$(Configuration)\netstandard2.0\win
+ ..\Usbipd.PowerShell\bin\$(Configuration)\netstandard2.0
PublishDir=$(PublishDir);PowerShellDir=$(PowerShellDir);DriversDir=..\Drivers;Year=$([System.DateTime]::UtcNow.ToString("yyyy"))
1130
@@ -76,7 +77,6 @@ SPDX-License-Identifier: GPL-3.0-only
-
-
+
\ No newline at end of file
diff --git a/NetStandard.props b/NetStandard.props
index 50ea8c83..75f55ed8 100644
--- a/NetStandard.props
+++ b/NetStandard.props
@@ -10,6 +10,7 @@ SPDX-License-Identifier: GPL-3.0-only
AnyCPU
AnyCPU
AnyCPU
+ netstandard2.0
netstandard2.0
false
diff --git a/Usbipd.Automation/Usbipd.Automation.csproj b/Usbipd.Automation/Usbipd.Automation.csproj
index f2448570..51cb8a56 100644
--- a/Usbipd.Automation/Usbipd.Automation.csproj
+++ b/Usbipd.Automation/Usbipd.Automation.csproj
@@ -11,6 +11,7 @@ SPDX-License-Identifier: GPL-3.0-only
net8.0-windows10.0.17763;netstandard2.0
+ true
@@ -19,7 +20,9 @@ SPDX-License-Identifier: GPL-3.0-only
-
+
+ TargetFramework=netstandard2.0
+
diff --git a/Usbipd.PowerShell/Usbipd.PowerShell.csproj b/Usbipd.PowerShell/Usbipd.PowerShell.csproj
index 6e650146..12948aab 100644
--- a/Usbipd.PowerShell/Usbipd.PowerShell.csproj
+++ b/Usbipd.PowerShell/Usbipd.PowerShell.csproj
@@ -8,10 +8,6 @@ SPDX-License-Identifier: GPL-3.0-only
-
- win
-
-
all
diff --git a/Usbipd/Properties/PublishProfiles/InputForInstaller.pubxml b/Usbipd/Properties/PublishProfiles/InputForInstaller.pubxml
index 007ace60..fab76e11 100644
--- a/Usbipd/Properties/PublishProfiles/InputForInstaller.pubxml
+++ b/Usbipd/Properties/PublishProfiles/InputForInstaller.pubxml
@@ -12,9 +12,8 @@ SPDX-License-Identifier: GPL-3.0-only
FileSystem
net8.0-windows10.0.17763
win-x64
- true
- False
- False
- True
+ false
+ false
+ false
\ No newline at end of file
diff --git a/Usbipd/Usbipd.csproj b/Usbipd/Usbipd.csproj
index 7aaf65ff..a87f02d4 100644
--- a/Usbipd/Usbipd.csproj
+++ b/Usbipd/Usbipd.csproj
@@ -9,12 +9,12 @@ SPDX-License-Identifier: GPL-3.0-only
Exe
app.manifest
- win-x64
true
true
Properties\PublishProfiles\InputForInstaller.pubxml
+ true
usbipd
@@ -42,4 +42,11 @@ SPDX-License-Identifier: GPL-3.0-only
+
+
+
+
+
+
+