Skip to content

Commit 54ff80e

Browse files
mikem8361mikem8361
authored
Merge latest main into release/stable (#5033)
2 parents 6d354b9 + b295dcd commit 54ff80e

File tree

43 files changed

+581
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+581
-248
lines changed

Diff for: ‎.github/CODEOWNERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
# have proper ownership.
88
/src/ @dotnet/dotnet-diag
99
/documentation/ @dotnet/dotnet-diag
10-
/eng/SourceBuild.props @dotnet/source-build-internal
11-
/eng/SourceBuildPrebuiltBaseline.xml @dotnet/source-build-internal
10+
/eng/DotNetBuild.props @dotnet/product-construction
11+
/eng/SourceBuildPrebuiltBaseline.xml @dotnet/source-build

Diff for: ‎NuGet.config

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
</solution>
66
<packageSources>
77
<clear />
8+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
9+
<!-- Begin: Package sources from dotnet-aspnetcore -->
10+
<add key="darc-pub-dotnet-aspnetcore-6d58cd8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-6d58cd8f/nuget/v3/index.json" />
11+
<!-- End: Package sources from dotnet-aspnetcore -->
12+
<!-- Begin: Package sources from dotnet-runtime -->
13+
<add key="darc-pub-dotnet-runtime-7dab903" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-7dab903b/nuget/v3/index.json" />
14+
<!-- End: Package sources from dotnet-runtime -->
15+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
816
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
917
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
1018
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />

Diff for: ‎documentation/FAQ.md

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
Frequently Asked Questions
22
==========================
33

4+
* For more information on any of the following errors, enabling logging will help diagnose the problem.
5+
6+
Under windbg/cdb execute the following commands:
7+
```
8+
!sosflush
9+
!logging enable
10+
```
11+
12+
Under dotnet-dump/lldb:
13+
```
14+
sosflush
15+
logging enable
16+
```
17+
18+
and then re-run command with the issue.
19+
420
* On MacOS if you see any of the following errors:
521
```
622
(lldb) plugin load libsosplugin.so
@@ -25,7 +41,7 @@ Frequently Asked Questions
2541
$ sudo codesign --force --sign - /usr/local/bin/lldb
2642
```
2743
28-
This will make a copy of Xcode lldb and adhoc sign it. Note that this workaround is only applicable to Xcode lldb, not the System lldb (`/usr/bin/lldb`), which may still fail to load. You may need to delete or rename `~/.lldbinit` to use `/usr/bin/lldb`.
44+
This will make a copy of Xcode lldb and adhoc sign it. Note that this workaround is only applicable to Xcode lldb, not the System lldb (`/usr/bin/lldb`), which may still fail to load. You may need to delete or rename `~/.lldbinit` to use `/usr/bin/lldb`.
2945
3046
* `dotnet-dump analyze` running on Windows doesn't support MacOS .NET 5.0 and 6.0 core dumps. `dotnet-dump` running on MacOS does support .NET 5.0 but not 6.0 core dumps (which will be fixed in a future dotnet-dump release). MacOS .NET 6.0 core dumps generated by the runtime via [createdump](https://github.com/dotnet/runtime/blob/main/docs/design/coreclr/botr/xplat-minidump-generation.md#os-x) are supported by lldb/SOS running on MacOS.
3147

Diff for: ‎eng/SourceBuild.props renamed to ‎eng/DotNetBuild.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
1+
<!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
22

33
<Project>
44

Diff for: ‎eng/SourceBuildPrebuiltBaseline.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
1+
<!-- When altering this file or making other Source Build related changes, include @dotnet/source-build as a reviewer. -->
22
<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
33

44
<UsageData>

Diff for: ‎eng/Version.Details.xml

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.24480.1">
3+
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.24528.1">
44
<Uri>https://github.com/microsoft/clrmd</Uri>
5-
<Sha>898339503a4f9d877be46826b5814c1813808ac5</Sha>
5+
<Sha>7616daa712ada6cc6c70d793fd5ed062c17fe2c0</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.0-beta.24480.1">
7+
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.0-beta.24528.1">
88
<Uri>https://github.com/microsoft/clrmd</Uri>
9-
<Sha>898339503a4f9d877be46826b5814c1813808ac5</Sha>
9+
<Sha>7616daa712ada6cc6c70d793fd5ed062c17fe2c0</Sha>
1010
</Dependency>
1111
</ProductDependencies>
1212
<ToolsetDependencies>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24504.4">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24527.1">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
15+
<Sha>bee0a0f7b1e68e88c63261e127beee2ed06c6d13</Sha>
1616
</Dependency>
1717
<!-- Intermediate is necessary for source build. -->
18-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24504.4">
18+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24527.1">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
20+
<Sha>bee0a0f7b1e68e88c63261e127beee2ed06c6d13</Sha>
2121
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24504.4">
23+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24527.1">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
25+
<Sha>bee0a0f7b1e68e88c63261e127beee2ed06c6d13</Sha>
2626
</Dependency>
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
3030
</Dependency>
31-
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rtm.24504.15">
31+
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rtm.24527.3">
3232
<Uri>https://github.com/dotnet/sdk</Uri>
33-
<Sha>6a7f86a90566a15439ae0332f17e50cf34c21c3a</Sha>
33+
<Sha>50e04b8d1d8ff413de90383aa799e4189612f685</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-rtm.24508.22">
35+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-rtm.24522.5">
3636
<Uri>https://github.com/dotnet/aspnetcore</Uri>
37-
<Sha>9f57b1ed7a4adab022ec5d227723f23862aad0e3</Sha>
37+
<Sha>6d58cd8ffa1b8f00a04238f16c58248d38c90776</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rtm.24508.22">
39+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0">
4040
<Uri>https://github.com/dotnet/aspnetcore</Uri>
41-
<Sha>9f57b1ed7a4adab022ec5d227723f23862aad0e3</Sha>
41+
<Sha>6d58cd8ffa1b8f00a04238f16c58248d38c90776</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-rtm.24508.17">
43+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0">
4444
<Uri>https://github.com/dotnet/runtime</Uri>
45-
<Sha>24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f</Sha>
45+
<Sha>7dab903b20269d78c6bc08d5269947db7d35c22b</Sha>
4646
</Dependency>
47-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24508.17">
47+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-rtm.24528.8">
4848
<Uri>https://github.com/dotnet/runtime</Uri>
49-
<Sha>24cfc7cc9dabdbe8607a3bf81ffbedf7e2cbb97f</Sha>
49+
<Sha>7dab903b20269d78c6bc08d5269947db7d35c22b</Sha>
5050
</Dependency>
5151
<!-- Intermediate is necessary for source build. -->
52-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.0-alpha.1.24507.1">
52+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.0-alpha.1.24528.1">
5353
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
54-
<Sha>fd609e3b427601180d23633e2f1a4cdac6c42c20</Sha>
54+
<Sha>ed0d2d18003162e01c244e5b7f97a3f8fd695d5f</Sha>
5555
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
5656
</Dependency>
5757
<Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-2.24271.11">

Diff for: ‎eng/Versions.props

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<RepositoryUrl>https://github.com/dotnet/diagnostics</RepositoryUrl>
44
<PreReleaseVersionLabel></PreReleaseVersionLabel>
5-
<VersionPrefix>8.0.0</VersionPrefix>
5+
<VersionPrefix>9.0.0</VersionPrefix>
66
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
77
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
88
<!--
@@ -16,11 +16,11 @@
1616
</PropertyGroup>
1717
<PropertyGroup>
1818
<!-- Latest shared runtime version updated by darc -->
19-
<VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.0-rtm.24508.17</VSRedistCommonNetCoreSharedFrameworkx6490Version>
20-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24508.17</MicrosoftNETCoreAppRuntimewinx64Version>
19+
<VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.0-rtm.24528.8</VSRedistCommonNetCoreSharedFrameworkx6490Version>
20+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
2121
<!-- Latest shared aspnetcore version updated by darc -->
22-
<MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-rtm.24508.22</MicrosoftAspNetCoreAppRefInternalVersion>
23-
<MicrosoftAspNetCoreAppRefVersion>9.0.0-rtm.24508.22</MicrosoftAspNetCoreAppRefVersion>
22+
<MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-rtm.24522.5</MicrosoftAspNetCoreAppRefInternalVersion>
23+
<MicrosoftAspNetCoreAppRefVersion>9.0.0</MicrosoftAspNetCoreAppRefVersion>
2424
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
2525
<MicrosoftDotnetSdkVersion>9.0.100-rc.1.24409.1</MicrosoftDotnetSdkVersion>
2626
</PropertyGroup>
@@ -37,7 +37,7 @@
3737
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
3838
<!-- Other libs -->
3939
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
40-
<MicrosoftDiagnosticsRuntimeVersion>4.0.0-beta.24480.1</MicrosoftDiagnosticsRuntimeVersion>
40+
<MicrosoftDiagnosticsRuntimeVersion>4.0.0-beta.24528.1</MicrosoftDiagnosticsRuntimeVersion>
4141
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
4242
<MicrosoftDiagnosticsTracingTraceEventVersion>3.0.7</MicrosoftDiagnosticsTracingTraceEventVersion>
4343
<MicrosoftExtensionsLoggingVersion>6.0.0</MicrosoftExtensionsLoggingVersion>
@@ -55,12 +55,12 @@
5555
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
5656
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
5757
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24504.4</MicrosoftDotNetCodeAnalysisVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24527.1</MicrosoftDotNetCodeAnalysisVersion>
5959
<StyleCopAnalyzersVersion>1.2.0-beta.406</StyleCopAnalyzersVersion>
6060
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
6161
<cdbsosversion>10.0.26100.1</cdbsosversion>
6262
<NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
63-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.0-alpha.1.24507.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
63+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.0-alpha.1.24528.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
6464
<!-- Roslyn and analyzers -->
6565
<!-- dotnet/roslyn dependencies -->
6666
<!--

Diff for: ‎eng/common/build.sh

-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ function Build {
231231
/p:Restore=$restore \
232232
/p:Build=$build \
233233
/p:DotNetBuildRepo=$product_build \
234-
/p:ArcadeBuildFromSource=$source_build \
235234
/p:DotNetBuildSourceOnly=$source_build \
236235
/p:Rebuild=$rebuild \
237236
/p:Test=$test \

Diff for: ‎eng/common/core-templates/job/job.yml

+9-45
Original file line numberDiff line numberDiff line change
@@ -128,33 +128,11 @@ jobs:
128128
- ${{ preStep }}
129129

130130
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
131-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
132-
- task: MicroBuildSigningPlugin@4
133-
displayName: Install MicroBuild plugin
134-
inputs:
135-
signType: $(_SignType)
136-
zipSources: false
137-
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138-
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
139-
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
140-
env:
141-
TeamName: $(_TeamName)
142-
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
143-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
131+
- template: /eng/common/core-templates/steps/install-microbuild.yml
132+
parameters:
133+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
134+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
144135
continueOnError: ${{ parameters.continueOnError }}
145-
condition: and(
146-
succeeded(),
147-
or(
148-
and(
149-
eq(variables['Agent.Os'], 'Windows_NT'),
150-
in(variables['_SignType'], 'real', 'test')
151-
),
152-
and(
153-
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
154-
ne(variables['Agent.Os'], 'Windows_NT'),
155-
eq(variables['_SignType'], 'real')
156-
)
157-
))
158136

159137
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
160138
- task: NuGetAuthenticate@1
@@ -183,26 +161,12 @@ jobs:
183161
- ${{ each step in parameters.componentGovernanceSteps }}:
184162
- ${{ step }}
185163

186-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
187-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
188-
- task: MicroBuildCleanup@1
189-
displayName: Execute Microbuild cleanup tasks
190-
condition: and(
191-
always(),
192-
or(
193-
and(
194-
eq(variables['Agent.Os'], 'Windows_NT'),
195-
in(variables['_SignType'], 'real', 'test')
196-
),
197-
and(
198-
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
199-
ne(variables['Agent.Os'], 'Windows_NT'),
200-
eq(variables['_SignType'], 'real')
201-
)
202-
))
164+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
165+
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
166+
parameters:
167+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
168+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
203169
continueOnError: ${{ parameters.continueOnError }}
204-
env:
205-
TeamName: $(_TeamName)
206170

207171
# Publish test results
208172
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:

Diff for: ‎eng/common/core-templates/steps/cleanup-microbuild.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
parameters:
2+
# Enable cleanup tasks for MicroBuild
3+
enableMicrobuild: false
4+
# Enable cleanup tasks for MicroBuild on Mac and Linux
5+
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
6+
enableMicrobuildForMacAndLinux: false
7+
continueOnError: false
8+
9+
steps:
10+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
11+
- task: MicroBuildCleanup@1
12+
displayName: Execute Microbuild cleanup tasks
13+
condition: and(
14+
always(),
15+
or(
16+
and(
17+
eq(variables['Agent.Os'], 'Windows_NT'),
18+
in(variables['_SignType'], 'real', 'test')
19+
),
20+
and(
21+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
22+
ne(variables['Agent.Os'], 'Windows_NT'),
23+
eq(variables['_SignType'], 'real')
24+
)
25+
))
26+
continueOnError: ${{ parameters.continueOnError }}
27+
env:
28+
TeamName: $(_TeamName)

Diff for: ‎eng/common/core-templates/steps/install-microbuild.yml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
parameters:
2+
# Enable cleanup tasks for MicroBuild
3+
enableMicrobuild: false
4+
# Enable cleanup tasks for MicroBuild on Mac and Linux
5+
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
6+
enableMicrobuildForMacAndLinux: false
7+
continueOnError: false
8+
9+
steps:
10+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
11+
# Remove Python downgrade with https://github.com/dotnet/arcade/issues/15151
12+
- ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
13+
- task: UsePythonVersion@0
14+
displayName: 'Use Python 3.11.x'
15+
inputs:
16+
versionSpec: '3.11.x'
17+
18+
- task: MicroBuildSigningPlugin@4
19+
displayName: Install MicroBuild plugin
20+
inputs:
21+
signType: $(_SignType)
22+
zipSources: false
23+
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
24+
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
25+
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
26+
env:
27+
TeamName: $(_TeamName)
28+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
29+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
30+
continueOnError: ${{ parameters.continueOnError }}
31+
condition: and(
32+
succeeded(),
33+
or(
34+
and(
35+
eq(variables['Agent.Os'], 'Windows_NT'),
36+
in(variables['_SignType'], 'real', 'test')
37+
),
38+
and(
39+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
40+
ne(variables['Agent.Os'], 'Windows_NT'),
41+
eq(variables['_SignType'], 'real')
42+
)
43+
))

Diff for: ‎eng/common/core-templates/steps/source-build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ steps:
8686
$runtimeOsArgs \
8787
$baseOsArgs \
8888
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
89-
/p:ArcadeBuildFromSource=true \
9089
/p:DotNetBuildSourceOnly=true \
9190
/p:DotNetBuildRepo=true \
9291
/p:AssetManifestFileName=$assetManifestFileName

0 commit comments

Comments
 (0)