Skip to content

Commit 8168b7f

Browse files
mast-eumast-eu
committedMay 4, 2019
Refactor VS solution
·
v0.2.4v0.1.0
1 parent 4d5a3a8 commit 8168b7f

12 files changed

+64
-66
lines changed
 

‎.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/.vs/GitExtensions.SVN/v15/*
2-
/src/GitExtensions.SVN/bin/*
3-
/src/GitExtensions.SVN/obj/*
2+
/GitExtensions.SVN/bin/*
3+
/GitExtensions.SVN/obj/*
44

5-
/references/*
5+
/references/*

‎GitExtensions.SVN.sln

+17-19
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26124.0
55
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E2ABC9F4-2058-45D0-A99C-E7D97CAAFF7C}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitExtensions.SVN", "src\GitExtensions.SVN\GitExtensions.SVN.csproj", "{C5137205-996A-41E9-A3EB-F6DB37F6AE21}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitExtensions.SVN", "GitExtensions.SVN\GitExtensions.SVN.csproj", "{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}"
97
EndProject
108
Global
119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,24 +14,24 @@ Global
1614
Release|x64 = Release|x64
1715
Release|x86 = Release|x86
1816
EndGlobalSection
17+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Debug|x64.ActiveCfg = Debug|Any CPU
21+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Debug|x64.Build.0 = Debug|Any CPU
22+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Debug|x86.ActiveCfg = Debug|Any CPU
23+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Debug|x86.Build.0 = Debug|Any CPU
24+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Release|x64.ActiveCfg = Release|Any CPU
27+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Release|x64.Build.0 = Release|Any CPU
28+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Release|x86.ActiveCfg = Release|Any CPU
29+
{0C69A3CA-76B8-4D9F-BB62-4DF659E58EF9}.Release|x86.Build.0 = Release|Any CPU
30+
EndGlobalSection
1931
GlobalSection(SolutionProperties) = preSolution
2032
HideSolutionNode = FALSE
2133
EndGlobalSection
22-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Debug|Any CPU.Build.0 = Debug|Any CPU
25-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Debug|x64.ActiveCfg = Debug|Any CPU
26-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Debug|x64.Build.0 = Debug|Any CPU
27-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Debug|x86.ActiveCfg = Debug|Any CPU
28-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Debug|x86.Build.0 = Debug|Any CPU
29-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Release|Any CPU.ActiveCfg = Release|Any CPU
30-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Release|Any CPU.Build.0 = Release|Any CPU
31-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Release|x64.ActiveCfg = Release|Any CPU
32-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Release|x64.Build.0 = Release|Any CPU
33-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Release|x86.ActiveCfg = Release|Any CPU
34-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21}.Release|x86.Build.0 = Release|Any CPU
35-
EndGlobalSection
36-
GlobalSection(NestedProjects) = preSolution
37-
{C5137205-996A-41E9-A3EB-F6DB37F6AE21} = {E2ABC9F4-2058-45D0-A99C-E7D97CAAFF7C}
34+
GlobalSection(ExtensibilityGlobals) = postSolution
35+
SolutionGuid = {04E37A28-7BBB-4283-AF4A-8A564543BABD}
3836
EndGlobalSection
3937
EndGlobal

‎src/GitExtensions.SVN/GitExtensions.SVN.csproj ‎GitExtensions.SVN/GitExtensions.SVN.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,32 @@
1818
<!-- Reference to GitExtensions dlls. -->
1919
<ItemGroup>
2020
<Reference Include="GitCommands">
21-
<HintPath>..\..\references\GitExtensions\GitCommands.dll</HintPath>
21+
<HintPath>..\references\GitExtensions\GitCommands.dll</HintPath>
2222
</Reference>
2323
<Reference Include="GitExtUtils">
24-
<HintPath>..\..\references\GitExtensions\GitExtUtils.dll</HintPath>
24+
<HintPath>..\references\GitExtensions\GitExtUtils.dll</HintPath>
2525
</Reference>
2626
<Reference Include="GitUI">
27-
<HintPath>..\..\references\GitExtensions\GitUI.dll</HintPath>
27+
<HintPath>..\references\GitExtensions\GitUI.dll</HintPath>
2828
</Reference>
2929
<Reference Include="GitUIPluginInterfaces">
30-
<HintPath>..\..\references\GitExtensions\GitUIPluginInterfaces.dll</HintPath>
30+
<HintPath>..\references\GitExtensions\GitUIPluginInterfaces.dll</HintPath>
3131
</Reference>
3232
<Reference Include="ResourceManager">
33-
<HintPath>..\..\references\GitExtensions\ResourceManager.dll</HintPath>
33+
<HintPath>..\references\GitExtensions\ResourceManager.dll</HintPath>
3434
</Reference>
3535
<Reference Include="System.ComponentModel.Composition" />
3636
<Reference Include="System.Windows.Forms" />
3737
</ItemGroup>
3838

3939
<!-- Before building project ensure we have debug GitExtensions instance (for references and debugging). -->
4040
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
41-
<Exec Command="powershell.exe -ExecutionPolicy Unrestricted ..\..\tools\Download-GitExtensions.ps1" />
41+
<Exec Command="powershell.exe -ExecutionPolicy Unrestricted Resources\Tools\Download-GitExtensions.ps1" />
4242
</Target>
4343

4444
<!-- After build, copy plugin to debug GitExtensions instance (for debugging). -->
4545
<PropertyGroup>
46-
<GitExtensionsDebugPluginsPath>..\..\references\GitExtensions\Plugins\</GitExtensionsDebugPluginsPath>
46+
<GitExtensionsDebugPluginsPath>..\references\GitExtensions\Plugins\</GitExtensionsDebugPluginsPath>
4747
</PropertyGroup>
4848
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
4949
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(GitExtensionsDebugPluginsPath)" />

‎src/GitExtensions.SVN/Properties/Resources.resx ‎GitExtensions.SVN/Properties/Resources.resx

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,6 @@
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\..\..\assets\subversion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
122+
<value>..\Resources\Icons\subversion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123123
</data>
124124
</root>

‎src/GitExtensions.SVN/RepoType.cs ‎GitExtensions.SVN/RepoType.cs

File renamed without changes.

‎assets/subversion.png ‎GitExtensions.SVN/Resources/Icons/subversion.png

File renamed without changes.

‎tools/Download-GitExtensions.ps1 ‎GitExtensions.SVN/Resources/Tools/Download-GitExtensions.ps1

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
Set-Location $PSScriptRoot
2-
3-
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
4-
$ExtractRootPath = '../references'
5-
$AssetToDownloadName = 'GitExtensions-Portable-3.0.2.5232.zip';
6-
$AssetToDownloadUrl = 'https://github.com/gitextensions/gitextensions/releases/download/v3.0.2/GitExtensions-Portable-3.0.2.5232.zip';
7-
8-
if (!($null -eq $AssetToDownloadUrl))
9-
{
10-
$DownloadName = [System.IO.Path]::GetFileName($AssetToDownloadName);
11-
$DownloadFilePath = [System.IO.Path]::Combine($ExtractRootPath, $DownloadName);
12-
$ExtractPath = $ExtractRootPath;
13-
14-
if (!(Test-Path $DownloadFilePath))
15-
{
16-
if (!(Test-Path $ExtractRootPath))
17-
{
18-
New-Item -ItemType directory -Path $ExtractRootPath | Out-Null;
19-
}
20-
21-
if (!(Test-Path $ExtractPath))
22-
{
23-
New-Item -ItemType directory -Path $ExtractPath | Out-Null;
24-
}
25-
26-
Write-Host ('Downloading "' + $DownloadName + '".');
27-
28-
Invoke-WebRequest -Uri $AssetToDownloadUrl -OutFile $DownloadFilePath;
29-
Expand-Archive $DownloadFilePath -DestinationPath $ExtractPath -Force
30-
}
31-
else
32-
{
33-
Write-Host ('Download "' + $DownloadName + '" already exists.');
34-
}
35-
}
36-
1+
Set-Location $PSScriptRoot
2+
3+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
4+
$ExtractRootPath = '../../../references'
5+
$AssetToDownloadName = 'GitExtensions-Portable-3.0.2.5232.zip';
6+
$AssetToDownloadUrl = 'https://github.com/gitextensions/gitextensions/releases/download/v3.0.2/GitExtensions-Portable-3.0.2.5232.zip';
7+
8+
if (!($null -eq $AssetToDownloadUrl))
9+
{
10+
$DownloadName = [System.IO.Path]::GetFileName($AssetToDownloadName);
11+
$DownloadFilePath = [System.IO.Path]::Combine($ExtractRootPath, $DownloadName);
12+
$ExtractPath = $ExtractRootPath;
13+
14+
if (!(Test-Path $DownloadFilePath))
15+
{
16+
if (!(Test-Path $ExtractRootPath))
17+
{
18+
New-Item -ItemType directory -Path $ExtractRootPath | Out-Null;
19+
}
20+
21+
if (!(Test-Path $ExtractPath))
22+
{
23+
New-Item -ItemType directory -Path $ExtractPath | Out-Null;
24+
}
25+
26+
Write-Host ('Downloading "' + $DownloadName + '".');
27+
28+
Invoke-WebRequest -Uri $AssetToDownloadUrl -OutFile $DownloadFilePath;
29+
Expand-Archive $DownloadFilePath -DestinationPath $ExtractPath -Force
30+
}
31+
else
32+
{
33+
Write-Host ('Download "' + $DownloadName + '" already exists.');
34+
}
35+
}
36+
3737
Pop-Location

‎src/GitExtensions.SVN/SvnPlugin.cs ‎GitExtensions.SVN/SvnPlugin.cs

File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.