diff --git a/Directory.Build.props b/Directory.Build.props index 8c145e5..11ad1b1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,7 +16,7 @@ true - net9.0-windows - 3.1.2 + net10.0-windows + 3.2.0 diff --git a/Directory.Packages.props b/Directory.Packages.props index ce490f3..562a899 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,14 +5,14 @@ true - + - - + + \ No newline at end of file diff --git a/GitExtensions.GerritPlugin.sln b/GitExtensions.GerritPlugin.sln index e869c5f..c5fab52 100644 --- a/GitExtensions.GerritPlugin.sln +++ b/GitExtensions.GerritPlugin.sln @@ -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 diff --git a/README.md b/README.md index dfac891..2e6ccd8 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/appveyor.yml b/appveyor.yml index cd83658..7f69ee6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 diff --git a/global.json b/global.json new file mode 100644 index 0000000..311edc2 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "10.0.103", + "rollForward": "feature" + } +} diff --git a/src/GitExtensions.GerritPlugin/GerritPlugin.cs b/src/GitExtensions.GerritPlugin/GerritPlugin.cs index 28e2bd5..cea7226 100644 --- a/src/GitExtensions.GerritPlugin/GerritPlugin.cs +++ b/src/GitExtensions.GerritPlugin/GerritPlugin.cs @@ -13,7 +13,6 @@ using GitExtensions.GerritPlugin.Properties; using GitExtensions.GerritPlugin.Server; using GitUI; -using GitUIPluginInterfaces; using JetBrains.Annotations; using ResourceManager; diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj index 217fabe..5291e34 100644 --- a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj +++ b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj @@ -1,8 +1,6 @@  - - true - + diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj.user b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj.user index 94f70c0..20856c6 100644 --- a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj.user +++ b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj.user @@ -4,9 +4,9 @@ ..\..\..\gitextensions.shared - v6.0.3 + latest - GitHub + AppVeyor $(GitExtensionsDownloadPath) diff --git a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec index 8fd761c..c821a78 100644 --- a/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec +++ b/src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec @@ -10,18 +10,14 @@ $tags$ Resources\IconGerrit.png - - - - - - + + - + \ No newline at end of file