Version changed to 2.47

BuildInstallers.Mono.cmd batch file fixed

.nuget/NuGet.targets

@@ -24,14 +24,8 @@
             <PackageSource Include="https://my-nuget-source/nuget/" />
         -->
     </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
-    </PropertyGroup>
     
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+    <PropertyGroup>
         <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
         <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
         <PackagesConfig>packages.config</PackagesConfig>
@@ -82,21 +76,11 @@
     </Target>
 
     <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-              
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+        <Exec Command="$(RestoreCommand)" Condition="Exists('$(PackagesConfig)')" />
     </Target>
 
     <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)" 
-              Condition=" '$(OS)' != 'Windows_NT' " />
-              
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
+        <Exec Command="$(BuildCommand)" />
     </Target>
     
     <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">

CommonAssemblyInfo.cs

@@ -19,5 +19,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.46")]
-[assembly: AssemblyFileVersion("2.46")]
+[assembly: AssemblyVersion("2.47")]
+[assembly: AssemblyFileVersion("2.47")]

GitExtensionsShellEx/GitExtensionsShellEx.rc

@@ -50,8 +50,8 @@ IDI_ICONCREATEREPOSITORY ICON                   "Resources\\IconRepoCreate.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,46,0,0
- PRODUCTVERSION 2,46,0,0
+ FILEVERSION 2,47,0,0
+ PRODUCTVERSION 2,47,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
         BLOCK "040904B0"
         BEGIN
             VALUE "FileDescription", "Git Extensions"
-            VALUE "FileVersion", "2.46"
+            VALUE "FileVersion", "2.47"
             VALUE "InternalName", "Git Extensions"
             VALUE "LegalCopyright", "Copyright 2013"
             VALUE "OriginalFilename", "GitExtensionsShellEx.dll"
             VALUE "ProductName", "Git Extensions"
-            VALUE "ProductVersion", "2.46"
+            VALUE "ProductVersion", "2.47"
         END
     END
     BLOCK "VarFileInfo"

GitUI/Resources/ChangeLog.md

@@ -1,6 +1,9 @@
 Changelog
 =========
 
+### Version 2.46
+* Fixed issue 1387: Shell extensions not work under Windows XP
+
 ### Version 2.45
 * Setup files moved to sourceforge http://sourceforge.net/projects/gitextensions/
 * Putty updated to version 0.62.9768.0 (80% faster for me when cloning repository from GitHub)

Setup/BuildInstallers.Mono.cmd

@@ -1,10 +1,10 @@
-rem @echo off
+@echo off
 
 cd /d "%~p0"
 
 if "%MONOPATH%"=="" SET MONOPATH=C:\Program Files (x86)\Mono-2.10.9\bin\
 
-set version=2.46
+set version=2.47
 set msbuild="%MONOPATH%\xbuild"
 set project=..\GitExtensionsMono.sln
 set nuget=..\.nuget\nuget.exe
@@ -22,13 +22,43 @@ set zipversion=%version:.=%
 set normal=GitExtensions%zipversion%Mono.zip
 rd /q /s GitExtensions\
 rd /q %normal%
-xcopy /y ..\GitExtensions\bin\Release\*.exe GitExtensions\
-xcopy /y ..\GitExtensions\bin\Release\*.config GitExtensions\
-xcopy /y ..\GitExtensions\bin\Release\*.dll GitExtensions\
-for /d %%I in (%~p0\..\Plugins\*, %~p0\..\Plugins\Statistics\*) do xcopy /y %%I\bin\Release\*.dll GitExtensions\Plugins\
-xcopy /y ..\GitExtensions\bin\Release\Translation GitExtensions\Translation\
+xcopy /y ..\GitExtensions\bin\Release\Git.hub.dll GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\GitCommands.dll GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\GitExtensions.exe GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\GitUI.dll GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\GitUIPluginInterfaces.dll GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\Gravatar.dll GitExtensions\
+xcopy /y ..\bin\ICSharpCode.SharpZipLib.dll GitExtensions\
+xcopy /y ..\bin\ICSharpCode.TextEditor.dll GitExtensions\
+xcopy /y ..\bin\Microsoft.WindowsAPICodePack.dll GitExtensions\
+xcopy /y ..\bin\Microsoft.WindowsAPICodePack.Shell.dll GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\NBug.dll GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\NetSpell.SpellChecker.dll GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\PSTaskDialog.dll GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\ResourceManager.dll GitExtensions\
+xcopy /y ..\Plugins\Github3\bin\Release\RestSharp.dll GitExtensions\
+xcopy /y ..\Plugins\BackgroundFetch\bin\Release\System.Reactive.Core.dll GitExtensions\
+xcopy /y ..\Plugins\BackgroundFetch\bin\Release\System.Reactive.Interfaces.dll GitExtensions\
+xcopy /y ..\Plugins\BackgroundFetch\bin\Release\System.Reactive.Linq.dll GitExtensions\
+xcopy /y ..\Plugins\BackgroundFetch\bin\Release\System.Reactive.PlatformServices.dll GitExtensions\
+xcopy /y ..\GitExtensions\bin\Release\TranslationApp.exe GitExtensions\
+xcopy /y ..\Plugins\AutoCompileSubmodules\bin\Release\AutoCompileSubmodules.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\BackgroundFetch\bin\Release\BackgroundFetch.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\CreateLocalBranches\bin\Release\CreateLocalBranches.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\DeleteUnusedBranches\bin\Release\DeleteUnusedBranches.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\FindLargeFiles\bin\Release\FindLargeFiles.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\Gerrit\bin\Release\Gerrit.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\Gerrit\bin\Release\Newtonsoft.Json.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\Github3\bin\Release\Github3.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\Statistics\GitImpact\bin\Release\GitImpact.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\Statistics\GitStatistics\bin\Release\GitStatistics.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\Gource\bin\Release\Gource.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\ProxySwitcher\bin\Release\ProxySwitcher.dll GitExtensions\Plugins\
+xcopy /y ..\Plugins\ReleaseNotesGenerator\bin\Release\ReleaseNotesGenerator.dll GitExtensions\Plugins\
+xcopy /y ..\GitUI\Translation GitExtensions\Translation\
 xcopy /y ..\bin\Dictionaries GitExtensions\Dictionaries\
-xcopy /y ..\bin\Diff-Scripts GitExtensions\Diff-Scripts\
+xcopy /y ..\bin\Diff-Scripts\merge-* GitExtensions\Diff-Scripts\
+xcopy /y ..\bin\Diff-Scripts\*.txt GitExtensions\Diff-Scripts\
 xcopy /y ..\bin\pageant.exe GitExtensions\PuTTY\
 xcopy /y ..\bin\plink.exe GitExtensions\PuTTY\
 xcopy /y ..\bin\puttygen.exe GitExtensions\PuTTY\

Setup/MakeInstallers.bat

@@ -3,7 +3,7 @@
 rem
 rem Update this version number with every release
 rem
-set version=2.46
+set version=2.47
 
 set msiversion=%version:.=%
 set normal=GitExtensions%msiversion%Setup.msi

Setup/set_version_to.py

@@ -61,3 +61,17 @@ if __name__ == '__main__':
            makeInstallers[i] = '='.join(data)
     outfile = open(filename, "w")
     outfile.writelines(makeInstallers)
+    
+    filename = "BuildInstallers.Mono.cmd"
+    makeInstallers = open(filename, "r").readlines()
+    for i in range(1, len(verSplitted)):
+        if len(verSplitted[i]) == 1:
+            verSplitted[i] = "0" + verSplitted[i]
+    for i in range(len(makeInstallers)):
+        line = makeInstallers[i]
+        if line.find("set version=") != -1:
+           data = line.split('=')
+           data[1] = '.'.join(verSplitted) + '\n'
+           makeInstallers[i] = '='.join(data)
+    outfile = open(filename, "w")
+    outfile.writelines(makeInstallers)