Skip to content

Commit b3cded0

Browse files
authored
Merge pull request #187 from laurentkempe/azure-pipeline-marketplace-release
Azure DevOps release pipeline to Visual Studio Marketplace
2 parents ab93840 + a634732 commit b3cded0

3 files changed

Lines changed: 262 additions & 4 deletions

File tree

README-Marketplace.md

Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
# Git Diff Margin
2+
3+
Git Diff Margin displays live Git changes of the currently edited file on Visual Studio margin and scroll bar.
4+
5+
* Supports Visual Studio 2012 through Visual Studio 2019 Preview 1
6+
* Quickly view all current file changes on
7+
* Left margin
8+
* Scroll Bars in map and bar mode with and without source overview
9+
* blue rectangle for modifications
10+
* green rectangles for new lines
11+
* red triangles for deletions
12+
* all colors configurable through Visual Studio Fonts and Colors options
13+
* Undo the change
14+
* Copy the old code into the clipboard
15+
* Copy a part of the old code by selecting it in the popup
16+
* Show the diff in Visual Studio Diff window except for Visual Studio 2010 which still use configured Git external diff tool
17+
* Navigate to previous/next change on file using user defined keyboard shortcuts or the popup icons
18+
* Open popup with user defined keyboard shortcuts, close with esc key
19+
* Support Visual Studio 2013 Dark, Light, and Blue Theme
20+
* Support zoom
21+
22+
![](/142621/1/gitdiffmargin-preview.png)
23+
24+
# Get the code
25+
26+
[https://github.com/laurentkempe/GitDiffMargin](https://github.com/laurentkempe/GitDiffMargin)
27+
28+
# Installation
29+
30+
You might also install it using the following [Chocolatey package](https://chocolatey.org/packages/GitDiffMargin).
31+
32+
# Report Issue
33+
34+
Please report all problems or feature requests you might have on the [following page](https://github.com/laurentkempe/GitDiffMargin/issues?milestone=none&state=open).
35+
36+
# Release Notes
37+
38+
## Version 3.9.0
39+
40+
### New feature
41+
42+
* Add support for Visual Studio 2019 Preview 1
43+
44+
## Version 3.8.2
45+
46+
### Fixes
47+
48+
* Fix MoeIDE conflict
49+
50+
## Version 3.8.1
51+
52+
### Fixes
53+
54+
* Keyboard shortcut to show diff at a change works only on 1st line of a change
55+
* Avoid to focus textbox when opening popup
56+
* Avoid crashing if GitDiffMarginCommandHandler is not in the property bag
57+
58+
## Version 3.8.0
59+
60+
### New feature
61+
62+
* Center when moving to next/previous change with keyboard shortcus
63+
64+
### Fix
65+
66+
* Address the "Gold Bar" notification saying Git Diff Margin was responsible for editor slowness
67+
68+
## Version 3.7.1
69+
70+
### Security fix
71+
72+
* Update to LibGit2Sharp v0.24.1 This is a security release fixing two issues. It updates libgit2's included zlib to 1.2.11, and includes a libgit2 fix for memory handling issues when reading crafted repository index files.
73+
74+
## Version 3.7.0
75+
76+
### New feature
77+
78+
* Add keyboard shortcut to show diff popup
79+
80+
## Version 3.6.0
81+
82+
### New feature
83+
84+
* Close popup using Escape key
85+
86+
## Version 3.5.3
87+
88+
### Fixes
89+
90+
* Fix unhandled AccessViolationException crashes in Visual Studio updating LibGit2Sharp
91+
92+
## Version 3.5.2
93+
94+
### Fixes
95+
96+
* Fix diff margin not shown when editing a project file  
97+
98+
## Version 3.5.1
99+
100+
### Fixes
101+
102+
* Fix diff window complains that files have different encodings 
103+
104+
## Version 3.5.0
105+
106+
### New feature
107+
108+
* Double-clicking on diff bar open `Show Difference`
109+
110+
## Version 3.4.0
111+
112+
### Fixes
113+
114+
* Fix installation in Visual Studio 2013 and earlier
115+
116+
## Version 3.3.0
117+
118+
### New features
119+
120+
* Add support for Visual Studio 2017 RC
121+
122+
### Fixes
123+
124+
* Fix issue to upload on the marketplace
125+
126+
### Other
127+
128+
* Drop support for Visual Studio 2010, download latest version supporting it [here](https://github.com/laurentkempe/GitDiffMargin/releases/tag/v3.2.2).
129+
130+
## Version 3.2.2
131+
132+
### Fixes
133+
134+
* Update to LibGit2Sharp v0.23.1
135+
136+
## Version 3.2.1
137+
138+
### Fixes
139+
140+
* Breaks Edit.GoTo command
141+
* Update to LibGit2Sharp v0.23
142+
* Automate AppVeyor build to create vsix
143+
144+
## Version 3.2.0
145+
146+
### New features
147+
148+
* Add support for Visual Studio 15 Preview and now Visual Studio 2017 RC
149+
150+
## Version 3.1.2
151+
152+
### Fixes
153+
154+
* Update LibGit2Sharp and LibGit2Sharp.NativeBinaries
155+
* Visual Studio crashes #96
156+
* With 3.1.1 use of memory of VS2013 increased until crashing #93
157+
* Crash in git2-785d8c4.dll seen in version 3.1.1.0 #92
158+
159+
## Version 3.1.1
160+
161+
### Fixes
162+
163+
* Fix SQL Server Object Explorer issue #81
164+
* Fix Enabling GitDiffMargin kills Git Source Control Provider #85
165+
* Fix Memory corruption in underlying libgit2 native DLL #87
166+
167+
## Version 3.1.0
168+
169+
### Improvements
170+
171+
* Move diff bar to the right of the line numbers #71 
172+
173+
## Version 3.0.0
174+
175+
### New features
176+
177+
* Support for Visual Studio 2010, 2012 and Visual Studio 2015
178+
* Show diff using Visual Studio Diff window except for Visual Studio 2010 which still use external diff tool
179+
* Possibility to define shortcuts for next/previous change navigation
180+
* Add options for highlighting untracked lines #29
181+
* Update icons
182+
183+
### Improvements
184+
185+
* Improve external diff configuration handling in .gitconfig #32
186+
* Improve "removed" glyph and editor diff positioning
187+
* Improve support of Dark, Light and Blue theme
188+
* Make sure the text editor is focused after a rollback
189+
* Prevent ScrollDiffMargin from affecting the scroll bar behavior
190+
* Play nice with other source control providers
191+
192+
### Fixes
193+
194+
* Fix Show Difference fails with DiffMerge for file names with spaces #38
195+
* Fix submodules issue #40
196+
197+
[Previous release notes](https://github.com/laurentkempe/GitDiffMargin/releases)
198+
199+
# Credits
200+
201+
Thanks to
202+
203+
* Sam Harwell [@sharwell](https://github.com/sharwell) for all the improvements
204+
* Rick Sladkey [@ricksladkey](https://github.com/ricksladkey) for the fixes
205+
* [@Iristyle](https://github.com/Iristyle) for the chocolatey package
206+
* Yves Goergen [@](https://github.com/dg9ngf)[dg9ngf](https://github.com/dg9ngf)
207+
* [@heinzbeinz](https://github.com/heinzbeinz) for the support of Visual Studio 15 preview
208+
* Jamie Cansdale [@jcansdale](https://github.com/jcansdale) for bugfix
209+
* Charles Milette [sylveon](https://github.com/sylveon) for bugfix

azure-pipelines.yml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,33 @@ pool:
77
vmImage: 'VS2017-Win2016'
88

99
variables:
10+
patch: $[counter('versioncounter', 0)]
1011
solution: '**/*.sln'
1112
buildPlatform: 'Any CPU'
1213
buildConfiguration: 'Release'
1314

15+
name: 3.9.0.$(patch)
16+
1417
steps:
1518
- task: NuGetToolInstaller@0
1619

1720
- task: NuGetCommand@2
1821
inputs:
1922
restoreSolution: '$(solution)'
2023

24+
- task: bleddynrichards.Assembly-Info-Task.Assembly-Info-Task.Assembly-Info-NetFramework@2
25+
displayName: 'Update Assembly Version'
26+
inputs:
27+
VersionNumber: '$(Build.BuildNumber)'
28+
FileVersionNumber: '$(Build.BuildNumber)'
29+
InformationalVersion: '$(Build.BuildNumber)'
30+
31+
- task: VsixToolsUpdateVersion@1
32+
displayName: 'Update Vsix Version'
33+
inputs:
34+
FileName: $(Build.SourcesDirectory)\$(system.teamProject).Extension\source.extension.vsixmanifest
35+
VersionNumber: '$(Build.BuildNumber)'
36+
2137
- task: VSBuild@1
2238
inputs:
2339
solution: '$(solution)'
@@ -28,9 +44,22 @@ steps:
2844
# inputs:
2945
# platform: '$(buildPlatform)'
3046
# configuration: '$(buildConfiguration)'
31-
47+
48+
- task: CopyFiles@2
49+
displayName: 'Copy Artifacts to Staging'
50+
inputs:
51+
contents: '**\?(*.vsix|extension-manifest.json|README-Marketplace.md)'
52+
targetFolder: '$(Build.ArtifactStagingDirectory)'
53+
flattenFolders: true
54+
55+
- task: PowerShell@2
56+
displayName: 'Rename Build Artifacts'
57+
inputs:
58+
targetType: 'inline'
59+
script: 'Get-ChildItem ./*.vsix -Recurse | Rename-Item -NewName {$_.basename + "_" + $env:BUILD_BUILDNUMBER + $_.extension }'
60+
workingDirectory: '$(Build.ArtifactStagingDirectory)'
61+
3262
- task: PublishBuildArtifacts@1
3363
inputs:
34-
pathtoPublish: '$(Build.SourcesDirectory)\GitDiffMargin.Extension\bin\Release\GitDiffMargin.vsix'
35-
artifactName: 'GitDiffMargin.vsix'
36-
64+
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
65+
artifactName: '$(system.teamProject)'

extension-manifest.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"$schema": "http://json.schemastore.org/vsix-publish",
3+
"categories": [
4+
"coding",
5+
"programming languages",
6+
"source control"
7+
],
8+
"identity": {
9+
"internalName": "GitDiffMargin",
10+
"tags": [
11+
"Git"
12+
]
13+
},
14+
"overview": "README-Marketplace.md",
15+
"priceCategory": "free",
16+
"publisher": "LaurentKempe",
17+
"private": false,
18+
"qna": true,
19+
"repo": "https://github.com/laurentkempe/GitDiffMargin"
20+
}

0 commit comments

Comments
 (0)