-
Notifications
You must be signed in to change notification settings - Fork 612
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
MSIX installer #366
Open
davidanthoff
wants to merge
17
commits into
git-for-windows:main
Choose a base branch
from
davidanthoff:msix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
MSIX installer #366
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
7ed4cdc
Add msix installer
davidanthoff 5cac2d1
Fix paths
davidanthoff c5a26e3
Change name
davidanthoff dd3007f
Fix Publisher
davidanthoff 35c0109
More Publisher fixes
davidanthoff 648e358
Fix appxmanifest
davidanthoff 3897639
Fix packaging layout file
davidanthoff 3426194
Fix packaging layout
davidanthoff ff7f8c9
Fix packaging layout
davidanthoff 4629540
Disable arm build
davidanthoff ce24da7
Update Publisher
davidanthoff a85c051
Write appmanifest.xml from script
davidanthoff b78de54
Annotate params
davidanthoff 60deae2
Fix paths
davidanthoff c7d123d
Update store images
davidanthoff e088bbb
Delete unnecessary file
davidanthoff d1b2b6b
Remove VCRedist
davidanthoff File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"profiles": [ | ||
{ | ||
"name": "Git Bash", | ||
"commandline": "git-bash.exe" | ||
} | ||
] | ||
} | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+463 Bytes
msix/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png
Oops, something went wrong.
Binary file added
BIN
+834 Bytes
msix/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,196 @@ | ||
function Write-PackageLayoutFile { | ||
param ([string]$version, [string]$filename) | ||
|
||
$packageLayout = [xml]@" | ||
<PackagingLayout xmlns="http://schemas.microsoft.com/appx/makeappx/2017"> | ||
<PackageFamily ID="Git-$($version)" FlatBundle="false" ManifestPath="appxmanifest.xml" ResourceManager="false"> | ||
<Package ID="Git-x64-$($version)" ProcessorArchitecture="x64"> | ||
<Files> | ||
<File DestinationPath="Git\**" SourcePath="..\build\x64\**" /> | ||
<File DestinationPath="Images\*.png" SourcePath="..\build-extra\msix\Images\*.png" /> | ||
<File DestinationPath="Public\Fragments\*" SourcePath="..\build-extra\msix\Fragments\*" /> | ||
</Files> | ||
</Package> | ||
<Package ID="Git-x86-$($version)" ProcessorArchitecture="x86"> | ||
<Files> | ||
<File DestinationPath="Git\**" SourcePath="..\build\x86\**" /> | ||
<File DestinationPath="Images\*.png" SourcePath="..\build-extra\msix\Images\*.png" /> | ||
<File DestinationPath="Public\Fragments\*" SourcePath="..\build-extra\msix\Fragments\*" /> | ||
</Files> | ||
</Package> | ||
<!-- <Package ID="Git-arm64-$($version)" ProcessorArchitecture="arm64"> | ||
<Files> | ||
<File DestinationPath="Git\**" SourcePath="arm64\**" /> | ||
<File DestinationPath="Images\*.png" SourcePath="..\build-extra\msix\Images\*.png" /> | ||
<File DestinationPath="Public\Fragments\*" SourcePath="..\build-extra\msix\Fragments\*" /> | ||
</Files> | ||
</Package> --> | ||
</PackageFamily> | ||
</PackagingLayout> | ||
"@ | ||
$packageLayout.Save($filename) | ||
|
||
} | ||
|
||
function Write-AppxManifest { | ||
param ([string]$version, [string]$publisher, [string]$filename) | ||
|
||
$appxmanifest = [xml]@" | ||
<?xml version="1.0" encoding="utf-8"?> | ||
|
||
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" | ||
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" | ||
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" | ||
xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" | ||
xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" | ||
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" | ||
xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" | ||
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" | ||
xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6" | ||
xmlns:iot2="http://schemas.microsoft.com/appx/manifest/iot/windows10/2" IgnorableNamespaces="mp uap uap3 uap5 rescap desktop desktop4 desktop6 iot2"> | ||
|
||
<Identity Name="JohannesSchindelin.Git" Publisher="$($publisher)" Version="$($version)" ProcessorArchitecture="neutral"/> | ||
|
||
<Properties> | ||
<DisplayName>Git</DisplayName> | ||
<PublisherDisplayName>Johannes Schindelin</PublisherDisplayName> | ||
<Logo>Images\StoreLogo.png</Logo> | ||
</Properties> | ||
|
||
<Dependencies> | ||
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17134.0" MaxVersionTested="10.0.17134.0" /> | ||
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.18362.0" /> | ||
</Dependencies> | ||
|
||
<Resources> | ||
<Resource Language="en-us"/> | ||
</Resources> | ||
|
||
<Applications> | ||
<Application Id="GitBash" Executable="Git\git-bash.exe" EntryPoint="Windows.FullTrustApplication"> | ||
<uap:VisualElements | ||
DisplayName="Git Bash" | ||
Description="Git Bash" | ||
BackgroundColor="transparent" | ||
Square150x150Logo="Images\Square150x150Logo.png" | ||
Square44x44Logo="Images\Square44x44Logo.png"> | ||
<uap:DefaultTile | ||
Wide310x150Logo="Images\Wide310x150Logo.png" | ||
ShortName="Git Bash" | ||
Square71x71Logo="Images\SmallTile.png" | ||
Square310x310Logo="Images\LargeTile.png"> | ||
<uap:ShowNameOnTiles> | ||
<uap:ShowOn Tile="square150x150Logo"/> | ||
<uap:ShowOn Tile="wide310x150Logo"/> | ||
<uap:ShowOn Tile="square310x310Logo"/> | ||
</uap:ShowNameOnTiles> | ||
</uap:DefaultTile > | ||
<uap:SplashScreen Image="Images\SplashScreen.png" /> | ||
</uap:VisualElements> | ||
<Extensions> | ||
<uap3:Extension Category="windows.appExecutionAlias" Executable="Git/git-bash.exe" EntryPoint="Windows.FullTrustApplication"> | ||
<uap3:AppExecutionAlias> | ||
<desktop:ExecutionAlias Alias="git-bash.exe" /> | ||
</uap3:AppExecutionAlias> | ||
</uap3:Extension> | ||
<uap3:Extension Category="windows.appExtension"> | ||
<uap3:AppExtension Name="com.microsoft.windows.terminal.settings" Id="GitBash" PublicFolder="Public" DisplayName="Git Bash"> | ||
</uap3:AppExtension> | ||
</uap3:Extension> | ||
</Extensions> | ||
</Application> | ||
<Application Id="GitGui" Executable="Git\cmd\git-gui.exe" EntryPoint="Windows.FullTrustApplication"> | ||
<uap:VisualElements | ||
DisplayName="Git GUI" | ||
Description="Git GUI" | ||
BackgroundColor="transparent" | ||
Square150x150Logo="Images\Square150x150Logo.png" | ||
Square44x44Logo="Images\Square44x44Logo.png"> | ||
<uap:DefaultTile | ||
Wide310x150Logo="Images\Wide310x150Logo.png" | ||
ShortName="Git GUI" | ||
Square71x71Logo="Images\SmallTile.png" | ||
Square310x310Logo="Images\LargeTile.png"> | ||
<uap:ShowNameOnTiles> | ||
<uap:ShowOn Tile="square150x150Logo"/> | ||
<uap:ShowOn Tile="wide310x150Logo"/> | ||
<uap:ShowOn Tile="square310x310Logo"/> | ||
</uap:ShowNameOnTiles> | ||
</uap:DefaultTile > | ||
<uap:SplashScreen Image="Images\SplashScreen.png" /> | ||
</uap:VisualElements> | ||
<Extensions> | ||
<uap3:Extension Category="windows.appExecutionAlias" Executable="Git/cmd/git-gui.exe" EntryPoint="Windows.FullTrustApplication"> | ||
<uap3:AppExecutionAlias> | ||
<desktop:ExecutionAlias Alias="git-gui.exe" /> | ||
</uap3:AppExecutionAlias> | ||
</uap3:Extension> | ||
</Extensions> | ||
</Application> | ||
<Application Id="Git" Executable="Git\cmd\git.exe" EntryPoint="Windows.FullTrustApplication"> | ||
<uap:VisualElements | ||
DisplayName="Git" | ||
Description="Git" | ||
BackgroundColor="transparent" | ||
Square150x150Logo="Images\Square150x150Logo.png" | ||
Square44x44Logo="Images\Square44x44Logo.png" | ||
AppListEntry="none"> | ||
<uap:DefaultTile | ||
Wide310x150Logo="Images\Wide310x150Logo.png" | ||
ShortName="Git" | ||
Square71x71Logo="Images\SmallTile.png" | ||
Square310x310Logo="Images\LargeTile.png"> | ||
<uap:ShowNameOnTiles> | ||
<uap:ShowOn Tile="square150x150Logo"/> | ||
<uap:ShowOn Tile="wide310x150Logo"/> | ||
<uap:ShowOn Tile="square310x310Logo"/> | ||
</uap:ShowNameOnTiles> | ||
</uap:DefaultTile > | ||
<uap:SplashScreen Image="Images\SplashScreen.png" /> | ||
</uap:VisualElements> | ||
<Extensions> | ||
<uap3:Extension Category="windows.appExecutionAlias" Executable="Git/cmd/git.exe" EntryPoint="Windows.FullTrustApplication"> | ||
<uap3:AppExecutionAlias> | ||
<desktop:ExecutionAlias Alias="git.exe" /> | ||
</uap3:AppExecutionAlias> | ||
</uap3:Extension> | ||
</Extensions> | ||
</Application> | ||
<Application Id="Gitk" Executable="Git\cmd\gitk.exe" EntryPoint="Windows.FullTrustApplication"> | ||
<uap:VisualElements | ||
DisplayName="Gitk" | ||
Description="Gitk" | ||
BackgroundColor="transparent" | ||
Square150x150Logo="Images\Square150x150Logo.png" | ||
Square44x44Logo="Images\Square44x44Logo.png" | ||
AppListEntry="none"> | ||
<uap:DefaultTile | ||
Wide310x150Logo="Images\Wide310x150Logo.png" | ||
ShortName="Gitk" | ||
Square71x71Logo="Images\SmallTile.png" | ||
Square310x310Logo="Images\LargeTile.png"> | ||
<uap:ShowNameOnTiles> | ||
<uap:ShowOn Tile="square150x150Logo"/> | ||
<uap:ShowOn Tile="wide310x150Logo"/> | ||
<uap:ShowOn Tile="square310x310Logo"/> | ||
</uap:ShowNameOnTiles> | ||
</uap:DefaultTile > | ||
<uap:SplashScreen Image="Images\SplashScreen.png" /> | ||
</uap:VisualElements> | ||
<Extensions> | ||
<uap3:Extension Category="windows.appExecutionAlias" Executable="Git/cmd/gitk.exe" EntryPoint="Windows.FullTrustApplication"> | ||
<uap3:AppExecutionAlias> | ||
<desktop:ExecutionAlias Alias="gitk.exe" /> | ||
</uap3:AppExecutionAlias> | ||
</uap3:Extension> | ||
</Extensions> | ||
</Application> | ||
</Applications> | ||
|
||
<Capabilities> | ||
<rescap:Capability Name="runFullTrust" /> | ||
</Capabilities> | ||
</Package> | ||
"@ | ||
$appxmanifest.Save($filename) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as off-topic.
Sorry, something went wrong.