Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update .NET Runtime Bootstrapper #9767

Merged
merged 3 commits into from Dec 7, 2021
Merged

Update .NET Runtime Bootstrapper #9767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b8a898
Update .NET Runtime Bootstrapper
Tyrrrz Dec 6, 2021
edad7ca
Sign the PR
Tyrrrz Dec 6, 2021
2cbde70
Don't reference bootstrapper conditionally
Tyrrrz Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions GitCommands/Settings/AppSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,7 @@ public static class AppSettings
public static readonly string ApplicationId = ApplicationName.Replace(" ", "");
public static readonly string SettingsFileName = ApplicationId + ".settings";
public static readonly string UserPluginsDirectoryName = "UserPlugins";

// Under DotnetRuntimeBootstrapper this points to C:\Program Files\dotnet\dotnet.exe
// whereas we need our executable
private static string _applicationExecutablePath = Assembly.GetEntryAssembly().Location.Replace(".dll", ".exe");

private static string _applicationExecutablePath = Application.ExecutablePath;
private static string? _documentationBaseUrl;

public static Lazy<string?> ApplicationDataPath { get; private set; }
Expand Down
6 changes: 2 additions & 4 deletions GitExtensions/GitExtensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@
<Nullable>annotations</Nullable>
</PropertyGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
<ItemGroup>
<PackageReference Include="DotnetRuntimeBootstrapper">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="GitInfo">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down Expand Up @@ -56,4 +54,4 @@
<EmbeddedResource Include="AutoCompleteRegexes.txt" />
</ItemGroup>

</Project>
</Project>
4 changes: 2 additions & 2 deletions Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackageReference Update="AppInsights.WindowsDesktop" Version="2.17.10" />
<PackageReference Update="Ben.Demystifier" Version="0.4.1" />
<PackageReference Update="ConEmu.Core" Version="21.7.18" />
<PackageReference Update="DotnetRuntimeBootstrapper" Version="1.1.2" />
<PackageReference Update="DotnetRuntimeBootstrapper" Version="2.0.2" />
<PackageReference Update="EnvDTE" Version="16.10.31320.204" />
<PackageReference Update="ExCSS" Version="4.1.0" />
<PackageReference Update="GitInfo" Version="2.1.2" />
Expand Down Expand Up @@ -49,4 +49,4 @@
<PackageReference Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="3.10.0" />

</ItemGroup>
</Project>
</Project>
3 changes: 2 additions & 1 deletion contributors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,5 @@ YYYY/MM/DD, github id, Full name, email
2021/10/12, simonmckenzie, Simon McKenzie, simonmckenzie(at)alumni.unimelb.edu.au
2021/10/22, calebnhay, Caleb N. Hay, caleb(at)calebnhay(dot)com
2021/10/28, matthiaslischka, Matthias Lischka, matthias.lischka(at)gmx.at
2021/11/13, h0lg, Holger Schmidt, leroyz.mailaccount(at)gmx.net
2021/11/13, h0lg, Holger Schmidt, leroyz.mailaccount(at)gmx.net
2021/12/06, Tyrrrz, Alexey Golub, tyrrrz(at)gmail.com