Skip to content

Commit 6b0afdb

Browse files
committedMar 1, 2022

File tree

6 files changed

+53
-5
lines changed

6 files changed

+53
-5
lines changed
 

‎NuGet.config

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<packageSources>
66
<clear />
77
<add key="DNCENG-CoreClrPal" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/CoreClrPal/nuget/v3/index.json" />
8-
<add key="privateDependency" value="https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/ClrInstrumentationEngine-PrivateDependency/nuget/v3/index.json" />
98
</packageSources>
109
<activePackageSource>
1110
<add key="All" value="(Aggregate source)" />

‎NuGet.internal.config

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (c) Microsoft Corporation. All rights reserved.
3+
Licensed under the MIT License. -->
4+
<configuration>
5+
<packageSources>
6+
<clear />
7+
<add key="DNCENG-CoreClrPal" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/CoreClrPal/nuget/v3/index.json" />
8+
<add key="privateDependency" value="https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/ClrInstrumentationEngine-PrivateDependency/nuget/v3/index.json" />
9+
</packageSources>
10+
<activePackageSource>
11+
<add key="All" value="(Aggregate source)" />
12+
</activePackageSource>
13+
<config>
14+
<!-- For projects using packages.config -->
15+
<add key="repositoryPath" value="packages" />
16+
<!-- For projects not using packages.config -->
17+
<add key="globalPackagesFolder" value="packages" />
18+
</config>
19+
</configuration>

‎build/yaml/jobs/binaries.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ jobs:
4848
Debug_AnyCPU:
4949
Configuration: 'Debug'
5050
Platform: 'Any CPU'
51+
${{ if eq(parameters.IsMicroBuildInternal, 'true') }}:
52+
Release_ARM64:
53+
Configuration: 'Release'
54+
Platform: 'ARM64'
55+
Debug_ARM64:
56+
Configuration: 'Debug'
57+
Platform: 'ARM64'
5158

5259
# Linux Binaries
5360
- template: linux/binaries.yaml

‎build/yaml/jobs/packages.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ jobs:
3636
Debug_AnyCPU:
3737
Configuration: 'Debug'
3838
Platform: 'Any CPU'
39+
${{ if eq(parameters.IsMicroBuildInternal, 'true') }}:
40+
Release_ARM64:
41+
Configuration: 'Release'
42+
Platform: 'ARM64'
43+
Debug_ARM64:
44+
Configuration: 'Debug'
45+
Platform: 'ARM64'
3946

4047
# Linux Packages
4148
- template: linux/packages.yaml

‎build/yaml/steps/windows/dotnetrestore.yaml

+19-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55

66
parameters:
77
Solution: ''
8-
Condition: 'succeeded()'
98
BinLogCategory: ''
109

1110
steps:
11+
- task: NuGetAuthenticate@0
12+
inputs:
13+
forceReinstallCredentialProvider: true
14+
1215
# 'command: restore' does not take additional arguments, thus set
1316
# 'command: custom' and 'custom: restore' which then requires setting
1417
# of all arguments.
@@ -22,4 +25,18 @@ steps:
2225
--configfile
2326
$(Build.SourcesDirectory)\NuGet.Config
2427
-bl:"$(Build.ArtifactStagingDirectory)\logs\${{ parameters.BinLogCategory }}_Windows_AnyCPU_$(Configuration)_Restore.binlog"
25-
condition: ${{ parameters.Condition }}
28+
condition: and(succeeded(), eq(variables['Platform'], 'Any CPU'))
29+
30+
- task: DotNetCoreCLI@2
31+
displayName: Restore ${{ parameters.Solution }}
32+
inputs:
33+
command: custom
34+
custom: restore
35+
arguments: >-
36+
$(Build.SourcesDirectory)\${{ parameters.Solution }}
37+
--configfile
38+
$(Build.SourcesDirectory)\NuGet.internal.Config
39+
/p:IncludeARM64=True
40+
-bl:"$(Build.ArtifactStagingDirectory)\logs\${{ parameters.BinLogCategory }}_Windows_ARM64_$(Configuration)_Restore.binlog"
41+
condition: and(succeeded(), eq(variables['Platform'], 'ARM64'))
42+

‎build/yaml/steps/windows/enginerestore.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ parameters:
2525
BinLogCategory: ''
2626

2727
steps:
28-
# nuget restore InstrumentationEngine.sln
28+
# restore InstrumentationEngine.sln packages
2929
- template: dotnetrestore.yaml
3030
parameters:
3131
Solution: InstrumentationEngine.sln
32-
Condition: and(succeeded(), eq(variables['Platform'], 'Any CPU'))
3332
BinLogCategory: ${{ parameters.BinLogCategory }}
3433

3534
- template: nugetrestore.yaml

0 commit comments

Comments
 (0)
Please sign in to comment.