Skip to content

Commit cbb8a87

Browse files
Copilotgerhardol
andcommitted
fix: fix CI build for GE7 (.NET 10)
Co-authored-by: gerhardol <6248932+gerhardol@users.noreply.github.com>
1 parent 7b83384 commit cbb8a87

4 files changed

Lines changed: 14 additions & 12 deletions

File tree

.github/workflows/build_plugin.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ jobs:
1414
runs-on: [windows-latest]
1515

1616
steps:
17-
- uses: actions/checkout@v1
17+
- uses: actions/checkout@v4
1818

19-
- name: Setup .NET Core
20-
uses: actions/setup-dotnet@v1
19+
- name: Setup .NET
20+
uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: 2.2.108
22+
dotnet-version: '10.x'
2323

24-
- name: Setup MSBuild.exe
25-
uses: warrenbuckley/Setup-MSBuild@v1
24+
- name: Restore
25+
run: dotnet restore --verbosity q --nologo
2626

27-
- name: Build & package with `msbuild`
27+
- name: Build & package with `dotnet`
2828
run: |
29-
msbuild -target:restore -property:Configuration=Release
30-
msbuild -target:pack -property:Configuration=Release
29+
dotnet build -c Release --verbosity q --nologo
30+
dotnet publish --configuration Release --verbosity q --nologo
3131
3232
# - name: Push to `Nuget.org` nuget feed
3333
# run: |

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageVersion Include="GitExtensions.Extensibility" Version="1.0.0.118" />
8+
<PackageVersion Include="GitExtensions.Extensibility" Version="1.0.0.129" />
99
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1010
<PackageVersion Include="System.ComponentModel.Composition" Version="6.0.0" />
1111
</ItemGroup>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.103",
4-
"rollForward": "feature"
3+
"version": "10.0.102",
4+
"rollForward": "latestPatch"
55
}
66
}

src/GitExtensions.PluginTemplate/GitExtensions.PluginTemplate.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
</PropertyGroup>
2020

2121
<!-- References to Git Extensions' DLLs -->
22+
<!-- PackageReference triggers the MSBuild targets that download GE before build -->
2223
<ItemGroup>
24+
<PackageReference Include="GitExtensions.Extensibility" />
2325
<Reference Include="GitExtensions.Extensibility">
2426
<HintPath>$(GitExtensionsPath)\GitExtensions.Extensibility.dll</HintPath>
2527
</Reference>

0 commit comments

Comments
 (0)