fix linux only package being included in windows build when using publish.ps1

This commit is contained in:
Chris
2022-10-20 20:01:31 -06:00
parent f558cbaae9
commit 486163a79a
2 changed files with 7 additions and 4 deletions

View File

@ -6,8 +6,7 @@ $version=$proj.Project.PropertyGroup.VersionPrefix
$release_name="min-ed-launcher_v${version}_$target"
$target_dir="artifacts\$release_name"
dotnet restore -r $target src\MinEdLauncher\MinEdLauncher.fsproj
dotnet publish src\MinEdLauncher\MinEdLauncher.fsproj -r "$target" --self-contained true --no-restore -o "$target_dir" -c ReleaseWindows -p:PublishSingleFile=true
dotnet publish -r "$target" --self-contained -o "$target_dir" -c ReleaseWindows -p:PublishSingleFile=true src\MinEdLauncher\MinEdLauncher.fsproj
$full_version=(Get-Item "$target_dir\MinEdLauncher.exe").VersionInfo.ProductVersion
(Get-Content Cargo.toml).replace('0.0.0', "$full_version") | Set-Content Cargo.toml # Workaround for https://github.com/rust-lang/cargo/issues/6583
cargo build --release

View File

@ -34,6 +34,10 @@
<DefineConstants>WINDOWS</DefineConstants>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup>
<IsLinux>!$(DefineConstants.Contains('WINDOWS'))</IsLinux>
</PropertyGroup>
<ItemGroup>
<Compile Include="Extensions.fs" />
@ -55,7 +59,7 @@
<Compile Include="App.fs" />
<Compile Include="Program.fs" />
<EmbeddedResource Include="settings.json" />
<Content Include="..\..\lib\libsteam_api.so" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release' ">
<Content Include="..\..\lib\libsteam_api.so" Condition="$(IsLinux)">
<Link>libsteam_api.so</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@ -73,7 +77,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-preview" Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release' " />
<PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-preview" Condition="$(IsLinux)" />
<PackageReference Include="TypeShape" Version="10.0.0" />
<PackageReference Include="FsConfig" Version="3.1.0" />
<PackageReference Update="FSharp.Core" Version="6.0.6" />