Skip to content

Commit e4eb8c8

Browse files
authored
Add support for targeting .NET 5 plugins. (#21)
1 parent aa123c6 commit e4eb8c8

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

src/GitExtensions.Extensibility/GitExtensions.Extensibility.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<license type="file">LICENSE.md</license>
99
</metadata>
1010
<files>
11-
<file src="lib/net461/_._" target="lib/net461/_._" />
12-
<file src="build/net461/GitExtensions.Extensibility.targets" target="build/net461/GitExtensions.Extensibility.targets" />
11+
<file src="build/GitExtensions.Extensibility.targets" target="build/net461/GitExtensions.Extensibility.targets" />
12+
<file src="build/GitExtensions.Extensibility.targets" target="build/net5.0/GitExtensions.Extensibility.targets" />
1313

1414
<file src="../../LICENSE.md" target="LICENSE.md" />
1515
<file src="tools/Download-GitExtensions.ps1" target="tools/Download-GitExtensions.ps1" />

src/GitExtensions.Extensibility/lib/net461/_._

Whitespace-only changes.

src/GitExtensions.Extensibility/tools/Download-GitExtensions.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,10 @@ function Get-Application
161161
[Parameter(Mandatory=$true, Position=1)]
162162
[string] $ExtractPath,
163163
[Parameter(Mandatory=$true, Position=2)]
164-
[string] $FileName
164+
[string] $FileName,
165+
[Parameter(Mandatory=$true, Position=3)]
166+
[ValidateSet('GitHub','AppVeyor', ignorecase=$False)]
167+
[string] $Source
165168
)
166169

167170
if (!(Test-Path $ExtractPath))
@@ -171,6 +174,11 @@ function Get-Application
171174

172175
$FilePath = [System.IO.Path]::Combine($ExtractPath, $FileName);
173176

177+
if ($Source -eq "AppVeyor")
178+
{
179+
$ExtractPath = [System.IO.Path]::Combine($ExtractPath, "GitExtensions");
180+
}
181+
174182
Write-Host "Downloading '$ArchiveUrl'...";
175183

176184
Invoke-WebRequest -Uri $ArchiveUrl -OutFile $FilePath;
@@ -216,7 +224,7 @@ try
216224
}
217225
}
218226

219-
Get-Application -ArchiveUrl $DownloadUrl -ExtractPath $ExtractRootPath -FileName $FileName;
227+
Get-Application -ArchiveUrl $DownloadUrl -ExtractPath $ExtractRootPath -FileName $FileName -Source $Source;
220228
}
221229
catch
222230
{

0 commit comments

Comments
 (0)