Skip to content

Commit 3f9fa5e

Browse files
florelisflorelis
committed
Add build caches
1 parent 86e3790 commit 3f9fa5e

17 files changed

Lines changed: 83 additions & 17 deletions

File tree

‎azure-pipelines.yml‎

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ pool:
2020
variables:
2121
solution: 'src\AppInstallerCLI.sln'
2222
EnableDetectorVcpkg: true
23+
EnablePipelineCache: true
24+
VCPKG_BINARY_SOURCES: "clear;nuget,https://pkgs.dev.azure.com/shine-oss/winget-cli/_packaging/WinGetDependencies/nuget/v3/index.json,readwrite"
2325

2426
# Do not set the build version for a PR build.
2527

@@ -67,6 +69,21 @@ jobs:
6769
- task: NuGetToolInstaller@1
6870
displayName: Install Nuget
6971

72+
- task: NuGetAuthenticate@1
73+
displayName: Authenticate to NuGet Feed
74+
75+
- task: PowerShell@2
76+
displayName: Configure vcpkg NuGet binary cache credentials
77+
inputs:
78+
targetType: inline
79+
script: |
80+
$nugetExe = (& "$(VCPKG_INSTALLATION_ROOT)\vcpkg.exe" fetch nuget) | Select-Object -Last 1
81+
$feedUrl = "https://pkgs.dev.azure.com/shine-oss/winget-cli/_packaging/WinGetDependencies/nuget/v3/index.json"
82+
& $nugetExe sources add -Name "WinGetDependencies" -Source $feedUrl -Username "AzureDevOps" -Password "$env:SYSTEM_ACCESSTOKEN" -StorePasswordInClearText
83+
& $nugetExe setapikey "AzureDevOps" -Source $feedUrl
84+
env:
85+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
86+
7087
# Restores all projects, including native (vcxproj) projects
7188
- task: NuGetCommand@2
7289
displayName: Restore Solution
@@ -114,13 +131,17 @@ jobs:
114131
platform: '$(buildPlatform)'
115132
solution: '$(solution)'
116133
configuration: '$(buildConfiguration)'
117-
msbuildArgs: '/bl:$(artifactsDir)\msbuild.binlog
134+
msbuildArgs: '/reportfileaccesses
135+
/bl:$(artifactsDir)\msbuild.binlog
118136
/p:AppxBundlePlatforms="$(buildPlatform)"
119137
/p:AppxPackageDir="$(appxPackageDir)"
120138
/p:AppxBundle=Always
121139
/p:UapAppxPackageBuildMode=SideloadOnly
122-
/p:WingetCleanIntermediateFiles=true'
140+
/p:WingetCleanIntermediateFiles=false'
123141
maximumCpuCount: true
142+
msbuildArchitecture: x64
143+
env:
144+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
124145

125146
- task: MSBuild@1
126147
displayName: Build MSIX Test Installer File
@@ -672,6 +693,21 @@ jobs:
672693
- task: NuGetToolInstaller@1
673694
displayName: Install Nuget
674695

696+
- task: NuGetAuthenticate@1
697+
displayName: Authenticate to NuGet Feed
698+
699+
- task: PowerShell@2
700+
displayName: Configure vcpkg NuGet binary cache credentials
701+
inputs:
702+
targetType: inline
703+
script: |
704+
$nugetExe = (& "$(VCPKG_INSTALLATION_ROOT)\vcpkg.exe" fetch nuget) | Select-Object -Last 1
705+
$feedUrl = "https://pkgs.dev.azure.com/shine-oss/winget-cli/_packaging/WinGetDependencies/nuget/v3/index.json"
706+
& $nugetExe sources add -Name "WinGetDependencies" -Source $feedUrl -Username "AzureDevOps" -Password "$env:SYSTEM_ACCESSTOKEN" -StorePasswordInClearText
707+
& $nugetExe setapikey "AzureDevOps" -Source $feedUrl
708+
env:
709+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
710+
675711
- task: NuGetCommand@2
676712
displayName: Restore Solution
677713
inputs:
@@ -690,7 +726,7 @@ jobs:
690726
platform: '$(buildPlatform)'
691727
solution: '$(solution)'
692728
configuration: '$(buildConfiguration)'
693-
msbuildArgs: '/bl:$(artifactsDir)\msbuild.binlog'
729+
msbuildArgs: '/bl:$(artifactsDir)\msbuild.binlog /p:MSBuildCacheEnabled=false'
694730
maximumCpuCount: true
695731

696732
- task: CopyFiles@2

‎src/AppInstallerCLI/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
2+
<packages>
3+
<package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.328-preview" targetFramework="native" developmentDependency="true" />
34
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
45
</packages>

‎src/AppInstallerCLICore/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
2+
<packages>
3+
<package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.328-preview" targetFramework="native" developmentDependency="true" />
34
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
45
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.1" targetFramework="native" />
56
</packages>

‎src/AppInstallerCommonCore/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
2+
<packages>
3+
<package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.328-preview" targetFramework="native" developmentDependency="true" />
34
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
45
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.1" targetFramework="native" />
56
</packages>

‎src/AppInstallerRepositoryCore/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
2+
<packages>
3+
<package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.328-preview" targetFramework="native" developmentDependency="true" />
34
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
45
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.1" targetFramework="native" />
56
</packages>

‎src/AppInstallerSharedLib/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
2+
<packages>
3+
<package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.328-preview" targetFramework="native" developmentDependency="true" />
34
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
45
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.1" targetFramework="native" />
56
</packages>

‎src/Directory.Build.props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@
4545
<DefineConstants>$(WinGetMacros)$(DefineConstants)</DefineConstants>
4646
</PropertyGroup>
4747

48+
<!-- MSBuildCache for C++ projects: props must be imported first. -->
49+
<!-- The package is restored via packages.config; Directory.Build.targets imports the corresponding .targets file. -->
50+
<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
51+
<MSBuildCachePackageName>Microsoft.MSBuildCache.AzurePipelines</MSBuildCachePackageName>
52+
<MSBuildCachePackageVersion>0.1.328-preview</MSBuildCachePackageVersion>
53+
<MSBuildCachePackageRoot>$(SolutionDir)\packages\$(MSBuildCachePackageName).$(MSBuildCachePackageVersion)</MSBuildCachePackageRoot>
54+
</PropertyGroup>
55+
<Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).props"
56+
Condition="'$(MSBuildProjectExtension)' == '.vcxproj' and Exists('$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).props')" />
57+
4858
<!-- To prevent build agents from running out of disk space, clean as we go. -->
4959
<Target Name="CleanIntermediateFiles" AfterTargets="Build" Condition="'$(WingetCleanIntermediateFiles)'=='true'">
5060
<RemoveDir Directories="$(IntDir)" />

‎src/Directory.Build.targets‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<!-- MSBuildCache for C++ projects: targets must be imported last. -->
4+
<Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets"
5+
Condition="'$(MSBuildProjectExtension)' == '.vcxproj' and Exists('$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets')" />
6+
</Project>

‎src/Microsoft.Management.Configuration.OutOfProc/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
2+
<packages>
3+
<package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.328-preview" targetFramework="native" developmentDependency="true" />
34
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
45
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.1" targetFramework="native" />
56
</packages>

‎src/Microsoft.Management.Configuration/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
2+
<packages>
3+
<package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.328-preview" targetFramework="native" developmentDependency="true" />
34
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
45
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.1" targetFramework="native" />
56
</packages>

0 commit comments

Comments
 (0)