From b02c2bf92d66e4ea37f700f5b4e61fe5b1950f27 Mon Sep 17 00:00:00 2001 From: Scot Walters Date: Mon, 19 Dec 2022 19:16:22 -0800 Subject: [PATCH 1/7] Fix CI --- src/BizHawk.Tests/BizHawk.Tests.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj index 78f0e2666d5..b96432aa20d 100644 --- a/src/BizHawk.Tests/BizHawk.Tests.csproj +++ b/src/BizHawk.Tests/BizHawk.Tests.csproj @@ -1,6 +1,8 @@ - net5.0 + + net5.0-windows + netcoreapp3.1 From 3c11b14893a4bb52c5f0ab3ed122e92f0d214a1e Mon Sep 17 00:00:00 2001 From: Scot Walters Date: Sat, 24 Dec 2022 13:14:36 -0800 Subject: [PATCH 2/7] Add build job --- .github/workflow/build.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflow/build.yml diff --git a/.github/workflow/build.yml b/.github/workflow/build.yml new file mode 100644 index 00000000000..d8cab5b09a0 --- /dev/null +++ b/.github/workflow/build.yml @@ -0,0 +1,26 @@ +name: Build +on: [push, pull_request] + +jobs: + build: + runs-on: windows-2019 + steps: + - name: Checkout current build target + uses: actions/checkout@v3 + with: + path: 'Bizhawk' + submodules: 'true' + - name: Checkout RTCV peer dependency + uses: actions/checkout@v3 + with: + repository: 'redscientistlabs/RTCV' + ref: '51x' + path: 'RTCV' + - name: Setup MSBuild.exe + uses: microsoft/setup-msbuild@v1.0.2 + - name: Restore packages in RTCV + run: msbuild /t:restore '.\RTCV\' + - name: Restore packages in dolphin-vanguard + run: msbuild /t:restore '.\Bizhawk\Bizhawk.sln' + - name: Build with MSBuild + run: msbuild '.\Bizhawk\Bizhawk.sln' From 0b524f2906b03768b60a1f3527e0f742fba73be6 Mon Sep 17 00:00:00 2001 From: Scot Walters Date: Sat, 24 Dec 2022 13:16:04 -0800 Subject: [PATCH 3/7] asdljk --- .github/workflow/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflow/build.yml b/.github/workflow/build.yml index d8cab5b09a0..efc581ce311 100644 --- a/.github/workflow/build.yml +++ b/.github/workflow/build.yml @@ -17,7 +17,7 @@ jobs: ref: '51x' path: 'RTCV' - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - name: Restore packages in RTCV run: msbuild /t:restore '.\RTCV\' - name: Restore packages in dolphin-vanguard From 0807e8fe42e7c7bbadeda0f2311552916ef88085 Mon Sep 17 00:00:00 2001 From: Scot Walters Date: Sat, 24 Dec 2022 13:17:54 -0800 Subject: [PATCH 4/7] Fix folder name --- .github/{workflow => workflows}/build.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflow => workflows}/build.yml (100%) diff --git a/.github/workflow/build.yml b/.github/workflows/build.yml similarity index 100% rename from .github/workflow/build.yml rename to .github/workflows/build.yml From 80ac1584ffd22f472899b4526da2859dcacc2f17 Mon Sep 17 00:00:00 2001 From: Scot Walters Date: Sat, 24 Dec 2022 13:19:38 -0800 Subject: [PATCH 5/7] Fixes --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efc581ce311..cc8b414ac42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,13 +14,13 @@ jobs: uses: actions/checkout@v3 with: repository: 'redscientistlabs/RTCV' - ref: '51x' + ref: '51X' path: 'RTCV' - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v1.1 - name: Restore packages in RTCV run: msbuild /t:restore '.\RTCV\' - - name: Restore packages in dolphin-vanguard + - name: Restore packages in Bizhawk run: msbuild /t:restore '.\Bizhawk\Bizhawk.sln' - - name: Build with MSBuild + - name: Build current target with MSBuild run: msbuild '.\Bizhawk\Bizhawk.sln' From afb3908a941292f2de6c52205cb8d820a132c3d9 Mon Sep 17 00:00:00 2001 From: Scot Walters Date: Sat, 24 Dec 2022 13:27:07 -0800 Subject: [PATCH 6/7] Trying without the code changes on VS2019 --- src/BizHawk.Tests/BizHawk.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj index b96432aa20d..c59a2c50d85 100644 --- a/src/BizHawk.Tests/BizHawk.Tests.csproj +++ b/src/BizHawk.Tests/BizHawk.Tests.csproj @@ -1,8 +1,8 @@ - net5.0-windows - + + net5.0 netcoreapp3.1 From bd40a4b639ebdad6dec21ab656417d9f4db830e9 Mon Sep 17 00:00:00 2001 From: Scot Walters Date: Sat, 24 Dec 2022 13:59:33 -0800 Subject: [PATCH 7/7] Remove VS2022 changes --- src/BizHawk.Tests/BizHawk.Tests.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj index c59a2c50d85..78f0e2666d5 100644 --- a/src/BizHawk.Tests/BizHawk.Tests.csproj +++ b/src/BizHawk.Tests/BizHawk.Tests.csproj @@ -1,7 +1,5 @@ - - net5.0 netcoreapp3.1