ArchiSteamFarm: choose correct framework instead of patching
This commit is contained in:
parent
c1222f071a
commit
a6e176c5b2
|
@ -22,11 +22,6 @@ buildDotnetModule rec {
|
||||||
sha256 = "sha256-SRWqe8KTjFdgVW7/EYRVUONtDWwxpcZ1GXWFPjKZzpI=";
|
sha256 = "sha256-SRWqe8KTjFdgVW7/EYRVUONtDWwxpcZ1GXWFPjKZzpI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# otherwise installPhase fails with NETSDK1129
|
|
||||||
./fix-framework.diff
|
|
||||||
];
|
|
||||||
|
|
||||||
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
|
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
|
||||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||||
|
|
||||||
|
@ -38,6 +33,9 @@ buildDotnetModule rec {
|
||||||
"-p:PublishSingleFile=true"
|
"-p:PublishSingleFile=true"
|
||||||
"-p:PublishTrimmed=true"
|
"-p:PublishTrimmed=true"
|
||||||
];
|
];
|
||||||
|
dotnetInstallFlags = [
|
||||||
|
"--framework=net7.0"
|
||||||
|
];
|
||||||
selfContainedBuild = true;
|
selfContainedBuild = true;
|
||||||
|
|
||||||
runtimeDeps = [ libkrb5 zlib openssl ];
|
runtimeDeps = [ libkrb5 zlib openssl ];
|
||||||
|
@ -58,9 +56,11 @@ buildDotnetModule rec {
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
buildPlugin() {
|
buildPlugin() {
|
||||||
|
echo "Publishing plugin $1"
|
||||||
dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \
|
dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \
|
||||||
--output $out/lib/${pname}/plugins/$1 --configuration Release \
|
--output $out/lib/${pname}/plugins/$1 --configuration Release \
|
||||||
-p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore
|
-p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore \
|
||||||
|
--framework=net7.0
|
||||||
}
|
}
|
||||||
|
|
||||||
buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher
|
buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
diff --git a/Directory.Build.props b/Directory.Build.props
|
|
||||||
index 89137fba..bce300a4 100644
|
|
||||||
--- a/Directory.Build.props
|
|
||||||
+++ b/Directory.Build.props
|
|
||||||
@@ -29,16 +29,16 @@
|
|
||||||
<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
|
|
||||||
<RollForward>LatestMajor</RollForward>
|
|
||||||
<RuntimeIdentifiers>linux-arm;linux-arm64;linux-x64;osx-arm64;osx-x64;win-arm64;win-x64</RuntimeIdentifiers>
|
|
||||||
- <TargetFrameworks>net7.0</TargetFrameworks>
|
|
||||||
+ <TargetFramework>net7.0</TargetFramework>
|
|
||||||
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(OS)' == 'Windows_NT' OR '$(ASFNetFramework)' != ''">
|
|
||||||
- <TargetFrameworks>$(TargetFrameworks);net481</TargetFrameworks>
|
|
||||||
+ <TargetFramework>$(TargetFramework);net481</TargetFramework>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(ASFNetStandard)' != ''">
|
|
||||||
- <TargetFrameworks>$(TargetFrameworks);netstandard2.1</TargetFrameworks>
|
|
||||||
+ <TargetFramework>$(TargetFramework);netstandard2.1</TargetFramework>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'net481' OR '$(TargetFramework)' == 'netstandard2.1'">
|
|
Loading…
Reference in a new issue