From 7b83384f9976656241f638d716c5bd9ea3d43732 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 6 Mar 2026 21:27:48 +0000 Subject: [PATCH 1/3] Initial plan From cbb8a87a89577c24ac149d196b25eb382ff42fc7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 6 Mar 2026 21:34:25 +0000 Subject: [PATCH 2/3] fix: fix CI build for GE7 (.NET 10) Co-authored-by: gerhardol <6248932+gerhardol@users.noreply.github.com> --- .github/workflows/build_plugin.yml | 18 +++++++++--------- Directory.Packages.props | 2 +- global.json | 4 ++-- .../GitExtensions.PluginTemplate.csproj | 2 ++ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_plugin.yml b/.github/workflows/build_plugin.yml index 2c5c1c8..d9e2e12 100644 --- a/.github/workflows/build_plugin.yml +++ b/.github/workflows/build_plugin.yml @@ -14,20 +14,20 @@ jobs: runs-on: [windows-latest] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + - name: Setup .NET + uses: actions/setup-dotnet@v4 with: - dotnet-version: 2.2.108 + dotnet-version: '10.x' - - name: Setup MSBuild.exe - uses: warrenbuckley/Setup-MSBuild@v1 + - name: Restore + run: dotnet restore --verbosity q --nologo - - name: Build & package with `msbuild` + - name: Build & package with `dotnet` run: | - msbuild -target:restore -property:Configuration=Release - msbuild -target:pack -property:Configuration=Release + dotnet build -c Release --verbosity q --nologo + dotnet publish --configuration Release --verbosity q --nologo # - name: Push to `Nuget.org` nuget feed # run: | diff --git a/Directory.Packages.props b/Directory.Packages.props index c4a9081..1df2e32 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ true - + diff --git a/global.json b/global.json index e5c8929..3799275 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.103", - "rollForward": "feature" + "version": "10.0.102", + "rollForward": "latestPatch" } } diff --git a/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj b/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj index 40ffdf6..a1ba801 100644 --- a/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj +++ b/src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj @@ -19,7 +19,9 @@ + + $(GitExtensionsPath)\GitExtensions.Extensibility.dll From ae709627b5b83f0cdd240fcde15a13ffe86edb82 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 6 Mar 2026 21:51:34 +0000 Subject: [PATCH 3/3] fix: revert global.json to original SDK 10.0.103 Co-authored-by: RussKie <4403806+RussKie@users.noreply.github.com> --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 3799275..e5c8929 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.102", - "rollForward": "latestPatch" + "version": "10.0.103", + "rollForward": "feature" } }