Merge pull request #394 from gerardog/dotnet8.0

Migrate to dotnet 8.0
gerardog · Feb 16, 2025 · b2cedb9 · b2cedb9
2 parents 521921f + 2a93ceb
commit b2cedb9
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 77 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,15 +28,14 @@ jobs:
     permissions:
       id-token: write
       contents: read
-      checks: write    
+      checks: write
     steps:
-    - uses: actions/setup-dotnet@v2
+    - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
-        include-prerelease: true 
+        dotnet-version: '8.0.x'
     - uses: actions/checkout@v2
-      with: 
-        fetch-depth: 0    
+      with:
+        fetch-depth: 0
     - name: Run Tests
       id: tests
       run: ./build/02-test.ps1
@@ -45,7 +44,7 @@ jobs:
       if: success() || failure()
       with:
         name: TestsResults (dotnet)
-        path: "**/TestResults*.trx"                            
+        path: "**/TestResults*.trx"
         reporter: dotnet-trx
         fail-on-error: true
     - name: Test Report PowerShell v5
@@ -68,15 +67,14 @@ jobs:
     name: Build
     runs-on: windows-latest
     steps:
-    - uses: actions/setup-dotnet@v2
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x'
+    - uses: actions/checkout@v2
       with:
-        dotnet-version: '7.0.x'
-        include-prerelease: true 
-    - uses: actions/checkout@v2   
-      with: 
         fetch-depth: 0
     - name: Install dependencies
-      run: choco install GitVersion.Portable --version 5.6.11 --confirm --no-progress; choco install il-repack --confirm --no-progress
+      run: choco install GitVersion.Portable --version 5.12.0 --confirm --no-progress; choco install il-repack --confirm --no-progress
     - name: Update project version
       run: gitversion /l console /output buildserver /updateAssemblyInfo /verbosity minimal
     - name: Get project version

diff --git a/README.md b/README.md
@@ -7,12 +7,12 @@
 
 **gsudo** is a `sudo` equivalent for Windows, with a similar user-experience as the original Unix/Linux sudo.
 Allows you to run a command (or re-launch your current shell) with elevated permissions, in the current console window or a new one.
- 
+
 Just [prepend `gsudo`](#usage) (or the `sudo` alias) to your command and it will run elevated. For PowerShell use this [syntax](#usage-from-powershell--powershell-core): `gsudo { ScriptBlock }`
 
 One UAC popup will appear each time. You can see less popups if you enable [gsudo cache](#credentials-cache).
 
-It detects your current shell and elevates your command as native shell commands. (Supports `Cmd`, `PowerShell`, `WSL`, `git-bash`, `MinGW`, `Cygwin`, `Yori`, `Take Command`, `BusyBox` & `NuShell`.) 
+It detects your current shell and elevates your command as native shell commands. (Supports `Cmd`, `PowerShell`, `WSL`, `git-bash`, `MinGW`, `Cygwin`, `Yori`, `Take Command`, `BusyBox` & `NuShell`.)
 
 ## Table of contents
 
@@ -52,7 +52,7 @@ It detects your current shell and elevates your command as native shell commands
 - Supports being used on scripts:
   - Outputs StdOut/StdErr can be piped or captured (e.g. `gsudo dir | findstr /c:"bytes free" > FreeSpace.txt`) and exit codes too (`%errorlevel%`). If `gsudo` fails to elevate, the exit code will be 999.
   - If `gsudo` is invoked from an already elevated console, it will just run the command (it won't fail). So, you don't have to worry if you run `gsudo` or a script that uses `gsudo` from an already elevated console. (The UAC popup will not appear, as no elevation is required)
-  
+
 - `gsudo !!` elevates the last executed command. Works on CMD, Git-Bash, MinGW, Cygwin (and PowerShell with [gsudo module](#gsudomodule) only)
 
 ## Installation
@@ -64,11 +64,11 @@ It detects your current shell and elevates your command as native shell commands
   ``` PowerShell
   PowerShell -Command "Set-ExecutionPolicy RemoteSigned -scope Process; [Net.ServicePointManager]::SecurityProtocol = 'Tls12'; iwr -useb https://raw.githubusercontent.com/gerardog/gsudo/master/installgsudo.ps1 | iex"
   ```
-- Portable: 
+- Portable:
   1. Download `gsudo.portable.zip` from the [latest release](https://github.com/gerardog/gsudo/releases/latest)
   2. Extract the folder corresponding to your processor architecture (x64, x86, or arm64) from the zip file to a suitable directory on your computer.
   3. Optionally, add that directory to your system's PATH environment variable if it's not already accessible.
-  
+
 **Please restart all your console windows** after installing to ensure that the `PATH` environment variable is refreshed.
 
 Note: `gsudo.exe` is portable. No windows service is required or system change is done, except adding it to the Path.
@@ -149,10 +149,10 @@ To elevate a commands or script block: **Wrap it in {curly braces}**.
 
    # Pass arguments with -args
    $MyString = "Hello World"
-   gsudo { Write-Output $args[0] } -args $MyString  
+   gsudo { Write-Output $args[0] } -args $MyString
 
    # Output is serialized as PSObjects with properties.
-   $services = gsudo { Get-Service 'WSearch', 'Winmgmt'} 
+   $services = gsudo { Get-Service 'WSearch', 'Winmgmt'}
    Write-Output $services.DisplayName
 
    # Inputs too: Example elevated iteration of a list.
@@ -167,18 +167,18 @@ Alternative syntaxes:
    # Pass values (not variables by reference) by prefixing `$using:`. I.E.
 
    $MyString = "Hello World"
-   Invoke-Gsudo { Write-Output $using:MyString }  
+   Invoke-Gsudo { Write-Output $using:MyString }
 
    # Syntax:
-   Invoke-Gsudo [-ScriptBlock] <ScriptBlock> 
-                [[-ArgumentList] <Object[]>] 
-                [-InputObject <PSObject>] 
-                [-LoadProfile | -NoProfile] 
+   Invoke-Gsudo [-ScriptBlock] <ScriptBlock>
+                [[-ArgumentList] <Object[]>]
+                [-InputObject <PSObject>]
+                [-LoadProfile | -NoProfile]
                 [-Credential <PSCredential>]
    ```
 
     - PowerShell function.
-    - Performs auto serialization of inputs & outputs. 
+    - Performs auto serialization of inputs & outputs.
     - You can prefix variables with the `$using:` scope modifier (like `$using:variableName`) and their serialized value is applied.
     - Use `-LoadProfile` or `-NoProfile` to override profile loading or not.
     - Use `-Credential` option for Run As User (same as `-u` but for `Get-Credentials`).
@@ -187,16 +187,16 @@ Alternative syntaxes:
 
 <details>
   <summary>3. Manual string interpolation. (not recommended) </summary>
-  I don't recommend this approach as it is really hard to do proper escape all special characters. 
+  I don't recommend this approach as it is really hard to do proper escape all special characters.
 
    ``` PowerShell
    Usage: gsudo 'string literal'
 
    # Variable substitutions example:
-   $file='C:\My Secret.txt'; 
+   $file='C:\My Secret.txt';
    $algorithm='md5';
    $hash = gsudo "(Get-FileHash '$file' -Algorithm $algorithm).Hash"
-   # or 
+   # or
    $hash = gsudo "(Get-FileHash ""$file"" -Algorithm $algorithm).Hash"
    ```
 
@@ -209,13 +209,13 @@ Alternative syntaxes:
 - <a name="gsudomodule"></a> Optional: Import module `gsudoModule.psd1` into your PowerShell Profile:
   - Adds syntax auto-complete to gsudo in PowerShell. Plus, it suggests the 3 previous commands, making your workflow smoother than ever!
   - Enables `gsudo !!` on Powershell, to elevate the last executed command.
-  - Adds Functions: 
+  - Adds Functions:
     - `Test-IsGsudoCacheAvailable` Returns true if a gsudo cache is active (meaning elevation with no UAC is possible).
     - `Test-IsProcessElevated`: Returns true if the current process is elevated.
     - `Test-IsAdminMember`: Returns true if the current user is member of the `Local Administrators` groups, which means it can elevate with.
-  
+
   ``` Powershell
-  # Add the following line to your $PROFILE 
+  # Add the following line to your $PROFILE
   Import-Module "gsudoModule"
 
   # Or run:
@@ -224,12 +224,12 @@ Alternative syntaxes:
 
   - If you haven't already customized your PowerShell prompt (for example by installing Oh-My-Posh), you can easily add a red `#` indicating that the current process is elevated:
     ![gsudo prompt](docs/static/img/gsudo-powershell-prompt.gif)
-  
+
   To do so add this line to your profile (after importing `gsudoModule`):
-  
+
   ``` powershell
   Set-Alias Prompt gsudoPrompt
-  ``` 
+  ```
 ---
 
 ### Usage from WSL (Windows Subsystem for Linux)
@@ -240,7 +240,7 @@ On WSL bash, prepend `gsudo` to elevate **WSL commands** or `gsudo -d` for **CMD
 
 ``` bash
 # elevate default shell
-PC:~$ gsudo 
+PC:~$ gsudo
 
 # run elevated WSL command
 PC:~$ gsudo mkdir /mnt/c/Windows/MyFolder
@@ -304,9 +304,9 @@ In any case, you can stop all cache sessions with `gsudo -k`.
 
   When I created `gsudo`, there were other `sudo` packages on most Windows popular package managers such as `Chocolatey` and `Scoop`, so I had no other choice to pick another name. `gsudo` installers create an alias for `sudo`, so feel free to use `sudo` on your command line to invoke `gsudo`.
 
-- Why did you migrated from `.Net Framework 4.6` to `.Net Core 7.0`?
+- Why did you migrated from `.Net Framework 4.6` to `.Net 8.0`?
 
-  Starting from v1.4.0, it is built using `.Net 7.0` NativeAOT. It loads faster and uses less memory, and runs on machines without any .Net runtime installed. Prior versions `<v1.3.0` used .Net 4.6, because it was included in every Windows 10/11 installation.
+  Starting from v1.4.0, it is built using NativeAOT. It loads faster and uses less memory, and runs on machines without any .Net runtime installed. Prior versions `<= v1.3.0` used .Net 4.6, because it was included in every Windows 10/11 installation.
 
 - Is `gsudo` a port of `*nix sudo`?
 

diff --git a/build/00-prerequisites.ps1 b/build/00-prerequisites.ps1
@@ -1,6 +1,6 @@
-choco install il-repack 
+choco install il-repack
 choco install GitVersion.Portable
 choco install wixtoolset
 choco install hub
-choco install dotnet-7.0-sdk
+choco install dotnet-8.0-sdk
 choco install NuGet.CommandLine
diff --git a/build/01-build.ps1 b/build/01-build.ps1
@@ -12,24 +12,24 @@ if ($env:version) {
 "- Using version number v$version / v$version_MajorMinorPatch"
 
 "-- Cleaning bin & obj folders"
-Get-Item ".\src\gsudo\bin\", ".\src\gsudo\obj\" -ErrorAction Ignore | Remove-Item -Recurse -Force 
-"-- Building net7.0 win-arm64"
-dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\arm64  -f net7.0 -r win-arm64 --sc -p:PublishAot=true -p:IlcOptimizationPreference=Size -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
-"-- Building net7.0 win-x64"
-dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\x64    -f net7.0 -r win-x64   --sc -p:PublishAot=true -p:IlcOptimizationPreference=Size -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
-"-- Building net7.0 win-x86"
-dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\x86    -f net7.0 -r win-x86   --sc -p:PublishReadyToRun=true -p:PublishSingleFile=true -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
+Get-Item ".\src\gsudo\bin\", ".\src\gsudo\obj\" -ErrorAction Ignore | Remove-Item -Recurse -Force
+"-- Building net8.0 win-arm64"
+dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\arm64  -f net8.0 -r win-arm64 --sc -p:IlcOptimizationPreference=Size -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
+"-- Building net8.0 win-x64"
+dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\x64    -f net8.0 -r win-x64   --sc -p:IlcOptimizationPreference=Size -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
+"-- Building net8.0 win-x86"
+dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\x86    -f net8.0 -r win-x86   --sc -p:PublishReadyToRun=true -p:PublishSingleFile=true -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
 "-- Building net4.6 AnyCpu"
 dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\net46-AnyCpu\unmerged -f net46 -p:Platform=AnyCpu -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
 
 "-- Repacking net4.6 AnyCpu into a single EXE"
 
-ilrepack .\artifacts\net46-AnyCpu\unmerged\gsudo.exe .\artifacts\net46-AnyCpu\unmerged\*.dll /out:.\artifacts\net46-AnyCpu\gsudo.exe /target:exe /targetplatform:v4 /ndebug /wildcards || $(exit $LASTEXITCODE)
-
-if ($?) {
-	rm artifacts\net46-AnyCpu\unmerged -Recurse
-	echo "artifacts\net46-AnyCpu\unmerged -> ilmerge -> artifacts\net46-AnyCpu\"
-}
+ilrepack .\artifacts\net46-AnyCpu\unmerged\gsudo.exe .\artifacts\net46-AnyCpu\unmerged\*.dll /out:.\artifacts\net46-AnyCpu\gsudo.exe /target:exe /targetplatform:v4 /ndebug /wildcards || $(exit $LASTEXITCODE)
+
+if ($?) {
+	rm artifacts\net46-AnyCpu\unmerged -Recurse
+	echo "artifacts\net46-AnyCpu\unmerged -> ilmerge -> artifacts\net46-AnyCpu\"
+}
 
 cp .\src\gsudo.Wrappers\* .\artifacts\x86
 cp .\src\gsudo.Wrappers\* .\artifacts\x64

diff --git a/build/02-test.ps1 b/build/02-test.ps1
@@ -14,7 +14,7 @@ dotnet build .\src\gsudo.sln || $(exit $LASTEXITCODE)
 
 $originalPath = $env:path
 
-$env:path=(Get-Item .\src\gsudo.Tests\bin\Debug\net7.0\).FullName+";" + [String]::Join(";", (($ENV:Path).Split(";") -notlike "*gsudo*" | % {$_ -replace "\\$" }))
+$env:path=(Get-Item .\src\gsudo.Tests\bin\Debug\net8.0\).FullName+";" + [String]::Join(";", (($ENV:Path).Split(";") -notlike "*gsudo*" | % {$_ -replace "\\$" }))
 
 gsudo -k
 gsudo --debug cache on -p 0 -d 1
@@ -25,19 +25,19 @@ if (! $?) { $failure = $true }
 if ($failure) { exit 1 } # fail fast
 
 $script  = {
-	$ProgressPreference = "SilentlyContinue";
+	$ProgressPreference = "SilentlyContinue";
 	if ((Get-InstalledModule Pester -ErrorAction SilentlyContinue).Version -lt "5.0.0") { Install-Module Pester -Force -SkipPublisherCheck }
-	Import-Module Pester 
-	
+	Import-Module Pester
+
 	$configuration = New-PesterConfiguration;
 	$configuration.Run.Path = "src"
 	$configuration.TestResult.Enabled = $true
 	$configuration.TestResult.OutputPath = "TestResults_PS$($PSVersionTable.PSVersion.Major).xml"
 	$configuration.TestResult.OutputFormat = "JUnitXml"
 #	$configuration.Should.ErrorAction = 'Continue'
-#	$configuration.CodeCoverage.Enabled = $true  
-	
-    Invoke-Pester -Configuration $configuration 
+#	$configuration.CodeCoverage.Enabled = $true
+
+    Invoke-Pester -Configuration $configuration
 }
 
 gsudo --debug cache on -p 0 -d 1

diff --git a/global.json b/global.json
diff --git a/src/gsudo.Tests/gsudo.Tests.csproj b/src/gsudo.Tests/gsudo.Tests.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\gsudo\gsudo.csproj" AdditionalProperties="TargetFramework=net7.0" />
+    <ProjectReference Include="..\gsudo\gsudo.csproj" AdditionalProperties="TargetFramework=net8.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />

diff --git a/src/gsudo/gsudo.csproj b/src/gsudo/gsudo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-	<TargetFrameworks>net7.0;net46</TargetFrameworks>
+	<TargetFrameworks>net8.0;net46</TargetFrameworks>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>StrongName.snk</AssemblyOriginatorKeyFile>
     <Authors>Gerardo Grignoli</Authors>
@@ -26,16 +26,20 @@
 	<NoWarn>1701;1702;CA1303;CA1707;CA1028;CA1001;CA1031;CA1416</NoWarn>
 	<ApplicationIcon>icon\gsudo.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
+  <PropertyGroup Condition="'$(Platform)' == 'x64'">
+    <PublishAot>true</PublishAot>
     <AutoGenerateBindingRedirects>False</AutoGenerateBindingRedirects>
-	<PublishTrimmed>true</PublishTrimmed>
-	<InvariantGlobalization>true</InvariantGlobalization> 
-	<IlcOptimizationPreference>Size</IlcOptimizationPreference>
-  </PropertyGroup>
+    <PublishTrimmed>true</PublishTrimmed>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <IlcOptimizationPreference>Size</IlcOptimizationPreference>
+  </PropertyGroup>	  
+  <PropertyGroup Condition="'$(Platform)' == 'x86'">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>	
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>DEBUG</DefineConstants>
     <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>    
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="bin\**" />
@@ -45,7 +49,7 @@
   <ItemGroup>
     <Compile Remove="Tokens\PrivilegeManager.cs" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
     <Content Include="gsudo.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -61,7 +65,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
+  <ItemGroup Condition="'$(TargetFramework)'!='net46'">
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
     <PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
   </ItemGroup>