diff --git a/appveyor.yml b/appveyor.yml
index 59ad72b..57c04df 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -49,8 +49,8 @@ test_script:
#---------------------------------#
artifacts:
-- path: .\*.zip
-- path: .\*.nupkg
+- path: .\GitExtensions.PluginManager.*.zip
+- path: .\GitExtensions.PluginManager.*.nupkg
#---------------------------------#
# deployment configuration #
diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj
index 9c4da5e..48884a0 100644
--- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj
+++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj
@@ -13,25 +13,26 @@
PackageManager\PackageManager.UI.exe
..\PackageManager.UI\bin\$(Configuration)\$(TargetFramework)\PackageManager.UI.exe
- ..\..\references\GitExtensions\UserPlugins\GitExtensions.PluginManager\
- appveyor
- v3.2.0.5938
true
+
+
+
+
- ..\..\references\GitExtensions\GitUI.dll
+ $(GitExtensionsPath)\GitUI.dll
- ..\..\references\GitExtensions\GitUIPluginInterfaces.dll
+ $(GitExtensionsPath)\GitUIPluginInterfaces.dll
- ..\..\references\GitExtensions\ResourceManager.dll
+ $(GitExtensionsPath)\ResourceManager.dll
@@ -53,16 +54,9 @@
-
-
-
-
-
-
-
diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj.user b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj.user
new file mode 100644
index 0000000..1d1ba20
--- /dev/null
+++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.csproj.user
@@ -0,0 +1,8 @@
+
+
+ ..\..\..\gitextensions.shared
+ latest
+ GitHub
+
+
+
diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec
index da0f169..797e5d3 100644
--- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec
+++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec
@@ -8,7 +8,7 @@
$projectUrl$
$tags$
-
+
diff --git a/src/GitExtensions.PluginManager/Properties/launchSettings.json b/src/GitExtensions.PluginManager/Properties/launchSettings.json
index f1a4204..cd371fe 100644
--- a/src/GitExtensions.PluginManager/Properties/launchSettings.json
+++ b/src/GitExtensions.PluginManager/Properties/launchSettings.json
@@ -2,7 +2,7 @@
"profiles": {
"GitExtensions.PluginManager": {
"commandName": "Executable",
- "executablePath": "$(SolutionDir)\\references\\GitExtensions\\GitExtensions.exe"
+ "executablePath": "$(GitExtensionsExecutablePath)"
}
}
}
\ No newline at end of file
diff --git a/tools/Download-GitExtensions.ps1 b/tools/Download-GitExtensions.ps1
deleted file mode 100644
index edca917..0000000
--- a/tools/Download-GitExtensions.ps1
+++ /dev/null
@@ -1,115 +0,0 @@
-param([string] $Version, [string] $Source = "github")
-
-if (-not($Version))
-{
- Throw "Parameter -Version is required";
-}
-
-if (-not($Source -eq "github") -and -not($Source -eq "appveyor"))
-{
- Throw "Parameter -Source must be either 'github' or 'appveyor'";
-}
-
-Set-Location $PSScriptRoot
-
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-$ExtractRootPath = '../references'
-$AssetToDownloadName = 'GitExtensions-' + $Version + '.zip';
-$AssetToDownloadUrl = $null;
-
-$DownloadName = [System.IO.Path]::GetFileName($AssetToDownloadName);
-$DownloadFilePath = [System.IO.Path]::Combine($ExtractRootPath, $DownloadName);
-if (Test-Path $DownloadFilePath)
-{
- Write-Host ('Download "' + $DownloadName + '" already exists.');
- Pop-Location
- exit;
-}
-
-Write-Host ('Searching for Git Extensions release on "' + $Source + '".');
-
-if ($Source -eq "github")
-{
- # Find release and asset.
- $Releases = Invoke-RestMethod -Uri 'https://api.github.com/repos/gitextensions/gitextensions/releases'
- foreach ($Release in $Releases)
- {
- if ($Release.tag_name -eq $Version)
- {
- Write-Host ('Selected release "' + $Release.name + '".');
- foreach ($Asset in $Release.assets)
- {
- if ($Asset.content_type -eq "application/zip" -and $Asset.name.Contains('Portable'))
- {
- Write-Host ('Selected asset "' + $Asset.name + '".');
- $AssetToDownloadUrl = $Asset.browser_download_url;
- break;
- }
- }
-
- if (!($null -eq $AssetToDownloadUrl))
- {
- break;
- }
- }
- }
-}
-elseif ($Source -eq "appveyor")
-{
- $UrlVersion = $Version;
- if ($UrlVersion.StartsWith("v"))
- {
- $UrlVersion = $UrlVersion.Substring(1);
- }
-
- $UrlBase = "https://ci.appveyor.com/api";
-
- $BuildInfo = Invoke-RestMethod -Uri "$UrlBase/projects/gitextensions/gitextensions/build/$UrlVersion";
- $Job = $BuildInfo.build.jobs[0];
- if ($Job.Status -eq "success")
- {
- $JobId = $Job.jobId;
- Write-Host ('Selected build job "' + $JobId + '".');
-
- $AssetsUrl = "$UrlBase/buildjobs/$JobId/artifacts";
- $Assets = Invoke-RestMethod -Method Get -Uri $AssetsUrl
- foreach ($Asset in $Assets)
- {
- if ($Asset.type -eq "zip" -and $Asset.FileName.Contains('Portable'))
- {
- Write-Host ('Selected asset "' + $Asset.FileName + '".');
- $AssetToDownloadUrl = $AssetsUrl + "/" + $Asset.FileName;
- break;
- }
- }
- }
-}
-
-# Download and extract zip.
-if (!($null -eq $AssetToDownloadUrl))
-{
- $ExtractPath = $ExtractRootPath;
-
- if (!(Test-Path $ExtractRootPath))
- {
- New-Item -ItemType directory -Path $ExtractRootPath | Out-Null;
- }
-
- if (!(Test-Path $ExtractPath))
- {
- New-Item -ItemType directory -Path $ExtractPath | Out-Null;
- }
-
- Write-Host ('Downloading "' + $DownloadName + '" from URL "' + $AssetToDownloadUrl + '".');
-
- Invoke-WebRequest -Uri $AssetToDownloadUrl -OutFile $DownloadFilePath;
- Expand-Archive $DownloadFilePath -DestinationPath $ExtractPath -Force
-
- Write-Host ('Extraction at "' + $ExtractPath + '" completed.');
-}
-else
-{
- Write-Host ('Download for version "' + $Version + '" not found.');
-}
-
-Pop-Location
\ No newline at end of file
diff --git a/tools/Prepare-Release.ps1 b/tools/Prepare-Release.ps1
index 06d1e80..2eb4c87 100644
--- a/tools/Prepare-Release.ps1
+++ b/tools/Prepare-Release.ps1
@@ -22,6 +22,7 @@ if (!($LastExitCode -eq 0))
$packPath = Join-Path ".." $targetPath;
dotnet pack ..\src\GitExtensions.PluginManager -c Release -o $packPath --no-build
-Copy-Item ..\src\GitExtensions.PluginManager\bin\Release\*.zip $targetPath
+Copy-Item ..\src\GitExtensions.PluginManager\bin\Release\GitExtensions.PluginManager.*.zip $targetPath
+Copy-Item ..\src\GitExtensions.PluginManager\bin\Release\GitExtensions.PluginManager.*.nupkg $targetPath
Pop-Location;
\ No newline at end of file