Skip to content

Commit

Permalink
Add support for Visual Studio 2019
Browse files Browse the repository at this point in the history
  • Loading branch information
sboulema committed Oct 29, 2018
1 parent 24b2456 commit d9464d6
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 62 deletions.
4 changes: 2 additions & 2 deletions 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)
Expand Down
9 changes: 4 additions & 5 deletions 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
Expand Down
2 changes: 1 addition & 1 deletion TGit/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion TGit/TGIT.csproj
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
<PropertyGroup>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<FileUpgradeFlags>
Expand Down
11 changes: 5 additions & 6 deletions TGit/source.extension.vsixmanifest
Expand Up @@ -13,19 +13,18 @@
<Tags>Git, Source control, Tortoise, repository</Tags>
</Metadata>
<Installation InstalledByMsi="false">
<InstallationTarget Version="[12.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[12.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[12.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[12.0,16.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
<Dependency Id="Microsoft.VisualStudio.MPF.12.0" DisplayName="Visual Studio MPF 12.0" d:Source="Installed" Version="[12.0]" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25904.2,16.0)" DisplayName="Visual Studio core editor" />
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
32 changes: 0 additions & 32 deletions appveyor.yml

This file was deleted.

25 changes: 10 additions & 15 deletions azure-pipelines.yml
Expand Up @@ -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

Expand All @@ -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'
Expand All @@ -48,16 +49,16 @@ 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

- task: PowerShell@2
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
Expand All @@ -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
displayName: 'Upload Vsix to Open Gallery'
13 changes: 13 additions & 0 deletions 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"
}

0 comments on commit d9464d6

Please sign in to comment.