diff --git a/LANCommander.Build/Include/Build-Launcher.ps1 b/LANCommander.Build/Include/Build-Launcher.ps1 index 410634ea..916bbb07 100644 --- a/LANCommander.Build/Include/Build-Launcher.ps1 +++ b/LANCommander.Build/Include/Build-Launcher.ps1 @@ -10,7 +10,6 @@ function Build-Launcher { ) $AssemblyVersion = "$($Version.Major).$($Version.Minor).$($Version.Patch)" - $TagVersion = "v$($Version)" $RuntimeIdentifier = "$Runtime-$Architecture" dotnet restore @@ -18,9 +17,9 @@ function Build-Launcher { npm install --prefix ./LANCommander.UI npm install --prefix ./LANCommander.Launcher - dotnet publish ./LANCommander.AutoUpdater/LANCommander.AutoUpdater.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$TagVersion" -p:AssemblyVersion="$AssemblyVersion" - dotnet publish ./LANCommander.Launcher/LANCommander.Launcher.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$TagVersion" -p:AssemblyVersion="$AssemblyVersion" - dotnet publish ./LANCommander.Launcher.CLI/LANCommander.Launcher.CLI.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$TagVersion" -p:AssemblyVersion="$AssemblyVersion" + dotnet publish ./LANCommander.AutoUpdater/LANCommander.AutoUpdater.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$Version" -p:AssemblyVersion="$AssemblyVersion" + dotnet publish ./LANCommander.Launcher/LANCommander.Launcher.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$Version" -p:AssemblyVersion="$AssemblyVersion" + dotnet publish ./LANCommander.Launcher.CLI/LANCommander.Launcher.CLI.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$Version" -p:AssemblyVersion="$AssemblyVersion" Copy-Item -Force -Recurse -Verbose LANCommander.AutoUpdater/bin/$Configuration/net9.0/$RuntimeIdentifier/publish/* LANCommander.Launcher/bin/$Configuration/net9.0/$RuntimeIdentifier/publish/ Copy-Item -Force -Recurse -Verbose LANCommander.Launcher.CLI/bin/$Configuration/net9.0/$RuntimeIdentifier/publish/* LANCommander.Launcher/bin/$Configuration/net9.0/$RuntimeIdentifier/publish/ @@ -51,7 +50,7 @@ function Build-Launcher { $Compress = @{ Path = "LANCommander.Launcher/bin/$Configuration/net9.0/$RuntimeIdentifier/publish/*" - DestinationPath = "LANCommander.Launcher-$Platform-$Architecture-$Version.zip" + DestinationPath = "LANCommander.Launcher-$Platform-$Architecture-v$Version.zip" CompressionLevel = "Fastest" } diff --git a/LANCommander.Build/Include/Build-Server.ps1 b/LANCommander.Build/Include/Build-Server.ps1 index 9f351497..d66b7f37 100644 --- a/LANCommander.Build/Include/Build-Server.ps1 +++ b/LANCommander.Build/Include/Build-Server.ps1 @@ -10,7 +10,6 @@ function Build-Server { ) $AssemblyVersion = "$($Version.Major).$($Version.Minor).$($Version.Patch)" - $TagVersion = "v$($Version)" $RuntimeIdentifier = "$Runtime-$Architecture" dotnet restore @@ -18,8 +17,8 @@ function Build-Server { npm install --prefix ./LANCommander.UI npm install --prefix ./LANCommander.Server - dotnet publish ./LANCommander.AutoUpdater/LANCommander.AutoUpdater.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$TagVersion" -p:AssemblyVersion="$AssemblyVersion" - dotnet publish ./LANCommander.Server/LANCommander.Server.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$TagVersion" -p:AssemblyVersion="$AssemblyVersion" + dotnet publish ./LANCommander.AutoUpdater/LANCommander.AutoUpdater.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$Version" -p:AssemblyVersion="$AssemblyVersion" + dotnet publish ./LANCommander.Server/LANCommander.Server.csproj -c $Configuration --self-contained --runtime $RuntimeIdentifier -p:Version="$Version" -p:AssemblyVersion="$AssemblyVersion" Copy-Item -Force -Recurse -Verbose LANCommander.AutoUpdater/bin/$Configuration/net9.0/$RuntimeIdentifier/publish/* LANCommander.Server/bin/$Configuration/net9.0/$RuntimeIdentifier/publish/ @@ -49,7 +48,7 @@ function Build-Server { $Compress = @{ Path = "LANCommander.Server/bin/$Configuration/net9.0/$RuntimeIdentifier/publish/*" - DestinationPath = "LANCommander.Server-$Platform-$Architecture-$TagVersion.zip" + DestinationPath = "LANCommander.Server-$Platform-$Architecture-v$Version.zip" CompressionLevel = "Fastest" }