From 01ef975c0688079d126ae3e1d21bf49f070f1303 Mon Sep 17 00:00:00 2001 From: Arlo Date: Sat, 15 Jul 2023 16:13:52 +0000 Subject: [PATCH 1/3] Use .NET 7 in CI --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0fea421..d6b96ead 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ on: merge_group: env: - DOTNET_VERSION: ${{ '6.0.x' }} + DOTNET_VERSION: ${{ '7.0.x' }} ENABLE_DIAGNOSTICS: false #COREHOST_TRACE: 1 COREHOST_TRACEFILE: corehosttrace.log @@ -133,7 +133,7 @@ jobs: - name: Run SourceGenerators tests id: test-generator - run: vstest.console.exe ./tooling/CommunityToolkit.Tooling.SampleGen.Tests/bin/Release/net6.0/CommunityToolkit.Tooling.SampleGen.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx" + run: vstest.console.exe ./tooling/CommunityToolkit.Tooling.SampleGen.Tests/bin/Release/net7.0/CommunityToolkit.Tooling.SampleGen.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx" - name: Run experiment tests against ${{ env.TEST_PLATFORM }} id: test-platform From cc7468be4f167ceb516777efda4a77d801fc523b Mon Sep 17 00:00:00 2001 From: Arlo Date: Sat, 15 Jul 2023 17:44:49 +0000 Subject: [PATCH 2/3] Revert output folder to 6.x for SampleGen tests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6b96ead..947960cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,7 +133,7 @@ jobs: - name: Run SourceGenerators tests id: test-generator - run: vstest.console.exe ./tooling/CommunityToolkit.Tooling.SampleGen.Tests/bin/Release/net7.0/CommunityToolkit.Tooling.SampleGen.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx" + run: vstest.console.exe ./tooling/CommunityToolkit.Tooling.SampleGen.Tests/bin/Release/net6.0/CommunityToolkit.Tooling.SampleGen.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx" - name: Run experiment tests against ${{ env.TEST_PLATFORM }} id: test-platform From a4da90ffa9386826130abe185ebc954af9f42880 Mon Sep 17 00:00:00 2001 From: Arlo Date: Sat, 15 Jul 2023 17:45:15 +0000 Subject: [PATCH 3/3] Update tooling to latest main --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 38728ba6..5490aac9 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 38728ba616661853b3bbcec9269ab1e362daa72a +Subproject commit 5490aac98b527e0801cd6403070ce73cf32858eb