Skip to content

Commit d9464d6

Browse files
committed
Add support for Visual Studio 2019
1 parent 24b2456 commit d9464d6

8 files changed

+36
-62
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# TGit
22
Control TortoiseGit from within Visual Studio
33

4-
[![Build status](https://ci.appveyor.com/api/projects/status/9qp6jfgql4irdy30?svg=true)](https://ci.appveyor.com/project/sboulema/tgit)
4+
[![Build Status](https://dev.azure.com/sboulema/TGit/_apis/build/status/sboulema.TGit)](https://dev.azure.com/sboulema/TGit/_build/latest?definitionId=1)
55
[![VS Marketplace](http://vsmarketplacebadge.apphb.com/version-short/SamirBoulema.TGit.svg)](https://visualstudiogallery.msdn.microsoft.com/132a30d8-f318-4a53-8386-2c9fe52d77a1)
6-
[![Beerpay](https://beerpay.io/sboulema/TGit/badge.svg?style=flat)](https://beerpay.io/sboulema/TGit)
6+
[![Beerpay](https://img.shields.io/beerpay/sboulema/TGit.svg?style=flat)](https://beerpay.io/sboulema/TGit)
77

88
## Getting started
99
1. Install the [TGit extension](https://visualstudiogallery.msdn.microsoft.com/132a30d8-f318-4a53-8386-2c9fe52d77a1)

TGIT.sln

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2026
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28210.120
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TGit", "TGit\TGit.csproj", "{22376990-61FD-4AF5-856C-004CEA4E77EC}"
7-
EndProject
86
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6D6C80BD-B63E-4F6D-A9D3-89AE15DA2D7C}"
97
ProjectSection(SolutionItems) = preProject
10-
appveyor.yml = appveyor.yml
118
azure-pipelines.yml = azure-pipelines.yml
129
README.md = README.md
1310
EndProjectSection
1411
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TGit", "TGit\TGit.csproj", "{22376990-61FD-4AF5-856C-004CEA4E77EC}"
13+
EndProject
1514
Global
1615
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1716
Debug|Any CPU = Debug|Any CPU

TGit/Resources.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

TGit/TGIT.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<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')" />
44
<PropertyGroup>
5-
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
5+
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
66
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
77
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
88
<FileUpgradeFlags>

TGit/source.extension.vsixmanifest

+5-6
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@
1313
<Tags>Git, Source control, Tortoise, repository</Tags>
1414
</Metadata>
1515
<Installation InstalledByMsi="false">
16-
<InstallationTarget Version="[12.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
17-
<InstallationTarget Version="[12.0,16.0)" Id="Microsoft.VisualStudio.Community" />
18-
<InstallationTarget Version="[12.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
19-
<InstallationTarget Version="[12.0,16.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
16+
<InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
17+
<InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Community" />
18+
<InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
19+
<InstallationTarget Version="[12.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
2020
</Installation>
2121
<Dependencies>
2222
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
23-
<Dependency Id="Microsoft.VisualStudio.MPF.12.0" DisplayName="Visual Studio MPF 12.0" d:Source="Installed" Version="[12.0]" />
2423
</Dependencies>
2524
<Assets>
2625
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2726
</Assets>
2827
<Prerequisites>
29-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25904.2,16.0)" DisplayName="Visual Studio core editor" />
28+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
3029
</Prerequisites>
3130
</PackageManifest>

appveyor.yml

-32
This file was deleted.

azure-pipelines.yml

+10-15
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ pool:
88

99
variables:
1010
patch: $[counter('versioncounter', 41)]
11-
version: 4.9.$(patch)
1211
solution: '**/*.sln'
1312
buildPlatform: 'Any CPU'
1413
buildConfiguration: 'Release'
1514

15+
name: 4.9.$(patch)
16+
1617
steps:
1718
- task: NuGetToolInstaller@0
1819

@@ -23,15 +24,15 @@ steps:
2324
- task: bleddynrichards.Assembly-Info-Task.Assembly-Info-Task.Assembly-Info-Task@1
2425
displayName: 'Update Assembly Version'
2526
inputs:
26-
VersionNumber: '$(version)'
27-
FileVersionNumber: '$(version)'
28-
InformationalVersion: '$(version)'
27+
VersionNumber: '$(Build.BuildNumber)'
28+
FileVersionNumber: '$(Build.BuildNumber)'
29+
InformationalVersion: '$(Build.BuildNumber)'
2930

3031
- task: VsixToolsUpdateVersion@1
3132
displayName: 'Update Vsix Version'
3233
inputs:
3334
FileName: $(Build.SourcesDirectory)\$(system.teamProject)\source.extension.vsixmanifest
34-
VersionNumber: '$(version)'
35+
VersionNumber: '$(Build.BuildNumber)'
3536

3637
- task: VSBuild@1
3738
displayName: 'Build Vsix'
@@ -48,16 +49,16 @@ steps:
4849

4950
- task: CopyFiles@2
5051
displayName: 'Copy Artifacts to Staging'
51-
inputs:
52-
contents: '**\*.vsix'
52+
inputs:
53+
contents: '**\?(*.vsix|publish-manifest.json|readme.md)'
5354
targetFolder: '$(Build.ArtifactStagingDirectory)'
5455
flattenFolders: true
5556

5657
- task: PowerShell@2
5758
displayName: 'Rename Build Artifacts'
5859
inputs:
5960
targetType: 'inline'
60-
script: 'Get-ChildItem ./*.vsix -Recurse | Rename-Item -NewName {$_.basename + "_" + $env:VERSION + $_.extension }'
61+
script: 'Get-ChildItem ./*.vsix -Recurse | Rename-Item -NewName {$_.basename + "_" + $env:BUILD_BUILDNUMBER + $_.extension }'
6162
workingDirectory: '$(Build.ArtifactStagingDirectory)'
6263

6364
- task: PublishBuildArtifacts@1
@@ -67,10 +68,4 @@ steps:
6768
artifactName: '$(system.teamProject)'
6869

6970
- task: VsixToolsUploadVsix@1
70-
displayName: 'Upload Vsix to Open Gallery'
71-
72-
- task: VsixToolsUploadVsix@1
73-
displayName: 'Upload Vsix to Myget'
74-
inputs:
75-
UploadTo: MyGetVsix
76-
ConnectedServiceName: MyGetVsix
71+
displayName: 'Upload Vsix to Open Gallery'

publish-manifest.json

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"$schema": "http://json.schemastore.org/vsix-publish",
3+
"categories": [ "source control" ],
4+
"identity": {
5+
"internalName": "TGit"
6+
},
7+
"overview": "readme.md",
8+
"priceCategory": "free",
9+
"publisher": "SamirBoulema",
10+
"private": false,
11+
"qna": true,
12+
"repo": "https://github.com/sboulema/TGit"
13+
}

0 commit comments

Comments
 (0)