Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<PropertyGroup>
<UseWindowsForms>true</UseWindowsForms>
<TargetFramework>net9.0-windows</TargetFramework>
<VersionPrefix>3.1.2</VersionPrefix>
<TargetFramework>net10.0-windows</TargetFramework>
<VersionPrefix>3.2.0</VersionPrefix>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="GitExtensions.Extensibility" Version="0.4.0.111" />
<PackageVersion Include="GitExtensions.Extensibility" Version="1.0.0.129" />
<PackageVersion Include="JetBrains.Annotations" Version="2023.2.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.2.41" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.13.61" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageVersion Include="coverlet.collector" Version="8.0.0" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions GitExtensions.GerritPlugin.sln
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
global.json = global.json
README.md = README.md
EndProjectSection
EndProject
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ Use the following pattern to link revision data to Gerrit:
| 4.1.x <= v <= 4.2.0 | 2.0.6 <= v |
| 4.2.x <= v <= 5.0.0 | 2.0.7 <= v |
| 5.0.x <= 6.0.0 | 3.0.0 <= v |
| 6.0.1 <= v | 3.1.0 <= v |
| 6.0.1 <= 6.0.5 | 3.1.0 <= v |
| 7.0.0 <= v | 3.2.0 <= v |

## GitExtensions Plugin Template information

Expand Down
142 changes: 77 additions & 65 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,65 +1,77 @@
#---------------------------------#
# general configuration #
#---------------------------------#

# version format
version: 3.1.2.{build}

# version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
environment:
version_suffix: ''

#---------------------------------#
# environment configuration #
#---------------------------------#

nuget:
disable_publish_on_pr: true

# Build worker image (VM template)
image: Visual Studio 2022

# enable patching of Directory.Build.props
dotnet_csproj:
patch: true
file: '**\*.props'
version: '{version}'
assembly_version: '{version}'
file_version: '{version}'
informational_version: '{version}$(version_suffix)'
package_version: '{version}$(version_suffix)'

#---------------------------------#
# build configuration #
#---------------------------------#

# scripts to run before build
before_build:
- ps: nuget restore .\GitExtensions.GerritPlugin.sln -Verbosity quiet

# build configuration
configuration: Release

build:
# enable MSBuild parallel builds
parallel: true
# MSBuild verbosity level
verbosity: quiet

#---------------------------------#
# artifacts configuration #
#---------------------------------#

artifacts:
- path: '**\GitExtensions.GerritPlugin.*.nupkg'
name: NuGet

deploy:
- provider: NuGet
name: production
artifact: /GitExtensions.GerritPlugin.*\.nupkg/
api_key:
secure: Cu5mvoCI+zw9j2rAhznAyc+pqunWrR9EodrrLyufOGMF10YahzhvyQWfk72an+Fm
skip_symbols: false
on:
appveyor_repo_tag: true
#---------------------------------#
# general configuration #
#---------------------------------#

# version format
version: 3.2.0.{build}

# version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
environment:
# Disable the .NET logo in the console output.
DOTNET_NOLOGO: true
# Disable the .NET first time experience to skip caching NuGet packages and speed up the build.
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
version_suffix: ''

#---------------------------------#
# environment configuration #
#---------------------------------#

nuget:
disable_publish_on_pr: true

# Build worker image (VM template)
image: Visual Studio 2022

# enable patching of Directory.Build.props
dotnet_csproj:
patch: true
file: '**\*.props'
version: '{version}'
assembly_version: '{version}'
file_version: '{version}'
informational_version: '{version}$(version_suffix)'
package_version: '{version}$(version_suffix)'

# Install .NET 10 SDK (not pre-installed on AppVeyor VS2022 image)
install:
- ps: |
# Install the required .NET SDK
Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./dotnet-install.ps1"
./dotnet-install.ps1 -JsonFile global.json -InstallDir 'C:\Program Files\dotnet'
# Remove the script so it doesn't "pollute" the build
Remove-Item -Path .\dotnet-install.ps1

#---------------------------------#
# build configuration #
#---------------------------------#

# build configuration
configuration: Release

build_script:
- ps: |
dotnet restore .\GitExtensions.GerritPlugin.sln --verbosity quiet --nologo -bl:restore.binlog

- ps: |
dotnet publish .\GitExtensions.GerritPlugin.sln --configuration Release --no-restore --verbosity quiet --nologo -bl:msbuild.binlog

#---------------------------------#
# artifacts configuration #
#---------------------------------#

artifacts:
- path: '**\GitExtensions.GerritPlugin.*.nupkg'
name: NuGet
- path: '*.binlog'
name: Binlogs

deploy:
- provider: NuGet
name: production
artifact: /GitExtensions.GerritPlugin.*\.nupkg/
api_key:
secure: Cu5mvoCI+zw9j2rAhznAyc+pqunWrR9EodrrLyufOGMF10YahzhvyQWfk72an+Fm
skip_symbols: false
on:
appveyor_repo_tag: true
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "10.0.103",
"rollForward": "feature"
}
}
1 change: 0 additions & 1 deletion src/GitExtensions.GerritPlugin/GerritPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using GitExtensions.GerritPlugin.Properties;
using GitExtensions.GerritPlugin.Server;
using GitUI;
using GitUIPluginInterfaces;
using JetBrains.Annotations;
using ResourceManager;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<!--/!\ GitExtensions version properties overwritten in `.csproj.user` file-->
<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>


<ItemGroup>
<PackageReference Include="GitExtensions.Extensibility" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<!-- path is relative to $(ProjectDir) -->
<GitExtensionsDownloadPath>..\..\..\gitextensions.shared</GitExtensionsDownloadPath>
<!-- 'latest' or 'v3.1' (= tag from GitHub releases) or 'v3.1.0.5877' (= build number from AppVeyor)-->
<GitExtensionsReferenceVersion>v6.0.3</GitExtensionsReferenceVersion>
<GitExtensionsReferenceVersion>latest</GitExtensionsReferenceVersion>
<!-- 'GitHub' or 'AppVeyor' -->
<GitExtensionsReferenceSource>GitHub</GitExtensionsReferenceSource>
<GitExtensionsReferenceSource>AppVeyor</GitExtensionsReferenceSource>
<!-- for local builds (no download) -->
<GitExtensionsPath>$(GitExtensionsDownloadPath)</GitExtensionsPath>
</PropertyGroup>
Expand Down
10 changes: 3 additions & 7 deletions src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,14 @@
<tags>$tags$</tags>
<icon>Resources\IconGerrit.png</icon>
<dependencies>
<group>
<dependency id="GitExtensions.Extensibility" version="[0.4.0, 0.5.0)" />
</group>
<!-- To fix Warning NU5128 Add a dependency group -->
<group targetFramework="net9.0-windows7.0">
<dependency id="GitExtensions.Extensibility" version="[0.4.0, 0.5.0)" />
<group targetFramework="net10.0-windows7.0">
<dependency id="GitExtensions.Extensibility" version="[1.0.0, 1.1.0)" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\LICENSE.md" target="\" />
<file src="bin\$configuration$\net9.0-windows\GitExtensions.GerritPlugin.dll" target="\lib\" />
<file src="bin\$configuration$\net10.0-windows\GitExtensions.GerritPlugin.dll" target="\lib\net10.0-windows7.0\" />
<file src="Resources\IconGerrit.png" target="\Resources\" />
</files>
</package>