Skip to content

Commit

Permalink
Update to Git v2.14.1.1 and new build process
Browse files Browse the repository at this point in the history
  • Loading branch information
robmen committed Aug 19, 2017
1 parent 2f67de2 commit 1929cb2
Show file tree
Hide file tree
Showing 14 changed files with 187 additions and 19,960 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.vs/
build/
src/portable/
files/
tools/
41 changes: 41 additions & 0 deletions gitsetup.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.8
MinimumVisualStudioVersion = 15.0.26124.0
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Bundle", "src\Bundle\Bundle.wixproj", "{32EDED6F-F573-4840-AECE-7E019A1A5C0D}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Package", "src\Package\Package.wixproj", "{DB21A71D-0866-4FF3-A39E-6877FF7C9F00}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Debug|x64 = Debug|x64
Release|x86 = Release|x86
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{32EDED6F-F573-4840-AECE-7E019A1A5C0D}.Debug|x64.ActiveCfg = Debug|x64
{32EDED6F-F573-4840-AECE-7E019A1A5C0D}.Debug|x64.Build.0 = Debug|x64
{32EDED6F-F573-4840-AECE-7E019A1A5C0D}.Debug|x86.ActiveCfg = Debug|x86
{32EDED6F-F573-4840-AECE-7E019A1A5C0D}.Debug|x86.Build.0 = Debug|x86
{32EDED6F-F573-4840-AECE-7E019A1A5C0D}.Release|x64.ActiveCfg = Release|x64
{32EDED6F-F573-4840-AECE-7E019A1A5C0D}.Release|x64.Build.0 = Release|x64
{32EDED6F-F573-4840-AECE-7E019A1A5C0D}.Release|x86.ActiveCfg = Release|x86
{32EDED6F-F573-4840-AECE-7E019A1A5C0D}.Release|x86.Build.0 = Release|x86
{DB21A71D-0866-4FF3-A39E-6877FF7C9F00}.Debug|x64.ActiveCfg = Debug|x64
{DB21A71D-0866-4FF3-A39E-6877FF7C9F00}.Debug|x64.Build.0 = Debug|x64
{DB21A71D-0866-4FF3-A39E-6877FF7C9F00}.Debug|x86.ActiveCfg = Debug|x86
{DB21A71D-0866-4FF3-A39E-6877FF7C9F00}.Debug|x86.Build.0 = Debug|x86
{DB21A71D-0866-4FF3-A39E-6877FF7C9F00}.Release|x64.ActiveCfg = Release|x64
{DB21A71D-0866-4FF3-A39E-6877FF7C9F00}.Release|x64.Build.0 = Release|x64
{DB21A71D-0866-4FF3-A39E-6877FF7C9F00}.Release|x86.ActiveCfg = Release|x86
{DB21A71D-0866-4FF3-A39E-6877FF7C9F00}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0F1F366A-8B5E-4500-B008-07C92484527A}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion lib/posh-git
Submodule posh-git updated 47 files
+12 −0 .editorconfig
+2 −2 .gitattributes
+8 −0 .vscode/extensions.json
+28 −0 .vscode/launch.json
+4 −0 .vscode/settings.json
+66 −0 .vscode/tasks.json
+227 −0 CHANGELOG.md
+0 −324 GitTabExpansion.ps1
+0 −396 GitUtils.ps1
+23 −0 ISSUE_TEMPLATE.md
+7 −7 LICENSE.txt
+32 −0 PSScriptAnalyzerSettings.psd1
+217 −0 README.md
+0 −70 TortoiseGit.ps1
+0 −38 Utils.ps1
+56 −0 appveyor.yml
+20 −0 chocolatey/packAndLocalInstall.ps1
+25 −8 chocolatey/poshgit.nuspec
+210 −210 chocolatey/tests/InstallChocolatey.Tests.ps1
+49 −69 chocolatey/tools/chocolateyInstall.ps1
+44 −0 chocolatey/tools/chocolateyUninstall.ps1
+6 −55 install.ps1
+0 −50 posh-git.psm1
+23 −25 profile.example.ps1
+0 −97 readme.md
+18 −18 src/CheckVersion.ps1
+164 −0 src/GitParamTabExpansion.ps1
+347 −268 src/GitPrompt.ps1
+428 −0 src/GitTabExpansion.ps1
+591 −0 src/GitUtils.ps1
+85 −0 src/TortoiseGit.ps1
+298 −0 src/Utils.ps1
+178 −0 src/en-US/about_posh-git.help.txt
+78 −0 src/posh-git.psd1
+162 −0 src/posh-git.psm1
+95 −0 test/DefaultPrompt.Tests.ps1
+16 −0 test/Get-GitBranch.Tests.ps1
+109 −0 test/Get-GitDirectory.Tests.ps1
+414 −0 test/Get-GitStatus.Tests.ps1
+46 −0 test/GitParamTabExpansion.Tests.ps1
+8 −0 test/ModuleManifest.Tests.ps1
+58 −0 test/Shared.ps1
+24 −0 test/Ssh.Tests.ps1
+253 −0 test/TabExpansion.Tests.ps1
+185 −0 test/Utils.Tests.ps1
+42 −0 test/git-help.txt
+2 −0 test/testDebugHarness.ps1
43 changes: 43 additions & 0 deletions src/Bundle/Bundle.wixproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<OutputName>gitsetup</OutputName>
<OutputType>Bundle</OutputType>
<ProjectGuid>{32eded6f-f573-4840-aece-7e019a1a5c0d}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>..\..\build\$(Configuration)\</OutputPath>
<IntermediateOutputPath>..\..\build\obj\$(Configuration)\$(MSBuildProjectFile)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\..\build\$(Configuration)\</OutputPath>
<IntermediateOutputPath>..\..\build\obj\$(Configuration)\$(MSBuildProjectFile)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="GitBundle.wxs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Package\Package.wixproj">
<Name>Package</Name>
<Project>{db21a71d-0866-4ff3-a39e-6877ff7c9f00}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixDependencyExtension">
<Name>WixDependencyExtension</Name>
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
</WixExtension>
<WixExtension Include="WixBalExtension">
<Name>WixBalExtension</Name>
<HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
</WixExtension>
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions src/GitBundle.wxs → src/Bundle/GitBundle.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:bal='http://schemas.microsoft.com/wix/BalExtension'
xmlns:dep='http://schemas.microsoft.com/wix/DependencyExtension'>
<Bundle Name='!(bind.packageName.git.msi)' Manufacturer='!(bind.packageManufacturer.git.msi)'
Version='2.11.0.0' UpgradeCode='4adb169f-377b-4a52-b817-4ecee51fe64d'
Version='!(bind.packageVersion.git.msi)' UpgradeCode='4adb169f-377b-4a52-b817-4ecee51fe64d'
IconSourceFile='git.ico'
dep:ProviderKey='GitSetupBundle'>

Expand All @@ -14,7 +14,7 @@
<Variable Name='InstallFolder' Value='[ProgramFilesFolder]Git' />

<Chain>
<MsiPackage SourceFile='git.msi'>
<MsiPackage Id='git.msi' SourceFile='$(var.Package.TargetPath)'>
<MsiProperty Name='INSTALLFOLDER' Value='[InstallFolder]' />
</MsiPackage>
</Chain>
Expand Down
File renamed without changes.
File renamed without changes
Loading

0 comments on commit 1929cb2

Please sign in to comment.