diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml index 772e3f67c..c5da53a0b 100644 --- a/.github/workflows/build_android.yml +++ b/.github/workflows/build_android.yml @@ -31,6 +31,12 @@ jobs: run: | git lfs version git lfs pull + - name: Configure .NET version + uses: richardrigutins/replace-in-files@v2 + with: + files: 'global.json' + search-text: 'latestMajor' + replacement-text: 'latestMinor' - name: Build run: | .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=ARM64 -platform=Android -configuration=Release -buildtargets=FlaxGame diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 85f4e0c79..6284a0263 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -28,6 +28,12 @@ jobs: run: | git lfs version git lfs pull + - name: Configure .NET version + uses: richardrigutins/replace-in-files@v2 + with: + files: 'global.json' + search-text: 'latestMajor' + replacement-text: 'latestMinor' - name: Build run: | .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor @@ -53,6 +59,12 @@ jobs: run: | git lfs version git lfs pull + - name: Configure .NET version + uses: richardrigutins/replace-in-files@v2 + with: + files: 'global.json' + search-text: 'latestMajor' + replacement-text: 'latestMinor' - name: Build run: | .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9b7c5c965..a6995b8c8 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -32,6 +32,12 @@ jobs: run: | dotnet --info dotnet workload --info + - name: Configure .NET version + uses: richardrigutins/replace-in-files@v2 + with: + files: 'global.json' + search-text: 'latestMajor' + replacement-text: 'latestMinor' - name: Build run: | .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8 @@ -65,6 +71,12 @@ jobs: run: | dotnet --info dotnet workload --info + - name: Configure .NET version + uses: richardrigutins/replace-in-files@v2 + with: + files: 'global.json' + search-text: 'latestMajor' + replacement-text: 'latestMinor' - name: Build run: | .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output -dotnet=8 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fdc8e80c9..40d1da844 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -68,6 +68,12 @@ jobs: run: | git lfs version git lfs pull + - name: Configure .NET version + uses: richardrigutins/replace-in-files@v2 + with: + files: 'global.json' + search-text: 'latestMajor' + replacement-text: 'latestMinor' - name: Build run: | .\GenerateProjectFiles.bat -vs2022 -log -verbose -printSDKs -dotnet=8 diff --git a/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs b/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs index 98a9ef530..d45d0dd4c 100644 --- a/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs +++ b/Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs @@ -201,7 +201,7 @@ namespace Flax.Deploy Log.Info("Building disk image..."); if (File.Exists(dmgPath)) File.Delete(dmgPath); - Utilities.Run("hdiutil", $"create -srcFolder \"{appPath}\" -o \"{dmgPath}\"", null, null, Utilities.RunOptions.Default | Utilities.RunOptions.ThrowExceptionOnError); + Utilities.Run("hdiutil", $"create -srcFolder \"{appPath}\" -o \"{dmgPath}\" -force", null, null, Utilities.RunOptions.Default | Utilities.RunOptions.ThrowExceptionOnError); CodeSign(dmgPath); Log.Info("Output disk image size: " + Utilities.GetFileSize(dmgPath)); diff --git a/global.json b/global.json index 9498eeef6..7da276347 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.0", + "version": "8.0.100", "rollForward": "latestMajor" } } \ No newline at end of file