diff options
| -rwxr-xr-x | build/prepare-install-package.sh | 9 | ||||
| -rw-r--r-- | src/SMAPI.Installer/assets/runtimeconfig.json (renamed from src/SMAPI.Installer/assets/runtimeconfig.unix.json) | 5 | ||||
| -rw-r--r-- | src/SMAPI.Installer/assets/runtimeconfig.windows.json | 13 | ||||
| -rw-r--r-- | src/SMAPI/SMAPI.csproj | 3 |
4 files changed, 10 insertions, 20 deletions
diff --git a/build/prepare-install-package.sh b/build/prepare-install-package.sh index 07dae217..39575c4c 100755 --- a/build/prepare-install-package.sh +++ b/build/prepare-install-package.sh @@ -97,11 +97,10 @@ for folder in ${folders[@]}; do rm -rf "$internalPath/assets" # runtime config for SMAPI - if [ $folder == "linux" ] || [ $folder == "macOS" ]; then - cp "$installAssets/runtimeconfig.unix.json" "$bundlePath/StardewModdingAPI.runtimeconfig.json" - else - cp "$installAssets/runtimeconfig.$folder.json" "$bundlePath/StardewModdingAPI.runtimeconfig.json" - fi + # This is identical to the one generated by the build, except that the min runtime version is + # set to 5.0.0 (instead of whatever version it was built with) and rollForward is set to latestMinor instead of + # minor. + cp "$installAssets/runtimeconfig.json" "$bundlePath/StardewModdingAPI.runtimeconfig.json" # installer DLL config if [ $folder == "windows" ]; then diff --git a/src/SMAPI.Installer/assets/runtimeconfig.unix.json b/src/SMAPI.Installer/assets/runtimeconfig.json index a1d060b5..34018b8a 100644 --- a/src/SMAPI.Installer/assets/runtimeconfig.unix.json +++ b/src/SMAPI.Installer/assets/runtimeconfig.json @@ -5,11 +5,12 @@ { "name": "Microsoft.NETCore.App", "version": "5.0.0", - "rollForward": "major" + "rollForward": "latestMinor" } ], "configProperties": { - "System.Runtime.TieredCompilation": false + "System.Runtime.TieredCompilation": false, + "System.Reflection.Metadata.MetadataUpdater.IsSupported": false } } } diff --git a/src/SMAPI.Installer/assets/runtimeconfig.windows.json b/src/SMAPI.Installer/assets/runtimeconfig.windows.json deleted file mode 100644 index d5f24bdb..00000000 --- a/src/SMAPI.Installer/assets/runtimeconfig.windows.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net5.0", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "5.0.0", - "rollForward": "major" - }, - "configProperties": { - "System.Runtime.TieredCompilation": false - } - } -} diff --git a/src/SMAPI/SMAPI.csproj b/src/SMAPI/SMAPI.csproj index b99028da..f07ede87 100644 --- a/src/SMAPI/SMAPI.csproj +++ b/src/SMAPI/SMAPI.csproj @@ -13,6 +13,9 @@ <!--copy dependency DLLs to bin folder so we can include them in installer bundle --> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> + + <!-- tiered compilation breaks Harmony --> + <TieredCompilation>false</TieredCompilation> </PropertyGroup> <Import Project="..\..\build\common.targets" /> |