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

build: fix/speed-up build graph dependencies #924

Merged
merged 1 commit into from
Nov 1, 2022
Merged

build: fix/speed-up build graph dependencies #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/linux/Packaging.Linux/Packaging.Linux.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

<ItemGroup>
<ProjectReference Include="../../shared/Git-Credential-Manager/Git-Credential-Manager.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/Atlassian.Bitbucket.UI.Avalonia/Atlassian.Bitbucket.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/GitHub.UI.Avalonia/GitHub.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/GitLab.UI.Avalonia/GitLab.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/Core.UI.Avalonia/Core.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
</ItemGroup>

<!-- Implicit SDK targets import (so we can override the default targets below) -->
Expand Down
6 changes: 4 additions & 2 deletions src/osx/Installer.Mac/Installer.Mac.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@

<ItemGroup>
<ProjectReference Include="../../shared/Git-Credential-Manager/Git-Credential-Manager.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/Atlassian.Bitbucket.UI/Atlassian.Bitbucket.UI.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/GitHub.UI/GitHub.UI.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/Atlassian.Bitbucket.UI.Avalonia/Atlassian.Bitbucket.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/GitHub.UI.Avalonia/GitHub.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/GitLab.UI.Avalonia/GitLab.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../../shared/Core.UI.Avalonia/Core.UI.Avalonia.csproj" ReferenceOutputAssembly="false" />
</ItemGroup>

<!-- Implicit SDK targets import (so we can override the default targets below) -->
Expand Down
10 changes: 0 additions & 10 deletions src/osx/Installer.Mac/layout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ cp "$INSTALLER_SRC/uninstall.sh" "$PAYLOAD" || exit 1
# Publish core application executables
echo "Publishing core application..."
dotnet publish "$GCM_SRC" \
--no-restore \
-m:1 \
--configuration="$CONFIGURATION" \
--framework="$FRAMEWORK" \
--runtime="$RUNTIME" \
Expand All @@ -107,8 +105,6 @@ dotnet publish "$GCM_SRC" \

echo "Publishing core UI helper..."
dotnet publish "$GCM_UI_SRC" \
--no-restore \
-m:1 \
--configuration="$CONFIGURATION" \
--framework="$FRAMEWORK" \
--runtime="$RUNTIME" \
Expand All @@ -117,8 +113,6 @@ dotnet publish "$GCM_UI_SRC" \

echo "Publishing Bitbucket UI helper..."
dotnet publish "$BITBUCKET_UI_SRC" \
--no-restore \
-m:1 \
--configuration="$CONFIGURATION" \
--framework="$FRAMEWORK" \
--runtime="$RUNTIME" \
Expand All @@ -127,8 +121,6 @@ dotnet publish "$BITBUCKET_UI_SRC" \

echo "Publishing GitHub UI helper..."
dotnet publish "$GITHUB_UI_SRC" \
--no-restore \
-m:1 \
--configuration="$CONFIGURATION" \
--framework="$FRAMEWORK" \
--runtime="$RUNTIME" \
Expand All @@ -137,8 +129,6 @@ dotnet publish "$GITHUB_UI_SRC" \

echo "Publishing GitLab UI helper..."
dotnet publish "$GITLAB_UI_SRC" \
--no-restore \
-m:1 \
--configuration="$CONFIGURATION" \
--framework="$FRAMEWORK" \
--runtime="$RUNTIME" \
Expand Down
8 changes: 8 additions & 0 deletions src/windows/Installer.Windows/Installer.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
<PayloadPath>$(PlatformOutPath)Installer.Windows\bin\$(Configuration)\net472\win-x86</PayloadPath>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="../../shared/Git-Credential-Manager/Git-Credential-Manager.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../Atlassian.Bitbucket.UI.Windows/Atlassian.Bitbucket.UI.Windows.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../GitHub.UI.Windows/GitHub.UI.Windows.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../GitLab.UI.Windows/GitLab.UI.Windows.csproj" ReferenceOutputAssembly="false" />
<ProjectReference Include="../Core.UI.Windows/Core.UI.Windows.csproj" ReferenceOutputAssembly="false" />
</ItemGroup>

<ItemGroup>
<None Include="Setup.iss" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/windows/Installer.Windows/layout.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ mkdir -p "$PAYLOAD","$SYMBOLS"
# Publish core application executables
Write-Output "Publishing core application..."
dotnet publish "$GCM_SRC" `
--framework net472 `
--framework net472 `
--configuration "$CONFIGURATION" `
--runtime win-x86 `
--output "$PAYLOAD"
Expand Down