Browse Source

Cleanup for updating versions to 3.1.0

pull/6141/head
Gerhard Olsson 7 years ago
parent
commit
96c559bfae
  1. 6
      CommonAssemblyInfo.cs
  2. 6
      CommonAssemblyInfoExternals.cs
  3. 2
      Externals/Git.hub
  4. 2
      Externals/ICSharpCode.TextEditor
  5. 2
      Externals/NBug
  6. 2
      Externals/conemu-inside
  7. 8
      GitExtSshAskPass/SshAskPass.rc2
  8. 2
      GitExtensionsDoc
  9. 8
      GitExtensionsShellEx/GitExtensionsShellEx.rc
  10. 2
      GitExtensionsVSIX/source.extension.vsixmanifest
  11. 52
      GitUI/Translation/English.Plugins.xlf
  12. 2
      GitUI/Translation/English.xlf
  13. 4
      Setup/MakeInstallers.cmd

6
CommonAssemblyInfo.cs

@ -20,9 +20,9 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.01.00.0")]
[assembly: AssemblyFileVersion("3.01.00.0")]
[assembly: AssemblyInformationalVersion("3.01.00.0")]
[assembly: AssemblyVersion("3.1.0")]
[assembly: AssemblyFileVersion("3.1.0")]
[assembly: AssemblyInformationalVersion("3.1.0")]
// Disable CLS compliance. See https://github.com/gitextensions/gitextensions/issues/4710
[assembly: CLSCompliant(isCompliant: false)]

6
CommonAssemblyInfoExternals.cs

@ -13,9 +13,9 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.01.00.0")]
[assembly: AssemblyFileVersion("3.01.00.0")]
[assembly: AssemblyInformationalVersion("3.01.00.0")]
[assembly: AssemblyVersion("3.1.0")]
[assembly: AssemblyFileVersion("3.1.0")]
[assembly: AssemblyInformationalVersion("3.1.0")]
// Disable CLS compliance. See https://github.com/gitextensions/gitextensions/issues/4710
[assembly: CLSCompliant(isCompliant: false)]

2
Externals/Git.hub

@ -1 +1 @@
Subproject commit 7df924a6a20fb608ff38ffbf95d41b2c9e665a1c
Subproject commit 8f42a1f67c2cf83a84019ba8e74a228614f2444f

2
Externals/ICSharpCode.TextEditor

@ -1 +1 @@
Subproject commit 97d20e82ce35d53241bfd41a555f9355589b3f40
Subproject commit 9f443b2435241e4a528558af1b02d0691c285efc

2
Externals/NBug

@ -1 +1 @@
Subproject commit bcbf230ea301d04727d8327c67ee8735acd423d2
Subproject commit 37d8e1a13c95c48efbf578524c1588b4e23da680

2
Externals/conemu-inside

@ -1 +1 @@
Subproject commit 37a6a1f7838c1bfbe4f34c550863a8f3ae605ef0
Subproject commit cb79a0259beacbd80e4cc67b6b3ec9b34e2a2de7

8
GitExtSshAskPass/SshAskPass.rc2

@ -13,8 +13,8 @@
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,01,00,0
PRODUCTVERSION 3,01,00,0
FILEVERSION 3,1,0,0
PRODUCTVERSION 3,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -29,12 +29,12 @@ BEGIN
BEGIN
BLOCK "040904B0"
BEGIN
VALUE "FileVersion", "3.01.00.0"
VALUE "FileVersion", "3.1.0"
VALUE "FileDescription", "Interactively ask for SSH password"
VALUE "InternalName", "GitExtensions"
VALUE "LegalCopyright", "Copyright 2013-2018"
VALUE "OriginalFilename", "GitExtSshAskPass.exe"
VALUE "ProductVersion", "3.01.00.0"
VALUE "ProductVersion", "3.1.0"
VALUE "ProductName", "GitExtensions"
END
END

2
GitExtensionsDoc

@ -1 +1 @@
Subproject commit 4f9e9cd59cd13360bccb4dac707036a600442fe9
Subproject commit 53f6c98979cb67ba615025067cb202e7f825b99c

8
GitExtensionsShellEx/GitExtensionsShellEx.rc

@ -51,8 +51,8 @@ IDI_ICONPATCHAPPLY ICON "Resources\\IconPatchApply.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,01,00,0
PRODUCTVERSION 3,01,00,0
FILEVERSION 3,1,0,0
PRODUCTVERSION 3,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -68,12 +68,12 @@ BEGIN
BLOCK "040904B0"
BEGIN
VALUE "FileDescription", "Shell extensions for Windows Explorer"
VALUE "FileVersion", "3.01.00.0"
VALUE "FileVersion", "3.1.0"
VALUE "InternalName", "GitExtensions"
VALUE "LegalCopyright", "Copyright 2008-2018"
VALUE "OriginalFilename", "GitExtensionsShellEx.dll"
VALUE "ProductName", "GitExtensions"
VALUE "ProductVersion", "3.01.00.0"
VALUE "ProductVersion", "3.1.0"
END
END
BLOCK "VarFileInfo"

2
GitExtensionsVSIX/source.extension.vsixmanifest

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Publisher="GitExt Team" Version="3.01.00.00" Language="en-US" Id="GitExtensions..550013F4-337C-4750-8967-DDEEEC2EB497" />
<Identity Publisher="GitExt Team" Version="3.1.0" Language="en-US" Id="GitExtensions..550013F4-337C-4750-8967-DDEEEC2EB497" />
<DisplayName>GitExtensions</DisplayName>
<Description xml:space="preserve" >Git Extensions is a graphical user interface for Git that allows you to control Git without using the command-line</Description>
<MoreInfo>https://gitextensions.github.io/</MoreInfo>

52
GitUI/Translation/English.Plugins.xlf

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" GitExVersion="3.01.00.0">
<xliff xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" GitExVersion="3.1.0">
<file datatype="plaintext" original="AppVeyorSettingsUserControl" source-language="en">
<body>
<trans-unit id="cbLoadTestResults.Text">
@ -1337,6 +1337,56 @@ branch names, tag names)</source>
</trans-unit>
</body>
</file>
<file datatype="plaintext" original="SettingsUserControl" source-language="en">
<body>
<trans-unit id="ExtractLink.Text">
<source>Extract data from a build result url copied in the clipboard</source>
<target />
</trans-unit>
<trans-unit id="TokenManagementLink.Text">
<source>Go to token management page</source>
<target />
</trans-unit>
<trans-unit id="_failToExtractDataFromClipboardCaption.Text">
<source>Could not extract data</source>
<target />
</trans-unit>
<trans-unit id="_failToExtractDataFromClipboardMessage.Text">
<source>The clipboard doesn't contain a valid build url.
Please copy the url of the build into the clipboard before retrying.
(Should contain at least the "buildId" parameter)</source>
<target />
</trans-unit>
<trans-unit id="_failToLoadBuildDefinitionInfoMessage.Text">
<source>Error while trying to retrieve build definition information from url.
Please ensure that the url is valid and that the API token has access to build and project information.</source>
<target />
</trans-unit>
<trans-unit id="_infoNoApiTokenMessage.Text">
<source>Unable to retrieve build definition information without API token. Field will be left blank.</source>
<target />
</trans-unit>
<trans-unit id="label1.Text">
<source>Examples:
- https://dev.azure.com/yourorganization/projectname/
- https://yourhost:8080/tfs/collectionname/projectname/
- https://yourorganization.visualstudio.com/projectname/</source>
<target />
</trans-unit>
<trans-unit id="label4.Text">
<source>You need to create a token with the following scopes:
- 'Build (read)'
- 'Project and team (read)'</source>
<target />
</trans-unit>
<trans-unit id="labelRegexError.Text">
<source>The 'Build definition name' regular expression is not valid and won't be saved!</source>
<target />
</trans-unit>
</body>
</file>
<file datatype="plaintext" original="TeamCitySettingsUserControl" source-language="en">
<body>
<trans-unit id="CheckBoxLogAsGuest.Text">

2
GitUI/Translation/English.xlf

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" GitExVersion="3.01.00.0">
<xliff xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" GitExVersion="3.1.0">
<file datatype="plaintext" original="AdvancedSettingsPage" source-language="en">
<body>
<trans-unit id="$this.Text">

4
Setup/MakeInstallers.cmd

@ -5,8 +5,8 @@ rem
rem Update this version number with every release
rem
setlocal
set version=3.01.00.0
set numericVersion=3.01.00.00
set version=3.1.0
set numericVersion=3.1.0
if not "%APPVEYOR_BUILD_VERSION%"=="" (
set version=%APPVEYOR_BUILD_VERSION%
set numericVersion=%APPVEYOR_BUILD_VERSION%

Loading…
Cancel
Save