From 88926a52ce459bd6f6e9de15a82408298b2ebec2 Mon Sep 17 00:00:00 2001 From: reduckted Date: Sun, 17 May 2026 21:11:52 +1000 Subject: [PATCH 1/3] Updated build tools. --- Directory.Packages.props | 2 +- ProjectFilter.slnx | 4 ++- global.json | 2 +- source/ProjectFilter/ProjectFilter.csproj | 27 ++----------------- .../ProjectFilter.UnitTests.csproj | 1 + 5 files changed, 8 insertions(+), 28 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index fdc8123..d6d65c9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ - + diff --git a/ProjectFilter.slnx b/ProjectFilter.slnx index 0da51fc..69a2439 100644 --- a/ProjectFilter.slnx +++ b/ProjectFilter.slnx @@ -14,7 +14,9 @@ - + + + diff --git a/global.json b/global.json index f1c37e2..d20023b 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "9.0.302" + "version": "10.0.203" } } diff --git a/source/ProjectFilter/ProjectFilter.csproj b/source/ProjectFilter/ProjectFilter.csproj index 88b1090..b80273a 100644 --- a/source/ProjectFilter/ProjectFilter.csproj +++ b/source/ProjectFilter/ProjectFilter.csproj @@ -1,43 +1,20 @@ - - $(VsSDKInstall)\Microsoft.VsSDK.targets - - ProjectFilter true - 2.0 - false + true + true true - true true false false - true - false - - - - Program - $(DevEnvDir)devenv.exe - /rootsuffix Exp - - - - true - true - full - true - false - pdbonly - true true diff --git a/tests/ProjectFilter.UnitTests/ProjectFilter.UnitTests.csproj b/tests/ProjectFilter.UnitTests/ProjectFilter.UnitTests.csproj index a4987d1..10f78f9 100644 --- a/tests/ProjectFilter.UnitTests/ProjectFilter.UnitTests.csproj +++ b/tests/ProjectFilter.UnitTests/ProjectFilter.UnitTests.csproj @@ -4,6 +4,7 @@ ProjectFilter Exe false + false From 9c11ccb690db51c018d52c27367d2ab02f8bcff9 Mon Sep 17 00:00:00 2001 From: reduckted Date: Sun, 17 May 2026 21:14:40 +1000 Subject: [PATCH 2/3] Updated dependencies. --- Directory.Packages.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d6d65c9..b558ba8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,16 +5,16 @@ - - - + + + - + - + \ No newline at end of file From e1f4eace1f95d0f8c27cf59205a47a4d2c03e2ca Mon Sep 17 00:00:00 2001 From: reduckted Date: Sun, 17 May 2026 21:43:23 +1000 Subject: [PATCH 3/3] Use .NET CLI when publishing. --- .github/workflows/ci.yml | 2 +- .github/workflows/publish.yml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 054e0b8..a83c977 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 - name: Setup .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 - name: Build run: dotnet build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 80472f3..cf675f9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,7 +17,8 @@ jobs: uses: actions/checkout@v2 - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 + uses: actions/setup-dotnet@v5 - name: Publish - run: msbuild source/ProjectFilter/ProjectFilter.csproj /t:PublishToMarketplace /Restore /v:Minimal /p:BuildBeforePublish=true /p:PersonalAccessToken=${{ secrets.PUBLISHER_TOKEN }} + working-directory: source/ProjectFilter + run: dotnet msbuild -target:PublishToMarketplace -property:BuildBeforePublish=true -property:PersonalAccessToken=${{ secrets.PUBLISHER_TOKEN }}