diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml deleted file mode 100644 index e3d8f48..0000000 --- a/.github/workflows/release-build.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: .NET Core Desktop - -on: - push: - branches: ["2.0-main"] - pull_request: - branches: ["2.0-main"] - -jobs: - build: - strategy: - matrix: - configuration: [Release] - - runs-on: windows-latest - - env: - PRE_MC_KEY: ${{ secrets.PRE_MC_KEY }} - REL_MC_KEY: ${{ secrets.REL_MC_KEY }} - - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Install .NET Core - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 10.0.x - - - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v2 - - - name: Launch Build - run: dotnet build BedrockLauncher.Core -c Release --runtime win-x64 - - - name: Publish BedrockLauncher.Core - uses: brandedoutcast/publish-nuget@v2.5.2 - with: - PROJECT_FILE_PATH: BedrockLauncher.Core/BedrockLauncher.Core.csproj - NUGET_KEY: ${{ secrets.NUGET_API_KEY }} diff --git a/BedrockLauncher.Core/BedrockCore.cs b/BedrockLauncher.Core/BedrockCore.cs index 894fa1b..e3e4a8d 100644 --- a/BedrockLauncher.Core/BedrockCore.cs +++ b/BedrockLauncher.Core/BedrockCore.cs @@ -339,6 +339,8 @@ public async Task LaunchGameAsync(LaunchOptions options) } Process[] processes = Process.GetProcessesByName("Minecraft.Windows"); + Process[] process_oldVersion = Process.GetProcessesByName("Minecraft.Win10.DX11"); + processes = processes.Concat(process_oldVersion).ToArray(); process = processes.OrderBy(p => p.StartTime).Last(); } return process; diff --git a/BedrockLauncher.Core/BedrockLauncher.Core.csproj b/BedrockLauncher.Core/BedrockLauncher.Core.csproj index 2fd6634..751fd3d 100644 --- a/BedrockLauncher.Core/BedrockLauncher.Core.csproj +++ b/BedrockLauncher.Core/BedrockLauncher.Core.csproj @@ -24,7 +24,7 @@ - 2.0.0 + 2.0.0-fix.1 diff --git a/CoreTest/InstallTest.cs b/CoreTest/InstallTest.cs index 95ed0f9..d9bc7a9 100644 --- a/CoreTest/InstallTest.cs +++ b/CoreTest/InstallTest.cs @@ -24,11 +24,19 @@ public void Test() }))), Type = MinecraftBuildTypeVersion.UWP, GameTypeVersion = MinecraftGameTypeVersion.Release, - InstallDstFolder = Path.GetFullPath("./Test5"), + InstallDstFolder = Path.GetFullPath("./Test7"), GameName = "8899", - FileFullPath = @"D:\Windows11\Download\Microsoft.MinecraftUWP_1.19.8301.0_x64__8wekyb3d8bbwe.Appx" + FileFullPath = @"D:\Windows11\Download\Microsoft.MinecraftUWP_0.140.1.0_x64__8wekyb3d8bbwe.Appx" }; - bedrockCore.InstallPackageAsync(localGamePackageOptions).Wait(); + //bedrockCore.InstallPackageAsync(localGamePackageOptions).Wait(); + var launchOptions = new LaunchOptions() + { + GameFolder = Path.GetFullPath("./Test7"), + GameType = MinecraftGameTypeVersion.Release, + MinecraftBuildType = MinecraftBuildTypeVersion.UWP, + }; + var process = bedrockCore.LaunchGameAsync(launchOptions).Result; + Assert.IsNotNull(process); } } } diff --git a/CoreTest/UriGetTest.cs b/CoreTest/UriGetTest.cs index 79ccfc1..8cfb81e 100644 --- a/CoreTest/UriGetTest.cs +++ b/CoreTest/UriGetTest.cs @@ -16,7 +16,7 @@ public async Task TestAsync() BuildInfo build = null; await foreach (var kvp in buildDatabaseAsync.Builds) { - if (kvp.Key == "1.21.131") + if (kvp.Key == "0.14.0") build = kvp.Value; } var result = bedrockCore.GetPackageUri(build,Architecture.X64).Result;