Skip to content

Commit d0f5039

Browse files
author
Mirroring
committed
Merge commit '67b32df67bc73fa9e3a28da2b770c4915e37106f'
2 parents 85104e1 + 67b32df commit d0f5039

18 files changed

+349
-91
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-ab8bc4e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ab8bc4e2/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-849e1a6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-849e1a63/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-wcf -->
1515
<!-- End: Package sources from dotnet-wcf -->

‎eng/Version.Details.xml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -8,95 +8,95 @@
88
<Uri>https://github.com/dotnet/msquic</Uri>
99
<Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.32">
11+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.33">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>ab8bc4e2860e29d700542c68e57daa5e7663af62</Sha>
13+
<Sha>849e1a63a8319f9578b9e5f02da592d24d4aa2df</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.32">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.33">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>ab8bc4e2860e29d700542c68e57daa5e7663af62</Sha>
17+
<Sha>849e1a63a8319f9578b9e5f02da592d24d4aa2df</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.32">
19+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.33">
2020
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>ab8bc4e2860e29d700542c68e57daa5e7663af62</Sha>
21+
<Sha>849e1a63a8319f9578b9e5f02da592d24d4aa2df</Sha>
2222
</Dependency>
2323
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
2424
<Uri>https://github.com/dotnet/wcf</Uri>
2525
<Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
2626
</Dependency>
2727
</ProductDependencies>
2828
<ToolsetDependencies>
29-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24266.4">
29+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24360.7">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
31+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24266.4">
33+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24360.7">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
35+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24266.4">
37+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24360.7">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
39+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24266.4">
41+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24360.7">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
43+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24266.4">
45+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24360.7">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
47+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24266.4">
49+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24360.7">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
51+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24266.4">
53+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24360.7">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
55+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24266.4">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24360.7">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
59+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24266.4">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24360.7">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
63+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24266.4">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24360.7">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
67+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24266.4">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24360.7">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
71+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24266.4">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24360.7">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
75+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24266.4">
77+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24360.7">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
79+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24266.4">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24360.7">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
83+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24266.4">
85+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24360.7">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
87+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24266.4">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24360.7">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
91+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24266.4">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24360.7">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
95+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24266.4">
97+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24360.7">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
99+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
100100
</Dependency>
101101
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
102102
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -222,9 +222,9 @@
222222
<Uri>https://github.com/dotnet/xharness</Uri>
223223
<Sha>d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1</Sha>
224224
</Dependency>
225-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24266.4">
225+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24360.7">
226226
<Uri>https://github.com/dotnet/arcade</Uri>
227-
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
227+
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
228228
</Dependency>
229229
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
230230
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@
4242
<!-- SDK dependencies -->
4343
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
4444
<!-- Arcade dependencies -->
45-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24266.4</MicrosoftDotNetApiCompatVersion>
46-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksFeedVersion>
47-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24266.4</MicrosoftDotNetCodeAnalysisVersion>
48-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24266.4</MicrosoftDotNetGenAPIVersion>
49-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24266.4</MicrosoftDotNetGenFacadesVersion>
50-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24266.4</MicrosoftDotNetXUnitExtensionsVersion>
51-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24266.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
52-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksArchivesVersion>
53-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksInstallersVersion>
54-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksPackagingVersion>
55-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksTemplatingVersion>
56-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24266.4</MicrosoftDotNetRemoteExecutorVersion>
58-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24266.4</MicrosoftDotNetVersionToolsTasksVersion>
59-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24266.4</MicrosoftDotNetPackageTestingVersion>
45+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24360.7</MicrosoftDotNetApiCompatVersion>
46+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksFeedVersion>
47+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24360.7</MicrosoftDotNetCodeAnalysisVersion>
48+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24360.7</MicrosoftDotNetGenAPIVersion>
49+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24360.7</MicrosoftDotNetGenFacadesVersion>
50+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24360.7</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24360.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
52+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksArchivesVersion>
53+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksInstallersVersion>
54+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksPackagingVersion>
55+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksTemplatingVersion>
56+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24360.7</MicrosoftDotNetRemoteExecutorVersion>
58+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24360.7</MicrosoftDotNetVersionToolsTasksVersion>
59+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24360.7</MicrosoftDotNetPackageTestingVersion>
6060
<!-- NuGet dependencies -->
6161
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
6262
<!-- Installer dependencies -->
@@ -175,9 +175,9 @@
175175
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
176176
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
177177
<!-- emscripten / Node -->
178-
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.32</MicrosoftNETWorkloadEmscriptenManifest60100Version>
179-
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.32</MicrosoftNETWorkloadEmscriptenManifest60300Version>
180-
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.32</MicrosoftNETWorkloadEmscriptenManifest60400Version>
178+
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.33</MicrosoftNETWorkloadEmscriptenManifest60100Version>
179+
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.33</MicrosoftNETWorkloadEmscriptenManifest60300Version>
180+
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.33</MicrosoftNETWorkloadEmscriptenManifest60400Version>
181181
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
182182
<!-- workloads -->
183183
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

‎eng/common/templates-official/job/source-build.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34+
# If set to true and running on a non-public project,
35+
# Internal blob storage locations will be enabled.
36+
# This is not enabled by default because many repositories do not need internal sources
37+
# and do not need to have the required service connections approved in the pipeline.
38+
enableInternalSources: false
39+
3440
jobs:
3541
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
3642
displayName: Source-Build (${{ parameters.platform.name }})
@@ -59,6 +65,8 @@ jobs:
5965
clean: all
6066

6167
steps:
68+
- ${{ if eq(parameters.enableInternalSources, true) }}:
69+
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
6270
- template: /eng/common/templates-official/steps/source-build.yml
6371
parameters:
6472
platform: ${{ parameters.platform }}

‎eng/common/templates-official/job/source-index-stage1.yml‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20240320.1
3+
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
45
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
56
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
67
preSteps: []
@@ -17,14 +18,14 @@ jobs:
1718
dependsOn: ${{ parameters.dependsOn }}
1819
condition: ${{ parameters.condition }}
1920
variables:
20-
- name: SourceIndexPackageVersion
21-
value: ${{ parameters.sourceIndexPackageVersion }}
21+
- name: SourceIndexUploadPackageVersion
22+
value: ${{ parameters.sourceIndexUploadPackageVersion }}
23+
- name: SourceIndexProcessBinlogPackageVersion
24+
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
2225
- name: SourceIndexPackageSource
2326
value: ${{ parameters.sourceIndexPackageSource }}
2427
- name: BinlogPath
2528
value: ${{ parameters.binlogPath }}
26-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
27-
- group: source-dot-net stage1 variables
2829

2930
pool: ${{ parameters.pool }}
3031
steps:
@@ -40,8 +41,8 @@ jobs:
4041
workingDirectory: $(Agent.TempDirectory)
4142

4243
- script: |
43-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
44-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
44+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
45+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
4546
displayName: Download Tools
4647
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
4748
workingDirectory: $(Agent.TempDirectory)
@@ -53,7 +54,21 @@ jobs:
5354
displayName: Process Binlog into indexable sln
5455

5556
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
56-
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
57+
- task: AzureCLI@2
58+
displayName: Get stage 1 auth token
59+
inputs:
60+
azureSubscription: 'SourceDotNet Stage1 Publish'
61+
addSpnToEnvironment: true
62+
scriptType: 'ps'
63+
scriptLocation: 'inlineScript'
64+
inlineScript: |
65+
echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId"
66+
echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken"
67+
echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId"
68+
69+
- script: |
70+
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
71+
displayName: "Login to Azure"
72+
73+
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
5774
displayName: Upload stage1 artifacts to source index
58-
env:
59-
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)

‎eng/common/templates-official/jobs/source-build.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ parameters:
2121
# one job runs on 'defaultManagedPlatform'.
2222
platforms: []
2323

24+
# If set to true and running on a non-public project,
25+
# Internal nuget and blob storage locations will be enabled.
26+
# This is not enabled by default because many repositories do not need internal sources
27+
# and do not need to have the required service connections approved in the pipeline.
28+
enableInternalSources: false
29+
2430
jobs:
2531

2632
- ${{ if ne(parameters.allCompletedJobId, '') }}:
@@ -38,9 +44,11 @@ jobs:
3844
parameters:
3945
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4046
platform: ${{ platform }}
47+
enableInternalSources: ${{ parameters.enableInternalSources }}
4148

4249
- ${{ if eq(length(parameters.platforms), 0) }}:
4350
- template: /eng/common/templates-official/job/source-build.yml
4451
parameters:
4552
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4653
platform: ${{ parameters.defaultManagedPlatform }}
54+
enableInternalSources: ${{ parameters.enableInternalSources }}

‎eng/common/templates-official/post-build/common-variables.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ variables:
22
- group: AzureDevOps-Artifact-Feeds-Pats
33
- group: DotNet-Blob-Feed
44
- group: DotNet-DotNetCli-Storage
5-
- group: DotNet-MSRC-Storage
65
- group: Publish-Build-Assets
76

87
# Whether the build is internal or not

0 commit comments

Comments
 (0)