Skip to content

Commit

Permalink
Set VS2017 as default
Browse files Browse the repository at this point in the history
Issue gitextensions#4311
Building in AppVeyor with VS2017
This aligns the use of 2015/2017 as well as future versions and therefore removing MS2015 in filenames.
The known breaking future compatibility issues are new versions of .sln format as well as msbuild location (handled in hMSBuild.bat right now).

Also removed seemingly unused scripts and descriptions referring to MS2013 and older.
  • Loading branch information
gerhardol committed Feb 5, 2018
1 parent 42fec7d commit a77d8c8
Show file tree
Hide file tree
Showing 18 changed files with 14 additions and 110 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ GitExtensionsShellEx/Generated/
*.opensdf
*.ipch
*.iml
*.VS2015.VC.db
*.VS2015.sqlite
*.VC.db
*.sqlite
*.aps
*.bak
*.[Cc]ache
Expand Down
4 changes: 0 additions & 4 deletions Build/build.VS2015.debug.cmd

This file was deleted.

3 changes: 0 additions & 3 deletions Build/build.VS2015.debug.run.cmd

This file was deleted.

33 changes: 0 additions & 33 deletions Build/build.generic.cmd

This file was deleted.

12 changes: 0 additions & 12 deletions Build/build.generic.debug.run.cmd

This file was deleted.

8 changes: 3 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,17 @@
* Fork the main repository from [github](http://github.com/gitextensions/gitextensions)
* Read [Project workflow](https://github.com/gitextensions/gitextensions/wiki/Project-Workflow) and [Coding guide](https://github.com/gitextensions/gitextensions/wiki#coding-guide)
* Push your changes to your fork
* Send me a pull request

If you do not want to use github, I also accept mailed patches. Just make sure the patch is send as an attachement and not in the body of the mail.
* Create a pull request

## How to debug GitExtensions

The installer is build using WiX. You need to install WiX when you want to build the installer. This can be downloaded here: [http://wixtoolset.org/](http://wixtoolset.org/). If you do not want to build the installer, just open the solution and ignore the warning.

* Open the solution file (GitExtensions.VS2015.sln, or GitExtensions.VS2013.sln, or GitExtensions.VS2012.sln)
* Open the solution file (GitExtensions.sln)
* Hit F5 to compile and run GitExtensions

## How to create the installer

* Download and install WiX [http://wixtoolset.org/](http://wixtoolset.org/)
* Run Setup\\BuildInstallers.VS2015.cmd, or Setup\\BuildInstallers.VS2013.cmd, or Setup\\BuildInstallers.VS2012.cmd to build the installers
* Run Setup\\BuildInstallers.cmd to build the installers

File renamed without changes.
2 changes: 0 additions & 2 deletions GitExtensions.VS2015.build.cmd

This file was deleted.

File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions Setup/BuildGitExtNative.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ SET BuildType=%2
IF "%BuildType%"=="" SET BuildType=Rebuild

for /f "tokens=*" %%i in ('hMSBuild.bat -only-path -notamd64') do set msbuild="%%i"
set projectShellEx=..\GitExtensionsShellEx\GitExtensionsShellEx.VS2015.sln
set projectSshAskPass=..\GitExtSshAskPass\GitExtSshAskPass.VS2015.sln
set projectShellEx=..\GitExtensionsShellEx\GitExtensionsShellEx.sln
set projectSshAskPass=..\GitExtSshAskPass\GitExtSshAskPass.sln
set SkipShellExtRegistration=1
set msbuildparams=/p:Configuration=%Configuration% /t:%BuildType% /nologo /v:m

Expand Down
23 changes: 0 additions & 23 deletions Setup/BuildInstallers.VS2017.cmd

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SET Configuration=%1
IF "%Configuration%"=="" SET Configuration=Release

for /f "tokens=*" %%i in ('hMSBuild.bat -only-path -notamd64') do set msbuild="%%i"
set project=..\GitExtensions.VS2015.sln
set project=..\GitExtensions.sln
set EnableNuGetPackageRestore=true
..\.nuget\nuget.exe restore %project%
set msbuildparams=/p:Configuration=%Configuration% /t:Rebuild /nologo /v:m
Expand Down
7 changes: 1 addition & 6 deletions Setup/MakePortableArchive.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@

cd /d "%~p0"

rem
rem Update this version number with every release
rem
setlocal
set version=2.51

SET Configuration=%1
IF "%Configuration%"=="" SET Configuration=Release
SET version=%2
if not "%APPVEYOR_BUILD_VERSION%"=="" set version=%APPVEYOR_BUILD_VERSION%
set normal=GitExtensions-Portable-%version%.zip
set szip="..\packages\7-Zip.CommandLine.9.20.0\tools\7za"
Expand Down
2 changes: 1 addition & 1 deletion Setup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ Building installers for Git Extensions
set_version_to.py -t 2.50 -v 2.50
```

5. Run BuildInstallers.VS2015.cmd or BuildInstallers.VS2017.cmd. This will generate two msi installers:
5. Run BuildInstallers.cmd. This will generate two msi installers:
* GitExtensions250.msi - the standard install with only Git Extensions
* GitExtensions250Complete.msi - also includes Git for Windows and KDiff3
11 changes: 0 additions & 11 deletions Setup/set_version_to.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,6 @@
outfile = open(filename, "w")
outfile.writelines(makeInstallers)

filename = "MakePortableArchive.cmd"
makeInstallers = open(filename, "r").readlines()
for i in range(len(makeInstallers)):
line = makeInstallers[i]
if line.find("set version=") == 0:
data = line.split('=')
data[1] = args.text + '\n'
makeInstallers[i] = '='.join(data)
outfile = open(filename, "w")
outfile.writelines(makeInstallers)

filename = "..\GitExtensionsDoc\source\conf.py"
docoConf = open(filename, "r").readlines()
for i in range(len(docoConf)):
Expand Down
9 changes: 4 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.50.90.{build}

os: Visual Studio 2015
os: Visual Studio 2017

branches:
except:
Expand All @@ -9,8 +9,7 @@ branches:

environment:
matrix:
- IdeVersion: VS2015
#- IdeVersion: Mono
- IdeVersion: VS2017
SKIP_PAUSE: TRUE
ARCHIVE_WITH_PDB: TRUE

Expand All @@ -32,8 +31,8 @@ install:
build_script:
- ps: |
Write-Output "Platform: $env:IdeVersion"
& Setup\BuildInstallers.$env:IdeVersion.cmd
& Setup\BuildInstallers.cmd
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
& Setup\MakePortableArchive.cmd
& Setup\MakePortableArchive.cmd Release %APPVEYOR_BUILD_VERSION%
#Upload a portable archive, not a installer
Get-ChildItem Setup\GitExtensions-Portable-*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }

0 comments on commit a77d8c8

Please sign in to comment.