Skip to content

Commit b9c18e7

Browse files
Jack251970Jack251970
committed
Revert "Set RuntimeIdentifier to win-x64 for directory build properties"
This reverts commit 9f5d578.
1 parent 9f5d578 commit b9c18e7

File tree

7 files changed

+81
-235
lines changed

7 files changed

+81
-235
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@
33
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
44
<!-- Work around https://github.com/dotnet/runtime/issues/109682 -->
55
<CETCompat>false</CETCompat>
6-
<!-- Since Flow.Launcher publish profiles are for win-x64 only -->
7-
<!-- rutime identifier is set to it so that we do not need to remove unnecessary runtime files -->
8-
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
96
</PropertyGroup>
107
</Project>

‎Flow.Launcher.Core/packages.lock.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,6 @@
272272
"JetBrains.Annotations": "[2024.3.0, )"
273273
}
274274
}
275-
},
276-
"net9.0-windows7.0/win-x64": {
277-
"Microsoft.Win32.SystemEvents": {
278-
"type": "Transitive",
279-
"resolved": "9.0.7",
280-
"contentHash": "lFGY2aGgmMREPJEfOmZcA6v0CLjWVpcfNHRgqYMoSQhy80+GxhYqdW5xe+DCLrVqE1M7/0RpOkIo49/KH/cd/A=="
281-
}
282275
}
283276
}
284277
}

‎Flow.Launcher.Infrastructure/packages.lock.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,6 @@
193193
"JetBrains.Annotations": "[2024.3.0, )"
194194
}
195195
}
196-
},
197-
"net9.0-windows7.0/win-x64": {
198-
"Microsoft.Win32.SystemEvents": {
199-
"type": "Transitive",
200-
"resolved": "9.0.7",
201-
"contentHash": "lFGY2aGgmMREPJEfOmZcA6v0CLjWVpcfNHRgqYMoSQhy80+GxhYqdW5xe+DCLrVqE1M7/0RpOkIo49/KH/cd/A=="
202-
}
203196
}
204197
}
205198
}

‎Flow.Launcher.Plugin/packages.lock.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
"Microsoft.Windows.SDK.Win32Metadata": "61.0.15-preview"
7373
}
7474
}
75-
},
76-
"net9.0-windows7.0/win-x64": {}
75+
}
7776
}
7877
}

‎Flow.Launcher/Flow.Launcher.csproj

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,48 @@
3939
<Prefer32Bit>false</Prefer32Bit>
4040
</PropertyGroup>
4141

42+
<Target Name="RemoveUnnecessaryRuntimesAfterBuild" AfterTargets="Build">
43+
<RemoveDir Directories="$(OutputPath)runtimes\browser-wasm;
44+
$(OutputPath)runtimes\linux-arm;
45+
$(OutputPath)runtimes\linux-arm64;
46+
$(OutputPath)runtimes\linux-armel;
47+
$(OutputPath)runtimes\linux-mips64;
48+
$(OutputPath)runtimes\linux-musl-arm;
49+
$(OutputPath)runtimes\linux-musl-arm64;
50+
$(OutputPath)runtimes\linux-musl-x64;
51+
$(OutputPath)runtimes\linux-musl-s390x;
52+
$(OutputPath)runtimes\linux-ppc64le;
53+
$(OutputPath)runtimes\linux-s390x;
54+
$(OutputPath)runtimes\linux-x64;
55+
$(OutputPath)runtimes\linux-x86;
56+
$(OutputPath)runtimes\maccatalyst-arm64;
57+
$(OutputPath)runtimes\maccatalyst-x64;
58+
$(OutputPath)runtimes\osx;
59+
$(OutputPath)runtimes\osx-arm64;
60+
$(OutputPath)runtimes\osx-x64"/>
61+
</Target>
62+
63+
<Target Name="RemoveUnnecessaryRuntimesAfterPublish" AfterTargets="Publish">
64+
<RemoveDir Directories="$(PublishDir)runtimes\browser-wasm;
65+
$(PublishDir)runtimes\linux-arm;
66+
$(PublishDir)runtimes\linux-arm64;
67+
$(PublishDir)runtimes\linux-armel;
68+
$(PublishDir)runtimes\linux-mips64;
69+
$(PublishDir)runtimes\linux-musl-arm;
70+
$(PublishDir)runtimes\linux-musl-arm64;
71+
$(PublishDir)runtimes\linux-musl-x64;
72+
$(PublishDir)runtimes\linux-musl-s390x;
73+
$(PublishDir)runtimes\linux-ppc64le;
74+
$(PublishDir)runtimes\linux-s390x;
75+
$(PublishDir)runtimes\linux-x64;
76+
$(PublishDir)runtimes\linux-x86;
77+
$(PublishDir)runtimes\maccatalyst-arm64;
78+
$(PublishDir)runtimes\maccatalyst-x64;
79+
$(PublishDir)runtimes\osx;
80+
$(PublishDir)runtimes\osx-arm64;
81+
$(PublishDir)runtimes\osx-x64"/>
82+
</Target>
83+
4284
<ItemGroup>
4385
<ApplicationDefinition Remove="App.xaml" />
4486
</ItemGroup>

‎Flow.Launcher/packages.lock.json

Lines changed: 0 additions & 216 deletions
Original file line numberDiff line numberDiff line change
@@ -872,222 +872,6 @@
872872
"JetBrains.Annotations": "[2024.3.0, )"
873873
}
874874
}
875-
},
876-
"net9.0-windows10.0.19041/win-x64": {
877-
"Microsoft.Win32.Registry": {
878-
"type": "Transitive",
879-
"resolved": "5.0.0",
880-
"contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
881-
"dependencies": {
882-
"System.Security.AccessControl": "5.0.0",
883-
"System.Security.Principal.Windows": "5.0.0"
884-
}
885-
},
886-
"Microsoft.Win32.SystemEvents": {
887-
"type": "Transitive",
888-
"resolved": "9.0.7",
889-
"contentHash": "lFGY2aGgmMREPJEfOmZcA6v0CLjWVpcfNHRgqYMoSQhy80+GxhYqdW5xe+DCLrVqE1M7/0RpOkIo49/KH/cd/A=="
890-
},
891-
"runtime.any.System.Collections": {
892-
"type": "Transitive",
893-
"resolved": "4.3.0",
894-
"contentHash": "23g6rqftKmovn2cLeGsuHUYm0FD7pdutb0uQMJpZ3qTvq+zHkgmt6J65VtRry4WDGYlmkMa4xDACtaQ94alNag==",
895-
"dependencies": {
896-
"System.Runtime": "4.3.0"
897-
}
898-
},
899-
"runtime.any.System.Globalization": {
900-
"type": "Transitive",
901-
"resolved": "4.3.0",
902-
"contentHash": "sMDBnad4rp4t7GY442Jux0MCUuKL4otn5BK6Ni0ARTXTSpRNBzZ7hpMfKSvnVSED5kYJm96YOWsqV0JH0d2uuw=="
903-
},
904-
"runtime.any.System.IO": {
905-
"type": "Transitive",
906-
"resolved": "4.3.0",
907-
"contentHash": "SDZ5AD1DtyRoxYtEcqQ3HDlcrorMYXZeCt7ZhG9US9I5Vva+gpIWDGMkcwa5XiKL0ceQKRZIX2x0XEjLX7PDzQ=="
908-
},
909-
"runtime.any.System.Reflection": {
910-
"type": "Transitive",
911-
"resolved": "4.3.0",
912-
"contentHash": "hLC3A3rI8jipR5d9k7+f0MgRCW6texsAp0MWkN/ci18FMtQ9KH7E2vDn/DH2LkxsszlpJpOn9qy6Z6/69rH6eQ=="
913-
},
914-
"runtime.any.System.Reflection.Primitives": {
915-
"type": "Transitive",
916-
"resolved": "4.3.0",
917-
"contentHash": "Nrm1p3armp6TTf2xuvaa+jGTTmncALWFq22CpmwRvhDf6dE9ZmH40EbOswD4GnFLrMRS0Ki6Kx5aUPmKK/hZBg=="
918-
},
919-
"runtime.any.System.Resources.ResourceManager": {
920-
"type": "Transitive",
921-
"resolved": "4.3.0",
922-
"contentHash": "Lxb89SMvf8w9p9+keBLyL6H6x/TEmc6QVsIIA0T36IuyOY3kNvIdyGddA2qt35cRamzxF8K5p0Opq4G4HjNbhQ=="
923-
},
924-
"runtime.any.System.Runtime": {
925-
"type": "Transitive",
926-
"resolved": "4.3.0",
927-
"contentHash": "fRS7zJgaG9NkifaAxGGclDDoRn9HC7hXACl52Or06a/fxdzDajWb5wov3c6a+gVSlekRoexfjwQSK9sh5um5LQ==",
928-
"dependencies": {
929-
"System.Private.Uri": "4.3.0"
930-
}
931-
},
932-
"runtime.any.System.Text.Encoding": {
933-
"type": "Transitive",
934-
"resolved": "4.3.0",
935-
"contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ=="
936-
},
937-
"runtime.any.System.Threading.Tasks": {
938-
"type": "Transitive",
939-
"resolved": "4.3.0",
940-
"contentHash": "OhBAVBQG5kFj1S+hCEQ3TUHBAEtZ3fbEMgZMRNdN8A0Pj4x+5nTELEqL59DU0TjKVE6II3dqKw4Dklb3szT65w=="
941-
},
942-
"runtime.osx.10.10-x64.CoreCompat.System.Drawing": {
943-
"type": "Transitive",
944-
"resolved": "5.8.64",
945-
"contentHash": "Ey7xQgWwixxdrmhzEUvaR4kxZDSQMWQScp8ViLvmL5xCBKG6U3TaMv/jzHilpfQXpHmJ4IylKGzzMvnYX2FwHQ=="
946-
},
947-
"runtime.win.System.Diagnostics.Debug": {
948-
"type": "Transitive",
949-
"resolved": "4.3.0",
950-
"contentHash": "hHHP0WCStene2jjeYcuDkETozUYF/3sHVRHAEOgS3L15hlip24ssqCTnJC28Z03Wpo078oMcJd0H4egD2aJI8g=="
951-
},
952-
"System.Collections": {
953-
"type": "Transitive",
954-
"resolved": "4.3.0",
955-
"contentHash": "3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==",
956-
"dependencies": {
957-
"Microsoft.NETCore.Platforms": "1.1.0",
958-
"Microsoft.NETCore.Targets": "1.1.0",
959-
"System.Runtime": "4.3.0",
960-
"runtime.any.System.Collections": "4.3.0"
961-
}
962-
},
963-
"System.Diagnostics.Debug": {
964-
"type": "Transitive",
965-
"resolved": "4.3.0",
966-
"contentHash": "ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==",
967-
"dependencies": {
968-
"Microsoft.NETCore.Platforms": "1.1.0",
969-
"Microsoft.NETCore.Targets": "1.1.0",
970-
"System.Runtime": "4.3.0",
971-
"runtime.win.System.Diagnostics.Debug": "4.3.0"
972-
}
973-
},
974-
"System.Diagnostics.EventLog": {
975-
"type": "Transitive",
976-
"resolved": "9.0.7",
977-
"contentHash": "AJ+9fyCtQUImntxAJ9l4PZiCd4iepuk4pm7Qcno7PBIWQnfXlvwKuFsGk2H+QyY69GUVzDP2heELW6ho5BCXUg=="
978-
},
979-
"System.Globalization": {
980-
"type": "Transitive",
981-
"resolved": "4.3.0",
982-
"contentHash": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==",
983-
"dependencies": {
984-
"Microsoft.NETCore.Platforms": "1.1.0",
985-
"Microsoft.NETCore.Targets": "1.1.0",
986-
"System.Runtime": "4.3.0",
987-
"runtime.any.System.Globalization": "4.3.0"
988-
}
989-
},
990-
"System.IO": {
991-
"type": "Transitive",
992-
"resolved": "4.3.0",
993-
"contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==",
994-
"dependencies": {
995-
"Microsoft.NETCore.Platforms": "1.1.0",
996-
"Microsoft.NETCore.Targets": "1.1.0",
997-
"System.Runtime": "4.3.0",
998-
"System.Text.Encoding": "4.3.0",
999-
"System.Threading.Tasks": "4.3.0",
1000-
"runtime.any.System.IO": "4.3.0"
1001-
}
1002-
},
1003-
"System.Private.Uri": {
1004-
"type": "Transitive",
1005-
"resolved": "4.3.0",
1006-
"contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==",
1007-
"dependencies": {
1008-
"Microsoft.NETCore.Platforms": "1.1.0",
1009-
"Microsoft.NETCore.Targets": "1.1.0"
1010-
}
1011-
},
1012-
"System.Reflection": {
1013-
"type": "Transitive",
1014-
"resolved": "4.3.0",
1015-
"contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==",
1016-
"dependencies": {
1017-
"Microsoft.NETCore.Platforms": "1.1.0",
1018-
"Microsoft.NETCore.Targets": "1.1.0",
1019-
"System.IO": "4.3.0",
1020-
"System.Reflection.Primitives": "4.3.0",
1021-
"System.Runtime": "4.3.0",
1022-
"runtime.any.System.Reflection": "4.3.0"
1023-
}
1024-
},
1025-
"System.Reflection.Primitives": {
1026-
"type": "Transitive",
1027-
"resolved": "4.3.0",
1028-
"contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==",
1029-
"dependencies": {
1030-
"Microsoft.NETCore.Platforms": "1.1.0",
1031-
"Microsoft.NETCore.Targets": "1.1.0",
1032-
"System.Runtime": "4.3.0",
1033-
"runtime.any.System.Reflection.Primitives": "4.3.0"
1034-
}
1035-
},
1036-
"System.Resources.ResourceManager": {
1037-
"type": "Transitive",
1038-
"resolved": "4.3.0",
1039-
"contentHash": "/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==",
1040-
"dependencies": {
1041-
"Microsoft.NETCore.Platforms": "1.1.0",
1042-
"Microsoft.NETCore.Targets": "1.1.0",
1043-
"System.Globalization": "4.3.0",
1044-
"System.Reflection": "4.3.0",
1045-
"System.Runtime": "4.3.0",
1046-
"runtime.any.System.Resources.ResourceManager": "4.3.0"
1047-
}
1048-
},
1049-
"System.Runtime": {
1050-
"type": "Transitive",
1051-
"resolved": "4.3.0",
1052-
"contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
1053-
"dependencies": {
1054-
"Microsoft.NETCore.Platforms": "1.1.0",
1055-
"Microsoft.NETCore.Targets": "1.1.0",
1056-
"runtime.any.System.Runtime": "4.3.0"
1057-
}
1058-
},
1059-
"System.Security.AccessControl": {
1060-
"type": "Transitive",
1061-
"resolved": "6.0.1",
1062-
"contentHash": "IQ4NXP/B3Ayzvw0rDQzVTYsCKyy0Jp9KI6aYcK7UnGVlR9+Awz++TIPCQtPYfLJfOpm8ajowMR09V7quD3sEHw=="
1063-
},
1064-
"System.Security.Principal.Windows": {
1065-
"type": "Transitive",
1066-
"resolved": "5.0.0",
1067-
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
1068-
},
1069-
"System.Text.Encoding": {
1070-
"type": "Transitive",
1071-
"resolved": "4.3.0",
1072-
"contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==",
1073-
"dependencies": {
1074-
"Microsoft.NETCore.Platforms": "1.1.0",
1075-
"Microsoft.NETCore.Targets": "1.1.0",
1076-
"System.Runtime": "4.3.0",
1077-
"runtime.any.System.Text.Encoding": "4.3.0"
1078-
}
1079-
},
1080-
"System.Threading.Tasks": {
1081-
"type": "Transitive",
1082-
"resolved": "4.3.0",
1083-
"contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==",
1084-
"dependencies": {
1085-
"Microsoft.NETCore.Platforms": "1.1.0",
1086-
"Microsoft.NETCore.Targets": "1.1.0",
1087-
"System.Runtime": "4.3.0",
1088-
"runtime.any.System.Threading.Tasks": "4.3.0"
1089-
}
1090-
}
1091875
}
1092876
}
1093877
}

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,44 @@
3636
<Prefer32Bit>false</Prefer32Bit>
3737
</PropertyGroup>
3838

39+
<Target Name="RemoveUnnecessaryRuntimesAfterBuild" AfterTargets="Build">
40+
<RemoveDir Directories="$(OutputPath)runtimes\browser-wasm;
41+
$(OutputPath)runtimes\linux-arm;
42+
$(OutputPath)runtimes\linux-arm64;
43+
$(OutputPath)runtimes\linux-armel;
44+
$(OutputPath)runtimes\linux-mips64;
45+
$(OutputPath)runtimes\linux-musl-arm;
46+
$(OutputPath)runtimes\linux-musl-arm64;
47+
$(OutputPath)runtimes\linux-musl-x64;
48+
$(OutputPath)runtimes\linux-ppc64le;
49+
$(OutputPath)runtimes\linux-s390x;
50+
$(OutputPath)runtimes\linux-x64;
51+
$(OutputPath)runtimes\linux-x86;
52+
$(OutputPath)runtimes\maccatalyst-arm64;
53+
$(OutputPath)runtimes\maccatalyst-x64;
54+
$(OutputPath)runtimes\osx-arm64;
55+
$(OutputPath)runtimes\osx-x64"/>
56+
</Target>
57+
58+
<Target Name="RemoveUnnecessaryRuntimesAfterPublish" AfterTargets="Publish">
59+
<RemoveDir Directories="$(PublishDir)runtimes\browser-wasm;
60+
$(PublishDir)runtimes\linux-arm;
61+
$(PublishDir)runtimes\linux-arm64;
62+
$(PublishDir)runtimes\linux-armel;
63+
$(PublishDir)runtimes\linux-mips64;
64+
$(PublishDir)runtimes\linux-musl-arm;
65+
$(PublishDir)runtimes\linux-musl-arm64;
66+
$(PublishDir)runtimes\linux-musl-x64;
67+
$(PublishDir)runtimes\linux-ppc64le;
68+
$(PublishDir)runtimes\linux-s390x;
69+
$(PublishDir)runtimes\linux-x64;
70+
$(PublishDir)runtimes\linux-x86;
71+
$(PublishDir)runtimes\maccatalyst-arm64;
72+
$(PublishDir)runtimes\maccatalyst-x64;
73+
$(PublishDir)runtimes\osx-arm64;
74+
$(PublishDir)runtimes\osx-x64"/>
75+
</Target>
76+
3977
<ItemGroup>
4078
<None Include="plugin.json">
4179
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

0 commit comments

Comments
 (0)