From d9464d6321d626933a59ce00e11339433c5486d7 Mon Sep 17 00:00:00 2001 From: "Samir L. Boulema" Date: Mon, 29 Oct 2018 13:19:57 +0100 Subject: [PATCH] Add support for Visual Studio 2019 --- README.md | 4 ++-- TGIT.sln | 9 ++++----- TGit/Resources.Designer.cs | 2 +- TGit/TGIT.csproj | 2 +- TGit/source.extension.vsixmanifest | 11 +++++----- appveyor.yml | 32 ------------------------------ azure-pipelines.yml | 25 ++++++++++------------- publish-manifest.json | 13 ++++++++++++ 8 files changed, 36 insertions(+), 62 deletions(-) delete mode 100644 appveyor.yml create mode 100644 publish-manifest.json diff --git a/README.md b/README.md index 0add882..3ca924d 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # TGit Control TortoiseGit from within Visual Studio -[![Build status](https://ci.appveyor.com/api/projects/status/9qp6jfgql4irdy30?svg=true)](https://ci.appveyor.com/project/sboulema/tgit) +[![Build Status](https://dev.azure.com/sboulema/TGit/_apis/build/status/sboulema.TGit)](https://dev.azure.com/sboulema/TGit/_build/latest?definitionId=1) [![VS Marketplace](http://vsmarketplacebadge.apphb.com/version-short/SamirBoulema.TGit.svg)](https://visualstudiogallery.msdn.microsoft.com/132a30d8-f318-4a53-8386-2c9fe52d77a1) -[![Beerpay](https://beerpay.io/sboulema/TGit/badge.svg?style=flat)](https://beerpay.io/sboulema/TGit) +[![Beerpay](https://img.shields.io/beerpay/sboulema/TGit.svg?style=flat)](https://beerpay.io/sboulema/TGit) ## Getting started 1. Install the [TGit extension](https://visualstudiogallery.msdn.microsoft.com/132a30d8-f318-4a53-8386-2c9fe52d77a1) diff --git a/TGIT.sln b/TGIT.sln index f397af6..7cb8e38 100644 --- a/TGIT.sln +++ b/TGIT.sln @@ -1,17 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2026 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28210.120 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TGit", "TGit\TGit.csproj", "{22376990-61FD-4AF5-856C-004CEA4E77EC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6D6C80BD-B63E-4F6D-A9D3-89AE15DA2D7C}" ProjectSection(SolutionItems) = preProject - appveyor.yml = appveyor.yml azure-pipelines.yml = azure-pipelines.yml README.md = README.md EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TGit", "TGit\TGit.csproj", "{22376990-61FD-4AF5-856C-004CEA4E77EC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/TGit/Resources.Designer.cs b/TGit/Resources.Designer.cs index b0d66b3..b8450cc 100644 --- a/TGit/Resources.Designer.cs +++ b/TGit/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace SamirBoulema.TGit { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/TGit/TGIT.csproj b/TGit/TGIT.csproj index 71ca2ba..890da7f 100644 --- a/TGit/TGIT.csproj +++ b/TGit/TGIT.csproj @@ -2,7 +2,7 @@ - 15.0 + 16.0 12.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/TGit/source.extension.vsixmanifest b/TGit/source.extension.vsixmanifest index 653e937..b4e66f5 100644 --- a/TGit/source.extension.vsixmanifest +++ b/TGit/source.extension.vsixmanifest @@ -13,19 +13,18 @@ Git, Source control, Tortoise, repository - - - - + + + + - - + diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index e96e4e2..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: 4.9.{build} -skip_tags: true - -image: Visual Studio 2017 - -configuration: -- Release - -install: -- ps: (new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex - -before_build: -- ps: >- - Vsix-IncrementVsixVersion | Vsix-UpdateBuildVersion - - nuget restore -Verbosity quiet - -assembly_info: - patch: true - file: '**\AssemblyInfo.*' - assembly_version: '{version}' - assembly_file_version: '{version}' - assembly_informational_version: '{version}' - -build: - verbosity: minimal - -after_build: -- ps: >- - Get-ChildItem ./*.vsix -Recurse | Rename-Item -NewName {$_.basename + '_' + $env:APPVEYOR_BUILD_VERSION + $_.extension } - - Vsix-PushArtifacts | Vsix-PublishToGallery \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2825cb8..8b9066f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,11 +8,12 @@ pool: variables: patch: $[counter('versioncounter', 41)] - version: 4.9.$(patch) solution: '**/*.sln' buildPlatform: 'Any CPU' buildConfiguration: 'Release' +name: 4.9.$(patch) + steps: - task: NuGetToolInstaller@0 @@ -23,15 +24,15 @@ steps: - task: bleddynrichards.Assembly-Info-Task.Assembly-Info-Task.Assembly-Info-Task@1 displayName: 'Update Assembly Version' inputs: - VersionNumber: '$(version)' - FileVersionNumber: '$(version)' - InformationalVersion: '$(version)' + VersionNumber: '$(Build.BuildNumber)' + FileVersionNumber: '$(Build.BuildNumber)' + InformationalVersion: '$(Build.BuildNumber)' - task: VsixToolsUpdateVersion@1 displayName: 'Update Vsix Version' inputs: FileName: $(Build.SourcesDirectory)\$(system.teamProject)\source.extension.vsixmanifest - VersionNumber: '$(version)' + VersionNumber: '$(Build.BuildNumber)' - task: VSBuild@1 displayName: 'Build Vsix' @@ -48,8 +49,8 @@ steps: - task: CopyFiles@2 displayName: 'Copy Artifacts to Staging' - inputs: - contents: '**\*.vsix' + inputs: + contents: '**\?(*.vsix|publish-manifest.json|readme.md)' targetFolder: '$(Build.ArtifactStagingDirectory)' flattenFolders: true @@ -57,7 +58,7 @@ steps: displayName: 'Rename Build Artifacts' inputs: targetType: 'inline' - script: 'Get-ChildItem ./*.vsix -Recurse | Rename-Item -NewName {$_.basename + "_" + $env:VERSION + $_.extension }' + script: 'Get-ChildItem ./*.vsix -Recurse | Rename-Item -NewName {$_.basename + "_" + $env:BUILD_BUILDNUMBER + $_.extension }' workingDirectory: '$(Build.ArtifactStagingDirectory)' - task: PublishBuildArtifacts@1 @@ -67,10 +68,4 @@ steps: artifactName: '$(system.teamProject)' - task: VsixToolsUploadVsix@1 - displayName: 'Upload Vsix to Open Gallery' - -- task: VsixToolsUploadVsix@1 - displayName: 'Upload Vsix to Myget' - inputs: - UploadTo: MyGetVsix - ConnectedServiceName: MyGetVsix \ No newline at end of file + displayName: 'Upload Vsix to Open Gallery' \ No newline at end of file diff --git a/publish-manifest.json b/publish-manifest.json new file mode 100644 index 0000000..4b6ccc2 --- /dev/null +++ b/publish-manifest.json @@ -0,0 +1,13 @@ +{ + "$schema": "http://json.schemastore.org/vsix-publish", + "categories": [ "source control" ], + "identity": { + "internalName": "TGit" + }, + "overview": "readme.md", + "priceCategory": "free", + "publisher": "SamirBoulema", + "private": false, + "qna": true, + "repo": "https://github.com/sboulema/TGit" +} \ No newline at end of file